diff options
27 files changed, 163 insertions, 25 deletions
diff --git a/app/src/custom/res/drawable-hdpi/bg_connected.png b/app/src/custom/res/drawable-hdpi/bg_connected.png Binary files differdeleted file mode 100644 index 53648c23..00000000 --- a/app/src/custom/res/drawable-hdpi/bg_connected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-hdpi/bg_connecting.png b/app/src/custom/res/drawable-hdpi/bg_connecting.png Binary files differdeleted file mode 100644 index a62d308c..00000000 --- a/app/src/custom/res/drawable-hdpi/bg_connecting.png +++ /dev/null diff --git a/app/src/custom/res/drawable-hdpi/bg_disconnected.png b/app/src/custom/res/drawable-hdpi/bg_disconnected.png Binary files differdeleted file mode 100644 index c2e031df..00000000 --- a/app/src/custom/res/drawable-hdpi/bg_disconnected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xhdpi/bg_connected.png b/app/src/custom/res/drawable-xhdpi/bg_connected.png Binary files differdeleted file mode 100644 index 4491692a..00000000 --- a/app/src/custom/res/drawable-xhdpi/bg_connected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xhdpi/bg_connecting.png b/app/src/custom/res/drawable-xhdpi/bg_connecting.png Binary files differdeleted file mode 100644 index 703a77c4..00000000 --- a/app/src/custom/res/drawable-xhdpi/bg_connecting.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png Binary files differdeleted file mode 100644 index 4e05614e..00000000 --- a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxhdpi/bg_connected.png Binary files differdeleted file mode 100644 index 29bd3a05..00000000 --- a/app/src/custom/res/drawable-xxhdpi/bg_connected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png Binary files differdeleted file mode 100644 index 9b91293c..00000000 --- a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png Binary files differdeleted file mode 100644 index c4a09aa7..00000000 --- a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxxhdpi/bg_connected.png Binary files differdeleted file mode 100644 index d1e95fb6..00000000 --- a/app/src/custom/res/drawable-xxxhdpi/bg_connected.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png Binary files differdeleted file mode 100644 index e6d36eb0..00000000 --- a/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png +++ /dev/null diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png Binary files differdeleted file mode 100644 index df597f2f..00000000 --- a/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png +++ /dev/null diff --git a/app/src/custom/res/drawable/bg_connected.png b/app/src/custom/res/drawable/bg_connected.png Binary files differdeleted file mode 100644 index a375181d..00000000 --- a/app/src/custom/res/drawable/bg_connected.png +++ /dev/null diff --git a/app/src/custom/res/drawable/bg_connected.xml b/app/src/custom/res/drawable/bg_connected.xml new file mode 100644 index 00000000..f851203d --- /dev/null +++ b/app/src/custom/res/drawable/bg_connected.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:gravity="fill"> + <shape android:shape="rectangle"> + <solid android:color="@color/bg_running"/> + </shape> + </item> + <item android:gravity="fill" + android:bottom="80dp" + android:drawable="@drawable/bg_connected_effect" + > + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connected_effect.xml b/app/src/custom/res/drawable/bg_connected_effect.xml new file mode 100644 index 00000000..75e79573 --- /dev/null +++ b/app/src/custom/res/drawable/bg_connected_effect.xml @@ -0,0 +1,25 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" + android:viewportWidth="375" + android:viewportHeight="622" + android:width="375dp" + android:height="622dp"> + <path + android:pathData="M185.501 621.837C315.565 621.837 421.003 346.305 421.003 6.4184C421.003 -333.468 315.565 -609 185.501 -609C55.4376 -609 -50 -333.468 -50 6.4184C-50 346.305 55.4376 621.837 185.501 621.837Z"> + <aapt:attr + name="android:fillColor"> + <gradient + android:startX="289.514" + android:startY="184.89" + android:endX="289.514" + android:endY="564.398" + android:tileMode="clamp"> + <item + android:color="#00A6C28A" + android:offset="0" /> + <item + android:color="#36669933" + android:offset="1" /> + </gradient> + </aapt:attr> + </path> +</vector>
\ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connecting.png b/app/src/custom/res/drawable/bg_connecting.png Binary files differdeleted file mode 100644 index eccf184b..00000000 --- a/app/src/custom/res/drawable/bg_connecting.png +++ /dev/null diff --git a/app/src/custom/res/drawable/bg_connecting.xml b/app/src/custom/res/drawable/bg_connecting.xml new file mode 100644 index 00000000..8482d30e --- /dev/null +++ b/app/src/custom/res/drawable/bg_connecting.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:gravity="fill"> + <shape android:shape="rectangle"> + <solid android:color="@color/bg_connecting"/> + </shape> + </item> + <item android:gravity="fill" + android:bottom="80dp" + android:drawable="@drawable/bg_connecting_effect" + > + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connecting_effect.xml b/app/src/custom/res/drawable/bg_connecting_effect.xml new file mode 100644 index 00000000..fd462a54 --- /dev/null +++ b/app/src/custom/res/drawable/bg_connecting_effect.xml @@ -0,0 +1,44 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" + android:viewportWidth="375" + android:viewportHeight="629" + android:width="375dp" + android:height="629dp"> + <path + android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z"> + <aapt:attr + name="android:fillColor"> + <gradient + android:startX="132.695" + android:startY="21.7787" + android:endX="11.0197" + android:endY="381.664" + android:tileMode="clamp"> + <item + android:color="#00FFAA33" + android:offset="0" /> + <item + android:color="#33FFAA33" + android:offset="1" /> + </gradient> + </aapt:attr> + </path> + <path + android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z"> + <aapt:attr + name="android:fillColor"> + <gradient + android:startX="183.501" + android:startY="255.483" + android:endX="183.501" + android:endY="634.991" + android:tileMode="clamp"> + <item + android:color="#00FFAA33" + android:offset="0" /> + <item + android:color="#33FFAA33" + android:offset="1" /> + </gradient> + </aapt:attr> + </path> +</vector>
\ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_disconnected.png b/app/src/custom/res/drawable/bg_disconnected.png Binary files differdeleted file mode 100644 index cc3ead9a..00000000 --- a/app/src/custom/res/drawable/bg_disconnected.png +++ /dev/null diff --git a/app/src/custom/res/drawable/bg_disconnected.xml b/app/src/custom/res/drawable/bg_disconnected.xml new file mode 100644 index 00000000..bfc3c1d1 --- /dev/null +++ b/app/src/custom/res/drawable/bg_disconnected.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:gravity="fill"> + <shape android:shape="rectangle"> + <solid android:color="@color/bg_disconnected"/> + </shape> + </item> + <item + android:top="-40dp" + android:gravity="fill" + android:drawable="@drawable/bg_disconnected_effect" + android:bottom="80dp" + > + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_disconnected_effect.xml b/app/src/custom/res/drawable/bg_disconnected_effect.xml new file mode 100644 index 00000000..d19c2f7f --- /dev/null +++ b/app/src/custom/res/drawable/bg_disconnected_effect.xml @@ -0,0 +1,45 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" + android:viewportWidth="375" + android:viewportHeight="636" + android:width="375dp" + android:height="636dp" + > + <path + android:pathData="M183.528 635.43C313.591 635.43 419.029 359.898 419.029 20.0117C419.029 -319.875 313.591 -595.407 183.528 -595.407C53.4638 -595.407 -51.9738 -319.875 -51.9738 20.0117C-51.9738 359.898 53.4638 635.43 183.528 635.43Z"> + <aapt:attr + name="android:fillColor"> + <gradient + android:startX="79.5145" + android:startY="198.483" + android:endX="79.5145" + android:endY="577.991" + android:tileMode="clamp"> + <item + android:color="#00FFAA33" + android:offset="0" /> + <item + android:color="#33AF0909" + android:offset="1" /> + </gradient> + </aapt:attr> + </path> + <path + android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z"> + <aapt:attr + name="android:fillColor"> + <gradient + android:startX="183.514" + android:startY="85.483" + android:endX="183.514" + android:endY="464.991" + android:tileMode="clamp"> + <item + android:color="#00FFAA33" + android:offset="0" /> + <item + android:color="#33AF0909" + android:offset="1" /> + </gradient> + </aapt:attr> + </path> +</vector>
\ No newline at end of file diff --git a/app/src/main/res/color/main_button_state_color.xml b/app/src/main/res/color/main_button_state_color.xml deleted file mode 100644 index 9650b033..00000000 --- a/app/src/main/res/color/main_button_state_color.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@color/colorPrimaryDark" android:state_pressed="true"/> - <item android:color="@color/colorPrimary"/> -</selector>
\ No newline at end of file diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml index 6d24f5ce..83aabcde 100644 --- a/app/src/main/res/layout-port/f_eip.xml +++ b/app/src/main/res/layout-port/f_eip.xml @@ -62,11 +62,6 @@ android:layout_height="match_parent" app:srcCompat="@drawable/bg_disconnected" android:scaleType="fitXY" - android:layout_marginTop="-300dp" - android:layout_marginBottom="-300dp" - android:layout_marginLeft="-300dp" - android:layout_marginRight="-300dp" - /> diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml index 9617b679..ee0fbac9 100644 --- a/app/src/main/res/layout-xlarge-port/f_eip.xml +++ b/app/src/main/res/layout-xlarge-port/f_eip.xml @@ -34,7 +34,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.55" /> + app:layout_constraintGuide_percent="0.65" /> <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_button_top" @@ -65,10 +65,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitXY" - android:layout_marginLeft="-300dp" - android:layout_marginRight="-300dp" - android:layout_marginTop="-300dp" - android:layout_marginBottom="-300dp" app:srcCompat="@drawable/bg_disconnected" /> diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index b2b8915d..e413319a 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -34,7 +34,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.55" /> + app:layout_constraintGuide_percent="0.6" /> <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_button_top" @@ -65,10 +65,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitXY" - android:layout_marginLeft="-300dp" - android:layout_marginRight="-300dp" - android:layout_marginTop="-300dp" - android:layout_marginBottom="-300dp" app:srcCompat="@drawable/bg_disconnected" /> diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index 7fb2d2d4..1e1f8e41 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -40,7 +40,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.45" /> + app:layout_constraintGuide_percent="0.50" /> <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_button_top" @@ -71,10 +71,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitXY" - android:layout_marginLeft="-300dp" - android:layout_marginRight="-300dp" - android:layout_marginTop="-300dp" - android:layout_marginBottom="-300dp" app:srcCompat="@drawable/bg_disconnected" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4bf2cb93..35e49370 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -57,6 +57,11 @@ <color name="btn_light_transparent">#CCFFFEFE</color> <color name="btn_light_transparent_dark">#CCCCCBCB</color> + <!-- main UI background colors --> + <color name="bg_disconnected">#DC6F6B</color> + <color name="bg_connecting">#FADD85</color> + <color name="bg_running">#CCDCB8</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> |
