diff options
author | Stefan Niedermann <info@niedermann.it> | 2024-01-22 16:41:01 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2024-01-22 16:41:01 +0300 |
commit | dd6e766eed7b3a0fe4b7a2d0fc770858301c7c3c (patch) | |
tree | 3fdf21218a1e77a71ab251bd2eafc7d5483fcca9 | |
parent | 432ad54c355d05db87f872654264303663b07b61 (diff) |
chore(lint): Use enhanced switch
Signed-off-by: Stefan Niedermann <info@niedermann.it>
15 files changed, 138 insertions, 236 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java b/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java index 1fc69c3b2..94f5e44c8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java @@ -87,24 +87,12 @@ public class DeckLog { .append("\n"); } switch (severity) { - case DEBUG: - Log.d(TAG, print); - break; - case INFO: - Log.i(TAG, print); - break; - case WARN: - Log.w(TAG, print); - break; - case ERROR: - Log.e(TAG, print); - break; - case WTF: - Log.wtf(TAG, print); - break; - default: - Log.v(TAG, print); - break; + case DEBUG -> Log.d(TAG, print); + case INFO -> Log.i(TAG, print); + case WARN -> Log.w(TAG, print); + case ERROR -> Log.e(TAG, print); + case WTF -> Log.wtf(TAG, print); + default -> Log.v(TAG, print); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java index a95ab7a8c..0775c5d36 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/database/DataBaseAdapter.java @@ -351,36 +351,26 @@ public class DataBaseAdapter { if (filter.getDueType() != EDueType.NO_FILTER) { switch (filter.getDueType()) { - case NO_DUE: - query.append("and c.dueDate is null "); - break; - case OVERDUE: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') <= datetime('now', 'localtime') "); - break; - case TODAY: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+24 hour', 'localtime') "); - break; - case WEEK: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+7 day', 'localtime') "); - break; - case MONTH: - query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+30 day', 'localtime') "); - break; - default: - throw new IllegalArgumentException("You need to add your new " + EDueType.class.getSimpleName() + " value\"" + filter.getDueType() + "\" here!"); + case NO_DUE -> query.append("and c.dueDate is null "); + case OVERDUE -> + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') <= datetime('now', 'localtime') "); + case TODAY -> + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+24 hour', 'localtime') "); + case WEEK -> + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+7 day', 'localtime') "); + case MONTH -> + query.append("and datetime(c.duedate/1000, 'unixepoch', 'localtime') between datetime('now', 'localtime') and datetime('now', '+30 day', 'localtime') "); + default -> + throw new IllegalArgumentException("You need to add your new " + EDueType.class.getSimpleName() + " value\"" + filter.getDueType() + "\" here!"); } } if (filter.getDoneType() != EDoneType.NO_FILTER) { switch (filter.getDoneType()) { - case DONE: - query.append("and (c.done is not null and c.done != 0) "); - break; - case UNDONE: - query.append("and (c.done is null or c.done = 0) "); - break; - default: - throw new IllegalArgumentException("You need to add your new " + EDoneType.class.getSimpleName() + " value\"" + filter.getDueType() + "\" here!"); + case DONE -> query.append("and (c.done is not null and c.done != 0) "); + case UNDONE -> query.append("and (c.done is null or c.done = 0) "); + default -> + throw new IllegalArgumentException("You need to add your new " + EDoneType.class.getSimpleName() + " value\"" + filter.getDueType() + "\" here!"); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java index 67552b2d7..db099aeb6 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java @@ -82,16 +82,12 @@ public class AboutActivity extends AppCompatActivity implements Themed { @NonNull @Override public Fragment createFragment(int position) { - switch (position) { - case 0: - return AboutFragmentCreditsTab.newInstance(account); - case 1: - return new AboutFragmentContributingTab(); - case 2: - return AboutFragmentLicenseTab.newInstance(account); - default: - throw new IllegalArgumentException("position must be between 0 and 2"); - } + return switch (position) { + case 0 -> AboutFragmentCreditsTab.newInstance(account); + case 1 -> new AboutFragmentContributingTab(); + case 2 -> AboutFragmentLicenseTab.newInstance(account); + default -> throw new IllegalArgumentException("position must be between 0 and 2"); + }; } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java index 89462c997..cd9c0cc44 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java @@ -56,16 +56,11 @@ public class CardTabAdapter extends FragmentStateAdapter { if (!this.hasCommentsAbility) { return position; } else { - switch (position) { - case 0: - case 1: - return position; - case 2: // Comments tab is on position 2 - return 3; - case 3: // Activities tab moved to position 3 - default: - return 2; - } + return switch (position) { + case 0, 1 -> position; + case 2 -> 3; // Comments tab is on position 2, Activities tab moved to position 3 + default -> 2; + }; } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardDialog.java index b6ce18f13..8aa5984d0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardDialog.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardDialog.java @@ -142,14 +142,11 @@ public class NewCardDialog extends ThemedDialogFragment implements DialogInterfa public void onClick(DialogInterface dialog, int which) { final boolean openOnSuccess; switch (which) { - case DialogInterface.BUTTON_POSITIVE: - openOnSuccess = false; - break; - case DialogInterface.BUTTON_NEGATIVE: - openOnSuccess = true; - break; - default: + case DialogInterface.BUTTON_POSITIVE -> openOnSuccess = false; + case DialogInterface.BUTTON_NEGATIVE -> openOnSuccess = true; + default -> { return; + } } if (Boolean.FALSE.equals(isPending.getValue())) { isPending.setValue(true); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java index fd1cf6115..677c68e9b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java @@ -41,48 +41,26 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder { private static void setImageResource(@NonNull ImageView imageView, @NonNull ActivityType type) { switch (type) { - case CHANGE: - imageView.setImageResource(R.drawable.type_change_36dp); - break; - case ADD: - imageView.setImageResource(R.drawable.type_add_color_36dp); - break; - case DELETE: - imageView.setImageResource(R.drawable.type_delete_color_36dp); - break; - case ARCHIVE: - imageView.setImageResource(R.drawable.type_archive_grey600_36dp); - break; - case TAGGED_WITH_LABEL: - imageView.setImageResource(R.drawable.type_label_grey600_36dp); - break; - case COMMENT: - imageView.setImageResource(R.drawable.type_comment_grey600_36dp); - break; - case FILES: - imageView.setImageResource(R.drawable.type_file_36dp); - break; - case HISTORY: - imageView.setImageResource(R.drawable.type_history_36dp); - break; - case DECK: - default: - imageView.setImageResource(R.drawable.ic_app_logo); - break; + case CHANGE -> imageView.setImageResource(R.drawable.type_change_36dp); + case ADD -> imageView.setImageResource(R.drawable.type_add_color_36dp); + case DELETE -> imageView.setImageResource(R.drawable.type_delete_color_36dp); + case ARCHIVE -> imageView.setImageResource(R.drawable.type_archive_grey600_36dp); + case TAGGED_WITH_LABEL -> + imageView.setImageResource(R.drawable.type_label_grey600_36dp); + case COMMENT -> imageView.setImageResource(R.drawable.type_comment_grey600_36dp); + case FILES -> imageView.setImageResource(R.drawable.type_file_36dp); + case HISTORY -> imageView.setImageResource(R.drawable.type_history_36dp); + default -> imageView.setImageResource(R.drawable.ic_app_logo); } } private static void setImageColor(@NonNull Context context, @NonNull ImageView imageView, @NonNull ActivityType type) { switch (type) { - case ADD: - DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_create); - break; - case DELETE: - DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_delete); - break; - default: - DeckViewThemeUtils.setImageColor(context, imageView, R.color.grey600); - break; + case ADD -> + DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_create); + case DELETE -> + DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_delete); + default -> DeckViewThemeUtils.setImageColor(context, imageView, R.color.grey600); } } }
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentAdapter.java index 3a1ebff15..f371bc350 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentAdapter.java @@ -80,13 +80,12 @@ public class CardAttachmentAdapter extends RecyclerView.Adapter<AttachmentViewHo @Override public AttachmentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { final var context = parent.getContext(); - switch (viewType) { - case VIEW_TYPE_IMAGE: - return new ImageAttachmentViewHolder(ItemAttachmentImageBinding.inflate(LayoutInflater.from(context), parent, false)); - case VIEW_TYPE_DEFAULT: - default: - return new DefaultAttachmentViewHolder(ItemAttachmentDefaultBinding.inflate(LayoutInflater.from(context), parent, false)); - } + return switch (viewType) { + case VIEW_TYPE_IMAGE -> + new ImageAttachmentViewHolder(ItemAttachmentImageBinding.inflate(LayoutInflater.from(context), parent, false)); + default -> + new DefaultAttachmentViewHolder(ItemAttachmentDefaultBinding.inflate(LayoutInflater.from(context), parent, false)); + }; } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java index 4de403ba7..42906d499 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java @@ -14,7 +14,6 @@ import static androidx.core.content.PermissionChecker.checkSelfPermission; import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED; import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN; import static java.net.HttpURLConnection.HTTP_CONFLICT; -import static it.niedermann.nextcloud.deck.ui.card.attachments.CardAttachmentAdapter.VIEW_TYPE_DEFAULT; import static it.niedermann.nextcloud.deck.ui.card.attachments.CardAttachmentAdapter.VIEW_TYPE_IMAGE; import static it.niedermann.nextcloud.deck.util.FilesUtil.copyContentUriToTempFile; @@ -177,13 +176,10 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet glm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { @Override public int getSpanSize(int position) { - switch (adapter.getItemViewType(position)) { - case VIEW_TYPE_IMAGE: - return 1; - case VIEW_TYPE_DEFAULT: - default: - return spanCount; - } + return switch (adapter.getItemViewType(position)) { + case VIEW_TYPE_IMAGE -> 1; + default -> spanCount; + }; } }); binding.attachmentsList.setLayoutManager(glm); @@ -347,9 +343,7 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); switch (requestCode) { - case REQUEST_CODE_PICK_CONTACT: - case REQUEST_CODE_PICK_CAMERA: - case REQUEST_CODE_PICK_FILE: { + case REQUEST_CODE_PICK_CONTACT, REQUEST_CODE_PICK_CAMERA, REQUEST_CODE_PICK_FILE -> { if (resultCode == RESULT_OK) { final Uri sourceUri = requestCode == REQUEST_CODE_PICK_CONTACT ? VCardUtil.getVCardContentUri(requireContext(), Uri.parse(data.getDataString())) : data.getData(); try { @@ -359,9 +353,8 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet ExceptionDialogFragment.newInstance(e, editViewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName()); } } - break; } - default: { + default -> { super.onActivityResult(requestCode, resultCode, data); } } @@ -382,8 +375,7 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet throw new UploadAttachmentFailedException("sourceUri is null"); } switch (sourceUri.getScheme()) { - case ContentResolver.SCHEME_CONTENT: - case ContentResolver.SCHEME_FILE: { + case ContentResolver.SCHEME_CONTENT, ContentResolver.SCHEME_FILE -> { DeckLog.verbose("--- found content URL", sourceUri.getPath()); // Separate Thread required because picked file might not yet be locally available // https://github.com/stefan-niedermann/nextcloud-deck/issues/814 @@ -406,9 +398,8 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet requireActivity().runOnUiThread(() -> ExceptionDialogFragment.newInstance(e, editViewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName())); } }); - break; } - default: { + default -> { throw new UploadAttachmentFailedException("Unknown URI scheme: " + sourceUri.getScheme()); } } 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(() -> { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java index 5dc89e46d..9ebe14ad1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java @@ -99,10 +99,8 @@ public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> { } else if (throwable instanceof NextcloudHttpRequestFailedException) { int statusCode = ((NextcloudHttpRequestFailedException) throwable).getStatusCode(); switch (statusCode) { - case 302: - add(R.string.error_dialog_redirect); - break; - case 500: + case 302 -> add(R.string.error_dialog_redirect); + case 500 -> { if (account != null) { add(R.string.error_dialog_check_server_logs, new Intent(Intent.ACTION_VIEW) .putExtra(INTENT_EXTRA_BUTTON_TEXT, R.string.error_action_server_logs) @@ -110,13 +108,9 @@ public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> { } else { add(R.string.error_dialog_check_server_logs); } - break; - case 503: - add(R.string.error_dialog_check_maintenance); - break; - case 507: - add(R.string.error_dialog_insufficient_storage); - break; + } + case 503 -> add(R.string.error_dialog_check_maintenance); + case 507 -> add(R.string.error_dialog_insufficient_storage); } } else if (throwable instanceof UploadAttachmentFailedException) { add(R.string.error_dialog_attachment_upload_failed); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java index fc722226a..d3b39caff 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java @@ -58,20 +58,16 @@ public class FilterDialogFragment extends ThemedDialogFragment { new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> { filterInformationDraft.observe(this, (draft) -> { switch (position) { - case 0: - tab.setIcon(draft.getLabels().size() > 0 || draft.isNoAssignedLabel() ? indicator : null); - break; - case 1: - tab.setIcon(draft.getUsers().size() > 0 || draft.isNoAssignedUser() ? indicator : null); - break; - case 2: - tab.setIcon(draft.getDoneType() != EDoneType.NO_FILTER ? indicator : null); - break; - case 3: - tab.setIcon(draft.getDueType() != EDueType.NO_FILTER ? indicator : null); - break; - default: - throw new IllegalStateException("position must be between 0 and 2 but was " + position); + case 0 -> + tab.setIcon(draft.getLabels().size() > 0 || draft.isNoAssignedLabel() ? indicator : null); + case 1 -> + tab.setIcon(draft.getUsers().size() > 0 || draft.isNoAssignedUser() ? indicator : null); + case 2 -> + tab.setIcon(draft.getDoneType() != EDoneType.NO_FILTER ? indicator : null); + case 3 -> + tab.setIcon(draft.getDueType() != EDueType.NO_FILTER ? indicator : null); + default -> + throw new IllegalStateException("position must be between 0 and 2 but was " + position); } }); tab.setText(tabTitles[position]); @@ -123,18 +119,14 @@ public class FilterDialogFragment extends ThemedDialogFragment { @NonNull @Override public Fragment createFragment(int position) { - switch (position) { - case 0: - return new FilterLabelsFragment(); - case 1: - return new FilterUserFragment(); - case 2: - return new FilterDoneTypeFragment(); - case 3: - return new FilterDueTypeFragment(); - default: - throw new IllegalArgumentException("position must be between 0 and 2 but was " + position); - } + return switch (position) { + case 0 -> new FilterLabelsFragment(); + case 1 -> new FilterUserFragment(); + case 2 -> new FilterDoneTypeFragment(); + case 3 -> new FilterDueTypeFragment(); + default -> + throw new IllegalArgumentException("position must be between 0 and 2 but was " + position); + }; } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivityNavigationHandler.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivityNavigationHandler.java index 88425e846..eaa39ff82 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivityNavigationHandler.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivityNavigationHandler.java @@ -71,24 +71,17 @@ public class MainActivityNavigationHandler implements NavigationView.OnNavigatio } switch (item.getItemId()) { - case MENU_ID_ABOUT: - activity.startActivity(AboutActivity.createIntent(activity, account)); - break; - case MENU_ID_SETTINGS: - settingsLauncher.launch(SettingsActivity.createIntent(activity, account)); - break; - case MENU_ID_ADD_BOARD: - EditBoardDialogFragment.newInstance(account).show(activity.getSupportFragmentManager(), EditBoardDialogFragment.class.getSimpleName()); - break; - case MENU_ID_ARCHIVED_BOARDS: - activity.startActivity(ArchivedBoardsActivity.createIntent(activity, account)); - break; - case MENU_ID_UPCOMING_CARDS: - activity.startActivity(UpcomingCardsActivity.createIntent(activity, account)); - break; - default: - onBoardSelected.accept(account.getId(), navigationMap.get(item.getItemId())); - break; + case MENU_ID_ABOUT -> + activity.startActivity(AboutActivity.createIntent(activity, account)); + case MENU_ID_SETTINGS -> + settingsLauncher.launch(SettingsActivity.createIntent(activity, account)); + case MENU_ID_ADD_BOARD -> + EditBoardDialogFragment.newInstance(account).show(activity.getSupportFragmentManager(), EditBoardDialogFragment.class.getSimpleName()); + case MENU_ID_ARCHIVED_BOARDS -> + activity.startActivity(ArchivedBoardsActivity.createIntent(activity, account)); + case MENU_ID_UPCOMING_CARDS -> + activity.startActivity(UpcomingCardsActivity.createIntent(activity, account)); + default -> onBoardSelected.accept(account.getId(), navigationMap.get(item.getItemId())); } drawerLayout.closeDrawer(GravityCompat.START); |