feat(theming): Enhance theming for comments, activities and accounts

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

14 files changed, 102 insertions, 49 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java
index eba776cd7..cedcef707 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java
@@ -19,6 +19,7 @@ import androidx.lifecycle.ViewModelProvider;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -115,5 +116,9 @@ public class AccountSwitcherDialog extends DialogFragment {
     private void applyTheme(int color) {
         final var utils = ThemeUtils.of(color, requireContext());
         utils.deck.themeSelectedCheck(binding.check.getContext(), binding.check.getDrawable());
+        utils.platform.colorImageView(binding.addAccountIcon, ColorRole.ON_SURFACE);
+        utils.platform.colorImageView(binding.manageAccountsIcon, ColorRole.ON_SURFACE);
+        utils.platform.colorTextView(binding.addAccountLabel, ColorRole.ON_SURFACE);
+        utils.platform.colorTextView(binding.manageAccountsLabel, ColorRole.ON_SURFACE);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java
index bd91d4ec8..8e0e010c9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAccountChooseBinding;
@@ -43,5 +44,7 @@ public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder {
 
         final var utils = ThemeUtils.of(account.getColor(), itemView.getContext());
         utils.deck.themeSelectedCheck(binding.currentAccountIndicator.getContext(), binding.currentAccountIndicator.getDrawable());
+        utils.platform.colorTextView(binding.accountName, ColorRole.ON_SURFACE);
+        utils.platform.colorTextView(binding.accountHost, ColorRole.ON_SURFACE_VARIANT);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java
index a64cf3a44..adcc21dc0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java
@@ -5,24 +5,28 @@ import android.view.MenuInflater;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import it.niedermann.nextcloud.deck.databinding.ItemActivityBinding;
 import it.niedermann.nextcloud.deck.model.ocs.Activity;
+import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils;
 
 public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityViewHolder> {
 
     @NonNull
-    private final List<Activity> activities;
+    private final List<Activity> activities = new ArrayList<>();
+    @Nullable
+    private ThemeUtils utils;
     @NonNull
     private final MenuInflater menuInflater;
 
     @SuppressWarnings("WeakerAccess")
-    public CardActivityAdapter(@NonNull List<Activity> activities, @NonNull MenuInflater menuInflater) {
+    public CardActivityAdapter(@NonNull MenuInflater menuInflater) {
         super();
-        this.activities = activities;
         this.menuInflater = menuInflater;
     }
 
@@ -34,9 +38,16 @@ public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityViewHo
         return new CardActivityViewHolder(binding);
     }
 
+    public void setData(@NonNull List<Activity> activities, @NonNull ThemeUtils utils) {
+        this.activities.clear();
+        this.activities.addAll(activities);
+        this.utils = utils;
+        this.notifyDataSetChanged();
+    }
+
     @Override
     public void onBindViewHolder(@NonNull CardActivityViewHolder holder, int position) {
-        holder.bind(activities.get(position), menuInflater);
+        holder.bind(activities.get(position), menuInflater, utils);
     }
 
     @Override
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 d301968c4..41d4d0963 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
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import it.niedermann.android.reactivelivedata.ReactiveLiveData;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabActivitiesBinding;
 import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
@@ -38,18 +39,22 @@ public class CardActivityFragment extends Fragment implements Themed {
             return binding.getRoot();
         }
 
-        viewModel.getBoardColor().observe(getViewLifecycleOwner(), this::applyTheme);
+        final var adapter = new CardActivityAdapter(requireActivity().getMenuInflater());
+        binding.activitiesList.setAdapter(adapter);
 
-        viewModel.syncActivitiesForCard(viewModel.getFullCard().getCard()).observe(getViewLifecycleOwner(), (activities -> {
-            if (activities == null || activities.size() == 0) {
-                binding.emptyContentView.setVisibility(View.VISIBLE);
-                binding.activitiesList.setVisibility(View.GONE);
-            } else {
-                binding.emptyContentView.setVisibility(View.GONE);
-                binding.activitiesList.setVisibility(View.VISIBLE);
-                binding.activitiesList.setAdapter(new CardActivityAdapter(activities, requireActivity().getMenuInflater()));
-            }
-        }));
+        new ReactiveLiveData<>(viewModel.syncActivitiesForCard(viewModel.getFullCard().getCard()))
+                .combineWith(viewModel::getBoardColor)
+                .observe(getViewLifecycleOwner(), data -> {
+                    applyTheme(data.second);
+                    if (data.first == null || data.first.size() == 0) {
+                        binding.emptyContentView.setVisibility(View.VISIBLE);
+                        binding.activitiesList.setVisibility(View.GONE);
+                    } else {
+                        binding.emptyContentView.setVisibility(View.GONE);
+                        binding.activitiesList.setVisibility(View.VISIBLE);
+                    }
+                    adapter.setData(data.first, ThemeUtils.of(data.second, requireContext()));
+                });
         return binding.getRoot();
     }
 
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 1d3101d61..b9f4ca436 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
@@ -1,19 +1,25 @@
 package it.niedermann.nextcloud.deck.ui.card.activities;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.view.MenuInflater;
 import android.view.View;
-import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+
+import java.util.function.Function;
+
 import it.niedermann.android.util.ClipboardUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemActivityBinding;
 import it.niedermann.nextcloud.deck.model.enums.ActivityType;
 import it.niedermann.nextcloud.deck.model.ocs.Activity;
-import it.niedermann.nextcloud.deck.ui.theme.DeckViewThemeUtils;
+import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils;
 import it.niedermann.nextcloud.deck.util.DateUtil;
 
 public class CardActivityViewHolder extends RecyclerView.ViewHolder {
@@ -25,7 +31,7 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder {
         this.binding = binding;
     }
 
-    public void bind(@NonNull Activity activity, @NonNull MenuInflater inflater) {
+    public void bind(@NonNull Activity activity, @NonNull MenuInflater inflater, @Nullable ThemeUtils utils) {
         final var context = itemView.getContext();
         binding.date.setText(DateUtil.getRelativeDateTimeString(context, activity.getLastModified().toEpochMilli()));
         binding.subject.setText(activity.getSubject());
@@ -34,33 +40,39 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder {
             inflater.inflate(R.menu.activity_menu, menu);
             menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(context, activity.getSubject()));
         });
+
         final var type = ActivityType.findById(activity.getType());
-        setImageResource(binding.type, type);
-        setImageColor(context, binding.type, type);
+        bindImageResource(type);
+        if (utils != null) {
+            applyTheme(context, utils, type);
+        }
     }
 
-    private static void setImageResource(@NonNull ImageView imageView, @NonNull ActivityType type) {
+    private void bindImageResource(@NonNull ActivityType type) {
         switch (type) {
-            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_36dp);
-            case TAGGED_WITH_LABEL ->
-                    imageView.setImageResource(R.drawable.type_label_36dp);
-            case COMMENT -> imageView.setImageResource(R.drawable.type_comment_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);
+            case CHANGE -> binding.type.setImageResource(R.drawable.type_change_36dp);
+            case ADD -> binding.type.setImageResource(R.drawable.type_add_color_36dp);
+            case DELETE -> binding.type.setImageResource(R.drawable.type_delete_color_36dp);
+            case ARCHIVE -> binding.type.setImageResource(R.drawable.type_archive_36dp);
+            case TAGGED_WITH_LABEL -> binding.type.setImageResource(R.drawable.type_label_36dp);
+            case COMMENT -> binding.type.setImageResource(R.drawable.type_comment_36dp);
+            case FILES -> binding.type.setImageResource(R.drawable.type_file_36dp);
+            case HISTORY -> binding.type.setImageResource(R.drawable.type_history_36dp);
+            default -> binding.type.setImageResource(R.drawable.ic_app_logo);
         }
     }
 
-    private static void setImageColor(@NonNull Context context, @NonNull ImageView imageView, @NonNull ActivityType type) {
+    private void applyTheme(@NonNull Context context, @NonNull ThemeUtils utils, @NonNull ActivityType type) {
+        utils.platform.colorTextView(binding.subject, ColorRole.ON_SURFACE);
+        utils.platform.colorTextView(binding.date, ColorRole.ON_SURFACE_VARIANT);
+
+        final Function<Integer, ColorStateList> getColor = color ->
+                ColorStateList.valueOf(ContextCompat.getColor(context, color));
+
         switch (type) {
-            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.surfaceVariant);
+            case ADD -> binding.type.setImageTintList(getColor.apply(R.color.activity_create));
+            case DELETE -> binding.type.setImageTintList(getColor.apply(R.color.activity_delete));
+            default -> utils.platform.colorImageView(binding.type, ColorRole.ON_SURFACE_VARIANT);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
index f8d805c92..839b904c0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
@@ -109,9 +109,11 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder {
         if (utils != null) {
             utils.platform.colorViewBackground(binding.parentBorder, ColorRole.SECONDARY);
             utils.platform.colorTextView(binding.parent, ColorRole.ON_SURFACE_VARIANT);
+
             utils.platform.colorImageView(binding.notSyncedYet, ColorRole.PRIMARY);
             utils.platform.colorTextView(binding.actorDisplayName, ColorRole.ON_SURFACE);
-            utils.platform.colorTextView(binding.actorDisplayName, ColorRole.ON_SURFACE);
+            utils.platform.colorTextView(binding.creationDateTime, ColorRole.ON_SURFACE_VARIANT);
+            utils.platform.colorTextView(binding.message, ColorRole.ON_SURFACE);
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java
index a6495817a..2ee0b1451 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAccountChooseBinding;
@@ -58,5 +59,8 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder {
 
         final var utils = ThemeUtils.of(account.getColor(), itemView.getContext());
         utils.deck.themeSelectedCheck(binding.currentAccountIndicator.getContext(), binding.currentAccountIndicator.getDrawable());
+        utils.platform.colorImageView(binding.delete, ColorRole.ON_SURFACE);
+        utils.platform.colorTextView(binding.accountName, ColorRole.ON_SURFACE);
+        utils.platform.colorTextView(binding.accountHost, ColorRole.ON_SURFACE_VARIANT);
     }
 }
diff --git a/app/src/main/res/drawable/ic_person_24dp.xml b/app/src/main/res/drawable/ic_person_24dp.xml
index 23b5b1c10..9e18df4f4 100644
--- a/app/src/main/res/drawable/ic_person_24dp.xml
+++ b/app/src/main/res/drawable/ic_person_24dp.xml
@@ -3,7 +3,8 @@
     android:height="24dp"
     android:autoMirrored="true"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorOnSurface">
     <path
         android:fillColor="#757575"
         android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
diff --git a/app/src/main/res/drawable/ic_person_add_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml
index 0c7a217da..0dadeaeda 100644
--- a/app/src/main/res/drawable/ic_person_add_24dp.xml
+++ b/app/src/main/res/drawable/ic_person_add_24dp.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0"
+    android:tint="?attr/colorOnSurface" android:viewportHeight="24.0"
     android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
index 8521eec7b..8ce6afc9b 100644
--- a/app/src/main/res/drawable/ic_settings_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_24dp.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24"
+    android:tint="?attr/colorOnSurface" android:viewportHeight="24"
     android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
 </vector>
diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml
index 9d0b7b122..feff52fe3 100644
--- a/app/src/main/res/layout/dialog_account_switcher.xml
+++ b/app/src/main/res/layout/dialog_account_switcher.xml
@@ -91,6 +91,7 @@
         android:paddingBottom="@dimen/spacer_1x">
 
         <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/add_account_icon"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:contentDescription="@null"
@@ -98,7 +99,8 @@
             android:scaleType="center"
             app:srcCompat="@drawable/ic_person_add_24dp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/add_account_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -107,7 +109,7 @@
             android:singleLine="true"
             android:text="@string/add_account"
             android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
-            android:textColor="?android:textColorPrimary" />
+            android:textColor="?attr/colorOnSurface" />
 
     </LinearLayout>
 
@@ -124,6 +126,7 @@
         android:paddingBottom="@dimen/spacer_1x">
 
         <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/manage_accounts_icon"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:contentDescription="@null"
@@ -132,6 +135,7 @@
             app:srcCompat="@drawable/ic_settings_24dp" />
 
         <TextView
+            android:id="@+id/manage_accounts_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -140,7 +144,7 @@
             android:singleLine="true"
             android:text="@string/manage_accounts"
             android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
-            android:textColor="?android:textColorPrimary" />
+            android:textColor="?attr/colorOnSurface" />
 
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml
index a734d8593..9d880bec8 100644
--- a/app/src/main/res/layout/item_account_choose.xml
+++ b/app/src/main/res/layout/item_account_choose.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:orientation="horizontal"
     android:gravity="center_vertical"
+    android:orientation="horizontal"
     android:padding="@dimen/spacer_3x">
 
     <FrameLayout
@@ -70,5 +70,6 @@
         android:scaleType="center"
         android:visibility="gone"
         app:srcCompat="@drawable/ic_delete_24dp"
+        app:tint="?attr/colorOnSurface"
         tools:visibility="visible" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index 85fc740f8..436e47ffc 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -8,12 +8,13 @@
     android:orientation="vertical"
     android:padding="@dimen/spacer_2x">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/date"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="56dp"
         android:textAppearance="?attr/textAppearanceListItemSecondary"
+        android:textColor="?attr/colorOnSurfaceVariant"
         tools:text="4 days ago" />
 
     <LinearLayout
@@ -28,11 +29,12 @@
             android:layout_marginEnd="@dimen/spacer_2x"
             app:srcCompat="@drawable/type_change_36dp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/subject"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?attr/textAppearanceListItem"
+            android:textColor="?attr/colorOnSurface"
             tools:maxLength="150"
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index af06cb008..655d88c2f 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -13,8 +13,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="54dp"
+        android:layout_marginBottom="@dimen/spacer_1x"
         android:orientation="horizontal"
-        android:paddingBottom="@dimen/spacer_1x"
         android:visibility="gone"
         tools:visibility="visible">
 
@@ -22,7 +22,7 @@
             android:id="@+id/parentBorder"
             android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:textColor="?attr/colorSecondary" />
+            android:background="?attr/colorSecondary" />
 
         <TextView
             android:id="@+id/parent"
@@ -30,6 +30,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="@integer/comment_parent_max_lines"
+            android:paddingVertical="@dimen/spacer_1hx"
             android:paddingStart="@dimen/spacer_1x"
             android:paddingEnd="@null"
             android:textColor="?attr/colorOnSurfaceVariant"
@@ -95,6 +96,7 @@
                     android:layout_gravity="center"
                     android:textAppearance="?attr/textAppearanceListItemSecondary"
                     android:textColor="?attr/colorOnSurface"
+                    android:textColorHighlight="?attr/colorOnSurfaceVariant"
                     tools:text="@tools:sample/date/day_of_week" />
             </LinearLayout>
 
@@ -105,6 +107,7 @@
                 android:layout_gravity="center"
                 android:autofillHints="@null"
                 android:textAppearance="?attr/textAppearanceListItem"
+                android:textColor="?attr/colorOnSurface"
                 tools:maxLength="200"
                 tools:text="@tools:sample/lorem/random" />
         </LinearLayout>