Skip to content

Commit 2679a4b

Browse files
committed
Removed the "Unset Thumbnail" item if you can't use this feature
1 parent dfd6534 commit 2679a4b

2 files changed

Lines changed: 17 additions & 37 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import android.view.LayoutInflater;
99
import android.view.View;
1010
import android.view.ViewGroup;
11-
import android.widget.ArrayAdapter;
12-
import android.widget.TextView;
1311

1412
import androidx.annotation.NonNull;
1513
import androidx.annotation.Nullable;
@@ -34,6 +32,7 @@
3432
import org.schabi.newpipe.util.NavigationHelper;
3533
import org.schabi.newpipe.util.OnClickGesture;
3634

35+
import java.util.ArrayList;
3736
import java.util.List;
3837

3938
import icepick.State;
@@ -267,49 +266,30 @@ private void showLocalDialog(final PlaylistMetadataEntry selectedItem) {
267266

268267
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
269268

270-
final ArrayAdapter<String> arrayAdapter = getLocalDialogArrayAdapter(isThumbnailPermanent,
271-
unsetThumbnail);
272-
arrayAdapter.addAll(rename, delete, unsetThumbnail);
269+
final ArrayList<String> items = new ArrayList<>();
270+
items.add(rename);
271+
items.add(delete);
272+
if (isThumbnailPermanent) {
273+
items.add(unsetThumbnail);
274+
}
273275

274-
final DialogInterface.OnClickListener action = (dialog, index) -> {
275-
if (index == arrayAdapter.getPosition(rename)) {
276+
final DialogInterface.OnClickListener action = (d, index) -> {
277+
if (items.get(index).equals(rename)) {
276278
showRenameDialog(selectedItem);
277-
} else if (index == arrayAdapter.getPosition(delete)) {
278-
showDeleteDialog(selectedItem.name, localPlaylistManager
279-
.deletePlaylist(selectedItem.uid));
280-
} else if (isThumbnailPermanent) {
279+
} else if (items.get(index).equals(delete)) {
280+
showDeleteDialog(selectedItem.name,
281+
localPlaylistManager.deletePlaylist(selectedItem.uid));
282+
} else if (isThumbnailPermanent && items.get(index).equals(unsetThumbnail)) {
281283
final String thumbnailUrl = localPlaylistManager
282284
.getAutomaticPlaylistThumbnail(selectedItem.uid);
283-
localPlaylistManager.changePlaylistThumbnail(selectedItem.uid, thumbnailUrl, false)
285+
localPlaylistManager
286+
.changePlaylistThumbnail(selectedItem.uid, thumbnailUrl, false)
284287
.observeOn(AndroidSchedulers.mainThread())
285288
.subscribe();
286289
}
287290
};
288291

289-
builder.setAdapter(arrayAdapter, action)
290-
.create()
291-
.show();
292-
}
293-
294-
private ArrayAdapter<String> getLocalDialogArrayAdapter(final boolean isPlaylistThumbnailSet,
295-
final String unsetThumbnail) {
296-
return new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1) {
297-
@Override
298-
public View getView(final int position, final View convertView,
299-
final ViewGroup parent) {
300-
final View v = super.getView(position, convertView, parent);
301-
final TextView textView = v.findViewById(android.R.id.text1);
302-
303-
// If the PlaylistThumbnail is not set permanently, the unset option is disabled.
304-
if (!isPlaylistThumbnailSet && textView.getText().equals(unsetThumbnail)) {
305-
textView.setEnabled(false);
306-
return v;
307-
}
308-
309-
textView.setEnabled(true);
310-
return v;
311-
}
312-
};
292+
builder.setItems(items.toArray(new String[0]), action).create().show();
313293
}
314294

315295
private void showRenameDialog(final PlaylistMetadataEntry selectedItem) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@
438438
<string name="mute">Mute</string>
439439
<string name="unmute">Unmute</string>
440440
<string name="set_as_playlist_thumbnail">Set as playlist thumbnail</string>
441-
<string name="unset_playlist_thumbnail">Unset thumbnail</string>
441+
<string name="unset_playlist_thumbnail">Unset permanent thumbnail</string>
442442
<string name="bookmark_playlist">Bookmark Playlist</string>
443443
<string name="unbookmark_playlist">Remove Bookmark</string>
444444
<string name="delete_playlist_prompt">Delete this playlist\?</string>

0 commit comments

Comments
 (0)