From dfb035cfa57481f178944837a17cc7cfd34e8d4f Mon Sep 17 00:00:00 2001 From: tehcneko <88844448+tehcneko@users.noreply.github.com> Date: Sat, 16 Oct 2021 00:14:58 +0800 Subject: [PATCH] [app] Update hint (#1283) --- .../java/org/lsposed/manager/adapters/ScopeAdapter.java | 6 +++++- .../org/lsposed/manager/ui/fragment/ModulesFragment.java | 8 ++++++-- .../org/lsposed/manager/ui/widget/ExpandableTextView.java | 5 +++-- app/src/main/res/layout/item_module.xml | 1 - 4 files changed, 14 insertions(+), 6 deletions(-) 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 321e9266..e512f475 100644 --- a/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java +++ b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java @@ -382,6 +382,7 @@ public class ScopeAdapter extends RecyclerView.Adapter SpannableStringBuilder sb = new SpannableStringBuilder(android ? "" : activity.getString(R.string.app_description, appInfo.packageName, appInfo.packageInfo.versionName)); if (android) holder.appDescription.setVisibility(View.GONE); else { + holder.appDescription.setVisibility(View.VISIBLE); holder.appDescription.setText(sb); sb = new SpannableStringBuilder(); } @@ -397,8 +398,11 @@ public class ScopeAdapter extends RecyclerView.Adapter sb.setSpan(styleSpan, sb.length() - recommended.length(), sb.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); } sb.setSpan(foregroundColorSpan, sb.length() - recommended.length(), sb.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); + holder.hint.setText(sb); + holder.hint.setVisibility(View.VISIBLE); + } else { + holder.hint.setVisibility(View.GONE); } - holder.hint.setText(sb);; holder.itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> { activity.getMenuInflater().inflate(R.menu.menu_app_item, menu); diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java index 8d57e41b..90f3aba6 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java @@ -488,8 +488,12 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi sb.setSpan(foregroundColorSpan, sb.length() - recommended.length(), sb.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); } } - if (sb.length() == 0) holder.hint.setVisibility(View.GONE); - else holder.hint.setText(sb); + if (sb.length() == 0) { + holder.hint.setVisibility(View.GONE); + } else { + holder.hint.setVisibility(View.VISIBLE); + holder.hint.setText(sb); + } if (!isPick) { holder.root.setAlpha(moduleUtil.isModuleEnabled(item.packageName) ? 1.0f : .5f); diff --git a/app/src/main/java/org/lsposed/manager/ui/widget/ExpandableTextView.java b/app/src/main/java/org/lsposed/manager/ui/widget/ExpandableTextView.java index 4f42162f..f8c0b8d8 100644 --- a/app/src/main/java/org/lsposed/manager/ui/widget/ExpandableTextView.java +++ b/app/src/main/java/org/lsposed/manager/ui/widget/ExpandableTextView.java @@ -117,13 +117,14 @@ public class ExpandableTextView extends TextView { ClickableSpan[] links = spanned.getSpans(offset, offset, ClickableSpan.class); if (links.length == 0) { - super.onTouchEvent(event); return false; + } else { + return super.onTouchEvent(event); } } } - return super.onTouchEvent(event); + return false; } } diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml index 3217add6..547ded4e 100644 --- a/app/src/main/res/layout/item_module.xml +++ b/app/src/main/res/layout/item_module.xml @@ -35,7 +35,6 @@ android:id="@+id/item_root" android:layout_width="match_parent" android:layout_height="wrap_content" - android:animateLayoutChanges="true" tools:ignore="RtlSymmetry">