From 883aead7593866618442efca0329da6a8773f38f Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Mon, 16 Jun 2025 21:12:57 +0530 Subject: [PATCH] theme components which were not following palette --- .../java/org/lineageos/twelve/SettingsActivity.kt | 4 ++-- .../PlaybackControlBottomSheetDialogFragment.kt | 4 ++-- app/src/main/res/drawable/bg_item_header_scrim.xml | 2 +- .../main/res/layout-land/fragment_now_playing.xml | 4 ++-- app/src/main/res/layout/album_labels.xml | 4 ++-- app/src/main/res/layout/audio_track_index.xml | 4 ++-- app/src/main/res/layout/fragment_album.xml | 2 +- app/src/main/res/layout/fragment_artist.xml | 2 +- app/src/main/res/layout/fragment_genre.xml | 2 +- app/src/main/res/layout/fragment_now_playing.xml | 2 +- ...ragment_playback_control_bottom_sheet_dialog.xml | 6 +++--- app/src/main/res/layout/fragment_playlist.xml | 2 +- app/src/main/res/layout/play_buttons.xml | 7 ++++++- app/src/main/res/layout/view_activity_tab.xml | 1 + app/src/main/res/values/themes.xml | 13 +++++++++++++ 15 files changed, 39 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt b/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt index 7708995d..0aa8ad7c 100644 --- a/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt +++ b/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt @@ -180,7 +180,7 @@ class SettingsActivity : AppCompatActivity(R.layout.activity_settings) { private fun showResetLocalStatsDialog() { val context = requireActivity() - MaterialAlertDialogBuilder(context) + MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_App_MaterialAlertDialog) .setTitle(R.string.reset_local_stats_confirm_title) .setMessage(R.string.reset_local_stats_confirm_message) .setPositiveButton(R.string.reset_local_stats_confirm_positive) { _, _ -> @@ -200,7 +200,7 @@ class SettingsActivity : AppCompatActivity(R.layout.activity_settings) { private fun showRescanMediaStoreDialog() { val context = requireActivity() - MaterialAlertDialogBuilder(context) + MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_App_MaterialAlertDialog) .setTitle(R.string.rescan_media_store_confirm_title) .setMessage(R.string.rescan_media_store_confirm_message) .setPositiveButton(R.string.rescan_media_store_confirm_positive) { _, _ -> diff --git a/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt b/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt index 67f4274c..a202cf00 100644 --- a/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt @@ -9,6 +9,7 @@ import android.icu.text.DecimalFormat import android.icu.text.DecimalFormatSymbols import android.os.Bundle import android.view.View +import android.widget.Switch import androidx.core.view.isVisible import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle @@ -16,7 +17,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.button.MaterialButton -import com.google.android.material.materialswitch.MaterialSwitch import com.google.android.material.slider.Slider import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @@ -36,7 +36,7 @@ class PlaybackControlBottomSheetDialogFragment : BottomSheetDialogFragment( private val playbackSpeedMinusMaterialButton by getViewProperty(R.id.playbackSpeedMinusMaterialButton) private val playbackSpeedPlusMaterialButton by getViewProperty(R.id.playbackSpeedPlusMaterialButton) private val playbackPitchSlider by getViewProperty(R.id.playbackPitchSlider) - private val playbackPitchUnlockMaterialSwitch by getViewProperty(R.id.playbackPitchUnlockMaterialSwitch) + private val playbackPitchUnlockMaterialSwitch by getViewProperty(R.id.playbackPitchUnlockMaterialSwitch) override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/res/drawable/bg_item_header_scrim.xml b/app/src/main/res/drawable/bg_item_header_scrim.xml index c89b77b7..0ef4f189 100644 --- a/app/src/main/res/drawable/bg_item_header_scrim.xml +++ b/app/src/main/res/drawable/bg_item_header_scrim.xml @@ -8,6 +8,6 @@ android:angle="90" android:centerColor="#00000000" android:endColor="#00000000" - android:startColor="?attr/colorSurface" + android:startColor="@color/e_background" android:type="linear" /> diff --git a/app/src/main/res/layout-land/fragment_now_playing.xml b/app/src/main/res/layout-land/fragment_now_playing.xml index 4d0c1056..ef34b699 100644 --- a/app/src/main/res/layout-land/fragment_now_playing.xml +++ b/app/src/main/res/layout-land/fragment_now_playing.xml @@ -19,12 +19,12 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/e_action_bar" app:navigationIcon="@drawable/ic_keyboard_arrow_down" app:navigationIconTint="?attr/colorOnSurface" app:titleCentered="true" app:titleTextAppearance="?attr/textAppearanceTitleMedium" - tools:title="Eyes shut, mouth still" - style="@style/Widget.App.Toolbar"> + tools:title="Eyes shut, mouth still" > diff --git a/app/src/main/res/layout/audio_track_index.xml b/app/src/main/res/layout/audio_track_index.xml index 616563ae..bce58072 100644 --- a/app/src/main/res/layout/audio_track_index.xml +++ b/app/src/main/res/layout/audio_track_index.xml @@ -9,7 +9,7 @@ style="@style/Widget.Material3.CardView.Filled" android:layout_width="24dp" android:layout_height="24dp" - app:cardBackgroundColor="?attr/colorPrimaryContainer" + app:cardBackgroundColor="@color/e_accent" app:cardCornerRadius="4dp"> diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml index be53f947..e00c0259 100644 --- a/app/src/main/res/layout/fragment_album.xml +++ b/app/src/main/res/layout/fragment_album.xml @@ -54,7 +54,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.4" - android:background="?attr/colorSurface" + android:background="@color/e_background" android:fitsSystemWindows="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_artist.xml b/app/src/main/res/layout/fragment_artist.xml index 9d0da20e..816157a0 100644 --- a/app/src/main/res/layout/fragment_artist.xml +++ b/app/src/main/res/layout/fragment_artist.xml @@ -55,7 +55,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.4" - android:background="?attr/colorSurface" + android:background="@color/e_background" android:fitsSystemWindows="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_genre.xml b/app/src/main/res/layout/fragment_genre.xml index d14fcf0f..392ce9e2 100644 --- a/app/src/main/res/layout/fragment_genre.xml +++ b/app/src/main/res/layout/fragment_genre.xml @@ -55,7 +55,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.4" - android:background="?attr/colorSurface" + android:background="@color/e_background" android:fitsSystemWindows="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_now_playing.xml b/app/src/main/res/layout/fragment_now_playing.xml index 2a0bd266..dd0fd5b2 100644 --- a/app/src/main/res/layout/fragment_now_playing.xml +++ b/app/src/main/res/layout/fragment_now_playing.xml @@ -18,7 +18,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - style="@style/Widget.App.Toolbar" + android:background="@color/e_action_bar" app:navigationIcon="@drawable/ic_keyboard_arrow_down" app:navigationIconTint="?attr/colorOnSurface" app:titleCentered="true" diff --git a/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml b/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml index 1c077421..435752fb 100644 --- a/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml +++ b/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml @@ -47,8 +47,8 @@ android:insetTop="0dp" android:insetBottom="0dp" android:textAppearance="?attr/textAppearanceTitleLarge" - android:textColor="?attr/colorOnPrimaryContainer" - app:backgroundTint="?attr/colorPrimaryContainer" + android:textColor="@color/e_primary_text_color" + app:backgroundTint="@color/e_floating_background_variant" app:cornerRadius="8dp" tool:text="1.5x" /> @@ -77,7 +77,7 @@ android:text="@string/playbacl_pitch_unlock" android:textAppearance="?attr/textAppearanceBodyLarge" /> - diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml index 2dddda8a..62145e0d 100644 --- a/app/src/main/res/layout/fragment_playlist.xml +++ b/app/src/main/res/layout/fragment_playlist.xml @@ -55,7 +55,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.4" - android:background="?attr/colorSurface" + android:background="@color/e_background" android:fitsSystemWindows="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/play_buttons.xml b/app/src/main/res/layout/play_buttons.xml index 9e9f2c13..8d3e6581 100644 --- a/app/src/main/res/layout/play_buttons.xml +++ b/app/src/main/res/layout/play_buttons.xml @@ -19,9 +19,11 @@ android:tooltipText="@string/shuffle_play" android:layout_gravity="end" android:layout_marginBottom="12dp" - app:backgroundTint="?attr/colorTertiaryContainer" + android:textColor="@color/e_background" + app:backgroundTint="@color/e_accent" app:collapsedSize="46dp" app:icon="@drawable/ic_shuffle_play" + app:iconTint="@color/e_background" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/view_activity_tab.xml b/app/src/main/res/layout/view_activity_tab.xml index 2b354d2e..9a8f799f 100644 --- a/app/src/main/res/layout/view_activity_tab.xml +++ b/app/src/main/res/layout/view_activity_tab.xml @@ -11,6 +11,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginVertical="8dp" + app:cardBackgroundColor="@color/e_floating_background_variant" app:cardCornerRadius="16dp" app:contentPaddingBottom="16dp" app:contentPaddingTop="16dp"> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f79e27f0..f3482747 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -16,6 +16,8 @@ @color/e_action_bar @style/Widget.App.SearchView @style/Widget.App.TabLayout + @style/ThemeOverlay.App.BottomSheetDialog + @style/ThemeOverlay.App.MaterialAlertDialog + + + + + -- GitLab