feat(theming): Add outline to cards

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

3 files changed, 7 insertions, 14 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) {