Revert "Added Circular Std and a toggle to use it"

This reverts commit 02b72551

app/src/main/assets/retro-changelog.html

@@ -67,7 +67,6 @@
     <h2>v5.6.2</h2>
     <h3>What's New</h3>
     <ul>
-        <li>Added back Circular Std</li>
         <li>Added ability to set Playback speed and pitch</li>
         <li>Added option to show lyrics over Cover</li>
     </ul>

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"

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()
         }
     }

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) {

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()
+    trackActiveTintList = context.accentColor().colorStateList
-    thumbTintList = accentColor.colorStateList
+    trackInactiveTintList = context.accentColorVariant().colorStateList
-    trackActiveTintList = accentColor.colorStateList
-    trackInactiveTintList = ColorUtil.withAlpha(accentColor, 0.1F).colorStateList
 }
 
 fun Button.accentTextColor() {

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?) {

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)
 

app/src/main/res/font/circular.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:android="http://schemas.android.com/apk/res/android">
-    <font
-        android:font="@font/circular_std_book"
-        android:fontStyle="normal"
-        android:fontWeight="400" />
-    <font
-        android:font="@font/circular_std_medium"
-        android:fontStyle="normal"
-        android:fontWeight="600" />
-
-    <font
-        android:font="@font/circular_std_black"
-        android:fontWeight="900" />
-
-</font-family>

app/src/main/res/values/strings.xml

@@ -529,5 +529,4 @@
     <string name="playback_speed">Playback Speed</string>
     <string name="playback_pitch">Pitch</string>
     <string name="playback_settings">Playback Settings</string>
-    <string name="pref_title_custom_font">Use Custom font</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -245,9 +245,4 @@
         <item name="android:windowFrame">@null</item>
         <item name="background">@color/transparent</item>
     </style>
-
-    <style name="CircularStdFontOverlay" parent="">
-        <item name="android:fontFamily">@font/circular</item>
-        <item name="fontFamily">@font/circular</item>
-    </style>
 </resources>

app/src/main/res/xml/pref_general.xml

@@ -30,12 +30,6 @@
             android:title="@string/pref_title_md3"
             app:isPreferenceVisible="@bool/md3_available" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="custom_font"
-            android:layout="@layout/list_item_view_switch_no_title"
-            android:title="@string/pref_title_custom_font" />
-
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory