From 71860717720f437f28f2ef970b15689e20e61d90 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Sun, 5 Jun 2022 22:31:29 +0530 Subject: [PATCH] Fixed Splash screen when theme settings are changed --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 3 +-- .../retromusic/activities/MainActivity.kt | 18 ++--------------- .../player/PlayerAlbumCoverFragment.kt | 1 + .../fragments/settings/AbsSettingsFragment.kt | 6 +----- .../fragments/settings/SettingsFragment.kt | 20 +------------------ .../{ic_splash_anim.xml => avd_splash.xml} | 0 .../fragment_md3_player_playback_controls.xml | 4 ++-- app/src/main/res/values-v31/styles.xml | 6 +++--- build.gradle | 2 +- 10 files changed, 14 insertions(+), 50 deletions(-) rename app/src/main/res/drawable/{ic_splash_anim.xml => avd_splash.xml} (100%) diff --git a/app/build.gradle b/app/build.gradle index 14dc195e5..b0ae9c498 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 10585 + versionCode 10587 versionName '5.9.0' buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"") @@ -92,7 +92,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.preference:preference-ktx:$preference_version" - implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.palette:palette-ktx:1.0.0' //Cast Dependencies diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 66b48f9c4..89cf058f6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,13 +39,12 @@ android:supportsRtl="true" android:theme="@style/Theme.RetroMusic.FollowSystem" android:usesCleartextTraffic="true" - tools:ignore="AllowBackup,GoogleAppIndexingWarning" tools:targetApi="m"> + android:theme="@style/Theme.RetroMusic.SplashScreen"> diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index fbbdac1b5..766031351 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -24,7 +24,6 @@ import androidx.navigation.ui.setupWithNavController import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsCastActivity import code.name.monkey.retromusic.extensions.* -import code.name.monkey.retromusic.fragments.settings.OnThemeChangedListener import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.SearchQueryHelper.getSongs import code.name.monkey.retromusic.interfaces.IScrollHelper @@ -39,14 +38,14 @@ import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import org.koin.android.ext.android.get -class MainActivity : AbsCastActivity(), OnThemeChangedListener { +class MainActivity : AbsCastActivity() { companion object { const val TAG = "MainActivity" const val EXPAND_PANEL = "expand_panel" } override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(extra(TAG).value ?: savedInstanceState) + super.onCreate(savedInstanceState) setTaskDescriptionColorAuto() hideStatusBar() updateTabs() @@ -132,19 +131,6 @@ class MainActivity : AbsCastActivity(), OnThemeChangedListener { } } - override fun onThemeValuesChanged() { - restart() - } - - private fun restart() { - val savedInstanceState = Bundle() - onSaveInstanceState(savedInstanceState) - finish() - val intent = Intent(this, this::class.java).putExtra(TAG, savedInstanceState) - startActivity(intent) - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) - } - override fun onServiceConnected() { super.onServiceConnected() intent ?: return diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt index 42fa58d3f..d0db68330 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt @@ -265,6 +265,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {} override fun onPageSelected(position: Int) { + logD("Page Selected $position") currentPosition = position if (binding.viewPager.adapter != null) { (binding.viewPager.adapter as AlbumCoverPagerAdapter).receiveColor( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt index b0fe30dfc..fece22696 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt @@ -108,10 +108,6 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() { } fun restartActivity() { - if (activity is OnThemeChangedListener && !VersionUtils.hasS()) { - (activity as OnThemeChangedListener).onThemeValuesChanged() - } else { - activity?.recreate() - } + activity?.recreate() } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt index de6d42946..5c3f5a4a0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt @@ -25,7 +25,6 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager import code.name.monkey.retromusic.databinding.FragmentSettingsBinding import code.name.monkey.retromusic.extensions.applyToolbar -import code.name.monkey.retromusic.extensions.extra import code.name.monkey.retromusic.extensions.findNavController import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.color.ColorCallback @@ -34,11 +33,6 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback { private var _binding: FragmentSettingsBinding? = null private val binding get() = _binding!! - override fun onCreate(savedInstanceState: Bundle?) { - val mSavedInstanceState = extra(TAG).value ?: savedInstanceState - super.onCreate(mSavedInstanceState) - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { _binding = FragmentSettingsBinding.bind(view) setupToolbar() @@ -77,15 +71,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback { ThemeStore.editTheme(requireContext()).accentColor(color).commit() if (VersionUtils.hasNougatMR()) DynamicShortcutManager(requireContext()).updateDynamicShortcuts() - restartActivity() - } - - fun restartActivity() { - if (activity is OnThemeChangedListener && !VersionUtils.hasS()) { - (activity as OnThemeChangedListener).onThemeValuesChanged() - } else { - activity?.recreate() - } + activity?.recreate() } override fun onDestroyView() { @@ -97,7 +83,3 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback { val TAG: String = SettingsFragment::class.java.simpleName } } - -interface OnThemeChangedListener { - fun onThemeValuesChanged() -} diff --git a/app/src/main/res/drawable/ic_splash_anim.xml b/app/src/main/res/drawable/avd_splash.xml similarity index 100% rename from app/src/main/res/drawable/ic_splash_anim.xml rename to app/src/main/res/drawable/avd_splash.xml diff --git a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml index bf669d816..99fd4e8d8 100644 --- a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml @@ -72,7 +72,7 @@ android:paddingHorizontal="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewHeadline6" + android:textAppearance="@style/TextViewHeadline5" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" tools:text="@tools:sample/lorem/random" /> @@ -91,7 +91,7 @@ android:paddingHorizontal="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewBody1" + android:textAppearance="@style/TextViewSubtitle2" android:textColor="?android:attr/textColorSecondary" app:layout_constrainedWidth="true" tools:text="@tools:sample/full_names" /> diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml index 7437a1528..e6579dd2f 100644 --- a/app/src/main/res/values-v31/styles.xml +++ b/app/src/main/res/values-v31/styles.xml @@ -17,9 +17,9 @@ @android:color/system_accent1_50 - diff --git a/build.gradle b/build.gradle index e37ddd4ef..d1d3d8338 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { navigation_version = '2.5.0-rc01' mdc_version = '1.7.0-alpha02' preference_version = '1.2.0' - appcompat_version = '1.4.1' + appcompat_version = '1.4.2' } repositories {