feat: Align theming with Nextcloud Files app

Signed-off-by: Stefan Niedermann <info@niedermann.it>

6 files changed, 25 insertions, 9 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java
index b3b539614..7edd10bbf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java
@@ -287,8 +287,10 @@ public class EditActivity extends AppCompatActivity {
 
         final var utils = ThemeUtils.of(color, this);
 
+        utils.platform.themeStatusBar(this);
+        utils.material.themeToolbar(binding.toolbar);
         utils.platform.colorEditText(binding.title);
-        utils.deck.themeTabLayout(binding.tabLayout);
+        utils.material.themeTabLayoutOnSurface(binding.tabLayout);
     }
 
     @NonNull
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 efe974598..b6ce18f13 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
@@ -22,7 +22,6 @@ import androidx.lifecycle.ViewModelProvider;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 
-import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.DialogNewCardBinding;
 import it.niedermann.nextcloud.deck.exceptions.OfflineException;
@@ -67,7 +66,6 @@ public class NewCardDialog extends ThemedDialogFragment implements DialogInterfa
         this.account = (Account) getArguments().getSerializable(KEY_ACCOUNT);
 
         newCardViewModel = new SyncViewModel.Provider(requireActivity(), requireActivity().getApplication(), account).get(NewCardViewModel.class);
-        DeckLog.log(newCardViewModel);
         viewModel = new ViewModelProvider(requireActivity()).get(PrepareCreateViewModel.class);
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java
index c204b1658..d301968c4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java
@@ -12,8 +12,10 @@ import androidx.lifecycle.ViewModelProvider;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabActivitiesBinding;
 import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
+import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils;
+import it.niedermann.nextcloud.deck.ui.theme.Themed;
 
-public class CardActivityFragment extends Fragment {
+public class CardActivityFragment extends Fragment implements Themed {
 
     private FragmentCardEditTabActivitiesBinding binding;
 
@@ -36,6 +38,8 @@ public class CardActivityFragment extends Fragment {
             return binding.getRoot();
         }
 
+        viewModel.getBoardColor().observe(getViewLifecycleOwner(), this::applyTheme);
+
         viewModel.syncActivitiesForCard(viewModel.getFullCard().getCard()).observe(getViewLifecycleOwner(), (activities -> {
             if (activities == null || activities.size() == 0) {
                 binding.emptyContentView.setVisibility(View.VISIBLE);
@@ -54,4 +58,11 @@ public class CardActivityFragment extends Fragment {
         super.onDestroy();
         this.binding = null;
     }
+
+    @Override
+    public void applyTheme(int color) {
+        final var utils = ThemeUtils.of(color, requireContext());
+
+        utils.deck.themeEmptyContentView(binding.emptyContentView);
+    }
 }
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 96292ecff..ea4e3c9a4 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
@@ -517,10 +517,10 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet
     private void applyTheme(@ColorInt int color) {
         final var utils = ThemeUtils.of(color, requireContext());
 
+        utils.deck.themeEmptyContentView(binding.emptyContentView);
         utils.material.themeFAB(binding.fab);
         utils.platform.colorBottomNavigationView(binding.bottomNavigation);
-        utils.platform.colorViewBackground(binding.pickerHeader, ColorRole.SURFACE);
-        utils.platform.colorViewBackground(binding.pickerRecyclerView, ColorRole.SURFACE);
+        utils.platform.colorViewBackground(binding.bottomSheetParent, ColorRole.SURFACE);
 
         adapter.applyTheme(color);
     }
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 f46aafd1c..4704ea45a 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
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Toast;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -36,10 +37,11 @@ import it.niedermann.nextcloud.deck.ui.card.EditActivity;
 import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment;
 import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils;
+import it.niedermann.nextcloud.deck.ui.theme.Themed;
 import it.niedermann.nextcloud.deck.ui.viewmodel.SyncViewModel;
 import it.niedermann.nextcloud.deck.util.KeyboardUtils;
 
-public class CardCommentsFragment extends Fragment implements CommentEditedListener, CommentDeletedListener, CommentSelectAsReplyListener {
+public class CardCommentsFragment extends Fragment implements Themed, CommentEditedListener, CommentDeletedListener, CommentSelectAsReplyListener {
 
     private static final String KEY_ACCOUNT = "account";
     private FragmentCardEditTabCommentsBinding binding;
@@ -185,9 +187,12 @@ public class CardCommentsFragment extends Fragment implements CommentEditedListe
         });
     }
 
-    private void applyTheme(int color) {
+    @Override
+    public void applyTheme(@ColorInt int color) {
         final var utils = ThemeUtils.of(color, requireContext());
 
+        utils.deck.themeEmptyContentView(binding.emptyContentView);
+        utils.platform.colorViewBackground(binding.addCommentLayout);
         utils.material.themeFAB(binding.fab);
         utils.material.colorTextInputLayout(binding.messageWrapper);
     }
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 49a0b33ae..76c99abe9 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
@@ -330,7 +330,7 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener,
     }
 
     private void setupAssignees() {
-        adapter = new AssigneeAdapter(user -> CardAssigneeDialog.newInstance(user).show(getChildFragmentManager(), CardAssigneeDialog.class.getSimpleName()), viewModel.getAccount());
+        adapter = new AssigneeAdapter((user) -> CardAssigneeDialog.newInstance(user).show(getChildFragmentManager(), CardAssigneeDialog.class.getSimpleName()), viewModel.getAccount());
         binding.assignees.setAdapter(adapter);
         binding.assignees.post(() -> {
             @Px final int gutter = DimensionUtil.INSTANCE.dpToPx(requireContext(), R.dimen.spacer_1x);