Merge branch 'rc_review' into 'master'

Bugfixes after Release Candidate Review

Closes #9121, #8934, and #9052

See merge request leap/bitmask_android!226

8 files changed, 43 insertions, 4 deletions

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>