Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2024-01-19 22:59:19 +0300
committerStefan Niedermann <info@niedermann.it>2024-01-19 22:59:19 +0300
commit99b5cf927a0f773882c040b95cda00c75a2cf024 (patch)
tree1036970ed1417574c96aa1a5dfd538a1ab12caf2
parentd244d8a4b7fec6d9496d146eb739628bea3b7656 (diff)
fix: BuildConfig and ResId issues
Signed-off-by: Stefan Niedermann <info@niedermann.it>
-rw-r--r--app/build.gradle1
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java10
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/view/FilterIndicator.java27
-rw-r--r--app/src/main/res/values/colors.xml1
4 files changed, 11 insertions, 28 deletions
diff --git a/app/build.gradle b/app/build.gradle
index a2fee90a2..25d034225 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,7 @@ android {
}
buildFeatures {
viewBinding true
+ buildConfig true
}
buildTypes {
release {
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 91c5db761..f5f0606fa 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
@@ -161,7 +161,15 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet
mBottomSheetBehaviour.setDraggable(true);
mBottomSheetBehaviour.setHideable(true);
mBottomSheetBehaviour.setState(STATE_HIDDEN);
- mBottomSheetBehaviour.addBottomSheetCallback(new CardAttachmentsBottomsheetBehaviorCallback(requireContext(), backPressedCallback, binding.fab, binding.pickerBackdrop, binding.bottomNavigation, R.color.mdtp_transparent_black, android.R.color.transparent, R.dimen.attachments_bottom_navigation_height));
+ mBottomSheetBehaviour.addBottomSheetCallback(new CardAttachmentsBottomsheetBehaviorCallback(
+ requireContext(),
+ backPressedCallback,
+ 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));
final var displayMetrics = getResources().getDisplayMetrics();
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/FilterIndicator.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/FilterIndicator.java
deleted file mode 100644
index 73b3a84a6..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/FilterIndicator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package it.niedermann.nextcloud.deck.ui.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.button.MaterialButton;
-
-import it.niedermann.nextcloud.deck.R;
-
-public class FilterIndicator extends MaterialButton {
-
- public FilterIndicator(Context context) {
- this(context, null, 0);
- }
-
- public FilterIndicator(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public FilterIndicator(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, R.style.ThemeOverlay_Material3_Button_IconButton);
- setIcon(ContextCompat.getDrawable(context, R.drawable.filter_active));
- }
-
-} \ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1983b6367..c6536b902 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,6 +15,7 @@
<!-- TODO REMOVE -->
<!-- ======================================= -->
+ <color name="bottom_sheet_backdrop">#7f000000</color>
<color name="grey600">#757575</color>
<color name="fg_secondary">#999</color>
<color name="bg_highlighted">#eee</color>