staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More chip color + color refactoring

Browse Source
hh
Laurent 5 years ago
parent aea0a48674
commit 4464ae54a3
28 changed files with 55 additions and 47 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
  2. 13
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
  3. 4
      app/src/main/res/color/bottom_navigation_item.xml
  4. 2
      app/src/main/res/drawable-xxhdpi/circle_player_color_1.xml
  5. 2
      app/src/main/res/drawable/ic_arrow_down.xml
  6. 2
      app/src/main/res/drawable/ic_arrow_right.xml
  7. 2
      app/src/main/res/drawable/ic_arrow_up.xml
  8. 2
      app/src/main/res/layout/bottom_sheet_double_edit_text.xml
  9. 2
      app/src/main/res/layout/bottom_sheet_edit_text.xml
  10. 2
      app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
  11. 2
      app/src/main/res/layout/bottom_sheet_sum.xml
  12. 2
      app/src/main/res/layout/fragment_bottom_sheet.xml
  13. 12
      app/src/main/res/layout/fragment_replayer.xml
  14. 2
      app/src/main/res/layout/fragment_subscription.xml
  15. 2
      app/src/main/res/layout/row_content.xml
  16. 2
      app/src/main/res/layout/row_legend_default.xml
  17. 4
      app/src/main/res/layout/row_player.xml
  18. 2
      app/src/main/res/layout/row_player_image.xml
  19. 2
      app/src/main/res/layout/row_session_view.xml
  20. 2
      app/src/main/res/layout/row_stats_title_value.xml
  21. 2
      app/src/main/res/layout/row_title.xml
  22. 2
      app/src/main/res/layout/row_title_arrow.xml
  23. 2
      app/src/main/res/layout/row_title_icon_arrow.xml
  24. 2
      app/src/main/res/layout/row_title_value_action.xml
  25. 2
      app/src/main/res/layout/row_title_value_arrow.xml
  26. 2
      app/src/main/res/layout/row_transaction_view.xml
  27. 8
      app/src/main/res/values/colors.xml
  28. 17
      app/src/main/res/values/styles.xml

2
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
Unescape View File

@ -41,7 +41,7 @@ class ReplayerView(context: Context, attrs: AttributeSet) : View(context, attrs)
override fun onDraw(canvas: Canvas?) { override fun onDraw(canvas: Canvas?) {
super.onDraw(canvas) super.onDraw(canvas)
Timber.d("ReplayerView > onDraw") // Timber.d("ReplayerView > onDraw")
canvas?.let { canvas?.let {

13
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
Unescape View File

@ -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.ui.modules.handhistory.model.ComputedAction
import net.pokeranalytics.android.util.RANDOM_PLAYER import net.pokeranalytics.android.util.RANDOM_PLAYER
import net.pokeranalytics.android.util.extensions.formatted import net.pokeranalytics.android.util.extensions.formatted
import timber.log.Timber
data class ChipColor(val fillColor: Int, val borderColor: Int) { data class ChipColor(val fillColor: Int, val borderColor: Int) {
companion object { companion object {
val all: List<ChipColor> by lazy { val all: List<ChipColor> by lazy {
listOf( listOf(
ChipColor(R.color.white, R.color.grey), 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.green, R.color.white),
ChipColor(R.color.player_color_2, R.color.chip_dash_color_2), 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_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_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_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_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.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)
) )
} }

4
app/src/main/res/color/bottom_navigation_item.xml
Unescape View File

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <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/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/grey_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="false" />
</selector> </selector>

2
app/src/main/res/drawable-xxhdpi/circle_player_color_1.xml
Unescape View File

@ -5,7 +5,7 @@
<solid android:color="@color/player_color_1" /> <solid android:color="@color/player_color_1" />
<stroke <stroke
android:color="@color/gray" android:color="@color/grey_medium"
android:width="1dp" /> android:width="1dp" />
<size <size

2
app/src/main/res/drawable/ic_arrow_down.xml
Unescape View File

@ -5,5 +5,5 @@
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" 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> </vector>

2
app/src/main/res/drawable/ic_arrow_right.xml
Unescape View File

@ -1,6 +1,6 @@
<vector android:height="24dp" android:tint="#FFFFFF" <vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0" android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> 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"/> android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
</vector> </vector>

2
app/src/main/res/drawable/ic_arrow_up.xml
Unescape View File

@ -5,5 +5,5 @@
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" 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> </vector>

2
app/src/main/res/layout/bottom_sheet_double_edit_text.xml
Unescape View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:background="@color/gray_darker"> tools:background="@color/grey_darkest">
<androidx.appcompat.widget.AppCompatEditText <androidx.appcompat.widget.AppCompatEditText
android:id="@+id/editText" android:id="@+id/editText"

2
app/src/main/res/layout/bottom_sheet_edit_text.xml
Unescape View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:background="@color/gray_darker"> tools:background="@color/grey_darkest">
<androidx.appcompat.widget.AppCompatEditText <androidx.appcompat.widget.AppCompatEditText
android:id="@+id/editText" android:id="@+id/editText"

2
app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
Unescape View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:background="@color/gray_darker"> tools:background="@color/grey_darkest">
<androidx.appcompat.widget.AppCompatEditText <androidx.appcompat.widget.AppCompatEditText
android:id="@+id/editText" android:id="@+id/editText"

2
app/src/main/res/layout/bottom_sheet_sum.xml
Unescape View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:background="@color/gray_darker"> tools:background="@color/grey_darkest">
<androidx.appcompat.widget.AppCompatButton <androidx.appcompat.widget.AppCompatButton
android:id="@+id/button1" android:id="@+id/button1"

2
app/src/main/res/layout/fragment_bottom_sheet.xml
Unescape View File

@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/gray_dark"> android:background="@color/grey_darker">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/bottomSheetToolbar" android:id="@+id/bottomSheetToolbar"

12
app/src/main/res/layout/fragment_replayer.xml
Unescape View File

@ -57,7 +57,7 @@
<ImageButton <ImageButton
android:id="@+id/previous_hand" android:id="@+id/previous_hand"
android:src="@drawable/ic_skip_previous_white" android:src="@drawable/ic_skip_previous_white"
style="@style/PokerAnalyticsTheme.TransparentButton" style="@style/PokerAnalyticsTheme.ToolbarButton"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
@ -66,7 +66,7 @@
<ImageButton <ImageButton
android:id="@+id/next_hand" android:id="@+id/next_hand"
style="@style/PokerAnalyticsTheme.TransparentButton" style="@style/PokerAnalyticsTheme.ToolbarButton"
android:src="@drawable/ic_skip_next_white" android:src="@drawable/ic_skip_next_white"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
@ -75,7 +75,7 @@
<ImageButton <ImageButton
android:id="@+id/play_pause" android:id="@+id/play_pause"
style="@style/PokerAnalyticsTheme.TransparentButton" style="@style/PokerAnalyticsTheme.ToolbarButton"
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
@ -84,7 +84,7 @@
<Button <Button
android:id="@+id/speed" android:id="@+id/speed"
style="@style/PokerAnalyticsTheme.TransparentButton" style="@style/PokerAnalyticsTheme.ToolbarButton"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
@ -92,7 +92,7 @@
<ImageButton <ImageButton
android:id="@+id/previous_action" android:id="@+id/previous_action"
style="@style/PokerAnalyticsTheme.TransparentButton" style="@style/PokerAnalyticsTheme.ToolbarButton"
android:src="@drawable/ic_fast_rewind_white" android:src="@drawable/ic_fast_rewind_white"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
@ -101,7 +101,7 @@
<ImageButton <ImageButton
android:id="@+id/next_action" android:id="@+id/next_action"
style="@style/PokerAnalyticsTheme.TransparentButton" style="@style/PokerAnalyticsTheme.ToolbarButton"
android:src="@drawable/ic_fast_forward_white" android:src="@drawable/ic_fast_forward_white"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"

2
app/src/main/res/layout/fragment_subscription.xml
Unescape View File

@ -124,7 +124,7 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:text="@string/subscription_text" android:text="@string/subscription_text"
android:textColor="@color/gray" android:textColor="@color/grey_medium"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>

2
app/src/main/res/layout/row_content.xml
Unescape View File

@ -12,7 +12,7 @@
android:id="@+id/foreground" android:id="@+id/foreground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_dark" android:background="@color/grey_darker"
android:foreground="?selectableItemBackground"> android:foreground="?selectableItemBackground">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView

2
app/src/main/res/layout/row_legend_default.xml
Unescape View File

@ -62,7 +62,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/row_player.xml
Unescape View File

@ -12,7 +12,7 @@
android:id="@+id/foreground" android:id="@+id/foreground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/gray_dark" android:background="@color/grey_darker"
android:foreground="?selectableItemBackground"> android:foreground="?selectableItemBackground">
<net.pokeranalytics.android.ui.view.PlayerImageView <net.pokeranalytics.android.ui.view.PlayerImageView
@ -67,7 +67,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/row_player_image.xml
Unescape View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/gray_dark" android:background="@color/grey_darker"
android:foreground="?selectableItemBackground"> android:foreground="?selectableItemBackground">
<net.pokeranalytics.android.ui.view.PlayerImageView <net.pokeranalytics.android.ui.view.PlayerImageView

2
app/src/main/res/layout/row_session_view.xml
Unescape View File

@ -186,7 +186,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/row_stats_title_value.xml
Unescape View File

@ -37,7 +37,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"

2
app/src/main/res/layout/row_title.xml
Unescape View File

@ -12,7 +12,7 @@
android:id="@+id/foreground" android:id="@+id/foreground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_dark" android:background="@color/grey_darker"
android:foreground="?selectableItemBackground"> android:foreground="?selectableItemBackground">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView

2
app/src/main/res/layout/row_title_arrow.xml
Unescape View File

@ -26,7 +26,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/row_title_icon_arrow.xml
Unescape View File

@ -37,7 +37,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/row_title_value_action.xml
Unescape View File

@ -12,7 +12,7 @@
android:id="@+id/foreground" android:id="@+id/foreground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_dark" android:background="@color/grey_darker"
android:foreground="?selectableItemBackground"> android:foreground="?selectableItemBackground">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView

2
app/src/main/res/layout/row_title_value_arrow.xml
Unescape View File

@ -39,7 +39,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/row_transaction_view.xml
Unescape View File

@ -85,7 +85,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_arrow_right" android:src="@drawable/ic_arrow_right"
android:tint="@color/gray_light" android:tint="@color/grey_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

8
app/src/main/res/values/colors.xml
Unescape View File

@ -10,10 +10,10 @@
<color name="white">#FFFFFF</color> <color name="white">#FFFFFF</color>
<color name="white_transparent">#30FFFFFF</color> <color name="white_transparent">#30FFFFFF</color>
<color name="gray_light">#8AFFFFFF</color> <color name="grey_light">#8AFFFFFF</color>
<color name="gray_darker">#141414</color> <color name="grey_darkest">#141414</color>
<color name="gray_dark">#1B1F1B</color> <color name="grey_darker">#1B1F1B</color>
<color name="gray">#808080</color> <color name="grey_medium">#808080</color>
<color name="white_dark">#e0e0e0</color> <color name="white_dark">#e0e0e0</color>
<color name="dark_clear">#40000000</color> <color name="dark_clear">#40000000</color>

17
app/src/main/res/values/styles.xml
Unescape View File

@ -7,7 +7,7 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="colorControlHighlight">@color/green_transparent</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:navigationBarColor">@color/colorPrimary</item>
<item name="android:actionMenuTextColor">@color/white</item> <item name="android:actionMenuTextColor">@color/white</item>
<item name="colorControlNormal">@color/white</item> <item name="colorControlNormal">@color/white</item>
@ -51,7 +51,7 @@
<style name="PokerAnalyticsTheme.BottomNavigationView"> <style name="PokerAnalyticsTheme.BottomNavigationView">
<item name="itemIconTint">@color/bottom_navigation_item</item> <item name="itemIconTint">@color/bottom_navigation_item</item>
<item name="itemTextColor">@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> </style>
@ -62,7 +62,7 @@
</style> </style>
<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar"> <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="titleTextColor">@color/white</item>
<item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item> <item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item>
</style> </style>
@ -91,7 +91,7 @@
<!-- Bottom App Bar --> <!-- Bottom App Bar -->
<style name="PokerAnalyticsTheme.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar"> <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:colorPrimary">@color/white</item>
<item name="android:titleTextColor">@color/white</item> <item name="android:titleTextColor">@color/white</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
@ -231,7 +231,7 @@
<!-- Tabs --> <!-- Tabs -->
<style name="PokerAnalyticsTheme.TabLayout" parent="Widget.MaterialComponents.TabLayout"> <style name="PokerAnalyticsTheme.TabLayout" parent="Widget.MaterialComponents.TabLayout">
<item name="android:background">@color/colorPrimary</item> <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="tabSelectedTextColor">@color/green</item>
<item name="tabIndicatorColor">@color/green</item> <item name="tabIndicatorColor">@color/green</item>
</style> </style>
@ -330,7 +330,7 @@
<style name="PokerAnalyticsTheme.AlertDialog" parent="Theme.MaterialComponents.Dialog"> <style name="PokerAnalyticsTheme.AlertDialog" parent="Theme.MaterialComponents.Dialog">
<item name="colorAccent">@color/green</item> <item name="colorAccent">@color/green</item>
<item name="android:textColorPrimary">@color/white</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>--> <!-- <item name="android:panelFullBackground">@color/kaki_darker</item>-->
</style> </style>
@ -354,6 +354,11 @@
<!-- Button --> <!-- 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"> <style name="PokerAnalyticsTheme.TransparentButton" parent="Widget.MaterialComponents.Button">
<item name="iconPadding">0dp</item> <item name="iconPadding">0dp</item>
<item name="backgroundTint">@color/transparent</item> <item name="backgroundTint">@color/transparent</item>

Write Preview
Loading…
Cancel
Save