summaryrefslogtreecommitdiff
path: root/app/src/normal/res
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/normal/res
parentacdee8421bcdc39151457dea72686c4a31b5cdbb (diff)
rename drawables and colors according to the state they're representing
Diffstat (limited to 'app/src/normal/res')
-rw-r--r--app/src/normal/res/drawable/cust_button_primary_rect.xml79
-rw-r--r--app/src/normal/res/layout-port/f_eip.xml2
-rw-r--r--app/src/normal/res/layout-xlarge-port/f_eip.xml2
-rw-r--r--app/src/normal/res/layout-xlarge/f_eip.xml2
-rw-r--r--app/src/normal/res/layout/f_eip.xml2
-rw-r--r--app/src/normal/res/layout/v_location_button.xml2
6 files changed, 5 insertions, 84 deletions
diff --git a/app/src/normal/res/drawable/cust_button_primary_rect.xml b/app/src/normal/res/drawable/cust_button_primary_rect.xml
deleted file mode 100644
index 74ddccb0..00000000
--- a/app/src/normal/res/drawable/cust_button_primary_rect.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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_white_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_white_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_white_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_white_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/normal/res/layout-port/f_eip.xml b/app/src/normal/res/layout-port/f_eip.xml
index b17e300c..eed5fde6 100644
--- a/app/src/normal/res/layout-port/f_eip.xml
+++ b/app/src/normal/res/layout-port/f_eip.xml
@@ -61,7 +61,7 @@
android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:srcCompat="@drawable/bg_red"
+ app:srcCompat="@drawable/bg_disconnected"
android:scaleType="fitXY"
android:layout_marginTop="-300dp"
android:layout_marginBottom="-300dp"
diff --git a/app/src/normal/res/layout-xlarge-port/f_eip.xml b/app/src/normal/res/layout-xlarge-port/f_eip.xml
index 26a90403..ae548c82 100644
--- a/app/src/normal/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/normal/res/layout-xlarge-port/f_eip.xml
@@ -69,7 +69,7 @@
android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:srcCompat="@drawable/bg_red"
+ app:srcCompat="@drawable/bg_disconnected"
android:scaleType="fitXY"
android:layout_marginTop="-300dp"
android:layout_marginBottom="-300dp"
diff --git a/app/src/normal/res/layout-xlarge/f_eip.xml b/app/src/normal/res/layout-xlarge/f_eip.xml
index e1ecf321..a4d94394 100644
--- a/app/src/normal/res/layout-xlarge/f_eip.xml
+++ b/app/src/normal/res/layout-xlarge/f_eip.xml
@@ -69,7 +69,7 @@
android:layout_marginRight="-300dp"
android:layout_marginTop="-300dp"
android:layout_marginBottom="-300dp"
- app:srcCompat="@drawable/bg_red" />
+ app:srcCompat="@drawable/bg_disconnected" />
<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/normal/res/layout/f_eip.xml b/app/src/normal/res/layout/f_eip.xml
index cd636b25..9c921721 100644
--- a/app/src/normal/res/layout/f_eip.xml
+++ b/app/src/normal/res/layout/f_eip.xml
@@ -75,7 +75,7 @@
android:layout_marginRight="-300dp"
android:layout_marginTop="-300dp"
android:layout_marginBottom="-300dp"
- app:srcCompat="@drawable/bg_red" />
+ app:srcCompat="@drawable/bg_disconnected" />
<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/normal/res/layout/v_location_button.xml b/app/src/normal/res/layout/v_location_button.xml
index e7d8a319..8aaf4978 100644
--- a/app/src/normal/res/layout/v_location_button.xml
+++ b/app/src/normal/res/layout/v_location_button.xml
@@ -7,7 +7,7 @@
android:layout_gravity="center_vertical"
android:layout_height="match_parent"
android:padding="@dimen/stdpadding"
- android:background="@drawable/cust_button_primary_rect"
+ android:background="@drawable/cust_button_light_rect"
>
<androidx.appcompat.widget.AppCompatImageView