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

Tiny player update

Browse source
This commit is contained in:
h4h13 2019-08-05 21:43:44 +05:30
parent 1270912d29
commit 147b8b5292
16 changed files with 84 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
View file

@ -256,7 +256,7 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(),
playerAlbumCoverFragment?.setCallbacks(this)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
statusBarShadow.hide()
statusBarShadow?.hide()
}
interface Callbacks {

15
app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
View file

@ -25,7 +25,6 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
import code.name.monkey.retromusic.service.MusicService
import code.name.monkey.retromusic.util.MusicUtil
import code.name.monkey.retromusic.util.PreferenceUtil
import kotlinx.android.synthetic.main.fragment_blur_player_playback_controls.*
class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
@ -113,17 +112,11 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
updateShuffleState()
updatePrevNextColor()
text.setTextColor(lastDisabledPlaybackControlsColor)
val colorFinal = if (PreferenceUtil.getInstance().adaptiveColor) {
color
} else {
ThemeStore.textColorSecondary(requireContext())
}
text.setTextColor(colorFinal)
TintHelper.setTintAuto(progressSlider, colorFinal.ripAlpha(), false)
volumeFragment?.setTintableColor(Color.WHITE)
setFabColor(colorFinal.ripAlpha())
TintHelper.setTintAuto(progressSlider, lastPlaybackControlsColor , false)
volumeFragment?.setTintableColor(lastPlaybackControlsColor)
setFabColor(lastPlaybackControlsColor)
}
private fun setFabColor(i: Int) {

27
app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
View file

@ -5,12 +5,11 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.appthemehelper.util.MaterialValueHelper
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.service.MusicService
import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
import kotlinx.android.synthetic.main.fragment_tiny_controls_fragment.*
class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() {
@ -28,13 +27,9 @@ class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() {
}
override fun setDark(color: Int) {
if (ColorUtil.isColorLight(color)) {
lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(getActivity(), true);
lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(getActivity(), true);
} else {
lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(getActivity(), false);
lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(getActivity(), false);
}
lastPlaybackControlsColor = ThemeStore.textColorPrimary(requireContext())
lastDisabledPlaybackControlsColor = ThemeStore.textColorSecondary(requireContext())
updateRepeatState();
updateShuffleState();
@ -94,4 +89,16 @@ class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() {
}
}
override fun onServiceConnected() {
updateRepeatState()
updateShuffleState()
}
override fun onRepeatModeChanged() {
updateRepeatState()
}
override fun onShuffleModeChanged() {
updateShuffleState()
}
}

10
app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
View file

@ -59,7 +59,7 @@ class TinyPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca
}
override fun toolbarIconColor(): Int {
return MaterialValueHelper.getSecondaryTextColor(context, ColorUtil.isColorLight(lastColor))
return ThemeStore.textColorSecondary(requireContext())
}
private var lastColor: Int = 0
@ -67,18 +67,20 @@ class TinyPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca
get() = lastColor
override fun onColorChanged(color: Int) {
val lastColor = if (PreferenceUtil.getInstance().adaptiveColor) {
color
} else {
ThemeStore.accentColor(context!!)
ThemeStore.accentColor(requireContext())
}
callbacks?.onPaletteColorChanged()
tinyPlaybackControlsFragment.setDark(lastColor)
TintHelper.setTintAuto(progressBar, lastColor, false)
val iconColor = MaterialValueHelper.getSecondaryTextColor(context, ColorUtil.isColorLight(lastColor))
ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, activity)
val iconColor = ThemeStore.textColorSecondary(requireContext())
ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, requireActivity())
}
override fun onFavoriteToggled() {

6
app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
View file

@ -35,8 +35,8 @@ import code.name.monkey.retromusic.util.NavigationUtil
abstract class AbsSettingsFragment : PreferenceFragmentCompat() {
internal fun showProToastAndNavigate(message: String) {
Toast.makeText(context, "$message is Pro version feature.", Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(activity!!)
Toast.makeText(requireContext(), "$message is Pro version feature.", Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(requireActivity())
}
internal fun setSummary(preference: Preference, value: Any) {
@ -60,7 +60,7 @@ abstract class AbsSettingsFragment : PreferenceFragmentCompat() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setDivider(ColorDrawable(Color.TRANSPARENT))
listView.setBackgroundColor(ThemeStore.primaryColor(context!!))
listView.setBackgroundColor(ThemeStore.primaryColor(requireContext()))
listView.overScrollMode = View.OVER_SCROLL_NEVER
listView.setPadding(0, 0, 0, 0)
listView.setPaddingRelative(0, 0, 0, 0)

4
app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
View file

@ -36,7 +36,7 @@ class AudioSettings : AbsSettingsFragment() {
findPreference.isEnabled = true
}
findPreference.setOnPreferenceClickListener {
NavigationUtil.openEqualizer(activity!!)
NavigationUtil.openEqualizer(requireActivity())
true
}
}
@ -44,7 +44,7 @@ class AudioSettings : AbsSettingsFragment() {
private fun hasEqualizer(): Boolean {
val effects = Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL)
val pm = activity!!.packageManager
val pm = requireActivity().packageManager
val ri = pm.resolveActivity(effects, 0)
return ri != null
}

4
app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
View file

@ -40,7 +40,7 @@ class ImageSettingFragment : AbsSettingsFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val preference: Preference = findPreference("auto_download_images_policy")!!
setSummary(preference)
val preference: Preference? = findPreference("auto_download_images_policy")
preference?.let { setSummary(it) }
}
}

12
app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
View file

@ -48,8 +48,6 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
}
}
private val settingsIcons = arrayOf(R.id.general_settings_icon, R.id.audio_settings_icon, R.id.now_playing_settings_icon, R.id.personalize_settings_icon, R.id.image_settings_icon, R.id.notification_settings_icon, R.id.other_settings_icon)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_main_settings, container, false)
@ -74,20 +72,16 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
}
}
buyPremium.setOnClickListener {
NavigationUtil.goToProVersion(context!!)
NavigationUtil.goToProVersion(requireContext())
}
MaterialUtil.setTint(buyPremium)
val primaryColor = MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(ThemeStore.primaryColor(context!!)))
val primaryColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), ColorUtil.isColorLight(ThemeStore.primaryColor(requireContext())))
text.setTextColor(ColorUtil.withAlpha(primaryColor, 0.75f))
//title.setTextColor(primaryColor)
text2.setTextColor(primaryColor)
text3.imageTintList = ColorStateList.valueOf(primaryColor)
}
private fun inflateFragment(fragment: Fragment, @StringRes title: Int) {
if (activity != null) {
(activity as SettingsActivity).setupFragment(fragment, title)
}
(requireActivity() as SettingsActivity).setupFragment(fragment, title)
}
}

3
app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
View file

@ -18,6 +18,7 @@ import android.os.Build.VERSION
import android.os.Build.VERSION_CODES
import android.os.Bundle
import androidx.preference.TwoStatePreference
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.util.PreferenceUtil
@ -58,6 +59,6 @@ class NotificationSettingsFragment : AbsSettingsFragment() {
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(code.name.monkey.retromusic.R.xml.pref_notification)
addPreferencesFromResource(R.xml.pref_notification)
}
}

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

@ -70,7 +70,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
else
PreferenceUtil.getThemeResFromPrefValue("dark")
ThemeStore.editTheme(context).activityTheme(theme).primaryColor(color).commit()
ThemeStore.editTheme(requireContext()).activityTheme(theme).primaryColor(color).commit()
if (VersionUtils.hasNougatMR())
DynamicShortcutManager(context).updateDynamicShortcuts()
@ -107,10 +107,10 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
.commit()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
activity?.setTheme(PreferenceUtil.getThemeResFromPrefValue(theme))
requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(theme))
DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
}
activity?.recreate()
requireActivity().recreate()
true
}
}
@ -128,9 +128,9 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
if (!ColorUtil.isColorSaturated(color)) {
colorFinal = color
}*/
ThemeStore.editTheme(context).accentColor(color).commit()
ThemeStore.editTheme(requireContext()).accentColor(color).commit()
if (VersionUtils.hasNougatMR())
DynamicShortcutManager(context).updateDynamicShortcuts()
DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
requireActivity().recreate()
}
}