diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt index 2a1074814..454cfedb1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt @@ -18,7 +18,6 @@ import android.app.KeyguardManager import android.os.Bundle import android.view.WindowManager import androidx.core.content.getSystemService -import androidx.core.view.ViewCompat import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity @@ -77,7 +76,7 @@ class LockScreenActivity : AbsMusicServiceActivity() { binding.slide.apply { translationY = 100f alpha = 0f - ViewCompat.animate(this).translationY(0f).alpha(1f).setDuration(1500).start() + animate().translationY(0f).alpha(1f).setDuration(1500).start() } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index 64c1b7bf9..ade999edc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -19,7 +19,6 @@ import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup -import androidx.core.view.ViewCompat import androidx.core.view.isVisible import androidx.fragment.app.FragmentActivity import code.name.monkey.retromusic.R @@ -92,9 +91,9 @@ open class AlbumAdapter( // Check if imageContainer exists so we can have a smooth transition without // CardView clipping, if it doesn't exist in current layout set transition name to image instead. if (holder.imageContainer != null) { - ViewCompat.setTransitionName(holder.imageContainer!!, album.id.toString()) + holder.imageContainer!!.setTransitionName(album.id.toString()) } else { - ViewCompat.setTransitionName(holder.image!!, album.id.toString()) + holder.image!!.setTransitionName(album.id.toString()) } loadAlbumCover(album, holder) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt index 2d2fba8c9..8798ed5ee 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt @@ -19,7 +19,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView -import androidx.core.view.ViewCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.lifecycle.lifecycleScope @@ -106,7 +105,7 @@ class AlbumCoverPagerAdapter( savedInstanceState: Bundle? ): View? { val view = inflater.inflate(getLayoutWithPlayerTheme(), container, false) - ViewCompat.setTransitionName(view, "lyrics") + view.setTransitionName("lyrics") albumCover = view.findViewById(R.id.player_image) view.setOnClickListener { if (mainActivity.getBottomSheetBehavior().state == STATE_EXPANDED) { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index a7262f8c9..d896b1c73 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -21,7 +21,6 @@ import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup -import androidx.core.view.ViewCompat import androidx.core.view.isVisible import androidx.fragment.app.FragmentActivity import code.name.monkey.retromusic.R @@ -93,9 +92,9 @@ class ArtistAdapter( val transitionName = if (albumArtistsOnly) artist.name else artist.id.toString() if (holder.imageContainer != null) { - ViewCompat.setTransitionName(holder.imageContainer!!, transitionName) + holder.imageContainer!!.setTransitionName(transitionName) } else { - ViewCompat.setTransitionName(holder.image!!, transitionName) + holder.image!!.setTransitionName(transitionName) } loadArtistImage(artist, holder) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index 0f0ef052f..a51663507 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -21,7 +21,6 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.PopupMenu -import androidx.core.view.ViewCompat import androidx.core.view.setPadding import androidx.fragment.app.FragmentActivity import code.name.monkey.retromusic.R @@ -171,7 +170,7 @@ class PlaylistAdapter( if (isInQuickSelectMode) { toggleChecked(layoutPosition) } else { - ViewCompat.setTransitionName(itemView, "playlist") + itemView.setTransitionName("playlist") listener.onPlaylistClick(dataSet[layoutPosition], itemView) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt index b0b69b8fa..c31a3e675 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt @@ -250,7 +250,7 @@ fun TextInputLayout.setTint(background: Boolean = true) { @CheckResult fun Drawable.tint(@ColorInt color: Int): Drawable { val tintedDrawable = DrawableCompat.wrap(this).mutate() - DrawableCompat.setTint(this, color) + setTint(color) return tintedDrawable } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt index 27d603d02..7b0e83480 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt @@ -23,7 +23,6 @@ import androidx.activity.addCallback import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.core.text.HtmlCompat -import androidx.core.view.ViewCompat import androidx.core.view.doOnPreDraw import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.FragmentNavigatorExtras @@ -118,7 +117,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det mainActivity.setSupportActionBar(binding.toolbar) binding.toolbar.title = " " - ViewCompat.setTransitionName(binding.albumCoverContainer, arguments.extraAlbumId.toString()) + binding.albumCoverContainer.setTransitionName(arguments.extraAlbumId.toString()) postponeEnterTransition() detailsViewModel.getAlbum().observe(viewLifecycleOwner) { requireView().doOnPreDraw { @@ -127,9 +126,9 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det albumArtistExists = !it.albumArtist.isNullOrEmpty() showAlbum(it) if (albumArtistExists) { - ViewCompat.setTransitionName(binding.artistImage, album.albumArtist) + binding.artistImage.setTransitionName(album.albumArtist) } else { - ViewCompat.setTransitionName(binding.artistImage, album.artistId.toString()) + binding.artistImage.setTransitionName(album.artistId.toString()) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index 5463de969..30f71c71d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -13,7 +13,6 @@ import androidx.activity.addCallback import androidx.appcompat.widget.PopupMenu import androidx.core.os.bundleOf import androidx.core.text.HtmlCompat -import androidx.core.view.ViewCompat import androidx.core.view.doOnPreDraw import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope @@ -89,10 +88,7 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm mainActivity.addMusicServiceEventListener(detailsViewModel) mainActivity.setSupportActionBar(binding.toolbar) binding.toolbar.title = null - ViewCompat.setTransitionName( - binding.artistCoverContainer, - (artistId ?: artistName).toString() - ) + binding.artistCoverContainer.setTransitionName((artistId ?: artistName).toString()) postponeEnterTransition() detailsViewModel.getArtist().observe(viewLifecycleOwner) { requireView().doOnPreDraw { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt index c286bf794..dd108ee6a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt @@ -19,7 +19,6 @@ import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View -import androidx.core.view.ViewCompat import androidx.core.view.doOnPreDraw import androidx.core.view.isVisible import androidx.navigation.fragment.navArgs @@ -57,7 +56,7 @@ class GenreDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_ setHasOptionsMenu(true) mainActivity.addMusicServiceEventListener(detailsViewModel) mainActivity.setSupportActionBar(binding.toolbar) - ViewCompat.setTransitionName(binding.container, "genre") + binding.container.setTransitionName("genre") genre = arguments.extraGenre binding.toolbar.title = arguments.extraGenre.name setupRecyclerView() 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 aa36c29b4..e64fbfab6 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 @@ -25,7 +25,6 @@ import android.view.* import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.IntentSenderRequest import androidx.activity.result.contract.ActivityResultContracts -import androidx.core.view.ViewCompat import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity @@ -150,7 +149,7 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { exitTransition = Fade() lyricsSectionsAdapter = LyricsSectionsAdapter(requireActivity()) _binding = FragmentLyricsBinding.bind(view) - ViewCompat.setTransitionName(binding.container, "lyrics") + binding.container.setTransitionName("lyrics") setupWakelock() setupViews() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index b02eb427d..59d8127b9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -25,7 +25,6 @@ import android.view.animation.LinearInterpolator import android.widget.SeekBar import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar -import androidx.core.view.ViewCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.util.ColorUtil @@ -368,7 +367,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player } private fun setupPanel() { - if (!ViewCompat.isLaidOut(binding.playerContainer) || binding.playerContainer.isLayoutRequested) { + if (!binding.playerContainer.isLaidOut() || binding.playerContainer.isLayoutRequested) { binding.playerContainer.addOnLayoutChangeListener(this) return } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index a3e2a4c1e..83eda6178 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt @@ -131,7 +131,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play } private fun setupPanel() { - if (!ViewCompat.isLaidOut(binding.colorBackground) || binding.colorBackground.isLayoutRequested) { + if (!binding.colorBackground.isLaidOut() || binding.colorBackground.isLayoutRequested) { binding.colorBackground.addOnLayoutChangeListener(this) return } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt index f90902a04..d48a5025f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt @@ -6,7 +6,6 @@ import android.view.MenuInflater import android.view.MenuItem import android.view.View import androidx.activity.addCallback -import androidx.core.view.ViewCompat import androidx.core.view.doOnPreDraw import androidx.core.view.isVisible import androidx.navigation.fragment.findNavController @@ -60,7 +59,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false) setHasOptionsMenu(true) mainActivity.setSupportActionBar(binding.toolbar) - ViewCompat.setTransitionName(binding.container, "playlist") + binding.container.setTransitionName("playlist") playlist = arguments.extraPlaylist binding.toolbar.title = playlist.playlistEntity.playlistName setUpRecyclerView() diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt index 972664e3c..37e26254f 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt @@ -19,7 +19,6 @@ import android.content.Context import android.content.Intent import android.media.audiofx.AudioEffect import android.widget.Toast -import androidx.core.app.ActivityCompat import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.* import code.name.monkey.retromusic.activities.bugreport.BugReportActivity @@ -27,37 +26,39 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote.audioSessionId object NavigationUtil { fun bugReport(activity: Activity) { - ActivityCompat.startActivity( - activity, - Intent(activity, BugReportActivity::class.java), - null + activity.startActivity( + Intent(activity, BugReportActivity::class.java), null ) } fun goToOpenSource(activity: Activity) { - ActivityCompat.startActivity(activity, Intent(activity, LicenseActivity::class.java), null) + activity.startActivity( + Intent(activity, LicenseActivity::class.java), null + ) } fun goToProVersion(context: Context) { - ActivityCompat.startActivity(context, Intent(context, PurchaseActivity::class.java), null) + context.startActivity( + Intent(context, PurchaseActivity::class.java), null + ) } fun goToSupportDevelopment(activity: Activity) { - ActivityCompat.startActivity( - activity, Intent(activity, SupportDevelopmentActivity::class.java), null + activity.startActivity( + Intent(activity, SupportDevelopmentActivity::class.java), null ) } fun gotoDriveMode(activity: Activity) { - ActivityCompat.startActivity( - activity, - Intent(activity, DriveModeActivity::class.java), - null + activity.startActivity( + Intent(activity, DriveModeActivity::class.java), null ) } fun gotoWhatNews(activity: Activity) { - ActivityCompat.startActivity(activity, Intent(activity, WhatsNewActivity::class.java), null) + activity.startActivity( + Intent(activity, WhatsNewActivity::class.java), null + ) } fun openEqualizer(activity: Activity) { diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt b/app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt index e85870d79..adcf36971 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt @@ -2,7 +2,6 @@ package code.name.monkey.retromusic.util import android.content.Context import android.content.Intent -import androidx.core.app.ActivityCompat import code.name.monkey.retromusic.App import code.name.monkey.retromusic.activities.PurchaseActivity @@ -27,11 +26,7 @@ object PremiumShow { prefEditor.putLong(DATE_FIRST_LAUNCH, dateLaunched) } if (System.currentTimeMillis() >= dateLaunched + 2 * 24 * 60 * 60 * 1000) { - ActivityCompat.startActivity( - context, - Intent(context, PurchaseActivity::class.java), - null - ) + context.startActivity(Intent(context, PurchaseActivity::class.java), null) } prefEditor.apply() } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt b/app/src/main/java/code/name/monkey/retromusic/util/Share.kt index de1b30605..b33559cea 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/Share.kt @@ -17,7 +17,6 @@ package code.name.monkey.retromusic.util import android.content.Context import android.content.Intent import android.net.Uri -import androidx.core.app.ActivityCompat import androidx.core.content.FileProvider import java.io.File @@ -30,7 +29,7 @@ object Share { val feedIntent = Intent(Intent.ACTION_SEND) feedIntent.type = "image/*" feedIntent.putExtra(Intent.EXTRA_STREAM, uri) - ActivityCompat.startActivity(context, feedIntent, null) + context.startActivity(feedIntent, null) } fun shareFile(context: Context, file: File) { diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt index 9ed1d0b09..aca848b08 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt @@ -9,8 +9,6 @@ import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR import android.view.WindowInsetsController import android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS import androidx.annotation.ColorInt -import androidx.appcompat.widget.Toolbar -import androidx.core.view.WindowInsetsControllerCompat import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java index 62ae42e25..19b18b8f5 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java @@ -8,8 +8,6 @@ import androidx.preference.PreferenceFragmentCompat; import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEListPreferenceDialogFragmentCompat; import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEPreferenceDialogFragment; -import static androidx.preference.PreferenceFragmentCompat.*; - /** * @author Karim Abou Zeid (kabouzeid) */ 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 09d1e9f70..b47d20c00 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 @@ -5,7 +5,6 @@ import android.text.Editable import android.util.AttributeSet import android.widget.SeekBar import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.core.graphics.BlendModeColorFilterCompat import androidx.core.graphics.BlendModeCompat import androidx.core.widget.doAfterTextChanged diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java index 54f0cd76b..001b51dd7 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java @@ -96,8 +96,8 @@ public final class TintHelper { return null; } drawable = DrawableCompat.wrap(drawable.mutate()); - DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN); - DrawableCompat.setTint(drawable, color); + drawable.setTintMode(PorterDuff.Mode.SRC_IN); + drawable.setTint(color); return drawable; } @@ -109,7 +109,7 @@ public final class TintHelper { return null; } Drawable temp = DrawableCompat.wrap(drawable.mutate()); - DrawableCompat.setTintList(temp, sl); + temp.setTintList(sl); return temp; } diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java index 62ffd2a47..8688005af 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java @@ -550,7 +550,7 @@ public final class ToolbarContentTintHelper { if (toolbar != null && toolbar.getOverflowIcon() != null) { Drawable bg = DrawableCompat.wrap(toolbar.getOverflowIcon()); - DrawableCompat.setTint(bg, toolbarIconsColor); + bg.setTint(toolbarIconsColor); } removeOnGlobalLayoutListener(decorView, this); } @@ -588,7 +588,7 @@ public final class ToolbarContentTintHelper { if (drawable != null) { final Drawable wrapped = DrawableCompat.wrap(drawable); drawable.mutate(); - DrawableCompat.setTint(wrapped, color); + wrapped.setTint(color); item.setIcon(drawable); } } @@ -603,7 +603,7 @@ public final class ToolbarContentTintHelper { final Drawable drawable = image.getDrawable(); final Drawable wrapped = DrawableCompat.wrap(drawable); drawable.mutate(); - DrawableCompat.setTint(wrapped, color); + wrapped.setTint(color); image.setImageDrawable(drawable); } }