From 4464ae54a32ec7dda3600d27aa5985898f50453a Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 12 Jun 2020 15:09:46 +0200
Subject: [PATCH] More chip color + color refactoring

---
 .../handhistory/replayer/ReplayerView.kt        |  2 +-
 .../modules/handhistory/replayer/TableDrawer.kt | 13 ++++++++-----
 .../main/res/color/bottom_navigation_item.xml   |  4 ++--
 .../drawable-xxhdpi/circle_player_color_1.xml   |  2 +-
 app/src/main/res/drawable/ic_arrow_down.xml     |  2 +-
 app/src/main/res/drawable/ic_arrow_right.xml    |  2 +-
 app/src/main/res/drawable/ic_arrow_up.xml       |  2 +-
 .../layout/bottom_sheet_double_edit_text.xml    |  2 +-
 .../main/res/layout/bottom_sheet_edit_text.xml  |  2 +-
 .../bottom_sheet_edit_text_multi_lines.xml      |  2 +-
 app/src/main/res/layout/bottom_sheet_sum.xml    |  2 +-
 .../main/res/layout/fragment_bottom_sheet.xml   |  2 +-
 app/src/main/res/layout/fragment_replayer.xml   | 12 ++++++------
 .../main/res/layout/fragment_subscription.xml   |  2 +-
 app/src/main/res/layout/row_content.xml         |  2 +-
 app/src/main/res/layout/row_legend_default.xml  |  2 +-
 app/src/main/res/layout/row_player.xml          |  4 ++--
 app/src/main/res/layout/row_player_image.xml    |  2 +-
 app/src/main/res/layout/row_session_view.xml    |  2 +-
 .../main/res/layout/row_stats_title_value.xml   |  2 +-
 app/src/main/res/layout/row_title.xml           |  2 +-
 app/src/main/res/layout/row_title_arrow.xml     |  2 +-
 .../main/res/layout/row_title_icon_arrow.xml    |  2 +-
 .../main/res/layout/row_title_value_action.xml  |  2 +-
 .../main/res/layout/row_title_value_arrow.xml   |  2 +-
 .../main/res/layout/row_transaction_view.xml    |  2 +-
 app/src/main/res/values/colors.xml              |  8 ++++----
 app/src/main/res/values/styles.xml              | 17 +++++++++++------
 28 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
index 4264ecac..5100d68e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
@@ -41,7 +41,7 @@ class ReplayerView(context: Context, attrs: AttributeSet) : View(context, attrs)
 	override fun onDraw(canvas: Canvas?) {
 		super.onDraw(canvas)
 
-		Timber.d("ReplayerView > onDraw")
+//		Timber.d("ReplayerView > onDraw")
 
 		canvas?.let {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
index 7cddc98a..f7f65e5a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
@@ -12,24 +12,27 @@ import net.pokeranalytics.android.model.realm.handhistory.Card
 import net.pokeranalytics.android.ui.modules.handhistory.model.ComputedAction
 import net.pokeranalytics.android.util.RANDOM_PLAYER
 import net.pokeranalytics.android.util.extensions.formatted
-import timber.log.Timber
 
 data class ChipColor(val fillColor: Int, val borderColor: Int) {
 	companion object {
 		val all: List<ChipColor> by lazy {
 			listOf(
 				ChipColor(R.color.white, R.color.grey),
+				ChipColor(R.color.kaki_light, R.color.white_dark),
 				ChipColor(R.color.green, R.color.white),
 				ChipColor(R.color.player_color_2, R.color.chip_dash_color_2),
 				ChipColor(R.color.player_color_3, R.color.chip_dash_color_3),
-				ChipColor(R.color.player_color_4, R.color.chip_dash_color_4),
+				ChipColor(R.color.player_color_9, R.color.chip_dash_color_9),
 				ChipColor(R.color.player_color_5, R.color.chip_dash_color_5),
-				ChipColor(R.color.player_color_6, R.color.chip_dash_color_6),
 				ChipColor(R.color.player_color_7, R.color.chip_dash_color_7),
+				ChipColor(R.color.player_color_6, R.color.chip_dash_color_6),
 				ChipColor(R.color.player_color_8, R.color.chip_dash_color_8),
-				ChipColor(R.color.player_color_9, R.color.chip_dash_color_9),
+				ChipColor(R.color.player_color_4, R.color.chip_dash_color_4),
 				ChipColor(R.color.chip_dash_color_7, R.color.player_color_2),
-				ChipColor(R.color.player_color_6, R.color.player_color_9)
+				ChipColor(R.color.chip_dash_color_4, R.color.player_color_3),
+				ChipColor(R.color.player_color_6, R.color.player_color_9),
+				ChipColor(R.color.player_color_8, R.color.player_color_2),
+				ChipColor(R.color.chip_dash_color_7, R.color.player_color_4)
 			)
 		}
 
diff --git a/app/src/main/res/color/bottom_navigation_item.xml b/app/src/main/res/color/bottom_navigation_item.xml
index 5c3998df..30f4760c 100644
--- a/app/src/main/res/color/bottom_navigation_item.xml
+++ b/app/src/main/res/color/bottom_navigation_item.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
 <item android:color="@color/green" android:state_checked="true" android:state_enabled="true" />
-<item android:color="@color/gray_light" android:state_checked="false" android:state_enabled="true" />
-<item android:color="@color/gray_light" android:state_checked="false" android:state_enabled="false" />
+<item android:color="@color/grey_light" android:state_checked="false" android:state_enabled="true" />
+<item android:color="@color/grey_light" android:state_checked="false" android:state_enabled="false" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/circle_player_color_1.xml b/app/src/main/res/drawable-xxhdpi/circle_player_color_1.xml
index 8cf572ee..38d1190f 100644
--- a/app/src/main/res/drawable-xxhdpi/circle_player_color_1.xml
+++ b/app/src/main/res/drawable-xxhdpi/circle_player_color_1.xml
@@ -5,7 +5,7 @@
 	<solid android:color="@color/player_color_1" />
 
 	<stroke
-		android:color="@color/gray"
+		android:color="@color/grey_medium"
 		android:width="1dp" />
 
 	<size
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index a9510d51..21d9dea3 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"
-      android:fillColor="@color/gray_light"/>
+      android:fillColor="@color/grey_light"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index 19d1897e..91735d45 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -1,6 +1,6 @@
 <vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/gray_light"
+    <path android:fillColor="@color/grey_light"
         android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml
index 59b4d185..22c45996 100644
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_up.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"
-      android:fillColor="@color/gray_light"/>
+      android:fillColor="@color/grey_light"/>
 </vector>
diff --git a/app/src/main/res/layout/bottom_sheet_double_edit_text.xml b/app/src/main/res/layout/bottom_sheet_double_edit_text.xml
index 703d8f60..d8d0ce52 100644
--- a/app/src/main/res/layout/bottom_sheet_double_edit_text.xml
+++ b/app/src/main/res/layout/bottom_sheet_double_edit_text.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	tools:background="@color/gray_darker">
+	tools:background="@color/grey_darkest">
 
 	<androidx.appcompat.widget.AppCompatEditText
 		android:id="@+id/editText"
diff --git a/app/src/main/res/layout/bottom_sheet_edit_text.xml b/app/src/main/res/layout/bottom_sheet_edit_text.xml
index bac63ced..918017ef 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_text.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_text.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	tools:background="@color/gray_darker">
+	tools:background="@color/grey_darkest">
 
 	<androidx.appcompat.widget.AppCompatEditText
 		android:id="@+id/editText"
diff --git a/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml b/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
index 8fe4b348..70fff917 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	tools:background="@color/gray_darker">
+	tools:background="@color/grey_darkest">
 
 	<androidx.appcompat.widget.AppCompatEditText
 		android:id="@+id/editText"
diff --git a/app/src/main/res/layout/bottom_sheet_sum.xml b/app/src/main/res/layout/bottom_sheet_sum.xml
index 8c31ff0c..06118165 100644
--- a/app/src/main/res/layout/bottom_sheet_sum.xml
+++ b/app/src/main/res/layout/bottom_sheet_sum.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	tools:background="@color/gray_darker">
+	tools:background="@color/grey_darkest">
 
 	<androidx.appcompat.widget.AppCompatButton
 		android:id="@+id/button1"
diff --git a/app/src/main/res/layout/fragment_bottom_sheet.xml b/app/src/main/res/layout/fragment_bottom_sheet.xml
index e0de450c..15c63961 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet.xml
@@ -4,7 +4,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	android:background="@color/gray_dark">
+	android:background="@color/grey_darker">
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/bottomSheetToolbar"
diff --git a/app/src/main/res/layout/fragment_replayer.xml b/app/src/main/res/layout/fragment_replayer.xml
index 50037977..79b4c1b8 100644
--- a/app/src/main/res/layout/fragment_replayer.xml
+++ b/app/src/main/res/layout/fragment_replayer.xml
@@ -57,7 +57,7 @@
 			<ImageButton
 				android:id="@+id/previous_hand"
 				android:src="@drawable/ic_skip_previous_white"
-				style="@style/PokerAnalyticsTheme.TransparentButton"
+				style="@style/PokerAnalyticsTheme.ToolbarButton"
 				android:layout_width="50dp"
 				android:layout_height="50dp"
 				android:layout_marginStart="4dp"
@@ -66,7 +66,7 @@
 
 			<ImageButton
 				android:id="@+id/next_hand"
-				style="@style/PokerAnalyticsTheme.TransparentButton"
+				style="@style/PokerAnalyticsTheme.ToolbarButton"
 				android:src="@drawable/ic_skip_next_white"
 				android:layout_width="50dp"
 				android:layout_height="50dp"
@@ -75,7 +75,7 @@
 
 			<ImageButton
 				android:id="@+id/play_pause"
-				style="@style/PokerAnalyticsTheme.TransparentButton"
+				style="@style/PokerAnalyticsTheme.ToolbarButton"
 				android:src="@drawable/ic_play_arrow"
 				android:layout_width="50dp"
 				android:layout_height="50dp"
@@ -84,7 +84,7 @@
 
 			<Button
 				android:id="@+id/speed"
-				style="@style/PokerAnalyticsTheme.TransparentButton"
+				style="@style/PokerAnalyticsTheme.ToolbarButton"
 				android:layout_width="68dp"
 				android:layout_height="50dp"
 				android:layout_marginStart="4dp"
@@ -92,7 +92,7 @@
 
 			<ImageButton
 				android:id="@+id/previous_action"
-				style="@style/PokerAnalyticsTheme.TransparentButton"
+				style="@style/PokerAnalyticsTheme.ToolbarButton"
 				android:src="@drawable/ic_fast_rewind_white"
 				android:layout_width="50dp"
 				android:layout_height="50dp"
@@ -101,7 +101,7 @@
 
 			<ImageButton
 				android:id="@+id/next_action"
-				style="@style/PokerAnalyticsTheme.TransparentButton"
+				style="@style/PokerAnalyticsTheme.ToolbarButton"
 				android:src="@drawable/ic_fast_forward_white"
 				android:layout_width="50dp"
 				android:layout_height="50dp"
diff --git a/app/src/main/res/layout/fragment_subscription.xml b/app/src/main/res/layout/fragment_subscription.xml
index 8549087f..3046c38c 100644
--- a/app/src/main/res/layout/fragment_subscription.xml
+++ b/app/src/main/res/layout/fragment_subscription.xml
@@ -124,7 +124,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:text="@string/subscription_text"
-                android:textColor="@color/gray"
+                android:textColor="@color/grey_medium"
                 android:paddingBottom="16dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/row_content.xml b/app/src/main/res/layout/row_content.xml
index 49c1bf77..8091edc5 100644
--- a/app/src/main/res/layout/row_content.xml
+++ b/app/src/main/res/layout/row_content.xml
@@ -12,7 +12,7 @@
 		android:id="@+id/foreground"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:background="@color/gray_dark"
+		android:background="@color/grey_darker"
 		android:foreground="?selectableItemBackground">
 
 		<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/row_legend_default.xml b/app/src/main/res/layout/row_legend_default.xml
index 974a8900..9d0134f2 100644
--- a/app/src/main/res/layout/row_legend_default.xml
+++ b/app/src/main/res/layout/row_legend_default.xml
@@ -62,7 +62,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 		app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/row_player.xml b/app/src/main/res/layout/row_player.xml
index 3a8582f1..ae805f9a 100644
--- a/app/src/main/res/layout/row_player.xml
+++ b/app/src/main/res/layout/row_player.xml
@@ -12,7 +12,7 @@
 		android:id="@+id/foreground"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="@color/gray_dark"
+		android:background="@color/grey_darker"
 		android:foreground="?selectableItemBackground">
 
 		<net.pokeranalytics.android.ui.view.PlayerImageView
@@ -67,7 +67,7 @@
 			android:layout_width="24dp"
 			android:layout_height="24dp"
 			android:src="@drawable/ic_arrow_right"
-			android:tint="@color/gray_light"
+			android:tint="@color/grey_light"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 			app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/row_player_image.xml b/app/src/main/res/layout/row_player_image.xml
index 2a8a6c20..803c7b1f 100644
--- a/app/src/main/res/layout/row_player_image.xml
+++ b/app/src/main/res/layout/row_player_image.xml
@@ -3,7 +3,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/gray_dark"
+	android:background="@color/grey_darker"
 	android:foreground="?selectableItemBackground">
 
 	<net.pokeranalytics.android.ui.view.PlayerImageView
diff --git a/app/src/main/res/layout/row_session_view.xml b/app/src/main/res/layout/row_session_view.xml
index 8e220f95..a9b54440 100644
--- a/app/src/main/res/layout/row_session_view.xml
+++ b/app/src/main/res/layout/row_session_view.xml
@@ -186,7 +186,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 		app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/row_stats_title_value.xml b/app/src/main/res/layout/row_stats_title_value.xml
index 482095f6..f428a1ed 100644
--- a/app/src/main/res/layout/row_stats_title_value.xml
+++ b/app/src/main/res/layout/row_stats_title_value.xml
@@ -37,7 +37,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		android:visibility="gone"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
diff --git a/app/src/main/res/layout/row_title.xml b/app/src/main/res/layout/row_title.xml
index 8bd71ab6..9921a28e 100644
--- a/app/src/main/res/layout/row_title.xml
+++ b/app/src/main/res/layout/row_title.xml
@@ -12,7 +12,7 @@
 		android:id="@+id/foreground"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:background="@color/gray_dark"
+		android:background="@color/grey_darker"
 		android:foreground="?selectableItemBackground">
 
 		<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/row_title_arrow.xml b/app/src/main/res/layout/row_title_arrow.xml
index a1579c30..ea38dd15 100644
--- a/app/src/main/res/layout/row_title_arrow.xml
+++ b/app/src/main/res/layout/row_title_arrow.xml
@@ -26,7 +26,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 		app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/row_title_icon_arrow.xml b/app/src/main/res/layout/row_title_icon_arrow.xml
index bea82a99..c91106c5 100644
--- a/app/src/main/res/layout/row_title_icon_arrow.xml
+++ b/app/src/main/res/layout/row_title_icon_arrow.xml
@@ -37,7 +37,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 		app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/row_title_value_action.xml b/app/src/main/res/layout/row_title_value_action.xml
index b43cf74f..54e80882 100644
--- a/app/src/main/res/layout/row_title_value_action.xml
+++ b/app/src/main/res/layout/row_title_value_action.xml
@@ -12,7 +12,7 @@
 		android:id="@+id/foreground"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:background="@color/gray_dark"
+		android:background="@color/grey_darker"
 		android:foreground="?selectableItemBackground">
 
 		<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/row_title_value_arrow.xml b/app/src/main/res/layout/row_title_value_arrow.xml
index 6491c8a9..6bbfae04 100644
--- a/app/src/main/res/layout/row_title_value_arrow.xml
+++ b/app/src/main/res/layout/row_title_value_arrow.xml
@@ -39,7 +39,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 		app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/row_transaction_view.xml b/app/src/main/res/layout/row_transaction_view.xml
index 3473977d..a4df34f0 100644
--- a/app/src/main/res/layout/row_transaction_view.xml
+++ b/app/src/main/res/layout/row_transaction_view.xml
@@ -85,7 +85,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:src="@drawable/ic_arrow_right"
-		android:tint="@color/gray_light"
+		android:tint="@color/grey_light"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 		app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 313d7062..5314f613 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,10 +10,10 @@
 	<color name="white">#FFFFFF</color>
 	<color name="white_transparent">#30FFFFFF</color>
 
-	<color name="gray_light">#8AFFFFFF</color>
-	<color name="gray_darker">#141414</color>
-	<color name="gray_dark">#1B1F1B</color>
-	<color name="gray">#808080</color>
+	<color name="grey_light">#8AFFFFFF</color>
+	<color name="grey_darkest">#141414</color>
+	<color name="grey_darker">#1B1F1B</color>
+	<color name="grey_medium">#808080</color>
 
 	<color name="white_dark">#e0e0e0</color>
 	<color name="dark_clear">#40000000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 30f80198..ed2e4464 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,7 @@
 		<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
 		<item name="colorAccent">@color/colorAccent</item>
 		<item name="colorControlHighlight">@color/green_transparent</item>
-		<item name="android:windowBackground">@color/gray_dark</item>
+		<item name="android:windowBackground">@color/grey_darker</item>
 		<item name="android:navigationBarColor">@color/colorPrimary</item>
 		<item name="android:actionMenuTextColor">@color/white</item>
 		<item name="colorControlNormal">@color/white</item>
@@ -51,7 +51,7 @@
 	<style name="PokerAnalyticsTheme.BottomNavigationView">
 		<item name="itemIconTint">@color/bottom_navigation_item</item>
 		<item name="itemTextColor">@color/bottom_navigation_item</item>
-		<item name="android:background">@color/gray_darker</item>
+		<item name="android:background">@color/grey_darkest</item>
 	</style>
 
 
@@ -62,7 +62,7 @@
 	</style>
 
 	<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
-		<item name="android:background">@color/gray_darker</item>
+		<item name="android:background">@color/grey_darkest</item>
 		<item name="titleTextColor">@color/white</item>
 		<item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item>
 	</style>
@@ -91,7 +91,7 @@
 	<!-- Bottom App Bar -->
 
 	<style name="PokerAnalyticsTheme.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar">
-		<item name="backgroundTint">@color/gray_darker</item>
+		<item name="backgroundTint">@color/grey_darkest</item>
 		<item name="android:colorPrimary">@color/white</item>
 		<item name="android:titleTextColor">@color/white</item>
 		<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
@@ -231,7 +231,7 @@
 	<!-- Tabs -->
 	<style name="PokerAnalyticsTheme.TabLayout" parent="Widget.MaterialComponents.TabLayout">
 		<item name="android:background">@color/colorPrimary</item>
-		<item name="tabTextColor">@color/gray_light</item>
+		<item name="tabTextColor">@color/grey_light</item>
 		<item name="tabSelectedTextColor">@color/green</item>
 		<item name="tabIndicatorColor">@color/green</item>
 	</style>
@@ -330,7 +330,7 @@
 	<style name="PokerAnalyticsTheme.AlertDialog" parent="Theme.MaterialComponents.Dialog">
 		<item name="colorAccent">@color/green</item>
 		<item name="android:textColorPrimary">@color/white</item>
-		<item name="android:windowBackground">@color/gray_dark</item>
+		<item name="android:windowBackground">@color/grey_darker</item>
 <!--		<item name="android:panelFullBackground">@color/kaki_darker</item>-->
 	</style>
 
@@ -354,6 +354,11 @@
 
 	<!-- Button -->
 
+	<style name="PokerAnalyticsTheme.ToolbarButton" parent="Widget.MaterialComponents.Button">
+		<item name="iconPadding">0dp</item>
+		<item name="tint">@color/green_light</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.TransparentButton" parent="Widget.MaterialComponents.Button">
 		<item name="iconPadding">0dp</item>
 		<item name="backgroundTint">@color/transparent</item>