nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Settings icons rolled back,preference category title style, tabs options fix

main
h4h13 2019-07-31 12:56:28 +05:30
parent 640ac4d4c3
commit da640ceff8
18 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
versionCode 344
versionName '3.2.203'
versionCode 345
versionName '3.2.220'
multiDexEnabled true

2
app/src/main/assets/retro-changelog.html
View File

File diff suppressed because one or more lines are too long

4
app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
View File

@ -41,10 +41,10 @@ class SettingsActivity : AbsBaseActivity(), SharedPreferences.OnSharedPreference
setSupportActionBar(toolbar)
setTitle(R.string.action_settings)
toolbar.apply {
setTitleTextColor( ThemeStore.accentColor(context))
setTitleTextColor( ThemeStore.textColorPrimary(context))
setBackgroundColor(ThemeStore.primaryColor(context))
setNavigationOnClickListener { onBackPressed() }
ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.accentColor(context))
ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.textColorSecondary(context))
}
appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this))

2
app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
View File

@ -123,7 +123,7 @@ public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapte
ViewHolder(View view) {
super(view);
checkBox = view.findViewById(R.id.checkbox);
checkBox.setBackgroundTintList(ColorStateList.valueOf(ThemeStore.Companion.accentColor(checkBox.getContext())));
checkBox.setButtonTintList(ColorStateList.valueOf(ThemeStore.Companion.accentColor(checkBox.getContext())));
title = view.findViewById(R.id.title);
dragView = view.findViewById(R.id.drag_view);
}

2
app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
View File

@ -55,7 +55,7 @@ class AlbumCoverStylePreference : ATEDialogPreference {
}
init {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
}

2
app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
View File

@ -42,7 +42,7 @@ class BlacklistPreference : ATEDialogPreference {
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
init {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
}

2
app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
View File

@ -44,7 +44,7 @@ class LibraryPreference : ATEDialogPreference {
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
init {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
}

2
app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt
View File

@ -37,7 +37,7 @@ class MaterialListPreference : ListPreference {
}
private fun init(context: Context) {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {

2
app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
View File

@ -57,7 +57,7 @@ class NowPlayingScreenPreference : ATEDialogPreference {
}
init {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
}

3
app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
View File

@ -384,6 +384,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
@Override
public void onSeekTo(long pos) {
seek((int) pos);
updateMediaSessionPlaybackState();
}
@Override
@ -698,7 +699,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
new PlaybackStateCompat.Builder()
.setActions(MEDIA_SESSION_ACTIONS)
.setState(isPlaying() ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED,
getPosition(), 1)
getSongProgressMillis(), 1)
.build());
}

4
app/src/main/res/layout/activity_settings.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -23,7 +24,8 @@
android:id="@+id/toolbar"
style="@style/Toolbar"
app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
tools:title="@string/app_name" />
</com.google.android.material.appbar.AppBarLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

11
app/src/main/res/values/styles.xml
View File

@ -41,9 +41,8 @@
<style name="ToolbarTextAppearance">
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
<item name="android:fontFamily">@font/circular</item>
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
</item>
</style>
<style name="ToolbarSubTitleTextAppearance">
@ -51,13 +50,7 @@
</style>
<style name="BigTitleTextAppearance">
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textStyle">bold</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
</style>
<style name="BigTitleTextAppearanceToolbar">

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.kt
View File

@ -39,7 +39,7 @@ class ATEColorPreference @JvmOverloads constructor(
widgetLayoutResource = R.layout.ate_preference_color
isPersistent = false
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
override fun onBindViewHolder(holder: PreferenceViewHolder) {

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.kt
View File

@ -30,7 +30,7 @@ class ATEListPreference @JvmOverloads constructor(
) : ListPreference(context, attrs, defStyleAttr, defStyleRes) {
init {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
layoutResource = R.layout.ate_preference_custom_support
if (summary == null || summary.toString().trim { it <= ' ' }.isEmpty())
summary = "%s"

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.kt
View File

@ -30,6 +30,6 @@ class ATEPreference @JvmOverloads constructor(
init {
layoutResource = R.layout.ate_preference_custom_support
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
}

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
View File

@ -28,7 +28,7 @@ class ATESeekBarPreference : SeekBarPreference {
}
private fun init() {
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
override fun onBindViewHolder(view: PreferenceViewHolder) {

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
View File

@ -33,6 +33,6 @@ class ATESwitchPreference : CheckBoxPreference {
private fun init() {
widgetLayoutResource = R.layout.ate_preference_switch_support
icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
}
}

5
appthemehelper/src/main/res/layout/ate_preference_category.xml
View File

@ -8,6 +8,7 @@
android:paddingStart="72dp"
android:paddingLeft="16dp"
android:paddingTop="16dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
tools:ignore="RtlSymmetry" />
tools:ignore="RtlSymmetry"
tools:text="@string/app_name" />