[app] Update hint (#1283)

This commit is contained in:
tehcneko 2021-10-16 00:14:58 +08:00 committed by GitHub
parent b30614abe4
commit dfb035cfa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions

View File

@ -382,6 +382,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
SpannableStringBuilder sb = new SpannableStringBuilder(android ? "" : activity.getString(R.string.app_description, appInfo.packageName, appInfo.packageInfo.versionName)); SpannableStringBuilder sb = new SpannableStringBuilder(android ? "" : activity.getString(R.string.app_description, appInfo.packageName, appInfo.packageInfo.versionName));
if (android) holder.appDescription.setVisibility(View.GONE); if (android) holder.appDescription.setVisibility(View.GONE);
else { else {
holder.appDescription.setVisibility(View.VISIBLE);
holder.appDescription.setText(sb); holder.appDescription.setText(sb);
sb = new SpannableStringBuilder(); sb = new SpannableStringBuilder();
} }
@ -397,8 +398,11 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
sb.setSpan(styleSpan, sb.length() - recommended.length(), sb.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); 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); 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) -> { holder.itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> {
activity.getMenuInflater().inflate(R.menu.menu_app_item, menu); activity.getMenuInflater().inflate(R.menu.menu_app_item, menu);

View File

@ -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); sb.setSpan(foregroundColorSpan, sb.length() - recommended.length(), sb.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
} }
} }
if (sb.length() == 0) holder.hint.setVisibility(View.GONE); if (sb.length() == 0) {
else holder.hint.setText(sb); holder.hint.setVisibility(View.GONE);
} else {
holder.hint.setVisibility(View.VISIBLE);
holder.hint.setText(sb);
}
if (!isPick) { if (!isPick) {
holder.root.setAlpha(moduleUtil.isModuleEnabled(item.packageName) ? 1.0f : .5f); holder.root.setAlpha(moduleUtil.isModuleEnabled(item.packageName) ? 1.0f : .5f);

View File

@ -117,13 +117,14 @@ public class ExpandableTextView extends TextView {
ClickableSpan[] links = spanned.getSpans(offset, offset, ClickableSpan.class); ClickableSpan[] links = spanned.getSpans(offset, offset, ClickableSpan.class);
if (links.length == 0) { if (links.length == 0) {
super.onTouchEvent(event);
return false; return false;
} else {
return super.onTouchEvent(event);
} }
} }
} }
return super.onTouchEvent(event); return false;
} }
} }

View File

@ -35,7 +35,6 @@
android:id="@+id/item_root" android:id="@+id/item_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true"
tools:ignore="RtlSymmetry"> tools:ignore="RtlSymmetry">
<ImageView <ImageView