diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker')
4 files changed, 39 insertions, 50 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java index ab05e1c2e..8d0e909c7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/AbstractCursorPickerAdapter.java @@ -74,12 +74,11 @@ public abstract class AbstractCursorPickerAdapter<T extends RecyclerView.ViewHol public long getItemId(int position) { if (!cursor.isClosed() && cursor.moveToPosition(position - 1)) { //noinspection SwitchStatementWithTooFewBranches - switch (columnIndexType) { - case FIELD_TYPE_INTEGER: - return cursor.getLong(columnIndex); - default: - throw new IllegalStateException("Unknown type for columnIndex \"" + columnIndex + "\": " + columnIndexType); - } + return switch (columnIndexType) { + case FIELD_TYPE_INTEGER -> cursor.getLong(columnIndex); + default -> + throw new IllegalStateException("Unknown type for columnIndex \"" + columnIndex + "\": " + columnIndexType); + }; } else { return NO_ID; } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactAdapter.java index 930ab76ab..daf82a88b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactAdapter.java @@ -46,14 +46,13 @@ public class ContactAdapter extends AbstractCursorPickerAdapter<RecyclerView.Vie @NonNull @Override public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - switch (viewType) { - case VIEW_TYPE_ITEM_NATIVE: - return new ContactNativeItemViewHolder(ItemPickerNativeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - case VIEW_TYPE_ITEM: - return new ContactItemViewHolder(ItemPickerUserBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - default: - throw new IllegalStateException("Unknown viewType " + viewType); - } + return switch (viewType) { + case VIEW_TYPE_ITEM_NATIVE -> + new ContactNativeItemViewHolder(ItemPickerNativeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + case VIEW_TYPE_ITEM -> + new ContactItemViewHolder(ItemPickerUserBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + default -> throw new IllegalStateException("Unknown viewType " + viewType); + }; } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileAdapter.java index 1ada444b4..853c744a9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileAdapter.java @@ -1,5 +1,14 @@ package it.niedermann.nextcloud.deck.ui.card.attachments.picker; +import static android.provider.BaseColumns._ID; +import static android.provider.MediaStore.Files.FileColumns.DATE_ADDED; +import static android.provider.MediaStore.Files.FileColumns.DATE_MODIFIED; +import static android.provider.MediaStore.Files.FileColumns.MEDIA_TYPE; +import static android.provider.MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE; +import static android.provider.MediaStore.Files.FileColumns.MIME_TYPE; +import static android.provider.MediaStore.Files.FileColumns.SIZE; +import static android.provider.MediaStore.Files.FileColumns.TITLE; + import android.content.ContentUris; import android.content.Context; import android.net.Uri; @@ -20,15 +29,6 @@ import java.util.function.BiConsumer; import it.niedermann.nextcloud.deck.databinding.ItemAttachmentDefaultBinding; import it.niedermann.nextcloud.deck.databinding.ItemPickerNativeBinding; -import static android.provider.BaseColumns._ID; -import static android.provider.MediaStore.Files.FileColumns.DATE_ADDED; -import static android.provider.MediaStore.Files.FileColumns.DATE_MODIFIED; -import static android.provider.MediaStore.Files.FileColumns.MEDIA_TYPE; -import static android.provider.MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE; -import static android.provider.MediaStore.Files.FileColumns.MIME_TYPE; -import static android.provider.MediaStore.Files.FileColumns.SIZE; -import static android.provider.MediaStore.Files.FileColumns.TITLE; - public class FileAdapter extends AbstractCursorPickerAdapter<RecyclerView.ViewHolder> { private final int displayNameColumnIndex; @@ -48,24 +48,20 @@ public class FileAdapter extends AbstractCursorPickerAdapter<RecyclerView.ViewHo @NonNull @Override public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - switch (viewType) { - case VIEW_TYPE_ITEM_NATIVE: - return new FileNativeItemViewHolder(ItemPickerNativeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - case VIEW_TYPE_ITEM: - return new FileItemViewHolder(ItemAttachmentDefaultBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - default: - throw new IllegalStateException("Unknown viewType " + viewType); - } + return switch (viewType) { + case VIEW_TYPE_ITEM_NATIVE -> + new FileNativeItemViewHolder(ItemPickerNativeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + case VIEW_TYPE_ITEM -> + new FileItemViewHolder(ItemAttachmentDefaultBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + default -> throw new IllegalStateException("Unknown viewType " + viewType); + }; } @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { switch (getItemViewType(position)) { - case VIEW_TYPE_ITEM_NATIVE: { - ((FileNativeItemViewHolder) holder).bind(openNativePicker); - break; - } - case VIEW_TYPE_ITEM: { + case VIEW_TYPE_ITEM_NATIVE -> ((FileNativeItemViewHolder) holder).bind(openNativePicker); + case VIEW_TYPE_ITEM -> { if (!cursor.isClosed()) { bindExecutor.execute(() -> { final long id = getItemId(position); @@ -76,7 +72,6 @@ public class FileAdapter extends AbstractCursorPickerAdapter<RecyclerView.ViewHo new Handler(Looper.getMainLooper()).post(() -> ((FileItemViewHolder) holder).bind(ContentUris.withAppendedId(MediaStore.Files.getContentUri("external"), id), name, mimeType, size, modified, onSelect)); }); } - break; } } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryAdapter.java index 5407be884..bac7f3a02 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryAdapter.java @@ -50,25 +50,21 @@ public class GalleryAdapter extends AbstractCursorPickerAdapter<RecyclerView.Vie @NonNull @Override public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - switch (viewType) { - case VIEW_TYPE_ITEM_NATIVE: - return new GalleryPhotoPreviewItemViewHolder(ItemPhotoPreviewBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - case VIEW_TYPE_ITEM: - return new GalleryItemViewHolder(ItemAttachmentImageBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - default: - throw new IllegalStateException("Unknown viewType " + viewType); - } + return switch (viewType) { + case VIEW_TYPE_ITEM_NATIVE -> + new GalleryPhotoPreviewItemViewHolder(ItemPhotoPreviewBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + case VIEW_TYPE_ITEM -> + new GalleryItemViewHolder(ItemAttachmentImageBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + default -> throw new IllegalStateException("Unknown viewType " + viewType); + }; } @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { switch (getItemViewType(position)) { - case VIEW_TYPE_ITEM_NATIVE: { - ((GalleryPhotoPreviewItemViewHolder) holder).bind(openNativePicker, lifecycleOwner); - break; - } - case VIEW_TYPE_ITEM: { + case VIEW_TYPE_ITEM_NATIVE -> ((GalleryPhotoPreviewItemViewHolder) holder).bind(openNativePicker, lifecycleOwner); + case VIEW_TYPE_ITEM -> { final long id = getItemId(position); if (!bindExecutor.isTerminated()) { bindExecutor.execute(() -> { |