From 88da71502f9a4bbf99b86ba8ae907c71790a6bee Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 20 Jul 2022 13:49:56 +0200 Subject: [PATCH] minor fixes --- .../github/libretube/fragments/PlayerFragment.kt | 16 +++++++++++----- .../com/github/libretube/util/ThemeHelper.kt | 6 ++++-- .../libretube/views/CustomExoPlayerView.kt | 2 +- .../main/res/layout/fragment_subscriptions.xml | 8 ++++---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt index 255113cb6..7a7bdeef7 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -404,10 +404,10 @@ class PlayerFragment : Fragment() { // show the advanced player options playerBinding.toggleOptions.setOnClickListener { if (playerBinding.advancedOptions.isVisible) { - playerBinding.toggleOptions.animate().rotationX(0F).setDuration(200).start() + playerBinding.toggleOptions.animate().rotation(0F).setDuration(250).start() playerBinding.advancedOptions.visibility = View.GONE } else { - playerBinding.toggleOptions.animate().rotationX(180F).setDuration(200).start() + playerBinding.toggleOptions.animate().rotation(180F).setDuration(250).start() playerBinding.advancedOptions.visibility = View.VISIBLE } } @@ -613,9 +613,15 @@ class PlayerFragment : Fragment() { } private fun toggleDescription() { - binding.playerDescriptionArrow.animate().rotationBy(180F).setDuration(250).start() - binding.descLinLayout.visibility = - if (binding.descLinLayout.isVisible) View.GONE else View.VISIBLE + if (binding.descLinLayout.isVisible) { + // hide the description and chapters + binding.playerDescriptionArrow.animate().rotation(0F).setDuration(250).start() + binding.descLinLayout.visibility = View.GONE + } else { + // show the description and chapters + binding.playerDescriptionArrow.animate().rotation(180F).setDuration(250).start() + binding.descLinLayout.visibility = View.VISIBLE + } } private fun toggleComments() { diff --git a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt index 6efb2591b..10e56715f 100644 --- a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt +++ b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt @@ -102,14 +102,16 @@ object ThemeHelper { val nManager = context .getSystemService(AppCompatActivity.NOTIFICATION_SERVICE) as NotificationManager nManager.cancelAll() - // restart to MainActivity + // start a new Intent of the app val pm: PackageManager = context.packageManager val intent = pm.getLaunchIntentForPackage(context.packageName) intent?.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK context.startActivity(intent) + // kill the old application + android.os.Process.killProcess(android.os.Process.myPid()) } - fun getThemeColor(context: Context, colorCode: Int): Int { + private fun getThemeColor(context: Context, colorCode: Int): Int { val value = TypedValue() context.theme.resolveAttribute(colorCode, value, true) return value.data diff --git a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt index 5a11b0e30..65f9af39b 100644 --- a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt @@ -19,7 +19,7 @@ internal class CustomExoPlayerView( init { setControllerVisibilityListener { // hide the advanced options - binding.toggleOptions.animate().rotationX(0F).setDuration(0).start() + binding.toggleOptions.animate().rotation(0F).setDuration(250).start() binding.advancedOptions.visibility = View.GONE } } diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index 02d31f998..b580cdf04 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -62,10 +62,10 @@ style="@style/Widget.Material3.CardView.Elevated" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" + android:layout_marginStart="8dp" + android:layout_marginTop="5dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="12dp" android:visibility="gone" app:cardCornerRadius="18dp" app:cardElevation="20dp">