Skip to content

Commit 96185fa

Browse files
mauriciocolliStypox
authored andcommitted
Remove manual menu creation from some fragments
Doing this programmatically is just a no-go when themes are being set in some other places (the toolbar is using a custom theme, in this case), so, instead of hunting down the proper theme, just let the system do its work.
1 parent af20b2c commit 96185fa

4 files changed

Lines changed: 15 additions & 21 deletions

File tree

app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import androidx.annotation.NonNull;
2222
import androidx.annotation.Nullable;
2323
import androidx.appcompat.app.AlertDialog;
24-
import androidx.appcompat.content.res.AppCompatResources;
2524
import androidx.appcompat.widget.AppCompatImageView;
2625
import androidx.fragment.app.Fragment;
2726
import androidx.preference.PreferenceManager;
@@ -51,8 +50,6 @@
5150
import io.reactivex.rxjava3.schedulers.Schedulers;
5251

5352
public class PeertubeInstanceListFragment extends Fragment {
54-
private static final int MENU_ITEM_RESTORE_ID = 123456;
55-
5653
private final List<PeertubeInstance> instanceList = new ArrayList<>();
5754
private PeertubeInstance selectedInstance;
5855
private String savedInstanceListKey;
@@ -142,17 +139,12 @@ public void onDestroy() {
142139
public void onCreateOptionsMenu(@NonNull final Menu menu,
143140
@NonNull final MenuInflater inflater) {
144141
super.onCreateOptionsMenu(menu, inflater);
145-
146-
final MenuItem restoreItem = menu
147-
.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults);
148-
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
149-
restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
150-
R.drawable.ic_settings_backup_restore));
142+
inflater.inflate(R.menu.menu_chooser_fragment, menu);
151143
}
152144

153145
@Override
154146
public boolean onOptionsItemSelected(final MenuItem item) {
155-
if (item.getItemId() == MENU_ITEM_RESTORE_ID) {
147+
if (item.getItemId() == R.id.menu_item_restore_default) {
156148
restoreDefaults();
157149
return true;
158150
}

app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.view.LayoutInflater;
88
import android.view.Menu;
99
import android.view.MenuInflater;
10-
import android.view.MenuItem;
1110
import android.view.MotionEvent;
1211
import android.view.View;
1312
import android.view.ViewGroup;
@@ -17,7 +16,6 @@
1716
import androidx.annotation.NonNull;
1817
import androidx.annotation.Nullable;
1918
import androidx.appcompat.app.AlertDialog;
20-
import androidx.appcompat.content.res.AppCompatResources;
2119
import androidx.appcompat.widget.AppCompatImageView;
2220
import androidx.fragment.app.Fragment;
2321
import androidx.recyclerview.widget.ItemTouchHelper;
@@ -107,12 +105,8 @@ public void onPause() {
107105
public void onCreateOptionsMenu(@NonNull final Menu menu,
108106
@NonNull final MenuInflater inflater) {
109107
super.onCreateOptionsMenu(menu, inflater);
110-
111-
final MenuItem restoreItem = menu.add(R.string.restore_defaults);
112-
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
113-
restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
114-
R.drawable.ic_settings_backup_restore));
115-
restoreItem.setOnMenuItemClickListener(ev -> {
108+
inflater.inflate(R.menu.menu_chooser_fragment, menu);
109+
menu.findItem(R.id.menu_item_restore_default).setOnMenuItemClickListener(item -> {
116110
restoreDefaults();
117111
return true;
118112
});

app/src/main/res/drawable/ic_settings_backup_restore.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
android:width="24dp"
33
android:height="24dp"
4-
android:tint="#FFFFFF"
5-
android:viewportWidth="24.0"
6-
android:viewportHeight="24.0">
4+
android:tint="@color/defaultIconTint"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
77
<path
88
android:fillColor="#FF000000"
99
android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z" />
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:app="http://schemas.android.com/apk/res-auto">
3+
<item
4+
android:id="@+id/menu_item_restore_default"
5+
android:title="@string/restore_defaults"
6+
android:icon="@drawable/ic_settings_backup_restore"
7+
app:showAsAction="always" />
8+
</menu>

0 commit comments

Comments
 (0)