From bba4ae81e723509084f1737b721b9034252727ca Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Fri, 18 Oct 2024 16:37:49 -0600 Subject: [PATCH] ui: phase out custom track color --- app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt | 6 ------ .../java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt | 5 ----- app/src/main/res/color/sel_track.xml | 4 ---- app/src/main/res/values/styles_ui.xml | 2 +- 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 app/src/main/res/color/sel_track.xml diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt index 6dd428f98..2a628996b 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt @@ -74,7 +74,6 @@ import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.util.collect import org.oxycblt.auxio.util.collectImmediately -import org.oxycblt.auxio.util.getColorCompat import org.oxycblt.auxio.util.lazyReflectedField import org.oxycblt.auxio.util.lazyReflectedMethod import org.oxycblt.auxio.util.navigateSafe @@ -141,11 +140,6 @@ class HomeFragment : MenuCompat.setGroupDividerEnabled(menu, true) } - // Load the track color in manually as it's unclear whether the track actually supports - // using a ColorStateList in the resources - binding.homeIndexingProgress.trackColor = - requireContext().getColorCompat(R.color.sel_track).defaultColor - binding.homePager.apply { // Update HomeViewModel whenever the user swipes through the ViewPager. // This would be implemented in HomeFragment itself, but OnPageChangeCallback diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt index c40b17a9f..a47f53123 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt @@ -71,11 +71,6 @@ class PlaybackBarFragment : ViewBindingFragment() { // Set up actions binding.playbackPlayPause.setOnClickListener { playbackModel.togglePlaying() } - // Load the track color in manually as it's unclear whether the track actually supports - // using a ColorStateList in the resources. - binding.playbackProgressBar.trackColor = - context.getColorCompat(R.color.sel_track).defaultColor - // binding.playbackProgressBar.wavelength = 48 // binding.playbackProgressBar.speed = 20 // binding.playbackProgressBar.amplitude = 5 diff --git a/app/src/main/res/color/sel_track.xml b/app/src/main/res/color/sel_track.xml deleted file mode 100644 index e3a847564..000000000 --- a/app/src/main/res/color/sel_track.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index b9e7e8a60..2d9a779a9 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -27,7 +27,7 @@