From 93541883bb5f8c7de69fd2faa96ee02aeb99c413 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:35:16 +0800 Subject: [PATCH] Adjust UI --- .../com/v2ray/ang/receiver/WidgetProvider.kt | 8 +++--- .../kotlin/com/v2ray/ang/ui/MainActivity.kt | 4 +-- .../main/res/drawable-night/ic_image_24dp.xml | 12 ++++++++ .../res/drawable-night/ic_image_photo.xml | 9 ------ .../main/res/drawable-night/ic_info_24dp.xml | 9 ------ .../src/main/res/drawable/ic_image_24dp.xml | 12 ++++++++ .../src/main/res/drawable/ic_image_photo.xml | 9 ------ .../src/main/res/drawable/ic_info_24dp.xml | 9 ------ .../res/drawable/ic_rounded_corner_active.xml | 10 +++++++ .../drawable/ic_rounded_corner_inactive.xml | 10 +++++++ .../app/src/main/res/layout/widget_switch.xml | 28 ++++++++++++++----- .../app/src/main/res/menu/menu_scanner.xml | 2 +- .../app/src/main/res/values-night/colors.xml | 4 +-- V2rayNG/app/src/main/res/values/colors.xml | 4 +-- 14 files changed, 76 insertions(+), 54 deletions(-) create mode 100644 V2rayNG/app/src/main/res/drawable-night/ic_image_24dp.xml delete mode 100644 V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml delete mode 100644 V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_image_24dp.xml delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_image_photo.xml delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml create mode 100644 V2rayNG/app/src/main/res/drawable/ic_rounded_corner_inactive.xml diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt index 46b4d078..52dacf04 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt @@ -38,11 +38,11 @@ class WidgetProvider : AppWidgetProvider() { }) remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent) if (isRunning) { - remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name) - remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.color.color_fab_orange) + remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stop_24dp) + remoteViews.setInt(R.id.layout_background, "setBackgroundResource", R.drawable.ic_rounded_corner_active) } else { - remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name_black) - remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.color.color_fab_grey) + remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_play_24dp) + remoteViews.setInt(R.id.layout_background, "setBackgroundResource", R.drawable.ic_rounded_corner_inactive) } for (appWidgetId in appWidgetIds) { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index 5f335ec4..cd33f7f2 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -147,12 +147,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList adapter.isRunning = isRunning if (isRunning) { binding.fab.setImageResource(R.drawable.ic_stop_24dp) - binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_orange)) + binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_active)) setTestState(getString(R.string.connection_connected)) binding.layoutTest.isFocusable = true } else { binding.fab.setImageResource(R.drawable.ic_play_24dp) - binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_grey)) + binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive)) setTestState(getString(R.string.connection_not_connected)) binding.layoutTest.isFocusable = false } diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_image_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_image_24dp.xml new file mode 100644 index 00000000..00449aaf --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_image_24dp.xml @@ -0,0 +1,12 @@ + + + + diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml b/V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml deleted file mode 100644 index c701a63f..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_image_photo.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml deleted file mode 100644 index f7b49e8e..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_info_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_image_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_image_24dp.xml new file mode 100644 index 00000000..e2ff6078 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_image_24dp.xml @@ -0,0 +1,12 @@ + + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml b/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml deleted file mode 100644 index 913d9d8b..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_image_photo.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml deleted file mode 100644 index 34b8202e..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_info_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml new file mode 100644 index 00000000..3dcd95f7 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_inactive.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_inactive.xml new file mode 100644 index 00000000..96a98158 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_inactive.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml index 32c608aa..444970a8 100644 --- a/V2rayNG/app/src/main/res/layout/widget_switch.xml +++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml @@ -2,16 +2,30 @@ + + + android:layout_gravity="center"> - + + + diff --git a/V2rayNG/app/src/main/res/menu/menu_scanner.xml b/V2rayNG/app/src/main/res/menu/menu_scanner.xml index 216ad347..5a51ffc7 100644 --- a/V2rayNG/app/src/main/res/menu/menu_scanner.xml +++ b/V2rayNG/app/src/main/res/menu/menu_scanner.xml @@ -8,7 +8,7 @@ app:showAsAction="always" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml index 39e1a38a..06af7bfa 100644 --- a/V2rayNG/app/src/main/res/values-night/colors.xml +++ b/V2rayNG/app/src/main/res/values-night/colors.xml @@ -1,7 +1,7 @@ - #f97910 - #646464 + #f97910 + #646464 #BDBDBD #FFFFFF #222222 diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index 3d53c1e5..8835e864 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -4,8 +4,8 @@ #FF0099 #f97910 - #f97910 - #9C9C9C + #f97910 + #9C9C9C #727272 #000000 #FFFFFF