Skip to content

Commit f23fa7e

Browse files
committed
[Profile] Fix updating profile modification status when an app is deleted from the list
Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>
1 parent 35ab7ce commit f23fa7e

5 files changed

Lines changed: 15 additions & 9 deletions

File tree

app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsBaseProfileActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
231231
int itemId = item.getItemId();
232232
if (itemId == R.id.action_apps) {
233233
mViewPager.setCurrentItem(0, true);
234+
} else if (itemId == R.id.action_filters) {
235+
mViewPager.setCurrentItem(0, true);
234236
} else if (itemId == R.id.action_conf) {
235237
mViewPager.setCurrentItem(1, true);
236238
} else if (itemId == R.id.action_logs) {

app/src/main/java/io/github/muntashirakon/AppManager/profiles/AppsProfileViewModel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ public void setPackages(@NonNull List<String> packages) {
302302
public void deletePackage(@NonNull String packageName) {
303303
if (mProfile == null) return;
304304
assert mProfile instanceof AppsProfile;
305+
setModified(true);
305306
synchronized (mProfileLock) {
306307
AppsProfile profile = (AppsProfile) mProfile;
307308
profile.packages = Objects.requireNonNull(ArrayUtils.removeString(profile.packages, packageName));

app/src/main/java/io/github/muntashirakon/AppManager/profiles/NewProfileDialogFragment.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ public static NewProfileDialogFragment getInstance(@Nullable OnCreateNewProfileI
4242
return fragment;
4343
}
4444

45-
// TODO: 7/10/25 Localization
46-
private static final String[] TYPE_LABELS = new String[]{
47-
"Apps", // PROFILE_TYPE_APPS
48-
"Filters", // PROFILE_TYPE_APPS_PROFILE
49-
};
50-
5145
@Nullable
5246
private OnCreateNewProfileInterface mOnCreateNewProfileInterface;
5347
private View mDialogView;
@@ -66,8 +60,8 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
6660
editTextLayout.setHelperText(requireContext().getText(R.string.input_profile_name_description));
6761
MaterialSpinner spinner = mDialogView.findViewById(R.id.type_selector_spinner);
6862
spinner.setVisibility(View.GONE);
69-
ArrayAdapter<CharSequence> spinnerAdapter = new SelectedArrayAdapter<>(requireContext(),
70-
io.github.muntashirakon.ui.R.layout.auto_complete_dropdown_item, TYPE_LABELS);
63+
ArrayAdapter<CharSequence> spinnerAdapter = SelectedArrayAdapter.createFromResource(requireContext(),
64+
R.array.profile_types, io.github.muntashirakon.ui.R.layout.auto_complete_dropdown_item);
7165
spinner.setAdapter(spinnerAdapter);
7266
spinner.setSelection(BaseProfile.PROFILE_TYPE_APPS);
7367
spinner.setOnItemClickListener((parent, view, position, id) -> {

app/src/main/res/menu/activity_profile_navigation.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android">
33
<item
44
android:id="@+id/action_apps"
5-
android:icon="@drawable/ic_view_list"
5+
android:icon="@drawable/ic_android"
66
android:title="@string/apps" />
77

8+
<item
9+
android:id="@+id/action_filters"
10+
android:icon="@drawable/ic_filter_menu"
11+
android:title="@string/filters" />
12+
813
<item
914
android:id="@+id/action_conf"
1015
android:icon="@drawable/ic_tune"

app/src/main/res/values/arrays.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@
126126
<item>@string/bouncy_castle_keystore</item>
127127
<item>@string/pem_and_pk8</item>
128128
</string-array>
129+
<string-array name="profile_types">
130+
<item>@string/apps</item>
131+
<item>@string/filters</item>
132+
</string-array>
129133
<integer-array name="random_colors">
130134
<item>@color/original_orange</item>
131135
<item>@color/dark_orange</item>

0 commit comments

Comments
 (0)