diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt index e785c597c..084d9cc38 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt @@ -1,6 +1,7 @@ package com.habitrpg.wearos.habitica.ui.views import android.content.Context +import android.content.res.ColorStateList import android.util.AttributeSet import android.widget.RelativeLayout import com.habitrpg.android.habitica.R @@ -18,11 +19,14 @@ open class TextActionChipView @JvmOverloads constructor(context: Context, attrs: val binding = TextActionChipBinding.inflate(context.layoutInflater, this) init { - val chipText = attributes?.getText(R.styleable.TextActionChip_chipText) - val chipImage = attributes?.getDrawable(R.styleable.TextActionChip_chipImage) - - binding.chipTextview.text = chipText - binding.chipImageview.setImageDrawable(chipImage) + binding.chipTextview.text = attributes?.getText(R.styleable.TextActionChip_chipText) + binding.chipImageview.setImageDrawable(attributes?.getDrawable(R.styleable.TextActionChip_chipImage)) + attributes?.getColor(R.styleable.TextActionChip_chipColor, context.getColor(R.color.surface))?.let { + binding.wearChipButton.backgroundTintList = ColorStateList.valueOf(it) + } + attributes?.getColor(R.styleable.TextActionChip_chipTextColor, context.getColor(R.color.watch_white))?.let { + binding.chipTextview.setTextColor(it) + } } fun setChipText(text: String) { diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml index 48e696dc1..d511c9d43 100644 --- a/wearos/src/main/res/layout/activity_rya.xml +++ b/wearos/src/main/res/layout/activity_rya.xml @@ -23,7 +23,7 @@ android:text="@string/day_start" style="@style/Text.Body1" android:gravity="center" - android:layout_marginHorizontal="12dp" + android:layout_marginHorizontal="28dp" android:layout_marginBottom="10dp"/> + + \ No newline at end of file diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml index 69bec7f92..582208f74 100644 --- a/wearos/src/main/res/values/styles.xml +++ b/wearos/src/main/res/values/styles.xml @@ -96,7 +96,7 @@ .01 10dp @color/watch_white - 14sp + 16sp \ No newline at end of file