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>2023-03-24 16:00:20 +0300
committerStefan Niedermann <info@niedermann.it>2023-03-24 16:26:53 +0300
commit3ef86d96c298e191cf6869de26f09331a689da8d (patch)
tree93bfd5de831cc4492615ab10b7a27477537c2662 /app/src/main/java/it/niedermann/nextcloud/deck/ui/view
parent4f31f75f6098ad2c1e3f418e8d7f7d8902a0d273 (diff)
feat: Align theming with Nextcloud Files app
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/view')
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java3
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/view/EmptyContentView.java23
2 files changed, 14 insertions, 12 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java
index 326979744..ae520cf91 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java
@@ -89,7 +89,8 @@ public class ColorChooser extends LinearLayout {
previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, previouslySelectedColor));
previouslySelectedImageView = null;
}
- @ColorInt final int customColor = envelope.getColor();
+ @ColorInt
+ final int customColor = envelope.getColor();
selectedColor = customColor;
previouslySelectedColor = customColor;
binding.customColorChooser.setImageDrawable(DeckViewThemeUtils.getTintedImageView(context, R.drawable.circle_alpha_colorize_36dp, selectedColor));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/EmptyContentView.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/EmptyContentView.java
index 2b3557694..281d0f68f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/EmptyContentView.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/EmptyContentView.java
@@ -4,19 +4,17 @@ import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.ImageView;
import android.widget.RelativeLayout;
+import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
-import com.nextcloud.android.common.ui.theme.utils.ColorRole;
-
import it.niedermann.nextcloud.deck.R;
import it.niedermann.nextcloud.deck.databinding.WidgetEmptyContentViewBinding;
-import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils;
-import it.niedermann.nextcloud.deck.ui.theme.Themed;
-public class EmptyContentView extends RelativeLayout implements Themed {
+public class EmptyContentView extends RelativeLayout {
private static final int NO_DESCRIPTION = -1;
@@ -47,12 +45,15 @@ public class EmptyContentView extends RelativeLayout implements Themed {
binding.description.setVisibility(View.VISIBLE);
}
- @Override
- public void applyTheme(int color) {
- final var utils = ThemeUtils.of(color, getContext());
+ public ImageView getImage() {
+ return binding.image;
+ }
+
+ public TextView getTitle() {
+ return binding.title;
+ }
-// utils.platform.colorImageView(binding.image, ColorRole.SECONDARY_CONTAINER);
- utils.platform.colorTextView(binding.title, ColorRole.ON_SURFACE);
- utils.platform.colorTextView(binding.description, ColorRole.ON_SURFACE);
+ public TextView getDescription() {
+ return binding.description;
}
}