From 0031ed83eb212cbbc79269742eb72a8c204911f1 Mon Sep 17 00:00:00 2001
From: Bryan Owens <djbryan3540@gmail.com>
Date: Sun, 1 May 2016 16:31:47 -0500
Subject: Themes: Expose and separate values for themes

Change-Id: Ifeff7fa28707de84af3c40f910787092f56c65b5
Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
---
 res/layout/activity_album_detail.xml      | 10 +++++-----
 res/layout/activity_artist_detail.xml     |  2 +-
 res/layout/activity_base.xml              |  6 +++---
 res/layout/app_msg.xml                    |  2 +-
 res/layout/app_widget_large.xml           |  2 +-
 res/layout/app_widget_large_alternate.xml |  2 +-
 res/layout/app_widget_small.xml           |  2 +-
 res/layout/artist_detail_album.xml        |  4 ++--
 res/layout/artist_detail_header.xml       |  6 +++---
 res/layout/grid_items_normal.xml          |  4 ++--
 res/layout/header_bar.xml                 |  2 +-
 res/layout/list_base_padding.xml          |  2 +-
 res/layout/list_item_top_tracks.xml       |  2 +-
 res/layout/main_album_flow.xml            |  2 +-
 res/layout/main_playback_controls.xml     | 10 +++++-----
 res/layout/playlist_detail_header.xml     |  4 ++--
 res/values/colors.xml                     | 25 +++++++++++++++++++++++++
 res/values/dimens.xml                     |  4 ++++
 res/values/styles.xml                     |  4 ++++
 19 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml
index 3838784..b92066f 100644
--- a/res/layout/activity_album_detail.xml
+++ b/res/layout/activity_album_detail.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color" >
+    android:background="@color/activity_album_detail_background_color" >
 
     <RelativeLayout
         android:id="@+id/header"
@@ -36,7 +36,7 @@
                 android:singleLine="true"
                 android:textStyle="bold"
                 android:textSize="@dimen/text_size_large"
-                android:textColor="@color/default_text_color" />
+                android:textColor="@color/album_detail_title_text_color" />
 
             <TextView
                 android:id="@+id/song_count_and_year"
@@ -45,7 +45,7 @@
                 android:layout_below="@id/title"
                 android:singleLine="true"
                 android:textSize="@dimen/text_size_micro"
-                android:textColor="@color/default_text_color" />
+                android:textColor="@color/album_detail_song_count_and_year_text_color" />
 
             <TextView
                 android:id="@+id/genre"
@@ -55,7 +55,7 @@
                 android:layout_marginRight="@dimen/standard_padding"
                 android:singleLine="true"
                 android:textSize="@dimen/text_size_micro"
-                android:textColor="@color/default_text_color"
+                android:textColor="@color/album_detail_genre_text_color"
                 android:visibility="gone"
                 android:layout_marginTop="4dp" />
 
@@ -79,7 +79,7 @@
                 android:layout_toRightOf="@id/duration_icon"
                 android:singleLine="true"
                 android:textSize="@dimen/text_size_micro"
-                android:textColor="@color/default_text_color"
+                android:textColor="@color/album_detail_duration_text_color"
                 android:layout_marginTop="4dp" />
         </RelativeLayout>
 
diff --git a/res/layout/activity_artist_detail.xml b/res/layout/activity_artist_detail.xml
index 79f0098..1670794 100644
--- a/res/layout/activity_artist_detail.xml
+++ b/res/layout/activity_artist_detail.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color" >
+    android:background="@color/activity_artist_detail_background_color" >
 
     <include
         layout="@layout/loading_empty_container" />
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 8426ffa..031223e 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -35,8 +35,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
-            android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
-            android:popupTheme="@android:style/Theme.Material.Light"
+            android:theme="@style/ToolBarTheme"
+            android:popupTheme="@style/ToolBarPopupTheme"
             android:elevation="@dimen/action_bar_elevation" />
 
         <FrameLayout
@@ -48,7 +48,7 @@
 
     <com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout2"
-        android:background="@color/background_color"
+        android:background="@color/activity_base_background_color"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="bottom"
diff --git a/res/layout/app_msg.xml b/res/layout/app_msg.xml
index 235fe47..8767a0f 100644
--- a/res/layout/app_msg.xml
+++ b/res/layout/app_msg.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="8dp"
-        android:textColor="?android:textColorPrimaryInverse"
+        android:textColor="@color/app_msg_text_color"
         android:textIsSelectable="false"
         android:textSize="14sp"
         android:textStyle="bold" />
diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml
index c4ea525..7ecc900 100644
--- a/res/layout/app_widget_large.xml
+++ b/res/layout/app_widget_large.xml
@@ -21,7 +21,7 @@
     android:layout_height="@dimen/app_widget_large_min_height"
     android:columnCount="2"
     android:rowCount="2"
-    android:background="@color/black"
+    android:background="@color/widget_background_color"
     tools:ignore="ContentDescription" >
 
     <ImageView
diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml
index da1aa59..59b6ad3 100644
--- a/res/layout/app_widget_large_alternate.xml
+++ b/res/layout/app_widget_large_alternate.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/app_widget_large_min_height"
-    android:background="@color/black"
+    android:background="@color/widget_background_color"
     android:columnCount="2"
     android:rowCount="2"
     tools:ignore="ContentDescription" >
diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml
index f6810a7..cb7cd6c 100644
--- a/res/layout/app_widget_small.xml
+++ b/res/layout/app_widget_small.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:columnCount="2"
     android:rowCount="2"
-    android:background="@color/black"
+    android:background="@color/widget_background_color"
     android:gravity="top"
     android:padding="@dimen/app_widget_padding"
     tools:ignore="NestedWeights" >
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 48733de..4433f9e 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -65,7 +65,7 @@
                 android:textSize="@dimen/text_size_micro"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/cardOne" />
+                android:textColor="@color/artist_detail_album_title_text_color" />
 
             <TextView
                 android:id="@+id/year"
@@ -73,7 +73,7 @@
                 android:textSize="@dimen/text_size_extra_micro"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/cardTwo" />
+                android:textColor="@color/artist_detail_album_year_text_color" />
 
         </LinearLayout>
 
diff --git a/res/layout/artist_detail_header.xml b/res/layout/artist_detail_header.xml
index 25cf202..3bdff8d 100644
--- a/res/layout/artist_detail_header.xml
+++ b/res/layout/artist_detail_header.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color" >
+    android:background="@color/artist_detail_header_background_color" >
 
     <ImageView
         android:id="@+id/hero"
@@ -17,7 +17,7 @@
         android:layout_below="@id/hero"
         android:gravity="center_vertical"
         android:textAllCaps="true"
-        android:textColor="@color/list_item_header_text_color"
+        android:textColor="@color/artist_detail_header_albums_label_text_color"
         android:textSize="@dimen/text_size_medium"
         android:text="@string/header_albums" />
 
@@ -36,7 +36,7 @@
         android:layout_below="@id/albums"
         android:gravity="bottom"
         android:textAllCaps="true"
-        android:textColor="@color/list_item_header_text_color"
+        android:textColor="@color/artist_detail_header_songs_label_text_color"
         android:textSize="@dimen/text_size_medium"
         android:text="@string/header_all_songs" />
 
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index fee88c1..3c1b0dd 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -47,7 +47,7 @@
                 <TextView
                     android:id="@+id/line_one"
                     style="@style/ListItemMainText.Grid.Single"
-                    android:textColor="@color/cardOne"
+                    android:textColor="@color/grid_items_normal_line_one"
                     android:paddingBottom="1dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -55,7 +55,7 @@
                 <TextView
                     android:id="@+id/line_two"
                     style="@style/ListItemSecondaryText.Grid.Single"
-                    android:textColor="@color/cardTwo"
+                    android:textColor="@color/grid_items_normal_line_two"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index 4e66b13..97731fe 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -23,7 +23,7 @@
     android:paddingStart="@dimen/drag_and_drop_width"
     android:background="@color/header_action_bar_color"
     android:elevation="@dimen/action_bar_elevation"
-    android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar">
+    android:theme="@style/ToolBarTheme">
 
     <ImageView
         android:id="@+id/header_bar_up"
diff --git a/res/layout/list_base_padding.xml b/res/layout/list_base_padding.xml
index b72a639..a2e36ab 100644
--- a/res/layout/list_base_padding.xml
+++ b/res/layout/list_base_padding.xml
@@ -19,7 +19,7 @@
     android:id="@+id/list_base_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@color/list_base_container_background_color">
 
     <include
         layout="@layout/loading_empty_container" />
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index 8988de7..1f74e46 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -49,7 +49,7 @@
                 android:layout_gravity="center"
                 android:textStyle="bold"
                 android:textSize="@dimen/text_size_small"
-                android:textColor="@color/white" />
+                android:textColor="@color/position_number_color" />
         </FrameLayout>
 
 
diff --git a/res/layout/main_album_flow.xml b/res/layout/main_album_flow.xml
index 109c782..d2e7cde 100644
--- a/res/layout/main_album_flow.xml
+++ b/res/layout/main_album_flow.xml
@@ -45,7 +45,7 @@
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
         android:background="@color/lyrics_background_color"
-        android:textColor="@color/white"
+        android:textColor="@color/audio_player_lyrics_text_color"
         android:textSize="@dimen/text_size_small"
         android:alpha="0.0"/>
 </com.cyanogenmod.eleven.widgets.SquareFrame>
\ No newline at end of file
diff --git a/res/layout/main_playback_controls.xml b/res/layout/main_playback_controls.xml
index cee200f..09f934a 100644
--- a/res/layout/main_playback_controls.xml
+++ b/res/layout/main_playback_controls.xml
@@ -20,9 +20,9 @@
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    card_view:cardCornerRadius="2dp"
-    card_view:contentPadding="8dp"
-    card_view:cardElevation="4dp"
+    card_view:cardCornerRadius="@dimen/audio_player_controls_card_corner_radius"
+    card_view:contentPadding="@dimen/audio_player_controls_card_content_padding"
+    card_view:cardElevation="@dimen/audio_player_controls_card_elevation"
     card_view:cardUseCompatPadding="true"
     card_view:cardBackgroundColor="@color/semitransparent_black" >
     <RelativeLayout
@@ -54,7 +54,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/audio_player_time_text_padding"
-                android:textColor="@color/white"
+                android:textColor="@color/audio_player_current_time_color"
                 android:textSize="@dimen/audio_player_time_text_size"
                 android:textStyle="bold"/>
 
@@ -104,7 +104,7 @@
                 android:layout_centerVertical="true"
                 android:paddingRight="@dimen/audio_player_time_text_padding"
                 android:gravity="right|center_vertical"
-                android:textColor="@color/white"
+                android:textColor="@color/audio_player_total_time_color"
                 android:textSize="@dimen/audio_player_time_text_size"
                 android:textStyle="bold"/>
 
diff --git a/res/layout/playlist_detail_header.xml b/res/layout/playlist_detail_header.xml
index 6b7c95a..8456cac 100644
--- a/res/layout/playlist_detail_header.xml
+++ b/res/layout/playlist_detail_header.xml
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingRight="16dp"
-                android:textColor="@color/white"
+                android:textColor="@color/number_of_songs_text_color"
                 android:textSize="@dimen/text_size_micro" />
 
             <ImageView
@@ -63,7 +63,7 @@
                 android:id="@+id/duration_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/white"
+                android:textColor="@color/duration_text_color"
                 android:textSize="@dimen/text_size_micro" />
         </LinearLayout>
     </FrameLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 481e8b3..2c905e6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -143,4 +143,29 @@
 
     <!-- Color for the visualizer bars -->
     <color name="visualizer_fill_color">#bffafafa</color>
+
+    <!-- Separated and exposed values for themes -->
+    <color name="widget_background_color">@color/black</color>
+    <color name="list_base_container_background_color">@color/white</color>
+    <color name="activity_album_detail_background_color">@color/background_color</color>
+    <color name="activity_artist_detail_background_color">@color/background_color</color>
+    <color name="activity_base_background_color">@color/background_color</color>
+    <color name="artist_detail_header_background_color">@color/background_color</color>
+    <color name="album_detail_title_text_color">@color/default_text_color</color>
+    <color name="album_detail_song_count_and_year_text_color">@color/default_text_color</color>
+    <color name="album_detail_genre_text_color">@color/default_text_color</color>
+    <color name="album_detail_duration_text_color">@color/default_text_color</color>
+    <color name="app_msg_text_color">?android:textColorPrimaryInverse</color>
+    <color name="artist_detail_album_title_text_color">@color/cardOne</color>
+    <color name="artist_detail_album_year_text_color">@color/cardTwo</color>
+    <color name="artist_detail_header_albums_label_text_color">@color/list_item_header_text_color</color>
+    <color name="artist_detail_header_songs_label_text_color">@color/list_item_header_text_color</color>
+    <color name="grid_items_normal_line_one">@color/cardOne</color>
+    <color name="grid_items_normal_line_two">@color/cardTwo</color>
+    <color name="position_number_color">@color/white</color>
+    <color name="audio_player_lyrics_text_color">@color/white</color>
+    <color name="audio_player_current_time_color">@color/white</color>
+    <color name="audio_player_total_time_color">@color/white</color>
+    <color name="number_of_songs_text_color">@color/white</color>
+    <color name="duration_text_color">@color/white</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dbbf5e8..80f7a85 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -215,4 +215,8 @@
     <dimen name="preview_title_textSize">12sp</dimen>
     <dimen name="preview_artist_textSize">10sp</dimen>
 
+    <!-- Audio Player Controls Card -->
+    <dimen name="audio_player_controls_card_corner_radius">2dp</dimen>
+    <dimen name="audio_player_controls_card_content_padding">8dp</dimen>
+    <dimen name="audio_player_controls_card_elevation">4dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 93acfd1..b942e5e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -191,4 +191,8 @@
         <item name="android:textColor">@color/tab_text_color</item>
         <item name="android:textSize">@dimen/tab_text_size</item>
     </style>
+
+    <style name="ToolBarTheme" parent="android:style/ThemeOverlay.Material.Dark.ActionBar" />
+
+    <style name="ToolBarPopupTheme" parent="android:style/Theme.Material.Light" />
 </resources>
-- 
cgit v1.2.3