From 9bb5d109ddd73b8e31e5f5d862372758290227aa Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 9 Jul 2019 23:30:32 +0200
Subject: tweak buttons - fix pressed states, tweak vpn button

---
 .../main/res/drawable/cust_button_primary_black.xml    | 18 ++++++++++++++++++
 app/src/main/res/layout/f_eip.xml                      |  4 ++--
 app/src/main/res/values-v21/styles.xml                 | 10 ----------
 app/src/main/res/values-v21/themes.xml                 |  2 +-
 app/src/main/res/values/styles.xml                     |  3 ++-
 5 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/drawable/cust_button_primary_black.xml

(limited to 'app')

diff --git a/app/src/main/res/drawable/cust_button_primary_black.xml b/app/src/main/res/drawable/cust_button_primary_black.xml
new file mode 100644
index 00000000..fc42dbc5
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_black.xml
@@ -0,0 +1,18 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="16dp"/>
+            <solid android:color="@color/black800_secondary"/>
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="16dp"/>
+            <solid android:color="@color/black800"/>
+        </shape>
+    </item>
+
+
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index ed4ec9c4..dda4ad78 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -83,8 +83,8 @@
 
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/vpn_main_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="150dp"
+        android:layout_height="32dp"
         android:layout_marginBottom="@dimen/stdpadding"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 9f36e474..50070e6d 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -26,15 +26,5 @@
         <item name="android:colorAccent">@color/accent</item>
     </style>
 
-    <style name="BitmaskButton" parent="android:Widget.Button">
-        <item name="android:textAllCaps">true</item>
-        <item name="android:backgroundTint">@color/colorPrimary</item>
-    </style>
-
-    <style name="BitmaskButtonBlack" parent="android:Widget.Button">
-        <item name="android:textAllCaps">true</item>
-        <item name="android:backgroundTint">@color/black800</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
 
 </resources>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index d6145217..0a426ced 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -17,7 +17,7 @@
 
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorPrimary">@color/colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:windowBackground">@drawable/splash_page</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4e845384..97f001a4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -69,8 +69,9 @@
 
     <style name="BitmaskButtonBlack" parent="android:Widget.Button">
         <item name="android:textAllCaps">true</item>
-        <item name="android:background">@color/black800</item>
+        <item name="android:background">@drawable/cust_button_primary_black</item>
         <item name="android:textColor">@color/white</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3