[Refactor] Improve accessibility by updating the content description of action items

MuntashirAkon · MuntashirAkon · commit 35ab7ce7152c · 2025-07-18T19:29:34.000-07:00
Signed-off-by: Muntashir Al-Islam &lt;muntashirakon@riseup.net&gt;
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsComponentsFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsComponentsFragment.java
@@ -371,6 +371,7 @@ public ViewHolder(@NonNull View itemView) {
                 super(itemView);
                 this.itemView = (MaterialCardView) itemView;
                 imageView = itemView.findViewById(R.id.icon);
+                imageView.setContentDescription(itemView.getContext().getString(R.string.icon));
                 labelView = itemView.findViewById(R.id.label);
                 nameView = itemView.findViewById(R.id.name);
                 processNameView = itemView.findViewById(R.id.process_name);
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsOtherFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsOtherFragment.java
@@ -306,6 +306,7 @@ private void getSharedLibsView(@NonNull Context context, @NonNull ViewHolder hol
                         sb.append("\n").append(item.path);
                         holder.launchBtn.setVisibility(View.VISIBLE);
                         holder.launchBtn.setIconResource(io.github.muntashirakon.ui.R.drawable.ic_information);
+                        holder.launchBtn.setContentDescription(holder.itemView.getContext().getString(R.string.app_info));
                         holder.launchBtn.setOnClickListener(v -> {
                             Intent intent = AppDetailsActivity.getIntent(context, Paths.get(item.path), false);
                             startActivity(intent);
@@ -331,6 +332,7 @@ private void getSharedLibsView(@NonNull Context context, @NonNull ViewHolder hol
                     holder.textView2.setText(sb);
                     holder.launchBtn.setVisibility(View.VISIBLE);
                     holder.launchBtn.setIconResource(R.drawable.ic_open_in_new);
+                    holder.launchBtn.setContentDescription(holder.itemView.getContext().getString(R.string.open));
                     holder.launchBtn.setOnClickListener(openAsFolderInFM(context, item.path.getParent()));
                     break;
                 }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsPermissionsFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsPermissionsFragment.java
@@ -426,6 +426,7 @@ public ViewHolder(@NonNull View itemView) {
                 switch (mRequestedProperty) {
                     case PERMISSIONS:
                         imageView = itemView.findViewById(R.id.icon);
+                        imageView.setContentDescription(itemView.getContext().getString(R.string.icon));
                         textView1 = itemView.findViewById(R.id.label);
                         textView2 = itemView.findViewById(R.id.name);
                         textView3 = itemView.findViewById(R.id.taskAffinity);
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoFragment.java
@@ -1698,33 +1698,47 @@ private void setPathsAndDirectories(@NonNull AppInfoViewModel.AppInfo appInfo) {
             mListItems.add(ListItem.newGroupStart(getString(R.string.paths_and_directories)));
             // Source directory (apk path)
             if (appInfo.sourceDir != null) {
-                mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.source_dir), appInfo.sourceDir,
-                        openAsFolderInFM(requireContext(), appInfo.sourceDir)));
+                ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.source_dir),
+                        appInfo.sourceDir, openAsFolderInFM(requireContext(), appInfo.sourceDir));
+                listItem.setActionContentDescription(R.string.open);
+                mListItems.add(listItem);
             }
             // Data dir
             if (appInfo.dataDir != null) {
-                mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.data_dir), appInfo.dataDir,
-                        openAsFolderInFM(requireContext(), appInfo.dataDir)));
+                ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.data_dir),
+                        appInfo.dataDir, openAsFolderInFM(requireContext(), appInfo.dataDir));
+                listItem.setActionContentDescription(R.string.open);
+                mListItems.add(listItem);
             }
             // Device-protected data dir
             if (appInfo.dataDeDir != null) {
-                mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.dev_protected_data_dir), appInfo.dataDeDir,
-                        openAsFolderInFM(requireContext(), appInfo.dataDeDir)));
+                ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.dev_protected_data_dir),
+                        appInfo.dataDeDir, openAsFolderInFM(requireContext(), appInfo.dataDeDir));
+                listItem.setActionContentDescription(R.string.open);
+                mListItems.add(listItem);
             }
             // External data dirs
             if (appInfo.extDataDirs.size() == 1) {
-                mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.external_data_dir), appInfo.extDataDirs.get(0),
-                        openAsFolderInFM(requireContext(), appInfo.extDataDirs.get(0))));
+                ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.external_data_dir),
+                        appInfo.extDataDirs.get(0), openAsFolderInFM(requireContext(),
+                                appInfo.extDataDirs.get(0)));
+                listItem.setActionContentDescription(R.string.open);
+                mListItems.add(listItem);
             } else {
                 for (int i = 0; i < appInfo.extDataDirs.size(); ++i) {
-                    mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.external_multiple_data_dir, i),
-                            appInfo.extDataDirs.get(i), openAsFolderInFM(requireContext(), appInfo.extDataDirs.get(i))));
+                    ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.external_multiple_data_dir, i),
+                            appInfo.extDataDirs.get(i), openAsFolderInFM(requireContext(),
+                                    appInfo.extDataDirs.get(i)));
+                    listItem.setActionContentDescription(R.string.open);
+                    mListItems.add(listItem);
                 }
             }
             // Native JNI library dir
             if (appInfo.jniDir != null) {
-                mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.native_library_dir), appInfo.jniDir,
-                        openAsFolderInFM(requireContext(), appInfo.jniDir)));
+                ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.native_library_dir), appInfo.jniDir,
+                        openAsFolderInFM(requireContext(), appInfo.jniDir));
+                listItem.setActionContentDescription(R.string.open);
+                mListItems.add(listItem);
             }
         }
     }
@@ -1735,7 +1749,7 @@ private void setMoreInfo(AppInfoViewModel.AppInfo appInfo) {
             // Set more info
             mListItems.add(ListItem.newGroupStart(getString(R.string.more_info)));
 
-            // Set installer version info
+            // Set installed version info
             if (mIsExternalApk && mInstalledPackageInfo != null) {
                 ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.installed_version),
                         getString(R.string.version_name_with_code, mInstalledPackageInfo.versionName,
@@ -1745,6 +1759,7 @@ private void setMoreInfo(AppInfoViewModel.AppInfo appInfo) {
                             mActivity.startActivity(intent);
                         });
                 listItem.setActionIcon(io.github.muntashirakon.ui.R.drawable.ic_information);
+                listItem.setActionContentDescription(R.string.app_info);
                 mListItems.add(listItem);
             }
 
@@ -1786,6 +1801,7 @@ private void setMoreInfo(AppInfoViewModel.AppInfo appInfo) {
                         getString(R.string.installer_app), appInfo.installerApp,
                         v -> displayInstallerDialog(Objects.requireNonNull(appInfo.installSource)));
                 installerItem.setActionIcon(R.drawable.ic_information_circle);
+                installerItem.setActionContentDescription(R.string.more_info);
                 mListItems.add(installerItem);
             }
             mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.user_id), String.format(Locale.getDefault(), "%d",
@@ -1812,8 +1828,10 @@ private void setMoreInfo(AppInfoViewModel.AppInfo appInfo) {
                 final ComponentName launchComponentName = appInfo.mainActivity.getComponent();
                 if (launchComponentName != null) {
                     final String mainActivity = launchComponentName.getClassName();
-                    mListItems.add(ListItem.newSelectableRegularItem(getString(R.string.main_activity), mainActivity,
-                            view -> startActivity(appInfo.mainActivity)));
+                    ListItem listItem = ListItem.newSelectableRegularItem(getString(R.string.main_activity),
+                            mainActivity, view -> startActivity(appInfo.mainActivity));
+                    listItem.setActionContentDescription(R.string.open);
+                    mListItems.add(listItem);
                 }
             }
         }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/filters/FinderFilterAdapter.java b/app/src/main/java/io/github/muntashirakon/AppManager/filters/FinderFilterAdapter.java
@@ -96,6 +96,7 @@ public ViewHolder(View itemView) {
             subtitleView = itemView.findViewById(R.id.item_subtitle);
             actionButton = itemView.findViewById(R.id.item_open);
             actionButton.setIcon(ContextCompat.getDrawable(itemView.getContext(), io.github.muntashirakon.ui.R.drawable.ic_clear));
+            actionButton.setContentDescription(itemView.getContext().getString(R.string.item_remove));
         }
     }
 }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/fm/FmActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/fm/FmActivity.java
@@ -431,6 +431,7 @@ public void getLabelView(@NonNull ViewHolder holder, FmDrawerItem item) {
                 // Locations
                 holder.actionView.setVisibility(View.VISIBLE);
                 holder.actionView.setIconResource(R.drawable.ic_add);
+                holder.actionView.setContentDescription(holder.itemView.getContext().getString(R.string.add));
                 holder.actionView.setOnClickListener(v -> {
                     Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
                             .putExtra("android.provider.extra.SHOW_ADVANCED", true);
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/fm/dialogs/OpenWithDialogFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/fm/dialogs/OpenWithDialogFragment.java
@@ -388,6 +388,7 @@ public ViewHolder(@NonNull View itemView) {
                 title = itemView.findViewById(android.R.id.title);
                 summary = itemView.findViewById(android.R.id.summary);
                 icon = itemView.findViewById(android.R.id.icon);
+                icon.setContentDescription(itemView.getContext().getString(R.string.icon));
             }
         }
     }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/intercept/ActivityInterceptor.java b/app/src/main/java/io/github/muntashirakon/AppManager/intercept/ActivityInterceptor.java
@@ -1164,6 +1164,7 @@ public ViewHolder(@NonNull View itemView) {
                 super(itemView);
                 title = itemView.findViewById(R.id.item_title);
                 actionIcon = itemView.findViewById(R.id.item_action);
+                actionIcon.setContentDescription(itemView.getContext().getString(R.string.item_remove));
             }
         }
     }
@@ -1217,6 +1218,7 @@ public ViewHolder(@NonNull View itemView) {
                 super(itemView);
                 title = itemView.findViewById(R.id.item_title);
                 actionIcon = itemView.findViewById(R.id.item_action);
+                actionIcon.setContentDescription(itemView.getContext().getString(R.string.item_remove));
             }
         }
     }
@@ -1280,6 +1282,7 @@ public ViewHolder(@NonNull View itemView) {
                 subtitle = itemView.findViewById(R.id.item_subtitle);
                 actionIcon = itemView.findViewById(R.id.item_open);
                 actionIcon.setIconResource(R.drawable.ic_trash_can);
+                actionIcon.setContentDescription(itemView.getContext().getString(R.string.item_remove));
                 icon = itemView.findViewById(R.id.item_icon);
                 icon.setVisibility(View.GONE);
             }
@@ -1344,6 +1347,7 @@ public ViewHolder(@NonNull View itemView) {
                 title = itemView.findViewById(R.id.item_title);
                 subtitle = itemView.findViewById(R.id.item_subtitle);
                 actionIcon = itemView.findViewById(R.id.item_open);
+                actionIcon.setContentDescription(itemView.getContext().getString(R.string.open));
                 icon = itemView.findViewById(R.id.item_icon);
             }
         }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/logcat/LogFilterAdapter.java b/app/src/main/java/io/github/muntashirakon/AppManager/logcat/LogFilterAdapter.java
@@ -83,6 +83,7 @@ public ViewHolder(View itemView) {
             super(itemView);
             textView = itemView.findViewById(R.id.item_title);
             actionButton = itemView.findViewById(R.id.item_action);
+            actionButton.setContentDescription(itemView.getContext().getString(R.string.item_remove));
         }
     }
 }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsBaseProfileActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsBaseProfileActivity.java
@@ -45,7 +45,7 @@ public abstract class AppsBaseProfileActivity extends BaseActivity implements Na
     protected static final String EXTRA_STATE = "state";
 
     private ViewPager2 mViewPager;
-    private NavigationBarView mBottomNavigationView;
+    NavigationBarView bottomNavigationView;
     private MenuItem mPrevMenuItem;
     private final Fragment[] mFragments = new Fragment[3];
     private final ViewPager2.OnPageChangeCallback mPageChangeCallback = new ViewPager2.OnPageChangeCallback() {
@@ -54,10 +54,10 @@ public void onPageSelected(int position) {
             if (mPrevMenuItem != null) {
                 mPrevMenuItem.setChecked(false);
             } else {
-                mBottomNavigationView.getMenu().getItem(0).setChecked(false);
+                bottomNavigationView.getMenu().getItem(0).setChecked(false);
             }
-            mBottomNavigationView.getMenu().getItem(position).setChecked(true);
-            mPrevMenuItem = mBottomNavigationView.getMenu().getItem(position);
+            bottomNavigationView.getMenu().getItem(position).setChecked(true);
+            mPrevMenuItem = bottomNavigationView.getMenu().getItem(position);
         }
     };
     private final OnBackPressedCallback mOnBackPressedCallback = new OnBackPressedCallback(false) {
@@ -132,8 +132,8 @@ protected void onAuthenticated(@Nullable Bundle savedInstanceState) {
         mViewPager.setOffscreenPageLimit(2);
         mViewPager.registerOnPageChangeCallback(mPageChangeCallback);
         mViewPager.setAdapter(new ProfileFragmentPagerAdapter(this));
-        mBottomNavigationView = findViewById(R.id.bottom_navigation);
-        mBottomNavigationView.setOnItemSelectedListener(this);
+        bottomNavigationView = findViewById(R.id.bottom_navigation);
+        bottomNavigationView.setOnItemSelectedListener(this);
         // Observers
         model.getProfileModifiedLiveData().observe(this, modified -> {
             mOnBackPressedCallback.setEnabled(modified);
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsFilterProfileActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsFilterProfileActivity.java
@@ -4,10 +4,14 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import io.github.muntashirakon.AppManager.R;
+
 public class AppsFilterProfileActivity extends AppsBaseProfileActivity {
     @NonNull
     public static Intent getProfileIntent(@NonNull Context context, @NonNull String profileId) {
@@ -42,4 +46,12 @@ public Fragment getAppsBaseFragment() {
     public void loadNewProfile(@NonNull String newProfileName, @NonNull Intent intent) {
         model.loadNewAppsFilterProfile(newProfileName);
     }
+
+    @Override
+    protected void onAuthenticated(@Nullable Bundle savedInstanceState) {
+        super.onAuthenticated(savedInstanceState);
+        bottomNavigationView.getMenu().removeItem(R.id.action_apps);
+        fab.setImageResource(R.drawable.ic_edit);
+        fab.setContentDescription(getString(R.string.item_edit));
+    }
 }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsFragment.java
@@ -175,6 +175,7 @@ public class ViewHolder extends RecyclerView.ViewHolder {
             public ViewHolder(@NonNull View itemView) {
                 super(itemView);
                 icon = itemView.findViewById(android.R.id.icon);
+                icon.setContentDescription(itemView.getContext().getString(R.string.icon));
                 title = itemView.findViewById(android.R.id.title);
                 subtitle = itemView.findViewById(android.R.id.summary);
             }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsProfileActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsProfileActivity.java
@@ -69,6 +69,7 @@ public void loadNewProfile(@NonNull String newProfileName, @NonNull Intent inten
     @Override
     protected void onAuthenticated(@Nullable Bundle savedInstanceState) {
         super.onAuthenticated(savedInstanceState);
+        bottomNavigationView.getMenu().removeItem(R.id.action_filters);
         if (getIntent().hasExtra(EXTRA_SHORTCUT_TYPE)) {
             // Compatibility mode for shortcut
             @ProfileApplierActivity.ShortcutType String shortcutType = getIntent().getStringExtra(EXTRA_SHORTCUT_TYPE);
@@ -80,6 +81,8 @@ protected void onAuthenticated(@Nullable Bundle savedInstanceState) {
             finish();
             return;
         }
+        fab.setImageResource(R.drawable.ic_add);
+        fab.setContentDescription(getString(R.string.add_item));
         fab.setOnClickListener(v -> {
             progressIndicator.show();
             model.loadInstalledApps();
diff --git a/app/src/main/res/layout/pager_app_info.xml b/app/src/main/res/layout/pager_app_info.xml
@@ -40,6 +40,7 @@
                     android:layout_marginTop="@dimen/padding_medium"
                     android:layout_marginBottom="@dimen/padding_small"
                     android:background="@drawable/item_transparent"
+                    android:contentDescription="@string/str_logo"
                     android:nextFocusDown="@id/label"
                     tools:ignore="contentDescription"
                     tools:srcCompat="@mipmap/ic_launcher" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1520,4 +1520,5 @@
     <string name="title_shortcut_for_frozen_app">Frozen app</string>
     <string name="message_shortcut_for_frozen_app">The app corresponding to the shortcut appears to have been frozen. Unfreeze temporarily and open the shortcut?</string>
     <string name="filters">Filters</string>
+    <string name="icon">icon</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ public ViewHolder(View itemView) {`
`96`	`96`	`subtitleView = itemView.findViewById(R.id.item_subtitle);`
`97`	`97`	`actionButton = itemView.findViewById(R.id.item_open);`
`98`	`98`	`actionButton.setIcon(ContextCompat.getDrawable(itemView.getContext(), io.github.muntashirakon.ui.R.drawable.ic_clear));`
	`99`	`+ actionButton.setContentDescription(itemView.getContext().getString(R.string.item_remove));`
`99`	`100`	`}`
`100`	`101`	`}`
`101`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,7 @@ public ViewHolder(@NonNull View itemView) {`
`388`	`388`	`title = itemView.findViewById(android.R.id.title);`
`389`	`389`	`summary = itemView.findViewById(android.R.id.summary);`
`390`	`390`	`icon = itemView.findViewById(android.R.id.icon);`
	`391`	`+ icon.setContentDescription(itemView.getContext().getString(R.string.icon));`
`391`	`392`	`}`
`392`	`393`	`}`
`393`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1164,6 +1164,7 @@ public ViewHolder(@NonNull View itemView) {`
`1164`	`1164`	`super(itemView);`
`1165`	`1165`	`title = itemView.findViewById(R.id.item_title);`
`1166`	`1166`	`actionIcon = itemView.findViewById(R.id.item_action);`
	`1167`	`+ actionIcon.setContentDescription(itemView.getContext().getString(R.string.item_remove));`
`1167`	`1168`	`}`
`1168`	`1169`	`}`
`1169`	`1170`	`}`
`@@ -1217,6 +1218,7 @@ public ViewHolder(@NonNull View itemView) {`
`1217`	`1218`	`super(itemView);`
`1218`	`1219`	`title = itemView.findViewById(R.id.item_title);`
`1219`	`1220`	`actionIcon = itemView.findViewById(R.id.item_action);`
	`1221`	`+ actionIcon.setContentDescription(itemView.getContext().getString(R.string.item_remove));`
`1220`	`1222`	`}`
`1221`	`1223`	`}`
`1222`	`1224`	`}`
`@@ -1280,6 +1282,7 @@ public ViewHolder(@NonNull View itemView) {`
`1280`	`1282`	`subtitle = itemView.findViewById(R.id.item_subtitle);`
`1281`	`1283`	`actionIcon = itemView.findViewById(R.id.item_open);`
`1282`	`1284`	`actionIcon.setIconResource(R.drawable.ic_trash_can);`
	`1285`	`+ actionIcon.setContentDescription(itemView.getContext().getString(R.string.item_remove));`
`1283`	`1286`	`icon = itemView.findViewById(R.id.item_icon);`
`1284`	`1287`	`icon.setVisibility(View.GONE);`
`1285`	`1288`	`}`
`@@ -1344,6 +1347,7 @@ public ViewHolder(@NonNull View itemView) {`
`1344`	`1347`	`title = itemView.findViewById(R.id.item_title);`
`1345`	`1348`	`subtitle = itemView.findViewById(R.id.item_subtitle);`
`1346`	`1349`	`actionIcon = itemView.findViewById(R.id.item_open);`
	`1350`	`+ actionIcon.setContentDescription(itemView.getContext().getString(R.string.open));`
`1347`	`1351`	`icon = itemView.findViewById(R.id.item_icon);`
`1348`	`1352`	`}`
`1349`	`1353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public ViewHolder(View itemView) {`
`83`	`83`	`super(itemView);`
`84`	`84`	`textView = itemView.findViewById(R.id.item_title);`
`85`	`85`	`actionButton = itemView.findViewById(R.id.item_action);`
	`86`	`+ actionButton.setContentDescription(itemView.getContext().getString(R.string.item_remove));`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`	`}`