summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-12-16 01:05:57 +0000
committercyberta <cyberta@riseup.net>2022-12-16 01:05:57 +0000
commitb4b5d98fe0bc0498773870990df2442f800158c4 (patch)
tree739de8a232d539804f8b61143879505271f52858 /app/src/main/res
parent62d9effae8fe5983056a7b225535ec763f03d87b (diff)
parentd988fb9e977a78c31fa902a99308d97d95b8487b (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')
-rw-r--r--app/src/main/res/color/button_state_font_color.xml5
-rw-r--r--app/src/main/res/drawable/button_circle_cancel_pressed.xml8
-rw-r--r--app/src/main/res/drawable/button_circle_cancel_released.xml10
-rw-r--r--app/src/main/res/drawable/button_circle_start_pressed.xml8
-rw-r--r--app/src/main/res/drawable/button_circle_start_released.xml10
-rw-r--r--app/src/main/res/drawable/button_circle_stop_pressed.xml8
-rw-r--r--app/src/main/res/drawable/button_circle_stop_released.xml10
-rw-r--r--app/src/main/res/drawable/cust_button_light_rect.xml13
-rw-r--r--app/src/main/res/layout-port/f_eip.xml9
-rw-r--r--app/src/main/res/layout-sw600dp-port/f_eip.xml147
-rw-r--r--app/src/main/res/layout/a_add_provider.xml2
-rw-r--r--app/src/main/res/layout/a_add_provider_tablet_scrollview.xml2
-rw-r--r--app/src/main/res/layout/a_main.xml2
-rw-r--r--app/src/main/res/layout/a_provider_credentials.xml1
-rw-r--r--app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml1
-rw-r--r--app/src/main/res/layout/d_obfuscation_proxy.xml3
-rw-r--r--app/src/main/res/layout/donation_reminder_dialog.xml4
-rw-r--r--app/src/main/res/layout/v_actionbar_title.xml32
-rw-r--r--app/src/main/res/values/colors.xml10
-rw-r--r--app/src/main/res/values/styles.xml2
20 files changed, 230 insertions, 57 deletions
diff --git a/app/src/main/res/color/button_state_font_color.xml b/app/src/main/res/color/button_state_font_color.xml
deleted file mode 100644
index f7fed335..00000000
--- a/app/src/main/res/color/button_state_font_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/colorFontBtnEnabled" android:state_enabled="true"/>
- <item android:color="@color/colorFontBtn"/>
-</selector> \ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_cancel_pressed.xml b/app/src/main/res/drawable/button_circle_cancel_pressed.xml
index b2efa78b..6b280959 100644
--- a/app/src/main/res/drawable/button_circle_cancel_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_pressed.xml
@@ -51,10 +51,10 @@
</shape>
</item>
<item
- android:top="68dp"
- android:bottom="62dp"
- android:left="50dp"
- android:right="50dp"
+ android:top="88dp"
+ android:bottom="82dp"
+ android:left="70dp"
+ android:right="70dp"
android:drawable="@drawable/ic_btn_cancel" />
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_cancel_released.xml b/app/src/main/res/drawable/button_circle_cancel_released.xml
index 70d47257..cd93ab2b 100644
--- a/app/src/main/res/drawable/button_circle_cancel_released.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_released.xml
@@ -44,7 +44,7 @@
android:type="radial"
android:gradientRadius="125dp"
android:centerX="0.51"
- android:centerY="0.58"
+ android:centerY="0.55"
android:startColor="#000000"
android:centerColor="#000000"
android:endColor="@color/transparent" />
@@ -52,10 +52,10 @@
</shape>
</item>
<item
- android:top="65dp"
- android:bottom="65dp"
- android:left="50dp"
- android:right="50dp"
+ android:top="85dp"
+ android:bottom="85dp"
+ android:left="70dp"
+ android:right="70dp"
android:drawable="@drawable/ic_btn_cancel"
/>
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_start_pressed.xml b/app/src/main/res/drawable/button_circle_start_pressed.xml
index dd8496c3..08712c47 100644
--- a/app/src/main/res/drawable/button_circle_start_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_start_pressed.xml
@@ -36,9 +36,9 @@
</shape>
</item>
<item
- android:top="68dp"
- android:bottom="62dp"
- android:left="50dp"
- android:right="50dp"
+ android:top="78dp"
+ android:bottom="72dp"
+ android:left="60dp"
+ android:right="60dp"
android:drawable="@drawable/ic_btn_on" />
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_start_released.xml b/app/src/main/res/drawable/button_circle_start_released.xml
index ad748e9c..c47d1019 100644
--- a/app/src/main/res/drawable/button_circle_start_released.xml
+++ b/app/src/main/res/drawable/button_circle_start_released.xml
@@ -28,7 +28,7 @@
android:type="radial"
android:gradientRadius="125dp"
android:centerX="0.51"
- android:centerY="0.58"
+ android:centerY="0.55"
android:startColor="#000000"
android:centerColor="#000000"
android:endColor="@color/transparent" />
@@ -36,9 +36,9 @@
</shape>
</item>
<item
- android:top="65dp"
- android:bottom="65dp"
- android:left="50dp"
- android:right="50dp"
+ android:top="75dp"
+ android:bottom="75dp"
+ android:left="60dp"
+ android:right="60dp"
android:drawable="@drawable/ic_btn_on" />
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_stop_pressed.xml b/app/src/main/res/drawable/button_circle_stop_pressed.xml
index 79f794b2..52a5a88e 100644
--- a/app/src/main/res/drawable/button_circle_stop_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_stop_pressed.xml
@@ -36,9 +36,9 @@
</shape>
</item>
<item
- android:top="68dp"
- android:bottom="62dp"
- android:left="50dp"
- android:right="50dp"
+ android:top="88dp"
+ android:bottom="82dp"
+ android:left="70dp"
+ android:right="70dp"
android:drawable="@drawable/ic_btn_cancel" />
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_stop_released.xml b/app/src/main/res/drawable/button_circle_stop_released.xml
index 62827b66..d29bfe1e 100644
--- a/app/src/main/res/drawable/button_circle_stop_released.xml
+++ b/app/src/main/res/drawable/button_circle_stop_released.xml
@@ -28,7 +28,7 @@
android:type="radial"
android:gradientRadius="125dp"
android:centerX="0.51"
- android:centerY="0.58"
+ android:centerY="0.55"
android:startColor="#000000"
android:centerColor="#000000"
android:endColor="@color/transparent" />
@@ -36,10 +36,10 @@
</shape>
</item>
<item
- android:top="65dp"
- android:bottom="65dp"
- android:left="50dp"
- android:right="50dp"
+ android:top="85dp"
+ android:bottom="85dp"
+ android:left="70dp"
+ android:right="70dp"
android:drawable="@drawable/ic_btn_cancel"
/>
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_light_rect.xml b/app/src/main/res/drawable/cust_button_light_rect.xml
index dd66c739..9840d7e1 100644
--- a/app/src/main/res/drawable/cust_button_light_rect.xml
+++ b/app/src/main/res/drawable/cust_button_light_rect.xml
@@ -61,19 +61,6 @@
<corners android:radius="@dimen/stdpadding"/>
</shape>
</item>
- <!-- gradient -->
- <item
- android:bottom="@dimen/button_bevel"
- android:right="1dp"
- >
- <shape android:shape="rectangle">
- <gradient android:startColor="@color/btn_light_transparent_dark"
- android:endColor="@color/white_transparent"
- android:angle="90"
- />
- <corners android:radius="@dimen/stdpadding"/>
- </shape>
- </item>
</layer-list>
</item>
</selector> \ No newline at end of file
diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index 83aabcde..80f42f91 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -79,13 +79,13 @@
android:textAppearance="@android:style/TextAppearance.Large"
android:textStyle="bold"
android:textSize="34sp"
- android:autoSizeMinTextSize="28sp"
- android:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="28sp"
+ app:autoSizeTextType="uniform"
android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="Connection secure"
android:gravity="center"
- android:maxLines="1"
+ android:maxLines="2"
/>
<androidx.appcompat.widget.AppCompatTextView
@@ -95,7 +95,8 @@
app:layout_constraintTop_toBottomOf="@id/main_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:padding="@dimen/activity_margin"
+ android:paddingLeft="@dimen/stdpadding"
+ android:paddingRight="@dimen/stdpadding"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:textStyle="bold"
android:textColor="@color/colorEipFragmentFont"
diff --git a/app/src/main/res/layout-sw600dp-port/f_eip.xml b/app/src/main/res/layout-sw600dp-port/f_eip.xml
new file mode 100644
index 00000000..93393565
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/f_eip.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/eipServiceFragment"
+ >
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_vertical_left"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ app:layout_constraintGuide_percent="0.3"
+ />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_horizontal_center"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_percent="0.25" />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_vertical_outer_left"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintGuide_percent="0.125"
+ />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_vertical_outer_right"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ app:layout_constraintGuide_percent="0.875"
+ />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_horizontal_bottom"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_percent="0.6"
+ />
+
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_vertical_right"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ app:layout_constraintGuide_percent="0.7"
+ />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:srcCompat="@drawable/bg_disconnected"
+ android:scaleType="fitXY"
+ />
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/main_description"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_center"
+ android:padding="@dimen/activity_margin"
+ android:layout_marginTop="@dimen/activity_margin"
+ android:textAppearance="@android:style/TextAppearance.Large"
+ android:textStyle="bold"
+ android:textSize="48sp"
+ app:autoSizeMinTextSize="32sp"
+ app:autoSizeTextType="uniform"
+ android:textColor="@color/colorEipFragmentFont"
+ app:layout_constraintDimensionRatio="1:1"
+ tools:text="Connection secure"
+ android:gravity="center"
+ android:maxLines="1"
+ />
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/sub_description"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/main_description"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:paddingLeft="@dimen/stdpadding"
+ android:paddingRight="@dimen/stdpadding"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+ android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
+ app:layout_constraintDimensionRatio="1:1"
+ tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf"
+ android:gravity="center"
+ android:maxLines="3"
+ android:ellipsize="end"
+ />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/state_view"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_bottom"
+ app:layout_constraintTop_toTopOf="@id/guideline_horizontal_center"
+ app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_outer_left"
+ app:layout_constraintRight_toRightOf="@id/guideline_vertical_outer_right"
+ app:layout_constraintVertical_bias="1"
+ app:srcCompat="@drawable/state_disconnected"
+ />
+ <se.leap.bitmaskclient.base.views.MainButton
+ android:id="@+id/main_button"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_margin="@dimen/stdpadding"
+ app:layout_constraintTop_toBottomOf="@+id/guideline_horizontal_bottom"
+ app:layout_constraintBottom_toTopOf="@id/gateway_location_button"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
+ app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
+ />
+
+ <se.leap.bitmaskclient.base.views.LocationButton
+ android:id="@+id/gateway_location_button"
+ android:layout_width="match_parent"
+ android:layout_height="64dp"
+ android:layout_marginBottom="@dimen/stdpadding"
+ android:layout_marginEnd="@dimen/stdpadding"
+ android:layout_marginStart="@dimen/stdpadding"
+ android:layout_marginTop="@dimen/stdpadding"
+ android:layout_marginLeft="@dimen/stdpadding"
+ android:layout_marginRight="@dimen/stdpadding"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:text="SEATTLE"
+ android:gravity="center_vertical" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml
index 517c8c19..aad64630 100644
--- a/app/src/main/res/layout/a_add_provider.xml
+++ b/app/src/main/res/layout/a_add_provider.xml
@@ -70,6 +70,7 @@
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/cancel" />
<Button
@@ -79,6 +80,7 @@
android:layout_marginLeft="@dimen/add_button_margin"
android:layout_marginStart="@dimen/add_button_margin"
android:enabled="false"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/save" />
</LinearLayout>
diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
index d3b8fc58..74904f36 100644
--- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
+++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
@@ -75,6 +75,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="80dp"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/cancel" />
<Button
@@ -84,6 +85,7 @@
android:minWidth="80dp"
android:layout_marginLeft="@dimen/add_button_margin"
android:layout_marginStart="@dimen/add_button_margin"
+ android:textColor="@color/color_font_btn_primary"
android:enabled="false"
android:text="@string/save" />
</LinearLayout>
diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml
index 92e0a3c0..927217f4 100644
--- a/app/src/main/res/layout/a_main.xml
+++ b/app/src/main/res/layout/a_main.xml
@@ -22,8 +22,6 @@
android:minHeight="?attr/actionBarSize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:titleTextColor="@color/colorActionBarTitleFont"
- app:subtitleTextColor="@color/colorActionBarSubtitleFont"
android:background="?attr/colorPrimary">
</androidx.appcompat.widget.Toolbar>
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index c5ff5f99..033aae16 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -44,6 +44,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:enabled="false"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/login_button" />
</LinearLayout>
diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
index 56222813..73557853 100644
--- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
@@ -50,6 +50,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:enabled="false"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/login_button" />
</LinearLayout>
diff --git a/app/src/main/res/layout/d_obfuscation_proxy.xml b/app/src/main/res/layout/d_obfuscation_proxy.xml
index 92d51fec..2ce9d7b3 100644
--- a/app/src/main/res/layout/d_obfuscation_proxy.xml
+++ b/app/src/main/res/layout/d_obfuscation_proxy.xml
@@ -81,6 +81,7 @@
android:layout_height="wrap_content"
android:text="Use defaults"
android:background="@drawable/cust_button_secondary"
+ android:textColor="@color/color_font_btn_secondary"
android:layout_marginHorizontal="@dimen/stdpadding"
/>
<androidx.appcompat.widget.LinearLayoutCompat
@@ -93,6 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/stdpadding"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/cancel"
/>
@@ -101,6 +103,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/stdpadding"
+ android:textColor="@color/color_font_btn_primary"
android:text="@string/save"
/>
</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
index 0a93c867..17eaf009 100644
--- a/app/src/main/res/layout/donation_reminder_dialog.xml
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -50,7 +50,7 @@
android:layout_marginTop="@dimen/add_button_margin"
android:background="@drawable/cust_button_primary"
android:text="@string/donate_button_donate"
- android:textColor="@color/white"
+ android:textColor="@color/color_font_btn_primary"
android:textStyle="bold" />
<Button
@@ -63,7 +63,7 @@
android:layout_marginTop="@dimen/standard_margin"
android:background="@drawable/cust_button_secondary"
android:text="@string/donate_button_remind_later"
- android:textColor="@android:color/tab_indicator_text"
+ android:textColor="@color/color_font_btn_secondary"
android:textStyle="bold" />
</LinearLayout>
diff --git a/app/src/main/res/layout/v_actionbar_title.xml b/app/src/main/res/layout/v_actionbar_title.xml
new file mode 100644
index 00000000..1985ef21
--- /dev/null
+++ b/app/src/main/res/layout/v_actionbar_title.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/action_bar_title_container"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/action_bar_title"
+ android:layout_width="wrap_content"
+ tools:text="Bitmask"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:textStyle="normal"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
+ />
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/action_bar_subtitle"
+ android:layout_width="wrap_content"
+ tools:text="Advanced Settings"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle"
+ android:textColor="@color/colorActionBarSubtitleFont"
+ />
+
+</androidx.appcompat.widget.LinearLayoutCompat>
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">