diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 99f35f66a..9a7b9538a 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -67,7 +67,6 @@

v5.6.2

What's New

diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt index 29e165973..23e9bf40c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt +++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt @@ -157,4 +157,3 @@ const val SNOWFALL = "snowfall" const val LYRICS_TYPE = "lyrics_type" const val PLAYBACK_SPEED = "playback_speed" const val PLAYBACK_PITCH = "playback_pitch" -const val CUSTOM_FONT = "custom_font" 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 502977858..e9aa2a3b3 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 @@ -147,7 +147,7 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener { } override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { - if (key == GENERAL_THEME || key == MATERIAL_YOU || key == BLACK_THEME || key == ADAPTIVE_COLOR_APP || key == USER_NAME || key == TOGGLE_FULL_SCREEN || key == TOGGLE_VOLUME || key == ROUND_CORNERS || key == CAROUSEL_EFFECT || key == NOW_PLAYING_SCREEN_ID || key == TOGGLE_GENRE || key == BANNER_IMAGE_PATH || key == PROFILE_IMAGE_PATH || key == CIRCULAR_ALBUM_ART || key == KEEP_SCREEN_ON || key == TOGGLE_SEPARATE_LINE || key == TOGGLE_HOME_BANNER || key == TOGGLE_ADD_CONTROLS || key == ALBUM_COVER_STYLE || key == HOME_ARTIST_GRID_STYLE || key == ALBUM_COVER_TRANSFORM || key == DESATURATED_COLOR || key == EXTRA_SONG_INFO || key == TAB_TEXT_MODE || key == LANGUAGE_NAME || key == LIBRARY_CATEGORIES || key == CUSTOM_FONT) { + if (key == GENERAL_THEME || key == MATERIAL_YOU || key == BLACK_THEME || key == ADAPTIVE_COLOR_APP || key == USER_NAME || key == TOGGLE_FULL_SCREEN || key == TOGGLE_VOLUME || key == ROUND_CORNERS || key == CAROUSEL_EFFECT || key == NOW_PLAYING_SCREEN_ID || key == TOGGLE_GENRE || key == BANNER_IMAGE_PATH || key == PROFILE_IMAGE_PATH || key == CIRCULAR_ALBUM_ART || key == KEEP_SCREEN_ON || key == TOGGLE_SEPARATE_LINE || key == TOGGLE_HOME_BANNER || key == TOGGLE_ADD_CONTROLS || key == ALBUM_COVER_STYLE || key == HOME_ARTIST_GRID_STYLE || key == ALBUM_COVER_TRANSFORM || key == DESATURATED_COLOR || key == EXTRA_SONG_INFO || key == TAB_TEXT_MODE || key == LANGUAGE_NAME || key == LIBRARY_CATEGORIES) { postRecreate() } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt index 6b95a2149..e9cac3e2a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt @@ -24,7 +24,6 @@ import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode import androidx.core.os.ConfigurationCompat import code.name.monkey.appthemehelper.common.ATHToolbarActivity import code.name.monkey.retromusic.LanguageContextWrapper -import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.theme.ThemeManager @@ -58,9 +57,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable { com.google.android.material.R.style.ThemeOverlay_Material3_DynamicColors_DayNight ) } - if (PreferenceUtil.isCustomFont) { - setTheme(R.style.CircularStdFontOverlay) - } } override fun onWindowFocusChanged(hasFocus: Boolean) { diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt index 5fc056b35..6463070d7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt @@ -115,10 +115,8 @@ fun SeekBar.addAccentColor() { fun Slider.accent() { if (materialYou) return - val accentColor = context.accentColor() - thumbTintList = accentColor.colorStateList - trackActiveTintList = accentColor.colorStateList - trackInactiveTintList = ColorUtil.withAlpha(accentColor, 0.1F).colorStateList + trackActiveTintList = context.accentColor().colorStateList + trackInactiveTintList = context.accentColorVariant().colorStateList } fun Button.accentTextColor() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt index 05205b9c5..c0c8207ef 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt @@ -121,11 +121,6 @@ class ThemeSettingsFragment : AbsSettingsFragment() { restartActivity() true } - val customFont: ATESwitchPreference? = findPreference(CUSTOM_FONT) - customFont?.setOnPreferenceChangeListener { _, _ -> - restartActivity() - true - } } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt index b12986c2e..7a92d61a6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt @@ -665,9 +665,6 @@ object PreferenceUtil { val materialYou get() = sharedPreferences.getBoolean(MATERIAL_YOU, VersionUtils.hasS()) - val isCustomFont - get() = sharedPreferences.getBoolean(CUSTOM_FONT, false) - val isSnowFalling get() = sharedPreferences.getBoolean(SNOWFALL, false) diff --git a/app/src/main/res/font/circular.xml b/app/src/main/res/font/circular.xml deleted file mode 100644 index d5fabd612..000000000 --- a/app/src/main/res/font/circular.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/font/circular_std_black.otf b/app/src/main/res/font/circular_std_black.otf deleted file mode 100644 index c62b210c5..000000000 Binary files a/app/src/main/res/font/circular_std_black.otf and /dev/null differ diff --git a/app/src/main/res/font/circular_std_book.otf b/app/src/main/res/font/circular_std_book.otf deleted file mode 100644 index 3a1f1ad82..000000000 Binary files a/app/src/main/res/font/circular_std_book.otf and /dev/null differ diff --git a/app/src/main/res/font/circular_std_medium.otf b/app/src/main/res/font/circular_std_medium.otf deleted file mode 100644 index 931f4159d..000000000 Binary files a/app/src/main/res/font/circular_std_medium.otf and /dev/null differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b0d46c2fa..5a1f5e2e1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -529,5 +529,4 @@ Playback Speed Pitch Playback Settings - Use Custom font diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f44d8fb6e..f137c7ce9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -245,9 +245,4 @@ @null @color/transparent - - diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 86b3e9c32..4b67a2825 100755 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -30,12 +30,6 @@ android:title="@string/pref_title_md3" app:isPreferenceVisible="@bool/md3_available" /> - -