summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-11-30 01:37:33 +0100
committercyberta <cyberta@riseup.net>2022-11-30 14:24:47 +0100
commitda824fa125a5583d07e8ac2f6585459956d87ac1 (patch)
tree14a07baeb8abfdb9f46a54559bd0e4730c3b4989 /app/src/main
parentacdee8421bcdc39151457dea72686c4a31b5cdbb (diff)
rename drawables and colors according to the state they're representing
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/res/drawable-hdpi/bg_connected.png (renamed from app/src/main/res/drawable-hdpi/bg_green.png)bin190405 -> 190405 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/bg_connecting.png (renamed from app/src/main/res/drawable-hdpi/bg_yellow.png)bin236571 -> 236571 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/bg_disconnected.png (renamed from app/src/main/res/drawable-hdpi/bg_red.png)bin143331 -> 143331 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/bg_connected.png (renamed from app/src/main/res/drawable-xhdpi/bg_green.png)bin319429 -> 319429 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/bg_connecting.png (renamed from app/src/main/res/drawable-xhdpi/bg_yellow.png)bin400307 -> 400307 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/bg_disconnected.png (renamed from app/src/main/res/drawable-xhdpi/bg_red.png)bin220676 -> 220676 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/bg_connected.png (renamed from app/src/main/res/drawable-xxhdpi/bg_green.png)bin701727 -> 701727 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/bg_connecting.png (renamed from app/src/main/res/drawable-xxhdpi/bg_yellow.png)bin828368 -> 828368 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/bg_disconnected.png (renamed from app/src/main/res/drawable-xxhdpi/bg_red.png)bin446155 -> 446155 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/bg_connected.png (renamed from app/src/main/res/drawable-xxxhdpi/bg_green.png)bin1228810 -> 1228810 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/bg_connecting.png (renamed from app/src/main/res/drawable-xxxhdpi/bg_yellow.png)bin1489207 -> 1489207 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/bg_disconnected.png (renamed from app/src/main/res/drawable-xxxhdpi/bg_red.png)bin745847 -> 745847 bytes
-rw-r--r--app/src/main/res/drawable/bg_connected.png (renamed from app/src/main/res/drawable/bg_green.png)bin90299 -> 90299 bytes
-rw-r--r--app/src/main/res/drawable/bg_connecting.png (renamed from app/src/main/res/drawable/bg_yellow.png)bin112042 -> 112042 bytes
-rw-r--r--app/src/main/res/drawable/bg_disconnected.png (renamed from app/src/main/res/drawable/bg_red.png)bin143331 -> 143331 bytes
-rw-r--r--app/src/main/res/drawable/button_circle_cancel_pressed.xml2
-rw-r--r--app/src/main/res/drawable/button_circle_cancel_released.xml2
-rw-r--r--app/src/main/res/drawable/button_circle_start_pressed.xml2
-rw-r--r--app/src/main/res/drawable/button_circle_start_released.xml2
-rw-r--r--app/src/main/res/drawable/button_circle_stop_pressed.xml2
-rw-r--r--app/src/main/res/drawable/button_circle_stop_released.xml2
-rw-r--r--app/src/main/res/drawable/cust_button_light_rect.xml79
-rw-r--r--app/src/main/res/layout/v_location_button.xml2
-rw-r--r--app/src/main/res/values/colors.xml43
24 files changed, 112 insertions, 24 deletions
diff --git a/app/src/main/res/drawable-hdpi/bg_green.png b/app/src/main/res/drawable-hdpi/bg_connected.png
index 0e98f705..0e98f705 100644
--- a/app/src/main/res/drawable-hdpi/bg_green.png
+++ b/app/src/main/res/drawable-hdpi/bg_connected.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/bg_yellow.png b/app/src/main/res/drawable-hdpi/bg_connecting.png
index 24632712..24632712 100644
--- a/app/src/main/res/drawable-hdpi/bg_yellow.png
+++ b/app/src/main/res/drawable-hdpi/bg_connecting.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/bg_red.png b/app/src/main/res/drawable-hdpi/bg_disconnected.png
index de96be57..de96be57 100644
--- a/app/src/main/res/drawable-hdpi/bg_red.png
+++ b/app/src/main/res/drawable-hdpi/bg_disconnected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_green.png b/app/src/main/res/drawable-xhdpi/bg_connected.png
index 915dff95..915dff95 100644
--- a/app/src/main/res/drawable-xhdpi/bg_green.png
+++ b/app/src/main/res/drawable-xhdpi/bg_connected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_yellow.png b/app/src/main/res/drawable-xhdpi/bg_connecting.png
index be4469df..be4469df 100644
--- a/app/src/main/res/drawable-xhdpi/bg_yellow.png
+++ b/app/src/main/res/drawable-xhdpi/bg_connecting.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_red.png b/app/src/main/res/drawable-xhdpi/bg_disconnected.png
index 433c776f..433c776f 100644
--- a/app/src/main/res/drawable-xhdpi/bg_red.png
+++ b/app/src/main/res/drawable-xhdpi/bg_disconnected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/bg_green.png b/app/src/main/res/drawable-xxhdpi/bg_connected.png
index cd78d865..cd78d865 100644
--- a/app/src/main/res/drawable-xxhdpi/bg_green.png
+++ b/app/src/main/res/drawable-xxhdpi/bg_connected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/bg_yellow.png b/app/src/main/res/drawable-xxhdpi/bg_connecting.png
index 718e102f..718e102f 100644
--- a/app/src/main/res/drawable-xxhdpi/bg_yellow.png
+++ b/app/src/main/res/drawable-xxhdpi/bg_connecting.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/bg_red.png b/app/src/main/res/drawable-xxhdpi/bg_disconnected.png
index ffbcdb79..ffbcdb79 100644
--- a/app/src/main/res/drawable-xxhdpi/bg_red.png
+++ b/app/src/main/res/drawable-xxhdpi/bg_disconnected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_green.png b/app/src/main/res/drawable-xxxhdpi/bg_connected.png
index 3c9d97b4..3c9d97b4 100644
--- a/app/src/main/res/drawable-xxxhdpi/bg_green.png
+++ b/app/src/main/res/drawable-xxxhdpi/bg_connected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_yellow.png b/app/src/main/res/drawable-xxxhdpi/bg_connecting.png
index bff2004c..bff2004c 100644
--- a/app/src/main/res/drawable-xxxhdpi/bg_yellow.png
+++ b/app/src/main/res/drawable-xxxhdpi/bg_connecting.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_red.png b/app/src/main/res/drawable-xxxhdpi/bg_disconnected.png
index 2503f135..2503f135 100644
--- a/app/src/main/res/drawable-xxxhdpi/bg_red.png
+++ b/app/src/main/res/drawable-xxxhdpi/bg_disconnected.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 611ac3c4..aa4af10c 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_gravity="center_vertical"
android:padding="@dimen/stdpadding"
- android:background="@drawable/cust_button_primary_rect"
+ android:background="@drawable/cust_button_light_rect"
android:layout_height="match_parent"
>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b6971138..c3a519cf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,34 +32,43 @@
<color name="amber200">#ffe082</color>
<color name="orange200">#ffcc80</color>
<color name="deepOrange200">#ffab91</color>
-
<color name="white">#ffffff</color>
<color name="white_transparent">#20ffffff</color>
<color name="black_transparent">#20000000</color>
<color name="black_high_transparent">#05000000</color>
- <color name="colorActionBarTitleFont">@color/white</color>
- <color name="colorActionBarSubtitleFont">@color/black800</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>
<color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color>
<color name="colorWarning">#B33A3A</color>
- <color name="btn_red">#FF7D7D</color>
- <color name="btn_red_dark">#c84c51</color>
- <color name="btn_yellow">#FFBF00</color>
- <color name="btn_yellow_dark">#C78F00</color>
- <color name="btn_green">#9FC17F</color>
- <color name="btn_green_dark">#709152</color>
- <color name="btn_white_transparent">#CCFFFEFE</color>
- <color name="btn_white_transparent_dark">#CCCCCBCB</color>
- <color name="bg_red_top">#EC6767</color>
- <color name="bg_red_top_light_transparent">#CCff9895</color>
- <color name="bg_yellow_top">#FADD85</color>
- <color name="bg_yellow_top_light_transparent">#CCffffb6</color>
- <color name="bg_green_top">#CCDCB8</color>
- <color name="bg_green_top_light_transparent">#ffffea</color>
+
+ <!-- main UI on/off button colors -->
+ <color name="btn_start">#FF7D7D</color>
+ <color name="btn_start_dark">#c84c51</color>
+ <color name="btn_cancel">#FFBF00</color>
+ <color name="btn_cancel_dark">#C78F00</color>
+ <color name="btn_stop">#9FC17F</color>
+ <color name="btn_stop_dark">#709152</color>
+
+ <!-- location button background colors -->
+ <color name="btn_light_transparent">#CCFFFEFE</color>
+ <color name="btn_light_transparent_dark">#CCCCCBCB</color>
+
+ <!-- actionbar and status bar colors for different connection states -->
+ <color name="bg_disconnected_top">#EC6767</color>
+ <color name="bg_disconnected_top_light_transparent">#CCff9895</color>
+ <color name="bg_connecting_top">#FADD85</color>
+ <color name="bg_connecting_top_light_transparent">#CCffffb6</color>
+ <color name="bg_running_top">#CCDCB8</color>
+ <color name="bg_running_top_light_transparent">#ffffea</color>
+
+ <!-- action bar text colors for per state colored action bar -->
<color name="actionbar_dark_color">@color/black800</color>
<color name="actionbar_light_color">@color/white</color>
+ <!-- default action bar colors used in other fragments than EipFragment -->
+ <color name="colorActionBarTitleFont">@color/white</color>
+ <color name="colorActionBarSubtitleFont">@color/black800</color>
</resources>