Merge branch 'UI_tweaks' into 'master'

Ui tweaks

See merge request leap/bitmask_android!90

12 files changed, 151 insertions, 101 deletions

diff --git a/app/src/main/res/drawable/black_circle.xml b/app/src/main/res/drawable/black_circle.xml
index 533652d6..f64c034d 100644
--- a/app/src/main/res/drawable/black_circle.xml
+++ b/app/src/main/res/drawable/black_circle.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item>
-    <shape android:shape="oval">
-        <solid android:color="@color/black800"/>
-        <size android:width="250dp" android:height="250dp"/>
-    </shape>
-</item>
+    <item android:drawable="@drawable/black_circle_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/black_circle_released"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/black_circle_pressed.xml b/app/src/main/res/drawable/black_circle_pressed.xml
new file mode 100644
index 00000000..d7d646a0
--- /dev/null
+++ b/app/src/main/res/drawable/black_circle_pressed.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/black800_secondary"/>
+            <size android:width="250dp" android:height="250dp"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/black_circle_released.xml b/app/src/main/res/drawable/black_circle_released.xml
new file mode 100644
index 00000000..b1ef3827
--- /dev/null
+++ b/app/src/main/res/drawable/black_circle_released.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/black800_transparent"/>
+            <size android:width="250dp" android:height="250dp"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="7dp"
+        android:right="5dp"
+        >
+        <shape android:shape="oval">
+            <solid android:color="@color/black800"/>
+            <size android:width="250dp" android:height="250dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary.xml b/app/src/main/res/drawable/cust_button_primary.xml
index 3b0f7e26..31f9fbdd 100644
--- a/app/src/main/res/drawable/cust_button_primary.xml
+++ b/app/src/main/res/drawable/cust_button_primary.xml
@@ -1,24 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" >
-        <shape android:shape="rectangle"  >
-            <corners android:radius="50dp" />
-            <padding android:left="8dp" android:right="8dp"/>
-            <solid android:color="@color/colorPrimaryDark"/>
-        </shape>
-    </item>
-    <item android:state_focused="true">
-        <shape android:shape="rectangle"  >
-            <corners android:radius="50dp" />
-            <padding android:left="8dp" android:right="8dp"/>
-            <solid android:color="@color/colorPrimaryDark"/>
-        </shape>
-    </item>
-    <item >
-        <shape android:shape="rectangle"  >
-            <corners android:radius="50dp" />
-            <padding android:left="8dp" android:right="8dp"/>
-            <solid android:color="@color/colorPrimary"/>
-        </shape>
-    </item>
+
+    <item android:state_enabled="false" android:drawable="@drawable/cust_button_primary_disabled"/>
+    <item android:state_pressed="true" android:drawable="@drawable/cust_button_primary_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/cust_button_primary_pressed"/>
+    <item android:drawable="@drawable/cust_button_primary_released"/>
 </selector>
\ No newline at end of file
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..d43237a1
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_black.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/cust_button_primary_black_pressed"/>
+    <item android:drawable="@drawable/cust_button_primary_black_released"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_black_pressed.xml b/app/src/main/res/drawable/cust_button_primary_black_pressed.xml
new file mode 100644
index 00000000..b8040ec0
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_black_pressed.xml
@@ -0,0 +1,8 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/button_radius"/>
+            <solid android:color="@color/black800_secondary"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_black_released.xml b/app/src/main/res/drawable/cust_button_primary_black_released.xml
new file mode 100644
index 00000000..8195c0c1
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_black_released.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/button_radius"/>
+            <solid android:color="@color/black800_transparent"/>
+        </shape>
+    </item>
+
+    <item
+        android:bottom="@dimen/button_bevel"
+        >
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/button_radius"/>
+            <solid android:color="@color/black800"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_disabled.xml b/app/src/main/res/drawable/cust_button_primary_disabled.xml
new file mode 100644
index 00000000..f62ecce3
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_disabled.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="50dp" />
+            <solid android:color="@color/colorPrimary_transparent"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="@dimen/button_bevel"
+        >
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <padding android:right="2dp"/>
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorDisabled"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_pressed.xml b/app/src/main/res/drawable/cust_button_primary_pressed.xml
new file mode 100644
index 00000000..012631e7
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_pressed.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="50dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimaryDark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml
new file mode 100644
index 00000000..c83d4e62
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_rect.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="8dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimaryDark"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="8dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimaryDark"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="8dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimary"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_released.xml b/app/src/main/res/drawable/cust_button_primary_released.xml
new file mode 100644
index 00000000..b9c2020f
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_released.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="50dp" />
+            <solid android:color="@color/colorPrimary_transparent"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="@dimen/button_bevel"
+        >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="50dp" />
+            <padding android:right="2dp"/>
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimary"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progressbar_circle.xml b/app/src/main/res/drawable/progressbar_circle.xml
index 6257e3af..3d5f6026 100644
--- a/app/src/main/res/drawable/progressbar_circle.xml
+++ b/app/src/main/res/drawable/progressbar_circle.xml
@@ -1,83 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/progress1">
-        <rotate
-            android:fromDegrees="-90"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:toDegrees="90">
-
-            <shape
-                android:shape="ring"
-                android:useLevel="true">
-                <gradient
-                    android:endColor="#00c5e1a5"
-                    android:centerColor="#c5e1a5"
-                    android:startColor="#00ffe082"
-                    android:type="sweep"
-                    />
-            </shape>
-        </rotate>
-    </item>
-
-    <item android:id="@+id/progress2">
-        <rotate
-            android:fromDegrees="0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:toDegrees="180">
-
-            <shape
-                android:shape="ring"
-                android:useLevel="true">
-                <gradient
-                    android:endColor="#00ffcc80"
-                    android:centerColor="#ffcc80"
-                    android:startColor="#00ffcc80"
-                    android:type="sweep"
-                    />
-            </shape>
-        </rotate>
-    </item>
-
-    <item android:id="@+id/progress3">
-        <rotate
-            android:fromDegrees="90"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:toDegrees="270">
+    <item>
+        <scale
+            android:scaleHeight="125%"
+            android:scaleWidth="125%"
+            android:scaleGravity="center"
+            >
             <shape
-                android:shape="ring"
-                android:useLevel="true">
+                android:shape="oval"
+                android:useLevel="true"
+                >
                 <gradient
-                    android:endColor="#00ce93d8"
-                    android:centerColor="#ce93d8"
-                    android:startColor="#00ce93d8"
-                    android:type="sweep"
+                    android:startColor="@color/colorPrimaryDark"
+                    android:centerColor="@color/colorPrimary"
+                    android:endColor="@color/black800_high_transparent"
+                    android:gradientRadius="100dp"
+                    android:type="radial"
                     />
             </shape>
-        </rotate>
+        </scale>
     </item>
-
-    <item android:id="@+id/progress4">
-        <rotate
-            android:fromDegrees="180"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:toDegrees="0">
-            <shape
-                android:shape="ring"
-                android:useLevel="true">
-                <gradient
-                    android:endColor="#0081d4fa"
-                    android:centerColor="#81d4fa"
-                    android:startColor="#0081d4fa"
-                    android:type="sweep"
-                    />
-            </shape>
-        </rotate>
-    </item>
-
 </layer-list>
\ No newline at end of file