From 48c0d5ca17b0cafa5ab71eda2a2680d385bc2f4a Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 25 Jun 2020 18:22:33 +0400 Subject: [PATCH] new additions --- app/app.iml | 10 +-- app/src/main/AndroidManifest.xml | 11 +-- .../manager/ui/fragments/HomeFragment.kt | 32 ++++++++- .../main/res/drawable/ic_shortcut_info.xml | 2 +- .../res/drawable/ic_shortcut_settings.xml | 2 +- app/src/main/res/drawable/ic_vanced_nobg.xml | 10 +-- app/src/main/res/layout/fragment_home.xml | 1 + .../res/layout/include_changelog_pages.xml | 27 -------- .../main/res/layout/include_changelogs.xml | 67 ++++++++++++++++--- .../main/res/layout/include_useful_links.xml | 31 ++------- .../main/res/layout/include_vanced_medias.xml | 7 +- 11 files changed, 111 insertions(+), 89 deletions(-) delete mode 100644 app/src/main/res/layout/include_changelog_pages.xml diff --git a/app/app.iml b/app/app.iml index 874c5236..8a4e9580 100644 --- a/app/app.iml +++ b/app/app.iml @@ -72,15 +72,15 @@ - + - + - - - + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2aa566b9..95a35c90 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -62,15 +62,8 @@ - - - + + diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index 3c5f8b0b..b68830f2 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt @@ -1,5 +1,6 @@ package com.vanced.manager.ui.fragments +import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -9,15 +10,16 @@ import android.graphics.Color import android.os.Bundle import android.util.Log import android.view.* -import android.widget.ProgressBar -import android.widget.TextView -import android.widget.Toast +import android.view.animation.Animation +import android.view.animation.RotateAnimation +import android.widget.* import androidx.databinding.DataBindingUtil import androidx.fragment.app.viewModels import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.preference.PreferenceManager.getDefaultSharedPreferences import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.button.MaterialButton +import com.google.android.material.card.MaterialCardView import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator import com.vanced.manager.R @@ -35,6 +37,7 @@ class HomeFragment : Home() { private lateinit var sectionPageRootAdapter: SectionPageRootAdapter private lateinit var viewPager: ViewPager2 private lateinit var binding: FragmentHomeBinding + private var isExpanded: Boolean = false override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -46,6 +49,7 @@ class HomeFragment : Home() { return binding.root } + @SuppressLint("ClickableViewAccessibility") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -71,6 +75,28 @@ class HomeFragment : Home() { } } + view.findViewById(R.id.changelog_card).setOnTouchListener { _, _ -> + cardExpandCollapse() + return@setOnTouchListener true + } + view.findViewById(R.id.changelog_button).setOnClickListener { + cardExpandCollapse() + } + } + + private fun cardExpandCollapse() { + val viewPagerContainer = view?.findViewById(R.id.viewpager_container) + val arrowAnimation: RotateAnimation + if (isExpanded) { + viewPagerContainer?.visibility = View.GONE + isExpanded = false + arrowAnimation = RotateAnimation(180f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f) + } else { + viewPagerContainer?.visibility = View.VISIBLE + isExpanded = true + arrowAnimation = RotateAnimation(0f, 180f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f) + } + arrowAnimation.start() } override fun onPause() { diff --git a/app/src/main/res/drawable/ic_shortcut_info.xml b/app/src/main/res/drawable/ic_shortcut_info.xml index 4194d487..17d70fcf 100644 --- a/app/src/main/res/drawable/ic_shortcut_info.xml +++ b/app/src/main/res/drawable/ic_shortcut_info.xml @@ -7,6 +7,6 @@ android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" android:fillColor="#FFFFFF"/> diff --git a/app/src/main/res/drawable/ic_shortcut_settings.xml b/app/src/main/res/drawable/ic_shortcut_settings.xml index 7a88ef89..48beb041 100644 --- a/app/src/main/res/drawable/ic_shortcut_settings.xml +++ b/app/src/main/res/drawable/ic_shortcut_settings.xml @@ -7,6 +7,6 @@ android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" android:fillColor="#FFFFFF"/> diff --git a/app/src/main/res/drawable/ic_vanced_nobg.xml b/app/src/main/res/drawable/ic_vanced_nobg.xml index 3c22913a..beea9b7c 100644 --- a/app/src/main/res/drawable/ic_vanced_nobg.xml +++ b/app/src/main/res/drawable/ic_vanced_nobg.xml @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index ed5c2aa4..08e6368b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -18,6 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" + android:animateLayoutChanges="true" android:scrollbars="none"> - - - - - - - diff --git a/app/src/main/res/layout/include_changelogs.xml b/app/src/main/res/layout/include_changelogs.xml index 13a14041..01fa05ee 100644 --- a/app/src/main/res/layout/include_changelogs.xml +++ b/app/src/main/res/layout/include_changelogs.xml @@ -1,12 +1,63 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/changelog_card" + style="@style/MaterialCard"> + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/include_useful_links.xml b/app/src/main/res/layout/include_useful_links.xml index 7927dd0d..3573f272 100644 --- a/app/src/main/res/layout/include_useful_links.xml +++ b/app/src/main/res/layout/include_useful_links.xml @@ -25,34 +25,11 @@ style="@style/CardTitle" android:text="@string/useful_links" /> - - - - - - - - - + android:layout_height="wrap_content" + bind:viewModel="@{viewModel}"/> diff --git a/app/src/main/res/layout/include_vanced_medias.xml b/app/src/main/res/layout/include_vanced_medias.xml index 9e1fcf89..07b4cbc2 100644 --- a/app/src/main/res/layout/include_vanced_medias.xml +++ b/app/src/main/res/layout/include_vanced_medias.xml @@ -33,11 +33,12 @@ android:textAllCaps="false" android:fontFamily="@font/exo_semibold" android:textSize="17sp" + app:iconPadding="7sp" app:layout_constraintEnd_toStartOf="@id/bravebtn" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:onClick='@{()-> viewModel.openUrl("https://reddit.com/r/vanced")}'/> + android:onClick='@{()-> viewModel.openUrl("https://vanced.app")}'/> + android:onClick='@{()-> viewModel.openUrl("https://brave.com/van874")}'/>