feat(theming): Add outline to cards

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

6 files changed, 23 insertions, 49 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java
index 473937753..13fc2a676 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java
@@ -5,11 +5,11 @@ import static android.view.View.VISIBLE;
 import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.view.View;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
 import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Px;
@@ -43,16 +43,15 @@ public class CardAttachmentsBottomsheetBehaviorCallback extends BottomSheetBehav
                                                       @NonNull FloatingActionButton fab,
                                                       @NonNull View pickerBackdrop,
                                                       @NonNull BottomNavigationView bottomNavigation,
-                                                      @ColorRes int backdropColorExpanded,
-                                                      @ColorRes int backdropColorCollapsed,
                                                       @DimenRes int bottomNavigationHeight
     ) {
         this.backPressedCallback = backPressedCallback;
         this.fab = fab;
         this.pickerBackdrop = pickerBackdrop;
         this.bottomNavigation = bottomNavigation;
-        this.backdropColorExpanded = ContextCompat.getColor(context, backdropColorExpanded);
-        this.backdropColorCollapsed = ContextCompat.getColor(context, backdropColorCollapsed);
+        final var color = ContextCompat.getColor(context, android.R.color.black);
+        this.backdropColorExpanded = Color.argb(127, Color.red(color), Color.green(color), Color.blue(color));
+        this.backdropColorCollapsed = ContextCompat.getColor(context, android.R.color.transparent);
         this.bottomNavigationHeight = context.getResources().getDimensionPixelSize(bottomNavigationHeight);
     }
 
@@ -75,13 +74,9 @@ public class CardAttachmentsBottomsheetBehaviorCallback extends BottomSheetBehav
             pickerBackdrop.setBackgroundColor(ArgbEvaluatorCompat.getInstance().evaluate(bottomSheetPercentageShown, backdropColorExpanded, backdropColorCollapsed));
             bottomNavigation.setTranslationY(bottomSheetPercentageShown * bottomNavigationHeight);
             if (slideOffset <= lastOffset && slideOffset != 0) {
-                if (fab.getVisibility() == GONE) {
-                    fab.show();
-                }
+                fab.show();
             } else {
-                if (fab.getVisibility() == VISIBLE) {
-                    fab.hide();
-                }
+                fab.hide();
             }
         }
         lastOffset = slideOffset;
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 42906d499..5e20eb6a2 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
@@ -165,8 +165,6 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet
                 binding.fab,
                 binding.pickerBackdrop,
                 binding.bottomNavigation,
-                R.color.bottom_sheet_backdrop,
-                android.R.color.transparent,
                 R.dimen.attachments_bottom_navigation_height));
         binding.pickerBackdrop.setOnClickListener(v -> mBottomSheetBehaviour.setState(STATE_HIDDEN));
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java
index 367e9c597..dd874045f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java
@@ -48,7 +48,7 @@ public class OverlappingAvatars extends RelativeLayout {
         overlapPx = resources.getDimensionPixelSize(R.dimen.avatar_size_small_overlapping);
         borderDrawable = ContextCompat.getDrawable(context, R.drawable.avatar_border);
         assert borderDrawable != null;
-        DrawableCompat.setTint(borderDrawable, ContextCompat.getColor(context, R.color.bg_card));
+        DrawableCompat.setTint(borderDrawable, ContextCompat.getColor(context, R.color.colorSurfaceContainer));
     }
 
     public void setAvatars(@NonNull Account account, @NonNull List<User> assignedUsers) {
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a48081423..31c1f32ef 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -27,23 +27,15 @@
     <color name="outlineVariant">#464646</color>
     <color name="primary">#C1C1C1</color>
     <color name="primaryContainer">#383838</color>
-    <color name="scrim">#000000</color>
+    <color name="scrim">@android:color/black</color>
     <color name="secondary">#C5C5C5</color>
     <color name="secondaryContainer">#454545</color>
-    <color name="shadow">#000000</color>
+    <color name="shadow">@android:color/black</color>
     <color name="surface">#1B1B1B</color>
     <color name="surfaceVariant">#464646</color>
     <color name="tertiary">#C9C9C9</color>
     <color name="tertiaryContainer">#484848</color>
-    <color name="colorSurfaceContainerHigh">#191919</color>
-
-    <!-- ======================================= -->
-    <!-- Custom styles                           -->
-    <!-- TODO REMOVE                             -->
-    <!-- ======================================= -->
-
-    <color name="bg_highlighted">#212121</color>
-    <color name="bg_card">#1e1e1e</color>
+    <color name="colorSurfaceContainer">#191919</color>
 
     <!-- ======================================= -->
     <!-- Widgets                                 -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b9ec64329..17f44e0ce 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- TODO Limit usage only to where it actually is needed (Import, About, …) -->
+    <color name="defaultBrand">#0082C9</color>
+
     <!-- ======================================= -->
     <!-- Base Theme                              -->
     <!-- ======================================= -->
 
-    <color name="defaultBrand">#0082C9</color>
-
     <!-- Generated by android-common, grayscale by https://hexcolorcodes.org/greyscale-desaturate-color -->
     <color name="background">#FCFCFC</color>
     <color name="error">#BA1A1A</color>
-    <color name="onError">#FFFFFF</color>
+    <color name="onError">@android:color/white</color>
     <color name="errorContainer">#FFDAD6</color>
     <color name="onErrorContainer">#410002</color>
     <color name="inverseOnSurface">#F0F0F0</color>
     <color name="inversePrimary">#C1C1C1</color>
     <color name="inverseSurface">#303030</color>
     <color name="onBackground">#1B1B1B</color>
-    <color name="onPrimary">#FFFFFF</color>
+    <color name="onPrimary">@android:color/white</color>
     <color name="onPrimaryContainer">#161616</color>
-    <color name="onSecondary">#FFFFFF</color>
+    <color name="onSecondary">@android:color/white</color>
     <color name="onSecondaryContainer">#0E1D2A</color>
     <color name="onSurface">#1B1B1B</color>
     <color name="onSurfaceVariant">#464646</color>
-    <color name="onTertiary">#FFFFFF</color>
+    <color name="onTertiary">@android:color/white</color>
     <color name="onTertiaryContainer">#1C1C1C</color>
     <color name="outline">#767676</color>
     <color name="outlineVariant">#C6C6C6</color>
@@ -37,16 +38,7 @@
     <color name="surfaceVariant">#E2E2E2</color>
     <color name="tertiary">#606060</color>
     <color name="tertiaryContainer">#E4E4E4</color>
-    <color name="colorSurfaceContainerHigh">@color/bg_default</color>
-
-    <!-- ======================================= -->
-    <!-- Custom styles                           -->
-    <!-- TODO REMOVE                             -->
-    <!-- ======================================= -->
-
-    <color name="bottom_sheet_backdrop">#7f000000</color>
-    <color name="bg_highlighted">#eee</color>
-    <color name="bg_card">@android:color/white</color>
+    <color name="colorSurfaceContainer">@color/bg_default</color>
 
     <!-- ======================================= -->
     <!-- Widgets                                 -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7f6d4c275..51fd1eaa3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,10 +29,10 @@
         <item name="colorTertiaryContainer">@color/tertiaryContainer</item>
 
         <!-- Used by PopupMenus -->
-        <item name="colorSurfaceContainer">@color/colorSurfaceContainerHigh</item>
+        <item name="colorSurfaceContainer">@color/colorSurfaceContainer</item>
 
         <!-- Used by Material Dialogs & Material SearchBar -->
-        <item name="colorSurfaceContainerHigh">@color/colorSurfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHigh">@color/colorSurfaceContainer</item>
 
         <item name="android:windowBackground">?attr/background</item>
         <item name="android:statusBarColor">?attr/background</item>
@@ -79,12 +79,9 @@
         <item name="tabIconTint">?attr/colorPrimary</item>
     </style>
 
-    <style name="materialCardViewStyle" parent="Widget.Material3.CardView.Elevated">
-        <item name="strokeWidth">1dp</item>
-        <item name="strokeColor">@color/bg_highlighted</item>
-        <item name="android:focusable">true</item>
-        <item name="cardElevation">2dp</item>
-        <item name="cardBackgroundColor">@color/bg_card</item>
+    <style name="materialCardViewStyle" parent="Widget.Material3.CardView.Outlined">
+        <item name="strokeColor">?attr/colorOutlineVariant</item>
+        <item name="cardBackgroundColor">?attr/colorSurfaceContainer</item>
     </style>
 
     <style name="textAppearanceHeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">