diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui')
19 files changed, 73 insertions, 76 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java index 85b1d6b1e..79824e1a3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java @@ -1,5 +1,7 @@ package it.niedermann.nextcloud.deck.ui; +import static com.nextcloud.android.sso.AccountImporter.REQUEST_AUTH_TOKEN_SSO; + import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; @@ -35,8 +37,6 @@ import it.niedermann.nextcloud.deck.persistence.sync.SyncWorker; import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment; import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler; -import static com.nextcloud.android.sso.AccountImporter.REQUEST_AUTH_TOKEN_SSO; - public class ImportAccountActivity extends AppCompatActivity { public static final int REQUEST_CODE_IMPORT_ACCOUNT = 1; @@ -115,7 +115,7 @@ public class ImportAccountActivity extends AppCompatActivity { SingleAccountHelper.setCurrentAccount(getApplicationContext(), account.name); SyncManager syncManager = new SyncManager(ImportAccountActivity.this); final Account accountToCreate = new Account(account.name, account.userId, account.url); - syncManager.createAccount(accountToCreate, new IResponseCallback<Account>() { + syncManager.createAccount(accountToCreate, new IResponseCallback<>() { @Override public void onResponse(Account createdAccount) { // Remember last account - THIS HAS TO BE DONE SYNCHRONOUSLY @@ -124,12 +124,12 @@ public class ImportAccountActivity extends AppCompatActivity { editor.putLong(sharedPreferenceLastAccount, createdAccount.getId()); editor.commit(); - syncManager.refreshCapabilities(new ResponseCallback<Capabilities>(createdAccount) { + syncManager.refreshCapabilities(new ResponseCallback<>(createdAccount) { @Override public void onResponse(Capabilities response) { if (!response.isMaintenanceEnabled()) { if (response.getDeckVersion().isSupported()) { - syncManager.synchronize(new ResponseCallback<Boolean>(account) { + syncManager.synchronize(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { restoreWifiPref(); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index ad8f50535..8c1f30f70 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -401,7 +401,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen } }); filterViewModel.hasActiveFilter().observe(this, (hasActiveFilter) -> binding.filterIndicator.setVisibility(hasActiveFilter ? View.VISIBLE : View.GONE)); -// binding.archivedCards.setOnClickListener((v) -> startActivity(ArchivedCardsActvitiy.createIntent(this, mainViewModel.getCurrentAccount(), mainViewModel.getCurrentBoardLocalId(), mainViewModel.currentBoardHasEditPermission()))); +// binding.archivedCards.setOnClickListener((v) -> startActivity(ArchivedCardsActivity.createIntent(this, mainViewModel.getCurrentAccount(), mainViewModel.getCurrentBoardLocalId(), mainViewModel.currentBoardHasEditPermission()))); binding.enableSearch.setOnClickListener((v) -> showFilterTextToolbar()); binding.toolbar.setOnClickListener((v) -> showFilterTextToolbar()); @@ -414,7 +414,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen DeckLog.verbose("Trigger refresh capabilities for", mainViewModel.getCurrentAccount().getName()); refreshCapabilities(mainViewModel.getCurrentAccount(), () -> { DeckLog.verbose("Trigger synchronization for", mainViewModel.getCurrentAccount().getName()); - mainViewModel.synchronize(new ResponseCallback<Boolean>(mainViewModel.getCurrentAccount()) { + mainViewModel.synchronize(new ResponseCallback<>(mainViewModel.getCurrentAccount()) { @Override public void onResponse(Boolean response) { DeckLog.info("End of synchronization for " + mainViewModel.getCurrentAccount().getName() + " → Stop spinner."); @@ -462,7 +462,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen @Override public void onCreateStack(String stackName) { DeckLog.info("Create Stack in account", mainViewModel.getCurrentAccount().getName(), "on board", mainViewModel.getCurrentBoardLocalId()); - mainViewModel.createStack(mainViewModel.getCurrentAccount().getId(), stackName, mainViewModel.getCurrentBoardLocalId(), new IResponseCallback<FullStack>() { + mainViewModel.createStack(mainViewModel.getCurrentAccount().getId(), stackName, mainViewModel.getCurrentBoardLocalId(), new IResponseCallback<>() { @Override public void onResponse(FullStack response) { DeckApplication.saveCurrentStackId(MainActivity.this, mainViewModel.getCurrentAccount().getId(), mainViewModel.getCurrentBoardLocalId(), response.getLocalId()); @@ -504,14 +504,14 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen @Override public void onCreateBoard(String title, @ColorInt int color) { if (boardsLiveData == null || boardsLiveDataObserver == null) { - throw new IllegalStateException("Cannot create board when noone observe boards yet. boardsLiveData or observer is null."); + throw new IllegalStateException("Cannot create board when no one observe boards yet. boardsLiveData or observer is null."); } boardsLiveData.removeObserver(boardsLiveDataObserver); final var boardToCreate = new Board(title, color); boardToCreate.setPermissionEdit(true); boardToCreate.setPermissionManage(true); - mainViewModel.createBoard(mainViewModel.getCurrentAccount().getId(), boardToCreate, new IResponseCallback<FullBoard>() { + mainViewModel.createBoard(mainViewModel.getCurrentAccount().getId(), boardToCreate, new IResponseCallback<>() { @Override public void onResponse(FullBoard response) { runOnUiThread(() -> { @@ -537,7 +537,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen @Override public void onUpdateBoard(FullBoard fullBoard) { - mainViewModel.updateBoard(fullBoard, new IResponseCallback<FullBoard>() { + mainViewModel.updateBoard(fullBoard, new IResponseCallback<>() { @Override public void onResponse(FullBoard response) { DeckLog.info("Successfully updated board", fullBoard.getBoard().getTitle()); @@ -553,7 +553,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen private void refreshCapabilities(final Account account, @Nullable Runnable runAfter) { DeckLog.verbose("Refreshing capabilities for", account.getName()); - mainViewModel.refreshCapabilities(new ResponseCallback<Capabilities>(account) { + mainViewModel.refreshCapabilities(new ResponseCallback<>(account) { @Override public void onResponse(Capabilities response) { DeckLog.verbose("Finished refreshing capabilities for", account.getName(), "successfully."); @@ -743,7 +743,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen : R.string.do_you_want_to_archive_all_cards_of_the_list, stack.getTitle())) .setPositiveButton(R.string.simple_archive, (dialog, whichButton) -> { final FilterInformation filterInformation = filterViewModel.getFilterInformation().getValue(); - mainViewModel.archiveCardsInStack(mainViewModel.getCurrentAccount().getId(), stackLocalId, filterInformation == null ? new FilterInformation() : filterInformation, new IResponseCallback<Void>() { + mainViewModel.archiveCardsInStack(mainViewModel.getCurrentAccount().getId(), stackLocalId, filterInformation == null ? new FilterInformation() : filterInformation, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully archived all cards in stack local id", stackLocalId); @@ -839,7 +839,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen @Override public void onResponse(Account createdAccount) { final var importSyncManager = new SyncManager(MainActivity.this, account.name); - importSyncManager.refreshCapabilities(new ResponseCallback<Capabilities>(createdAccount) { + importSyncManager.refreshCapabilities(new ResponseCallback<>(createdAccount) { @SuppressLint("StringFormatInvalid") @Override public void onResponse(Capabilities response) { @@ -1018,7 +1018,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen DeckLog.logError(e); } binding.viewPager.setCurrentItem(nextStackPosition); - mainViewModel.deleteStack(mainViewModel.getCurrentAccount().getId(), stackLocalId, mainViewModel.getCurrentBoardLocalId(), new IResponseCallback<Void>() { + mainViewModel.deleteStack(mainViewModel.getCurrentAccount().getId(), stackLocalId, mainViewModel.getCurrentBoardLocalId(), new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted stack with local id", stackLocalId, "and remote id", stackLocalId); @@ -1049,7 +1049,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen } } - mainViewModel.deleteBoard(board, new IResponseCallback<Void>() { + mainViewModel.deleteBoard(board, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted board", board.getTitle()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java index 34df713c7..a024f1290 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java @@ -1,5 +1,10 @@ package it.niedermann.nextcloud.deck.ui; +import static androidx.lifecycle.Transformations.switchMap; +import static it.niedermann.nextcloud.deck.DeckApplication.isDarkTheme; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme; +import static it.niedermann.nextcloud.deck.util.DeckColorUtil.contrastRatioIsSufficientBigAreas; + import android.content.res.ColorStateList; import android.graphics.Color; import android.os.Bundle; @@ -33,11 +38,6 @@ import it.niedermann.nextcloud.deck.ui.pickstack.PickStackFragment; import it.niedermann.nextcloud.deck.ui.pickstack.PickStackListener; import it.niedermann.nextcloud.deck.ui.pickstack.PickStackViewModel; -import static androidx.lifecycle.Transformations.switchMap; -import static it.niedermann.nextcloud.deck.DeckApplication.isDarkTheme; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme; -import static it.niedermann.nextcloud.deck.util.DeckColorUtil.contrastRatioIsSufficientBigAreas; - public abstract class PickStackActivity extends AppCompatActivity implements Branded, PickStackListener { private ActivityPickStackBinding binding; @@ -74,7 +74,7 @@ public abstract class PickStackActivity extends AppCompatActivity implements Bra binding.cancel.setOnClickListener((v) -> finish()); binding.submit.setOnClickListener((v) -> { viewModel.setSubmitInProgress(true); - onSubmit(viewModel.getAccount(), viewModel.getBoardLocalId(), viewModel.getStackLocalId(), new IResponseCallback<Void>() { + onSubmit(viewModel.getAccount(), viewModel.getBoardLocalId(), viewModel.getStackLocalId(), new IResponseCallback<>() { @Override public void onResponse(Void response) { runOnUiThread(() -> viewModel.setSubmitInProgress(false)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java index eb9c4cd30..59f01f862 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java @@ -1,5 +1,7 @@ package it.niedermann.nextcloud.deck.ui; +import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce; + import android.content.Intent; import android.net.Uri; import android.text.TextUtils; @@ -22,8 +24,6 @@ import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment; import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler; import it.niedermann.nextcloud.deck.util.ProjectUtil; -import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce; - /** * Warning: Do not move this class to another package or folder! * The integration of the Nextcloud Android app <a href="https://github.com/nextcloud/android/blob/master/src/main/java/com/nextcloud/client/integrations/deck/DeckApiImpl.java#L42">assumes it to be at this location</a>. @@ -88,7 +88,7 @@ public class PushNotificationActivity extends AppCompatActivity { observeOnce(viewModel.getCardByRemoteID(account.getId(), cardRemoteId), PushNotificationActivity.this, (card -> { DeckLog.verbose("Card:", card); if (card != null) { - viewModel.synchronizeCard(new ResponseCallback<Boolean>(account) { + viewModel.synchronizeCard(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { openCardOnSubmit(account, board.getLocalId(), card.getLocalId()); @@ -103,7 +103,7 @@ public class PushNotificationActivity extends AppCompatActivity { } else { DeckLog.info("Card is not yet available locally. Synchronize board with localId", board); - viewModel.synchronizeBoard(new ResponseCallback<Boolean>(account) { + viewModel.synchronizeBoard(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { runOnUiThread(() -> observeOnce(viewModel.getCardByRemoteID(account.getId(), cardRemoteId), PushNotificationActivity.this, (card -> { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java index c824fb37f..083606019 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java @@ -76,7 +76,7 @@ public class ArchivedBoardsActvitiy extends AppCompatActivity implements DeleteB @Override public void onBoardDeleted(Board board) { - viewModel.deleteBoard(board, new IResponseCallback<Void>() { + viewModel.deleteBoard(board, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted board", board.getTitle()); @@ -94,7 +94,7 @@ public class ArchivedBoardsActvitiy extends AppCompatActivity implements DeleteB @Override public void onUpdateBoard(FullBoard fullBoard) { - viewModel.updateBoard(fullBoard, new IResponseCallback<FullBoard>() { + viewModel.updateBoard(fullBoard, new IResponseCallback<>() { @Override public void onResponse(FullBoard response) { DeckLog.info("Successfully updated board", fullBoard.getBoard().getTitle()); @@ -110,7 +110,7 @@ public class ArchivedBoardsActvitiy extends AppCompatActivity implements DeleteB @Override public void onArchive(Board board) { - viewModel.dearchiveBoard(board, new IResponseCallback<FullBoard>() { + viewModel.dearchiveBoard(board, new IResponseCallback<>() { @Override public void onResponse(FullBoard response) { DeckLog.info("Successfully dearchived board", response.getBoard().getTitle()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java index 60ddfd660..45212f287 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java @@ -33,7 +33,7 @@ public class ArchivedCardsAdapter extends CardAdapter { public boolean onCardOptionsItemSelected(@NonNull MenuItem menuItem, @NonNull FullCard fullCard) { int itemId = menuItem.getItemId(); if (itemId == R.id.action_card_dearchive) { - mainViewModel.dearchiveCard(fullCard, new IResponseCallback<FullCard>() { + mainViewModel.dearchiveCard(fullCard, new IResponseCallback<>() { @Override public void onResponse(FullCard response) { DeckLog.info("Successfully dearchived", Card.class.getSimpleName(), fullCard.getCard().getTitle()); @@ -47,7 +47,7 @@ public class ArchivedCardsAdapter extends CardAdapter { }); return true; } else if (itemId == R.id.action_card_delete) { - mainViewModel.deleteCard(fullCard.getCard(), new IResponseCallback<Void>() { + mainViewModel.deleteCard(fullCard.getCard(), new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted card", fullCard.getCard().getTitle()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java index 336e085d7..bfc21b787 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java @@ -42,7 +42,7 @@ public class AttachmentViewHolder extends RecyclerView.ViewHolder { final String uri = AttachmentUtil.getThumbnailUrl(account, cardRemoteId, attachment, binding.preview.getWidth(), binding.preview.getHeight()); Glide.with(parentContext) .load(uri) - .listener(new RequestListener<Drawable>() { + .listener(new RequestListener<>() { @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java index f5d453479..241fa6121 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java @@ -1,5 +1,8 @@ package it.niedermann.nextcloud.deck.ui.board.accesscontrol; +import static it.niedermann.nextcloud.deck.ui.board.accesscontrol.AccessControlAdapter.HEADER_ITEM_LOCAL_ID; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout; + import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -30,9 +33,6 @@ import it.niedermann.nextcloud.deck.ui.branding.BrandedSnackbar; import it.niedermann.nextcloud.deck.ui.card.UserAutoCompleteAdapter; import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment; -import static it.niedermann.nextcloud.deck.ui.board.accesscontrol.AccessControlAdapter.HEADER_ITEM_LOCAL_ID; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout; - public class AccessControlDialogFragment extends DialogFragment implements AccessControlChangedListener, OnItemClickListener { private MainViewModel viewModel; @@ -100,7 +100,7 @@ public class AccessControlDialogFragment extends DialogFragment implements Acces @Override public void updateAccessControl(AccessControl accessControl) { - viewModel.updateAccessControl(accessControl, new IResponseCallback<AccessControl>() { + viewModel.updateAccessControl(accessControl, new IResponseCallback<>() { @Override public void onResponse(AccessControl response) { DeckLog.info("Successfully updated", AccessControl.class.getSimpleName(), "for user", accessControl.getUser().getDisplayname()); @@ -116,7 +116,7 @@ public class AccessControlDialogFragment extends DialogFragment implements Acces @Override public void deleteAccessControl(AccessControl ac) { - viewModel.deleteAccessControl(ac, new IResponseCallback<Void>() { + viewModel.deleteAccessControl(ac, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted access control for user", ac.getUser().getDisplayname()); @@ -144,7 +144,7 @@ public class AccessControlDialogFragment extends DialogFragment implements Acces ac.setType(0L); // https://github.com/nextcloud/deck/blob/master/docs/API.md#post-boardsboardidacl---add-new-acl-rule ac.setUserId(user.getLocalId()); ac.setUser(user); - viewModel.createAccessControl(viewModel.getCurrentAccount().getId(), ac, new IResponseCallback<AccessControl>() { + viewModel.createAccessControl(viewModel.getCurrentAccount().getId(), ac, new IResponseCallback<>() { @Override public void onResponse(AccessControl response) { DeckLog.info("Successfully created", AccessControl.class.getSimpleName(), "for user", user.getDisplayname()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java index 4a81dd04c..8f778c749 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java @@ -1,5 +1,8 @@ package it.niedermann.nextcloud.deck.ui.board.managelabels; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToFAB; + import android.app.Dialog; import android.content.Context; import android.database.sqlite.SQLiteConstraintException; @@ -26,9 +29,6 @@ import it.niedermann.nextcloud.deck.ui.MainViewModel; import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment; import it.niedermann.nextcloud.deck.ui.branding.DeleteAlertDialogBuilder; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToFAB; - public class ManageLabelsDialogFragment extends BrandedDialogFragment implements ManageLabelListener, EditLabelListener { private MainViewModel viewModel; @@ -81,7 +81,7 @@ public class ManageLabelsDialogFragment extends BrandedDialogFragment implements label.setTitle(binding.addLabelTitle.getText().toString()); label.setColor(colors[new Random().nextInt(colors.length)]); - viewModel.createLabel(viewModel.getCurrentAccount().getId(), label, boardId, new IResponseCallback<Label>() { + viewModel.createLabel(viewModel.getCurrentAccount().getId(), label, boardId, new IResponseCallback<>() { @Override public void onResponse(Label response) { requireActivity().runOnUiThread(() -> { @@ -144,7 +144,7 @@ public class ManageLabelsDialogFragment extends BrandedDialogFragment implements } private void deleteLabel(@NonNull Label label) { - viewModel.deleteLabel(label, new IResponseCallback<Void>() { + viewModel.deleteLabel(label, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted label", label.getTitle()); @@ -167,7 +167,7 @@ public class ManageLabelsDialogFragment extends BrandedDialogFragment implements @Override public void onLabelUpdated(@NonNull Label label) { - viewModel.updateLabel(label, new IResponseCallback<Label>() { + viewModel.updateLabel(label, new IResponseCallback<>() { @Override public void onResponse(Label label) { DeckLog.info("Successfully update label", label.getTitle()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java index ecbc3f4ce..1c0567793 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java @@ -223,7 +223,7 @@ public class CardAdapter extends RecyclerView.Adapter<AbstractCardViewHolder> im .show(fragmentManager, MoveCardDialogFragment.class.getSimpleName()); return true; } else if (itemId == R.id.action_card_archive) { - mainViewModel.archiveCard(fullCard, new IResponseCallback<FullCard>() { + mainViewModel.archiveCard(fullCard, new IResponseCallback<>() { @Override public void onResponse(FullCard response) { DeckLog.info("Successfully archived", Card.class.getSimpleName(), fullCard.getCard().getTitle()); @@ -237,7 +237,7 @@ public class CardAdapter extends RecyclerView.Adapter<AbstractCardViewHolder> im }); return true; } else if (itemId == R.id.action_card_delete) { - mainViewModel.deleteCard(fullCard.getCard(), new IResponseCallback<Void>() { + mainViewModel.deleteCard(fullCard.getCard(), new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted card", fullCard.getCard().getTitle()); 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 534e296e5..8ddb0add9 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 @@ -461,7 +461,7 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet a.setStatusEnum(DBStatus.LOCAL_EDITED); editViewModel.getFullCard().getAttachments().add(0, a); adapter.addAttachment(a); - editViewModel.addAttachmentToCard(editViewModel.getAccount().getId(), editViewModel.getFullCard().getLocalId(), a.getMimetype(), fileToUpload, new IResponseCallback<Attachment>() { + editViewModel.addAttachmentToCard(editViewModel.getAccount().getId(), editViewModel.getFullCard().getLocalId(), a.getMimetype(), fileToUpload, new IResponseCallback<>() { @Override public void onResponse(Attachment response) { requireActivity().runOnUiThread(() -> { @@ -525,7 +525,7 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet adapter.removeAttachment(attachment); editViewModel.getFullCard().getAttachments().remove(attachment); if (attachment.getLocalId() != null) { - editViewModel.deleteAttachmentOfCard(editViewModel.getAccount().getId(), editViewModel.getFullCard().getLocalId(), attachment.getLocalId(), new IResponseCallback<Void>() { + editViewModel.deleteAttachmentOfCard(editViewModel.getAccount().getId(), editViewModel.getFullCard().getLocalId(), attachment.getLocalId(), new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully delete", Attachment.class.getSimpleName(), attachment.getFilename(), "from", Card.class.getSimpleName(), editViewModel.getFullCard().getCard().getTitle()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java index f0e54a18b..08ef5cdf1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java @@ -1,5 +1,10 @@ package it.niedermann.nextcloud.deck.ui.card.comments; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToFAB; + import android.os.Bundle; import android.text.TextUtils; import android.view.KeyEvent; @@ -30,11 +35,6 @@ import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel; import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment; import it.niedermann.nextcloud.deck.util.ViewUtil; -import static android.view.View.GONE; -import static android.view.View.VISIBLE; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToFAB; - public class CardCommentsFragment extends Fragment implements CommentEditedListener, CommentDeletedListener, CommentSelectAsReplyListener { private FragmentCardEditTabCommentsBinding binding; @@ -141,7 +141,7 @@ public class CardCommentsFragment extends Fragment implements CommentEditedListe @Override public void onCommentDeleted(Long localId) { - commentsViewModel.deleteComment(mainViewModel.getAccount().getId(), mainViewModel.getFullCard().getLocalId(), localId, new IResponseCallback<Void>() { + commentsViewModel.deleteComment(mainViewModel.getAccount().getId(), mainViewModel.getFullCard().getLocalId(), localId, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted comment with localId", localId); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java index a4e4fac72..11b565cb3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java @@ -228,7 +228,7 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, newLabel.setBoardId(boardId); newLabel.setTitle(((LabelAutoCompleteAdapter) binding.labels.getAdapter()).getLastFilterText()); newLabel.setLocalId(null); - viewModel.createLabel(accountId, newLabel, boardId, new IResponseCallback<Label>() { + viewModel.createLabel(accountId, newLabel, boardId, new IResponseCallback<>() { @Override public void onResponse(Label response) { requireActivity().runOnUiThread(() -> { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java index ab41e71b5..35454d496 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java @@ -165,19 +165,16 @@ public class PickStackFragment extends Fragment { } }); - binding.accountSelect.setOnItemSelectedListener((SelectedListener) (parent, view, position, id) -> { - updateLiveDataSource(boardsLiveData, boardsObserver, showBoardsWithoutEditPermission - ? viewModel.getBoards(parent.getSelectedItemId()) - : viewModel.getBoardsWithEditPermission(parent.getSelectedItemId())); - }); + binding.accountSelect.setOnItemSelectedListener((SelectedListener) (parent, view, position, id) -> + updateLiveDataSource(boardsLiveData, boardsObserver, showBoardsWithoutEditPermission + ? viewModel.getBoards(parent.getSelectedItemId()) + : viewModel.getBoardsWithEditPermission(parent.getSelectedItemId()))); - binding.boardSelect.setOnItemSelectedListener((SelectedListener) (parent, view, position, id) -> { - updateLiveDataSource(stacksLiveData, stacksObserver, viewModel.getStacksForBoard(binding.accountSelect.getSelectedItemId(), parent.getSelectedItemId())); - }); + binding.boardSelect.setOnItemSelectedListener((SelectedListener) (parent, view, position, id) -> + updateLiveDataSource(stacksLiveData, stacksObserver, viewModel.getStacksForBoard(binding.accountSelect.getSelectedItemId(), parent.getSelectedItemId()))); - binding.stackSelect.setOnItemSelectedListener((SelectedListener) (parent, view, position, id) -> { - pickStackListener.onStackPicked((Account) binding.accountSelect.getSelectedItem(), (Board) binding.boardSelect.getSelectedItem(), (Stack) parent.getSelectedItem()); - }); + binding.stackSelect.setOnItemSelectedListener((SelectedListener) (parent, view, position, id) -> + pickStackListener.onStackPicked((Account) binding.accountSelect.getSelectedItem(), (Board) binding.boardSelect.getSelectedItem(), (Stack) parent.getSelectedItem())); return binding.getRoot(); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java index 0557001b7..5e316593f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java @@ -55,7 +55,7 @@ public class PrepareCreateActivity extends PickStackActivity { ); } - viewModel.saveCard(account.getId(), boardId, stackId, fullCard, new IResponseCallback<FullCard>() { + viewModel.saveCard(account.getId(), boardId, stackId, fullCard, new IResponseCallback<>() { @Override public void onResponse(FullCard response) { saveCurrentAccount(PrepareCreateActivity.this, account); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java index 450450fe6..2c67556a9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java @@ -123,7 +123,7 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe if (mimeType == null) { throw new IllegalArgumentException("MimeType of uri is null. [" + uri + "]"); } - mainViewModel.addAttachmentToCard(fullCard.getAccountId(), fullCard.getCard().getLocalId(), mimeType, tempFile, new IResponseCallback<Attachment>() { + mainViewModel.addAttachmentToCard(fullCard.getAccountId(), fullCard.getCard().getLocalId(), mimeType, tempFile, new IResponseCallback<>() { @Override public void onResponse(Attachment response) { runOnUiThread(shareProgressViewModel::increaseProgress); @@ -162,7 +162,7 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe ? receivedText : oldDescription + "\n\n" + receivedText ); - mainViewModel.updateCard(fullCard, new IResponseCallback<FullCard>() { + mainViewModel.updateCard(fullCard, new IResponseCallback<>() { @Override public void onResponse(FullCard response) { Toast.makeText(getApplicationContext(), getString(R.string.share_success, "\"" + receivedText + "\"", "\"" + fullCard.getCard().getTitle() + "\""), Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java index 93ebd0093..61f58a9d4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java @@ -159,7 +159,7 @@ public class StackFragment extends Fragment implements DragAndDropTab<CardAdapte @Override public void move(long originAccountId, long originCardLocalId, long targetAccountId, long targetBoardLocalId, long targetStackLocalId) { - mainViewModel.moveCard(originAccountId, originCardLocalId, targetAccountId, targetBoardLocalId, targetStackLocalId, new IResponseCallback<Void>() { + mainViewModel.moveCard(originAccountId, originCardLocalId, targetAccountId, targetBoardLocalId, targetStackLocalId, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.log("Moved", Card.class.getSimpleName(), originCardLocalId, "to", Stack.class.getSimpleName(), targetStackLocalId); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java index e5f9297fd..9bfa165c4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java @@ -42,7 +42,7 @@ public class UpcomingCardsActivity extends AppCompatActivity implements MoveCard final var adapter = new UpcomingCardsAdapter(this, getSupportFragmentManager(), viewModel::assignUser, viewModel::unassignUser, - (fullCard) -> viewModel.archiveCard(fullCard, new IResponseCallback<FullCard>() { + (fullCard) -> viewModel.archiveCard(fullCard, new IResponseCallback<>() { @Override public void onResponse(FullCard response) { DeckLog.info("Successfully archived", Card.class.getSimpleName(), fullCard.getCard().getTitle()); @@ -54,7 +54,7 @@ public class UpcomingCardsActivity extends AppCompatActivity implements MoveCard runOnUiThread(() -> ExceptionDialogFragment.newInstance(throwable, null).show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName())); } }), - (card) -> viewModel.deleteCard(card, new IResponseCallback<Void>() { + (card) -> viewModel.deleteCard(card, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.info("Successfully deleted card", card.getTitle()); @@ -91,7 +91,7 @@ public class UpcomingCardsActivity extends AppCompatActivity implements MoveCard @Override public void move(long originAccountId, long originCardLocalId, long targetAccountId, long targetBoardLocalId, long targetStackLocalId) { - viewModel.moveCard(originAccountId, originCardLocalId, targetAccountId, targetBoardLocalId, targetStackLocalId, new IResponseCallback<Void>() { + viewModel.moveCard(originAccountId, originCardLocalId, targetAccountId, targetBoardLocalId, targetStackLocalId, new IResponseCallback<>() { @Override public void onResponse(Void response) { DeckLog.log("Moved", Card.class.getSimpleName(), originCardLocalId, "to", Stack.class.getSimpleName(), targetStackLocalId); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java index 42c7989dd..cfb22bccd 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java @@ -1,5 +1,7 @@ package it.niedermann.nextcloud.deck.ui.widget.upcoming; +import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE; + import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -30,8 +32,6 @@ import it.niedermann.nextcloud.deck.model.widget.filter.FilterWidgetUser; import it.niedermann.nextcloud.deck.persistence.sync.SyncManager; import it.niedermann.nextcloud.deck.ui.card.EditActivity; -import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE; - public class UpcomingWidget extends AppWidgetProvider { private static final String PENDING_INTENT_ACTION_EDIT = "edit"; private static final String PENDING_INTENT_ACTION_OPEN = "open"; @@ -58,7 +58,7 @@ public class UpcomingWidget extends AppWidgetProvider { fwa.setUsers(new FilterWidgetUser(syncManager.getUserByUidDirectly(account.getId(), account.getUserName()).getLocalId())); return fwa; }).collect(Collectors.toList())); - syncManager.createFilterWidget(config, new IResponseCallback<Integer>() { + syncManager.createFilterWidget(config, new IResponseCallback<>() { @Override public void onResponse(Integer response) { DeckLog.verbose("Successfully created", UpcomingWidget.class.getSimpleName(), "with id", appWidgetId); |