diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-07-04 14:34:40 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-07-04 14:34:40 +0300 |
| commit | 0a4d8fc074b2fc06a48aab3242ec257014aa9b24 (patch) | |
| tree | 0371dff5f87c00e4731029b768c892e697bc5f9c /app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards | |
| parent | dd5dff7fd1a518fda4fce182f52334ef90e4dc73 (diff) | |
| parent | f302d4ac2de08138064bf1b8aa3863fd3b05a1d0 (diff) | |
Merge branch 'master' into 455-clone-boards
# Conflicts:
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 1febd4950..f0146a379 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 @@ -53,7 +53,7 @@ public class ArchivedBoardsActvitiy extends BrandedActivity implements DeleteBoa setSupportActionBar(binding.toolbar); viewModel = new ViewModelProvider(this).get(MainViewModel.class); - viewModel.setCurrentAccount(account, account.getServerDeckVersionAsObject().isSupported(this)); + viewModel.setCurrentAccount(account); syncManager = new SyncManager(this); adapter = new ArchivedBoardsAdapter(viewModel.isCurrentAccountIsSupportedVersion(), getSupportFragmentManager(), (board) -> syncManager.dearchiveBoard(board)); @@ -67,8 +67,8 @@ public class ArchivedBoardsActvitiy extends BrandedActivity implements DeleteBoa } @Override - public void applyBrand(int mainColor, int textColor) { - applyBrandToPrimaryToolbar(mainColor, textColor, binding.toolbar); + public void applyBrand(int mainColor) { + // Nothing to do... } @NonNull |