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 3e72b7014..15f054ac7 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 @@ -54,9 +54,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(theme)) DynamicShortcutManager(requireContext()).updateDynamicShortcuts() } - Handler().postDelayed({ - requireActivity().recreate() - }, 400) + requireActivity().recreate() true } } @@ -96,9 +94,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue("black")) DynamicShortcutManager(requireContext()).updateDynamicShortcuts() } - Handler().postDelayed({ - requireActivity().recreate() - }, 400) + requireActivity().recreate() true } @@ -109,9 +105,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { ThemeStore.prefs(requireContext()).edit().putBoolean("desaturated_color", desaturated) .apply() PreferenceUtil.getInstance(requireContext()).setDesaturatedColor(desaturated) - Handler().postDelayed({ - requireActivity().recreate() - }, 400) + requireActivity().recreate() true } diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt index 9541e1c60..7cb4babf4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt +++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt @@ -37,6 +37,7 @@ import androidx.annotation.ColorInt import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.view.ViewCompat +import code.name.monkey.retromusic.BuildConfig import code.name.monkey.retromusic.R import java.util.* @@ -71,8 +72,10 @@ class LrcView @JvmOverloads constructor( private var mCurrentPlayLineColor: Int = 0 private var mNoLrcTextSize: Float = 0.toFloat() private var mNoLrcTextColor: Int = 0 + //是否拖拽中,否的话响应onClick事件 private var isDragging: Boolean = false + //用户开始操作 private var isUserScroll: Boolean = false private var isAutoAdjustPosition = true @@ -213,7 +216,9 @@ class LrcView @JvmOverloads constructor( isAntiAlias = true textAlign = Paint.Align.LEFT textSize = mLrcTextSize - typeface = ResourcesCompat.getFont(context, R.font.circular) + /* if (BuildConfig.FLAVOR != "nofont") { + typeface = ResourcesCompat.getFont(context, R.font.circular) + }*/ } mDefaultContent = DEFAULT_CONTENT diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml new file mode 100644 index 000000000..4dbbe7f3d --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png index 99464a03b..73792fe25 100755 Binary files a/app/src/main/res/drawable-hdpi/ic_notification.png and b/app/src/main/res/drawable-hdpi/ic_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png index 03d796b76..d14b8bdc7 100755 Binary files a/app/src/main/res/drawable-mdpi/ic_notification.png and b/app/src/main/res/drawable-mdpi/ic_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png index ce0c680d0..35ccc8aaf 100755 Binary files a/app/src/main/res/drawable-xhdpi/ic_notification.png and b/app/src/main/res/drawable-xhdpi/ic_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png index d22f7944e..927de0a58 100755 Binary files a/app/src/main/res/drawable-xxhdpi/ic_notification.png and b/app/src/main/res/drawable-xxhdpi/ic_notification.png differ