From 1e9202c3d929083220924f7c76ea01a2b6f6af9f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 22 Jul 2021 15:31:08 +0200 Subject: first implementation of the gateway button, started to remove labels from EipFragment, implement method to get the avearage load of a location as an enum value --- .../res/drawable/cust_button_primary_hard_rect.xml | 21 +++++++++++++++++++++ .../main/res/drawable/cust_button_primary_rect.xml | 3 --- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/cust_button_primary_hard_rect.xml (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/cust_button_primary_hard_rect.xml b/app/src/main/res/drawable/cust_button_primary_hard_rect.xml new file mode 100644 index 00000000..93be5c18 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_hard_rect.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ 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 index c83d4e62..93be5c18 100644 --- a/app/src/main/res/drawable/cust_button_primary_rect.xml +++ b/app/src/main/res/drawable/cust_button_primary_rect.xml @@ -2,21 +2,18 @@ - - - -- cgit v1.2.3 From 033ac24155bf9b56fbf8a247ab582ecd2b934e9a Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 31 Jul 2021 18:32:01 +0200 Subject: initial implementation of classic on-off push button --- app/src/main/res/drawable/ic_btn_on_connecting.xml | 22 ++++++++++++++++++++++ app/src/main/res/drawable/ic_btn_on_disabled.xml | 20 ++++++++++++++++++++ .../main/res/drawable/ic_btn_on_primary_color.xml | 22 ++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 app/src/main/res/drawable/ic_btn_on_connecting.xml create mode 100644 app/src/main/res/drawable/ic_btn_on_disabled.xml create mode 100644 app/src/main/res/drawable/ic_btn_on_primary_color.xml (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/ic_btn_on_connecting.xml b/app/src/main/res/drawable/ic_btn_on_connecting.xml new file mode 100644 index 00000000..4b3d1384 --- /dev/null +++ b/app/src/main/res/drawable/ic_btn_on_connecting.xml @@ -0,0 +1,22 @@ + + + + diff --git a/app/src/main/res/drawable/ic_btn_on_disabled.xml b/app/src/main/res/drawable/ic_btn_on_disabled.xml new file mode 100644 index 00000000..9c83422d --- /dev/null +++ b/app/src/main/res/drawable/ic_btn_on_disabled.xml @@ -0,0 +1,20 @@ + + + + diff --git a/app/src/main/res/drawable/ic_btn_on_primary_color.xml b/app/src/main/res/drawable/ic_btn_on_primary_color.xml new file mode 100644 index 00000000..9f449299 --- /dev/null +++ b/app/src/main/res/drawable/ic_btn_on_primary_color.xml @@ -0,0 +1,22 @@ + + + + -- cgit v1.2.3 From 580c97e368cd0d9fa47691f70cc31e9b711581ec Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 15 Nov 2021 14:09:17 +0100 Subject: implement a new fancy on-off-button --- app/src/main/res/drawable/main_btn_glow.xml | 15 +++++++++++++++ app/src/main/res/drawable/on_off_btn_fill.png | Bin 0 -> 41384 bytes .../main/res/drawable/on_off_btn_start_2_disabled.png | Bin 0 -> 33323 bytes .../main/res/drawable/on_off_btn_start_2_enabled.png | Bin 0 -> 31261 bytes .../main/res/drawable/on_off_btn_start_2_no_shadow.png | Bin 0 -> 20182 bytes .../main/res/drawable/on_off_btn_start_2_pressed.png | Bin 0 -> 28721 bytes .../main/res/drawable/on_off_btn_start_animation1.png | Bin 0 -> 32481 bytes .../main/res/drawable/on_off_btn_start_animation2.png | Bin 0 -> 36701 bytes .../main/res/drawable/on_off_btn_start_animation3.png | Bin 0 -> 39980 bytes .../main/res/drawable/on_off_btn_start_animation4.png | Bin 0 -> 41982 bytes .../main/res/drawable/on_off_btn_start_animation5.png | Bin 0 -> 43093 bytes 11 files changed, 15 insertions(+) create mode 100644 app/src/main/res/drawable/main_btn_glow.xml create mode 100644 app/src/main/res/drawable/on_off_btn_fill.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_disabled.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_enabled.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_pressed.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation1.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation2.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation3.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation4.png create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation5.png (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/main_btn_glow.xml b/app/src/main/res/drawable/main_btn_glow.xml new file mode 100644 index 00000000..e740e96f --- /dev/null +++ b/app/src/main/res/drawable/main_btn_glow.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/on_off_btn_fill.png b/app/src/main/res/drawable/on_off_btn_fill.png new file mode 100644 index 00000000..8394ccfb Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_fill.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_2_disabled.png b/app/src/main/res/drawable/on_off_btn_start_2_disabled.png new file mode 100644 index 00000000..4675e48d Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_disabled.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_2_enabled.png b/app/src/main/res/drawable/on_off_btn_start_2_enabled.png new file mode 100644 index 00000000..383e1076 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_enabled.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png b/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png new file mode 100644 index 00000000..941bdef1 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_2_pressed.png b/app/src/main/res/drawable/on_off_btn_start_2_pressed.png new file mode 100644 index 00000000..7ff60cdb Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_pressed.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation1.png b/app/src/main/res/drawable/on_off_btn_start_animation1.png new file mode 100644 index 00000000..f9d18488 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation1.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation2.png b/app/src/main/res/drawable/on_off_btn_start_animation2.png new file mode 100644 index 00000000..33b600c9 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation2.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation3.png b/app/src/main/res/drawable/on_off_btn_start_animation3.png new file mode 100644 index 00000000..2172107a Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation3.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation4.png b/app/src/main/res/drawable/on_off_btn_start_animation4.png new file mode 100644 index 00000000..8b744462 Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation4.png differ diff --git a/app/src/main/res/drawable/on_off_btn_start_animation5.png b/app/src/main/res/drawable/on_off_btn_start_animation5.png new file mode 100644 index 00000000..11bb16cd Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation5.png differ -- cgit v1.2.3 From 78b06a47b6c7e3de5706893eeebb01bef89060d8 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 15 Nov 2021 14:23:23 +0100 Subject: only use two button pressed states --- app/src/main/res/drawable/main_btn_shadow.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/src/main/res/drawable/main_btn_shadow.xml (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/main_btn_shadow.xml b/app/src/main/res/drawable/main_btn_shadow.xml new file mode 100644 index 00000000..94cf379f --- /dev/null +++ b/app/src/main/res/drawable/main_btn_shadow.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file -- cgit v1.2.3 From 31ef0e2a1b39a2aaa9e8b43609f6786e31e44eeb Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 15 Nov 2021 17:36:51 +0100 Subject: improve location button layout with rounded corners, gradient and shadow --- .../main/res/drawable/cust_button_primary_rect.xml | 82 ++++++++++++++++++---- 1 file changed, 70 insertions(+), 12 deletions(-) (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml index 93be5c18..cb77b578 100644 --- a/app/src/main/res/drawable/cust_button_primary_rect.xml +++ b/app/src/main/res/drawable/cust_button_primary_rect.xml @@ -1,21 +1,79 @@ - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From d536ef7bd7199deefab859faed3e85f9d7316b4f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 20 Nov 2021 13:45:14 +0100 Subject: improve location button shadow corner radius --- app/src/main/res/drawable/cust_button_primary_rect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml index cb77b578..1587caf4 100644 --- a/app/src/main/res/drawable/cust_button_primary_rect.xml +++ b/app/src/main/res/drawable/cust_button_primary_rect.xml @@ -47,7 +47,7 @@ android:left="1dp" > - + -- cgit v1.2.3 From a6cd31ae8624f830454adc627ac3a6be323a5333 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sun, 21 Nov 2021 19:36:46 +0100 Subject: implement new gateway selection UI, using same UX principles as for desktop --- app/src/main/res/drawable/check_bold.xml | 8 ++++++++ app/src/main/res/drawable/cust_checkbox.xml | 27 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 app/src/main/res/drawable/check_bold.xml create mode 100644 app/src/main/res/drawable/cust_checkbox.xml (limited to 'app/src/main/res/drawable') diff --git a/app/src/main/res/drawable/check_bold.xml b/app/src/main/res/drawable/check_bold.xml new file mode 100644 index 00000000..836bd3bf --- /dev/null +++ b/app/src/main/res/drawable/check_bold.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cust_checkbox.xml b/app/src/main/res/drawable/cust_checkbox.xml new file mode 100644 index 00000000..1fa45d09 --- /dev/null +++ b/app/src/main/res/drawable/cust_checkbox.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3