Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 02b72551
This commit is contained in:
Prathamesh More 2022-01-05 20:22:54 +05:30
parent c974d7fefc
commit 5589fab2c6
14 changed files with 3 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/assets/retro-changelog.html
View file

@ -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>

1
app/src/main/java/code/name/monkey/retromusic/Constants.kt
View file

@ -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"

2
app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
View file

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

4
app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
View file

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

6
app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
View file

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

5
app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
View file

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

3
app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
View file

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

16
app/src/main/res/font/circular.xml
View file

@ -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>

BIN
app/src/main/res/font/circular_std_black.otf
View file

Binary file not shown.

BIN
app/src/main/res/font/circular_std_book.otf
View file

Binary file not shown.

BIN
app/src/main/res/font/circular_std_medium.otf
View file

Binary file not shown.

1
app/src/main/res/values/strings.xml
View file

@ -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>

5
app/src/main/res/values/styles.xml
View file

@ -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>

6
app/src/main/res/xml/pref_general.xml
View file

@ -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