From 535c6e1b60074210f12a1e896a9ec3876f615312 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Tue, 13 Apr 2021 23:05:42 +0800 Subject: [PATCH] [app] Nuke customized ripple effect (#485) * [app] Nuke customized ripple effect * [app] Fix progressbar glitches --- app/src/main/AndroidManifest.xml | 4 +- .../manager/adapters/ScopeAdapter.java | 8 +- .../manager/util/NotificationUtil.java | 2 +- .../{ic_modules.xml => ic_extension.xml} | 8 +- app/src/main/res/drawable/ic_get_app.xml | 3 +- app/src/main/res/drawable/ic_notification.xml | 30 ------- app/src/main/res/drawable/item_background.xml | 37 -------- .../main/res/drawable/shortcut_ic_modules.xml | 4 +- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/item_module.xml | 4 +- app/src/main/res/layout/item_onlinemodule.xml | 4 +- .../main/res/layout/item_repo_loadmore.xml | 4 +- app/src/main/res/layout/item_repo_release.xml | 2 +- .../layout/item_repo_title_description.xml | 2 +- .../main/res/layout/preference_material.xml | 72 --------------- .../main/res/layout/preference_simplemenu.xml | 88 ------------------- app/src/main/res/values/attrs.xml | 3 +- app/src/main/res/values/colors.xml | 3 - app/src/main/res/values/themes.xml | 4 +- 19 files changed, 27 insertions(+), 259 deletions(-) rename app/src/main/res/drawable/{ic_modules.xml => ic_extension.xml} (79%) delete mode 100644 app/src/main/res/drawable/ic_notification.xml delete mode 100644 app/src/main/res/drawable/item_background.xml delete mode 100644 app/src/main/res/layout/preference_material.xml delete mode 100644 app/src/main/res/layout/preference_simplemenu.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 74e31b16..3793c9f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,9 +38,11 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:hasFragileUserData="true" android:supportsRtl="true" android:theme="@style/AppTheme" - tools:ignore="AllowBackup,GoogleAppIndexingWarning"> + tools:ignore="AllowBackup,GoogleAppIndexingWarning" + tools:targetApi="q"> diff --git a/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java index 2e032885..6d4ea14c 100644 --- a/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java +++ b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java @@ -491,9 +491,11 @@ public class ScopeAdapter extends RecyclerView.Adapter } refreshing = true; } - activity.binding.progress.setVisibility(View.INVISIBLE); - activity.binding.progress.setIndeterminate(true); - activity.binding.progress.setVisibility(View.VISIBLE); + if (!force) { + activity.binding.progress.setVisibility(View.INVISIBLE); + activity.binding.progress.setIndeterminate(true); + activity.binding.progress.setVisibility(View.VISIBLE); + } enabled = ModuleUtil.getInstance().isModuleEnabled(modulePackageName); activity.binding.masterSwitch.setOnCheckedChangeListener(null); activity.binding.masterSwitch.setChecked(enabled); diff --git a/app/src/main/java/org/lsposed/manager/util/NotificationUtil.java b/app/src/main/java/org/lsposed/manager/util/NotificationUtil.java index c3437676..fa3e7f57 100644 --- a/app/src/main/java/org/lsposed/manager/util/NotificationUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/NotificationUtil.java @@ -65,7 +65,7 @@ public final class NotificationUtil { .setContentTitle(title) .setContentText(content) .setAutoCancel(true) - .setSmallIcon(R.drawable.ic_notification) + .setSmallIcon(R.drawable.ic_extension) .setColor(context.getColor(R.color.color_primary)) .setContentIntent(contentIntent) .setStyle(style); diff --git a/app/src/main/res/drawable/ic_modules.xml b/app/src/main/res/drawable/ic_extension.xml similarity index 79% rename from app/src/main/res/drawable/ic_modules.xml rename to app/src/main/res/drawable/ic_extension.xml index 12603b3e..83d047fb 100644 --- a/app/src/main/res/drawable/ic_modules.xml +++ b/app/src/main/res/drawable/ic_extension.xml @@ -14,18 +14,16 @@ ~ You should have received a copy of the GNU General Public License ~ along with LSPosed. If not, see . ~ - ~ Copyright (C) 2020 EdXposed Contributors ~ Copyright (C) 2021 LSPosed Contributors --> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z" /> diff --git a/app/src/main/res/drawable/ic_get_app.xml b/app/src/main/res/drawable/ic_get_app.xml index 996b3025..4b847b66 100644 --- a/app/src/main/res/drawable/ic_get_app.xml +++ b/app/src/main/res/drawable/ic_get_app.xml @@ -14,7 +14,6 @@ ~ You should have received a copy of the GNU General Public License ~ along with LSPosed. If not, see . ~ - ~ Copyright (C) 2020 EdXposed Contributors ~ Copyright (C) 2021 LSPosed Contributors --> @@ -26,5 +25,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M16.59,9H15V4c0,-0.55 -0.45,-1 -1,-1h-4c-0.55,0 -1,0.45 -1,1v5H7.41c-0.89,0 -1.34,1.08 -0.71,1.71l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.63,-0.63 0.19,-1.71 -0.7,-1.71zM5,19c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H6c-0.55,0 -1,0.45 -1,1z" /> diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml deleted file mode 100644 index 4c70c6a2..00000000 --- a/app/src/main/res/drawable/ic_notification.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/item_background.xml b/app/src/main/res/drawable/item_background.xml deleted file mode 100644 index 3a562128..00000000 --- a/app/src/main/res/drawable/item_background.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shortcut_ic_modules.xml b/app/src/main/res/drawable/shortcut_ic_modules.xml index bbca99a6..cf8ad63f 100644 --- a/app/src/main/res/drawable/shortcut_ic_modules.xml +++ b/app/src/main/res/drawable/shortcut_ic_modules.xml @@ -24,7 +24,7 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 045b4204..a1061e38 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -170,7 +170,7 @@ android:layout_height="28dp" android:layout_centerVertical="true" android:contentDescription="@string/Modules" - app:srcCompat="@drawable/ic_modules" /> + app:srcCompat="@drawable/ic_extension" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml index 55f848cf..3781006a 100644 --- a/app/src/main/res/layout/item_module.xml +++ b/app/src/main/res/layout/item_module.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/item_background" + android:background="?selectableItemBackground" android:clickable="true" android:focusable="true" android:minHeight="?attr/listPreferredItemHeight" @@ -106,4 +106,4 @@ app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_onlinemodule.xml b/app/src/main/res/layout/item_onlinemodule.xml index 0eef6d17..1491bf4d 100644 --- a/app/src/main/res/layout/item_onlinemodule.xml +++ b/app/src/main/res/layout/item_onlinemodule.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/item_background" + android:background="?selectableItemBackground" android:clickable="true" android:focusable="true" android:minHeight="?attr/listPreferredItemHeight" @@ -63,4 +63,4 @@ tools:text="@tools:sample/lorem" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_repo_loadmore.xml b/app/src/main/res/layout/item_repo_loadmore.xml index 4676a1e7..7f6ece77 100644 --- a/app/src/main/res/layout/item_repo_loadmore.xml +++ b/app/src/main/res/layout/item_repo_loadmore.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="64dp" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@drawable/item_background" + android:background="?selectableItemBackground" android:clickable="true" android:focusable="true"> @@ -47,4 +47,4 @@ android:layout_gravity="center" android:text="@string/module_release_load_more" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_repo_release.xml b/app/src/main/res/layout/item_repo_release.xml index 91de88cd..8c523e26 100644 --- a/app/src/main/res/layout/item_repo_release.xml +++ b/app/src/main/res/layout/item_repo_release.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/item_background" + android:background="?selectableItemBackground" android:clickable="true" android:focusable="true" android:minHeight="?attr/listPreferredItemHeight" diff --git a/app/src/main/res/layout/item_repo_title_description.xml b/app/src/main/res/layout/item_repo_title_description.xml index ca7402f6..d3aa1797 100644 --- a/app/src/main/res/layout/item_repo_title_description.xml +++ b/app/src/main/res/layout/item_repo_title_description.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/item_background" + android:background="?selectableItemBackground" android:clickable="true" android:focusable="true" android:minHeight="?attr/listPreferredItemHeight" diff --git a/app/src/main/res/layout/preference_material.xml b/app/src/main/res/layout/preference_material.xml deleted file mode 100644 index 57d9b0a2..00000000 --- a/app/src/main/res/layout/preference_material.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/preference_simplemenu.xml b/app/src/main/res/layout/preference_simplemenu.xml deleted file mode 100644 index 0f772204..00000000 --- a/app/src/main/res/layout/preference_simplemenu.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index e60f1ee8..81a1e791 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -20,7 +20,6 @@ --> - - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 46bc6721..5d0a2d15 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -19,9 +19,6 @@ --> - #34ffffff - #cbffffff - @color/google_blue_600 @color/google_blue_300 @color/color_primary_light diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 82cbf2e8..61901768 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -31,7 +31,6 @@ @color/material_red_500 @color/material_green_500 @color/material_blue_500 - @color/rippleTransparency_light @style/Widget.Material.ActionBar.Surface @style/ThemeOverlay.ActionBar @@ -63,7 +62,6 @@ @color/material_red_200 @color/material_green_200 @color/material_blue_200 - @color/rippleTransparency_dark @style/Widget.Material.ActionBar.Surface @style/ThemeOverlay.ActionBar @@ -136,4 +134,4 @@ 24dp - \ No newline at end of file +