rename drawables and colors according to the state they're representing

10 files changed, 85 insertions, 6 deletions

diff --git a/app/src/main/res/drawable/bg_green.png b/app/src/main/res/drawable/bg_connected.png
index 6da7878d..6da7878d 100644
--- a/app/src/main/res/drawable/bg_green.png
+++ b/app/src/main/res/drawable/bg_connected.png
diff --git a/app/src/main/res/drawable/bg_yellow.png b/app/src/main/res/drawable/bg_connecting.png
index c371f3f0..c371f3f0 100644
--- a/app/src/main/res/drawable/bg_yellow.png
+++ b/app/src/main/res/drawable/bg_connecting.png
diff --git a/app/src/main/res/drawable/bg_red.png b/app/src/main/res/drawable/bg_disconnected.png
index de96be57..de96be57 100644
--- a/app/src/main/res/drawable/bg_red.png
+++ b/app/src/main/res/drawable/bg_disconnected.png
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 8d349770..690baa0c 100644
--- a/app/src/main/res/drawable/button_circle_cancel_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_pressed.xml
@@ -26,7 +26,7 @@
         android:bottom="12dp"
         >
         <shape android:shape="oval">
-            <solid android:color="@color/btn_yellow_dark"/>
+            <solid android:color="@color/btn_cancel_dark"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
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 e6d5948d..833a9076 100644
--- a/app/src/main/res/drawable/button_circle_cancel_released.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_released.xml
@@ -27,7 +27,7 @@
         android:top="15dp"
         >
         <shape android:shape="oval">
-           <solid android:color="@color/btn_yellow"/>
+           <solid android:color="@color/btn_cancel"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
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 ce8eb8e1..4157ffe0 100644
--- a/app/src/main/res/drawable/button_circle_start_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_start_pressed.xml
@@ -11,7 +11,7 @@
         android:bottom="12dp"
         >
         <shape android:shape="oval">
-            <solid android:color="@color/btn_red_dark"/>
+            <solid android:color="@color/btn_start_dark"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
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 ce1ba997..671d06dc 100644
--- a/app/src/main/res/drawable/button_circle_start_released.xml
+++ b/app/src/main/res/drawable/button_circle_start_released.xml
@@ -11,7 +11,7 @@
        android:top="15dp"
         >
         <shape android:shape="oval">
-           <solid android:color="@color/btn_red"/>
+           <solid android:color="@color/btn_start"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
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 0561455a..ce7583f1 100644
--- a/app/src/main/res/drawable/button_circle_stop_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_stop_pressed.xml
@@ -11,7 +11,7 @@
         android:bottom="12dp"
         >
         <shape android:shape="oval">
-            <solid android:color="@color/btn_green_dark"/>
+            <solid android:color="@color/btn_stop_dark"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
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 2e168c2d..ed786ee0 100644
--- a/app/src/main/res/drawable/button_circle_stop_released.xml
+++ b/app/src/main/res/drawable/button_circle_stop_released.xml
@@ -11,7 +11,7 @@
        android:top="15dp"
         >
         <shape android:shape="oval">
-           <solid android:color="@color/btn_green"/>
+           <solid android:color="@color/btn_stop"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/cust_button_light_rect.xml b/app/src/main/res/drawable/cust_button_light_rect.xml
new file mode 100644
index 00000000..dd66c739
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_light_rect.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <layer-list
+            android:paddingLeft="@dimen/button_bevel"
+            android:paddingRight="@dimen/button_bevel">
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/black_transparent"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/btn_light_transparent_dark"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_focused="true">
+        <layer-list
+            android:paddingLeft="@dimen/button_bevel"
+            android:paddingRight="@dimen/button_bevel">
+            <item>
+                <shape android:shape="rectangle"  >
+                    <solid android:color="@color/black_transparent"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/btn_light_transparent_dark"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+
+        </layer-list>
+    </item>
+    <item >
+        <layer-list
+            android:paddingLeft="@dimen/button_bevel"
+            android:paddingRight="@dimen/button_bevel">
+            <!-- shadow -->
+            <item
+                android:top="@dimen/button_bevel"
+                android:left="1dp"
+                >
+                <shape android:shape="rectangle"  >
+                    <corners android:radius="@dimen/stdpadding" />
+                    <solid android:color="@color/black_transparent"/>
+                </shape>
+            </item>
+            <!-- fill -->
+            <item
+                android:bottom="@dimen/button_bevel"
+                android:right="1dp"
+                >
+                <shape android:shape="rectangle"  >
+                    <solid android:color="@color/btn_light_transparent"/>
+                    <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