diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt index a1a70b14..f7f56526 100644 --- a/app/src/main/java/code/name/monkey/retromusic/App.kt +++ b/app/src/main/java/code/name/monkey/retromusic/App.kt @@ -20,10 +20,8 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager -import code.name.monkey.retromusic.util.PreferenceUtil import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.TransactionDetails -import com.google.android.material.color.DynamicColors import org.koin.android.ext.koin.androidContext import org.koin.core.context.startKoin @@ -47,10 +45,6 @@ class App : Application() { .commit() } - if (PreferenceUtil.materialYou) { - DynamicColors.applyToActivitiesIfAvailable(this) - } - if (VersionUtils.hasNougatMR()) DynamicShortcutManager(this).initDynamicShortcuts() diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index ac0ec1ea..cc0ca55c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt @@ -30,7 +30,6 @@ import androidx.annotation.StringDef import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.MaterialUtil import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper @@ -89,8 +88,6 @@ open class BugReportActivity : AbsThemeActivity() { private fun initViews() { val accentColor = ThemeStore.accentColor(this) - val primaryColor = ATHUtil.resolveColor(this, R.attr.colorSurface) - binding.toolbar.setBackgroundColor(primaryColor) setSupportActionBar(binding.toolbar) ToolbarContentTintHelper.colorBackButton(binding.toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index 2f922be0..85c3578b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -21,7 +21,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatTextView -import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.findFragment import androidx.navigation.findNavController @@ -31,7 +30,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ColorUtil -import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.* import code.name.monkey.retromusic.adapter.album.AlbumAdapter import code.name.monkey.retromusic.adapter.artist.ArtistAdapter @@ -192,11 +190,7 @@ class HomeAdapter( ) fun bindView(home: Home) { - val color = if (PreferenceUtil.materialYou && VersionUtils.hasS()) { - ContextCompat.getColor(App.getContext(), R.color.m3_accent_color) - } else { - ThemeStore.accentColor(activity) - } + val color = ThemeStore.accentColor(activity) itemView.findViewById(R.id.message).apply { setTextColor(color) setOnClickListener { diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt index 087996ea..8571fe8b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt @@ -24,7 +24,6 @@ import android.view.ViewGroup.MarginLayoutParams import android.view.ViewTreeObserver import android.view.inputmethod.InputMethodManager import android.widget.EditText -import android.widget.FrameLayout import androidx.annotation.LayoutRes import androidx.core.animation.doOnEnd import androidx.core.animation.doOnStart @@ -34,7 +33,6 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil import com.afollestad.materialdialogs.utils.MDUtil.updatePadding -import com.google.android.material.appbar.AppBarLayout import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.imageview.ShapeableImageView import com.google.android.material.shape.ShapeAppearanceModel diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt index 15464ef5..1be42655 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt @@ -20,30 +20,27 @@ import android.view.MenuInflater import android.view.MenuItem import android.view.MenuItem.SHOW_AS_ACTION_IF_ROOM import android.view.View -import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.core.text.HtmlCompat import androidx.core.view.doOnPreDraw import androidx.navigation.fragment.FragmentNavigatorExtras import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager -import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.common.ATHToolbarActivity import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper -import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.* import code.name.monkey.retromusic.adapter.HomeAdapter import code.name.monkey.retromusic.databinding.FragmentBannerHomeBinding import code.name.monkey.retromusic.databinding.FragmentHomeBinding import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog +import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.drawNextToNavbar import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.util.PreferenceUtil import com.google.android.gms.cast.framework.CastButtonFactory -import com.google.android.material.appbar.AppBarLayout import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialSharedAxis @@ -144,12 +141,7 @@ class HomeFragment : MaterialSharedAxis(MaterialSharedAxis.Z, false) findNavController().navigate(R.id.searchFragment, null, navOptions) } - val color = if (PreferenceUtil.materialYou && VersionUtils.hasS()) { - ContextCompat.getColor(App.getContext(), R.color.m3_accent_color) - } else { - ThemeStore.accentColor(requireContext()) - } - val hexColor = String.format("#%06X", 0xFFFFFF and color) + val hexColor = String.format("#%06X", 0xFFFFFF and accentColor()) val appName = HtmlCompat.fromHtml( "Retro Music", HtmlCompat.FROM_HTML_MODE_COMPACT diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt index 78d684cc..4f7b91e1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt @@ -23,7 +23,6 @@ import androidx.fragment.app.FragmentActivity import androidx.navigation.fragment.findNavController import androidx.transition.Fade import androidx.viewpager2.adapter.FragmentStateAdapter -import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity @@ -118,7 +117,7 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { }.attach() // lyricsPager.isUserInputEnabled = false - binding.tabLyrics.setSelectedTabIndicatorColor(ThemeStore.accentColor(requireContext())) + binding.tabLyrics.setSelectedTabIndicatorColor(accentColor()) binding.tabLyrics.setTabTextColors(textColorSecondary(), accentColor()) } @@ -326,10 +325,10 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { private fun setupLyricsView() { binding.lyricsView.apply { - setCurrentColor(ThemeStore.accentColor(context)) - setTimeTextColor(ThemeStore.accentColor(context)) - setTimelineColor(ThemeStore.accentColor(context)) - setTimelineTextColor(ThemeStore.accentColor(context)) + setCurrentColor(accentColor()) + setTimeTextColor(accentColor()) + setTimelineColor(accentColor()) + setTimelineTextColor(accentColor()) setDraggable(true, LrcView.OnPlayClickListener { MusicPlayerRemote.seekTo(it.toInt()) return@OnPlayClickListener true diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt index 7c000c89..3f5edc8c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt @@ -1,10 +1,8 @@ package code.name.monkey.retromusic.glide import android.graphics.drawable.Drawable -import androidx.core.content.ContextCompat import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor import code.name.monkey.appthemehelper.util.TintHelper -import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.App.Companion.getContext import code.name.monkey.retromusic.Constants.USER_BANNER import code.name.monkey.retromusic.Constants.USER_PROFILE @@ -19,7 +17,6 @@ import code.name.monkey.retromusic.util.CustomArtistImageUtil.Companion.getFile import code.name.monkey.retromusic.util.CustomArtistImageUtil.Companion.getInstance import code.name.monkey.retromusic.util.MusicUtil.getMediaStoreAlbumCoverUri import code.name.monkey.retromusic.util.PreferenceUtil -import code.name.monkey.retromusic.util.PreferenceUtil.materialYou import com.bumptech.glide.GenericTransitionOptions import com.bumptech.glide.Priority import com.bumptech.glide.RequestBuilder @@ -185,11 +182,7 @@ object RetroGlideExtension { return TintHelper.createTintedDrawable( getContext(), R.drawable.ic_account, - if (materialYou && VersionUtils.hasS()) { - ContextCompat.getColor(getContext(), R.color.m3_accent_color) - } else { - accentColor(getContext()) - } + accentColor(getContext()) ) } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt b/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt index 4e5e7ab5..2019fa6a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt @@ -18,7 +18,6 @@ import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight import code.name.monkey.appthemehelper.util.MaterialValueHelper.getPrimaryTextColor import code.name.monkey.appthemehelper.util.TintHelper -import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.views.PopupBackground import me.zhanghai.android.fastscroll.FastScroller import me.zhanghai.android.fastscroll.FastScrollerBuilder @@ -28,11 +27,7 @@ import me.zhanghai.android.fastscroll.R object ThemedFastScroller { fun create(view: ViewGroup): FastScroller { val context = view.context - val color = if (PreferenceUtil.materialYou && VersionUtils.hasS()) { - context.getColor(code.name.monkey.retromusic.R.color.m3_accent_color) - } else { - accentColor(context) - } + val color = accentColor(context) val textColor = getPrimaryTextColor(context, isColorLight(color)) val fastScrollerBuilder = FastScrollerBuilder(view) fastScrollerBuilder.useMd2Style() diff --git a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt b/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt index fd442a27..74a08e83 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt @@ -4,13 +4,7 @@ import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet import androidx.appcompat.widget.AppCompatImageView -import androidx.core.content.ContextCompat import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.VersionUtils -import code.name.monkey.retromusic.App -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.extensions.accentColor -import code.name.monkey.retromusic.util.PreferenceUtil class AccentIcon @JvmOverloads constructor( context: Context, @@ -18,11 +12,6 @@ class AccentIcon @JvmOverloads constructor( defStyleAttr: Int = -1 ) : AppCompatImageView(context, attrs, defStyleAttr) { init { - val color = if (PreferenceUtil.materialYou && VersionUtils.hasS()) { - ContextCompat.getColor(context, R.color.m3_accent_color) - } else { - ThemeStore.accentColor(context) - } - imageTintList = ColorStateList.valueOf(color) + imageTintList = ColorStateList.valueOf(ThemeStore.accentColor(context)) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_share_instagram.xml b/app/src/main/res/layout/activity_share_instagram.xml index fe53bb31..4fa8c82c 100644 --- a/app/src/main/res/layout/activity_share_instagram.xml +++ b/app/src/main/res/layout/activity_share_instagram.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/colorSurface" + android:fitsSystemWindows="true" android:orientation="vertical"> - + android:layout_height="wrap_content" + android:elevation="0dp" + app:elevation="0dp"> - - - - - - - + app:navigationIcon="@drawable/ic_keyboard_backspace_black" + app:title="@string/social_stories" + app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> + diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt index af8b417f..59774443 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt @@ -10,6 +10,7 @@ import androidx.preference.PreferenceManager import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor import code.name.monkey.appthemehelper.util.ColorUtil +import code.name.monkey.appthemehelper.util.VersionUtils /** @@ -205,6 +206,10 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt @CheckResult @ColorInt fun accentColor(context: Context): Int { + // Set MD3 accent if MD3 is enabled or in-app accent otherwise + if (isMD3Enabled(context) && VersionUtils.hasS()) { + return ContextCompat.getColor(context, R.color.m3_accent_color) + } val desaturatedColor = prefs(context).getBoolean("desaturated_color", false) val color = prefs(context).getInt( ThemeStorePrefKeys.KEY_ACCENT_COLOR, @@ -301,7 +306,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt return true } - fun isMD3Enabled(context: Context): Boolean { + private fun isMD3Enabled(context: Context): Boolean { return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ThemeStorePrefKeys.KEY_MATERIAL_YOU, false) } } diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt index c2a890a3..c39affe9 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt @@ -17,12 +17,9 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7 import android.content.Context import android.util.AttributeSet import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.preference.PreferenceCategory import androidx.preference.PreferenceViewHolder -import code.name.monkey.appthemehelper.R import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.VersionUtils class ATEPreferenceCategory @JvmOverloads constructor( context: Context?, @@ -35,12 +32,7 @@ class ATEPreferenceCategory @JvmOverloads constructor( super.onBindViewHolder(holder) val title = holder.itemView.findViewById(android.R.id.title) title.setTextColor( - // Set MD3 accent if MD3 is enabled or in-app accent otherwise - if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) { - ContextCompat.getColor(context, R.color.m3_accent_color) - } else { - ThemeStore.accentColor(context) - } + ThemeStore.accentColor(context) ) } } diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt index 7963f5fa..09d1e9f7 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt @@ -47,11 +47,7 @@ class ATESeekBarPreference @JvmOverloads constructor( val seekBar = view.findViewById(R.id.seekbar) as SeekBar TintHelper.setTintAuto( seekBar, // Set MD3 accent if MD3 is enabled or in-app accent otherwise - if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) { - ContextCompat.getColor(context, R.color.m3_accent_color) - } else { - ThemeStore.accentColor(context) - }, false + ThemeStore.accentColor(context), false ) (view.findViewById(R.id.seekbar_value) as TextView).apply { appendUnit(editableText) diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt index 911487e4..9f88e54e 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt @@ -17,10 +17,7 @@ package code.name.monkey.appthemehelper.common.views import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import androidx.core.content.ContextCompat -import code.name.monkey.appthemehelper.R import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.VersionUtils class ATEAccentTextView @JvmOverloads constructor( context: Context, @@ -31,11 +28,7 @@ class ATEAccentTextView @JvmOverloads constructor( init { setTextColor( // Set MD3 accent if MD3 is enabled or in-app accent otherwise - if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) { - ContextCompat.getColor(context, R.color.m3_accent_color) - } else { - ThemeStore.accentColor(context) - } + ThemeStore.accentColor(context) ) } } diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt index 62cd23e3..c4dc3c77 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt @@ -3,12 +3,9 @@ package code.name.monkey.appthemehelper.common.views import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.SwitchCompat -import androidx.core.content.ContextCompat import androidx.core.view.isVisible import code.name.monkey.appthemehelper.ATH -import code.name.monkey.appthemehelper.R import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.VersionUtils /** * @author Aidan Follestad (afollestad) @@ -32,11 +29,7 @@ class ATESwitch : SwitchCompat { } private fun init(context: Context) { - if (ThemeStore.isMD3Enabled(context) && VersionUtils.hasS()) { - ATH.setTint(this, ContextCompat.getColor(context, R.color.m3_accent_color)) - } else { - ATH.setTint(this, ThemeStore.accentColor(context)) - } + ATH.setTint(this, ThemeStore.accentColor(context)) } override fun isShown(): Boolean {