diff options
| author | cyberta <cyberta@riseup.net> | 2022-12-16 01:05:57 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-12-16 01:05:57 +0000 |
| commit | b4b5d98fe0bc0498773870990df2442f800158c4 (patch) | |
| tree | 739de8a232d539804f8b61143879505271f52858 /app/src/main/res/values | |
| parent | 62d9effae8fe5983056a7b225535ec763f03d87b (diff) | |
| parent | d988fb9e977a78c31fa902a99308d97d95b8487b (diff) | |
Merge branch 'rc_review' into 'master'
Bugfixes after Release Candidate Review
Closes #9121, #8934, and #9052
See merge request leap/bitmask_android!226
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 35e49370..ead4785e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,6 +10,7 @@ <color name="colorMainBtnHighlight">#03DAC6</color> <color name="colorMainBtnError">#eF2222</color> + <color name="black">#000000</color> <color name="black800_dark">#1b1b1b</color> <color name="black800">#424242</color> <color name="black800_secondary">#3b3b3b</color> @@ -39,9 +40,12 @@ <color name="black_high_transparent">#05000000</color> <color name="colorEipFragmentFont">@color/black800</color> - <color name="colorFontBtn">@color/black800</color> - <color name="colorFontBtnEnabled">@color/white</color> - <color name="colorLocationButtonTint">@color/black800</color> + <!-- button text colors in Alerts etc. --> + <color name="color_font_btn">@color/black800</color> + <!-- pill style button text colors --> + <color name="color_font_btn_primary">@color/black800</color> + <color name="color_font_btn_secondary">@color/black800</color> + <color name="colorLocationButtonTint">@color/black</color> <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color> <color name="colorWarning">#B33A3A</color> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9b05d3fe..f42be3c1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -65,7 +65,7 @@ <item name="android:background">@drawable/cust_button_primary</item> <item name="android:height">36dp</item> <item name="android:minWidth">75dp</item> - <item name="android:textColor">@color/colorFontBtn</item> + <item name="android:textColor">@color/color_font_btn</item> </style> <style name="BitmaskActivity"> |