diff options
| author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-10-03 23:47:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-03 23:47:12 +0300 |
| commit | 04d85196c4dc37b5ab237191d9f73792fb33a484 (patch) | |
| tree | c1fd5e6e10034b335b35680c4d517369a7e2234f /app/src/main/java/it/niedermann/nextcloud/deck/ui/view | |
| parent | 8e0b4546aa33b3215a394e55a8fbee33f72621fb (diff) | |
🎨 Store colors as integer in database (#603)
* #556 Store colors as integer in database - UI should only use @ColorInt from model
* Merge master
Signed-off-by: Stefan Niedermann <info@niedermann.it>
* #556 Store colors as integer in database
Signed-off-by: Stefan Niedermann <info@niedermann.it>
* #556 Store colors as integer in database
Signed-off-by: Stefan Niedermann <info@niedermann.it>
* merged into branch
Co-authored-by: desperateCoder <echotodevnull@gmail.com>
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/OverlappingAvatars.java | 6 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java | 3 |
2 files changed, 5 insertions, 4 deletions
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 501d33106..611cd30b0 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 @@ -10,6 +10,7 @@ import android.widget.RelativeLayout; import androidx.annotation.NonNull; import androidx.annotation.Px; +import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import com.bumptech.glide.Glide; @@ -47,8 +48,9 @@ public class OverlappingAvatars extends RelativeLayout { avatarBorderSize = dpToPx(context, R.dimen.avatar_size_small_overlapping_border); avatarSize = dpToPx(context, R.dimen.avatar_size_small) + avatarBorderSize * 2; overlapPx = dpToPx(context, R.dimen.avatar_size_small_overlapping); - borderDrawable = getResources().getDrawable(R.drawable.avatar_border); - DrawableCompat.setTint(borderDrawable, getResources().getColor(R.color.bg_card)); + borderDrawable = ContextCompat.getDrawable(context, R.drawable.avatar_border); + assert borderDrawable != null; + DrawableCompat.setTint(borderDrawable, ContextCompat.getColor(context, R.color.bg_card)); } public void setAvatars(@NonNull Account account, @NonNull List<User> assignedUsers) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java index ba3331457..1853d1b88 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java @@ -3,7 +3,6 @@ package it.niedermann.nextcloud.deck.ui.view.labelchip; import android.annotation.SuppressLint; import android.content.Context; import android.content.res.ColorStateList; -import android.graphics.Color; import android.view.ViewGroup; import androidx.annotation.NonNull; @@ -42,7 +41,7 @@ public class LabelChip extends Chip { setChipEndPadding(gutter); try { - int labelColor = Color.parseColor("#" + label.getColor()); + int labelColor = label.getColor(); ColorStateList c = ColorStateList.valueOf(labelColor); setChipBackgroundColor(c); setTextColor(ColorUtil.getForegroundColorForBackgroundColor(labelColor)); |