From c80b3bf036a0ce0699291868bf3aa2100d62383d Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 9 Mar 2023 10:19:32 +0100 Subject: refactor: Move packages to clarify architecture https://developer.android.com/topic/architecture Signed-off-by: Stefan Niedermann --- .../nextcloud/deck/ui/card/comments/CardCommentsFragment.java | 6 +++--- .../deck/ui/card/comments/CardCommentsMentionProposer.java | 2 +- .../nextcloud/deck/ui/card/comments/CommentsViewModel.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments') 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 9a7822bb2..254765a0a 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 @@ -26,12 +26,12 @@ import java.time.Instant; import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; -import it.niedermann.nextcloud.deck.api.IResponseCallback; import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabCommentsBinding; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment; import it.niedermann.nextcloud.deck.model.ocs.comment.full.FullDeckComment; -import it.niedermann.nextcloud.deck.persistence.sync.SyncManager; +import it.niedermann.nextcloud.deck.remote.api.IResponseCallback; +import it.niedermann.nextcloud.deck.repository.SyncRepository; import it.niedermann.nextcloud.deck.ui.card.EditActivity; import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel; import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment; @@ -177,7 +177,7 @@ public class CardCommentsFragment extends Fragment implements CommentEditedListe @Override public void onError(Throwable throwable) { - if (SyncManager.isNoOnVoidError(throwable)) { + if (SyncRepository.isNoOnVoidError(throwable)) { IResponseCallback.super.onError(throwable); requireActivity().runOnUiThread(() -> ExceptionDialogFragment.newInstance(throwable, editCardViewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName())); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java index 5b5dead49..c41420147 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java @@ -23,7 +23,7 @@ import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.User; -import it.niedermann.nextcloud.deck.persistence.BaseRepository; +import it.niedermann.nextcloud.deck.repository.BaseRepository; import it.niedermann.nextcloud.deck.ui.card.comments.util.CommentsUtil; public class CardCommentsMentionProposer implements TextWatcher { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java index 5918c9b41..79b0043fe 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java @@ -12,10 +12,10 @@ import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundExce import java.util.List; -import it.niedermann.nextcloud.deck.api.IResponseCallback; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment; import it.niedermann.nextcloud.deck.model.ocs.comment.full.FullDeckComment; +import it.niedermann.nextcloud.deck.remote.api.IResponseCallback; import it.niedermann.nextcloud.deck.ui.viewmodel.SyncViewModel; @SuppressWarnings("WeakerAccess") @@ -40,14 +40,14 @@ public class CommentsViewModel extends SyncViewModel { } public void addCommentToCard(long accountId, long cardId, @NonNull DeckComment comment) { - syncManager.addCommentToCard(accountId, cardId, comment); + syncRepository.addCommentToCard(accountId, cardId, comment); } public void updateComment(long accountId, long localCardId, long localCommentId, String comment) { - syncManager.updateComment(accountId, localCardId, localCommentId, comment); + syncRepository.updateComment(accountId, localCardId, localCommentId, comment); } public void deleteComment(long accountId, long localCardId, long localCommentId, @NonNull IResponseCallback callback) { - syncManager.deleteComment(accountId, localCardId, localCommentId, callback); + syncRepository.deleteComment(accountId, localCardId, localCommentId, callback); } } -- cgit v1.2.3