From 8b44518bce7adba7e488ec9405bac7d142b11033 Mon Sep 17 00:00:00 2001 From: Mohit Date: Fri, 4 Dec 2020 17:56:35 +0530 Subject: [PATCH 1/3] Ui revamping color implmentation , player seeker and control , player background , action bar colors, main tabs and color and its background. top action bar text color , menu icon color , theme text color --- res/drawable/btn_playback_next.xml | 2 +- res/drawable/btn_playback_pause.xml | 2 +- res/drawable/btn_playback_play.xml | 2 +- res/drawable/btn_playback_previous.xml | 2 +- res/drawable/btn_playback_repeat_all.xml | 2 +- res/drawable/btn_playback_repeat_one.xml | 2 +- res/drawable/btn_playback_shuffle_all.xml | 2 +- res/layout/activity_player_fragment.xml | 4 +- res/layout/activity_settings.xml | 2 +- res/layout/audio_player_header_bar.xml | 6 +-- res/layout/bottom_action_bar.xml | 2 +- res/layout/play_pause_progress_button.xml | 2 +- res/values/colors.xml | 50 +++++++++++++------ res/values/styles.xml | 5 +- .../eleven/ui/activities/BaseActivity.java | 3 ++ 15 files changed, 57 insertions(+), 31 deletions(-) diff --git a/res/drawable/btn_playback_next.xml b/res/drawable/btn_playback_next.xml index 80afe5bb..01c5a3d9 100644 --- a/res/drawable/btn_playback_next.xml +++ b/res/drawable/btn_playback_next.xml @@ -6,6 +6,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/btn_playback_pause.xml b/res/drawable/btn_playback_pause.xml index b593b24d..4eda34cd 100644 --- a/res/drawable/btn_playback_pause.xml +++ b/res/drawable/btn_playback_pause.xml @@ -6,6 +6,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/btn_playback_play.xml b/res/drawable/btn_playback_play.xml index 48333e83..1b6ecd0c 100644 --- a/res/drawable/btn_playback_play.xml +++ b/res/drawable/btn_playback_play.xml @@ -6,6 +6,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/btn_playback_previous.xml b/res/drawable/btn_playback_previous.xml index 23ec00ca..34095163 100644 --- a/res/drawable/btn_playback_previous.xml +++ b/res/drawable/btn_playback_previous.xml @@ -6,6 +6,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/btn_playback_repeat_all.xml b/res/drawable/btn_playback_repeat_all.xml index 1d98d0de..8be94ed2 100644 --- a/res/drawable/btn_playback_repeat_all.xml +++ b/res/drawable/btn_playback_repeat_all.xml @@ -6,6 +6,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/btn_playback_repeat_one.xml b/res/drawable/btn_playback_repeat_one.xml index dcd085fb..8e9086a5 100644 --- a/res/drawable/btn_playback_repeat_one.xml +++ b/res/drawable/btn_playback_repeat_one.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/btn_playback_shuffle_all.xml b/res/drawable/btn_playback_shuffle_all.xml index 3694d25e..c3d208b7 100644 --- a/res/drawable/btn_playback_shuffle_all.xml +++ b/res/drawable/btn_playback_shuffle_all.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml index 75b46ff7..dd9c63ca 100644 --- a/res/layout/activity_player_fragment.xml +++ b/res/layout/activity_player_fragment.xml @@ -24,7 +24,9 @@ android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" - tools:background="@color/blue_dark"> + tools:background="@color/blue_dark" + android:background="@color/player_action_bar_color" + > + android:tag="org.lineageos2.eleven.ui.activities.SettingsActivity$SettingsFragment" /> diff --git a/res/layout/audio_player_header_bar.xml b/res/layout/audio_player_header_bar.xml index 7934b106..781de164 100644 --- a/res/layout/audio_player_header_bar.xml +++ b/res/layout/audio_player_header_bar.xml @@ -20,7 +20,7 @@ android:id="@+id/audio_player_header" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - android:background="@android:color/transparent" + android:background="@color/player_action_bar_color" android:elevation="@dimen/action_bar_elevation" android:theme="@style/ToolBarTheme" app:popupTheme="@style/ToolBarPopupTheme" @@ -42,7 +42,7 @@ android:ellipsize="end" android:maxLines="1" android:textAllCaps="true" - android:textColor="@color/header_action_bar_text_color" + android:textColor="@color/player_action_bar_title_text_color" android:textSize="@dimen/text_size_medium" android:textStyle="bold" tools:text="Really long and nice album title" /> @@ -55,7 +55,7 @@ android:maxLines="1" android:paddingBottom="2dp" android:textAllCaps="true" - android:textColor="@color/header_action_bar_text_color" + android:textColor="@color/player_action_bar_subtitle_text_color" android:textSize="@dimen/text_size_micro" tools:text="Name of Artist" /> diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml index f564dc1f..d1340330 100644 --- a/res/layout/bottom_action_bar.xml +++ b/res/layout/bottom_action_bar.xml @@ -63,6 +63,6 @@ android:contentDescription="@string/accessibility_play" android:layout_width="@dimen/bab_progress_size" android:layout_height="@dimen/bab_progress_size" - layout="@layout/play_pause_progress_button" /> + layout="@layout/play_pause_progress_button_collapsed" /> diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml index 06b02531..4eecb30a 100644 --- a/res/layout/play_pause_progress_button.xml +++ b/res/layout/play_pause_progress_button.xml @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@color/accent" + android:background="@color/player_control_color" android:contentDescription="@string/accessibility_play" android:focusable="true" android:scaleType="centerCrop" diff --git a/res/values/colors.xml b/res/values/colors.xml index 723839d7..2d5913d8 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,10 +16,16 @@ --> - #333333 - #212121 + + + + + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_primary_dark #424242 - #E91E63 + @lineageos.platform:color/color_default_accent + + @lineageos.platform:color/color_default_primary_text #333333 @@ -45,11 +51,11 @@ #303F9F - @color/black - @color/white + @lineageos.platform:color/color_default_primary_text + @color/primary - #fefefe + @lineageos.platform:color/color_default_background @color/black #424242 @@ -63,9 +69,18 @@ @color/primary - #f5f5f5 - #ffffff + @lineageos.platform:color/color_default_primary_text + + @lineageos.platform:color/color_default_secondary_text + @lineageos.platform:color/color_default_primary_text @color/default_text_color_light + + @color/primary + @color/main_action_bar_text_color + @color/header_action_bar_text_color + + @color/header_action_bar_text_color + @color/header_action_bar_text_color @color/white @@ -99,8 +114,9 @@ @color/default_text_color_light - #40ffffff - @color/white + @color/player_control_background_color + @color/player_control_color + @color/white @color/black @@ -163,14 +179,16 @@ @color/cardOne @color/cardTwo @color/white - @color/white - @color/white - @color/white @color/white @color/white - @color/white - @color/white - @color/white + @color/player_control_color + @color/player_control_background_color + @color/player_control_color + + @color/player_control_background_color + @color/player_control_background_color + @color/player_control_background_color + diff --git a/res/values/styles.xml b/res/values/styles.xml index b64d2929..df10fdad 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -190,7 +190,10 @@ @dimen/tab_text_size -