sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 20:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wear RYA improvements

Browse source
This commit is contained in:
Phillip Thelen 2022-07-28 10:42:59 +02:00
parent 9b0ecc914e
commit 65f0c28870
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
View file

@ -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) {

7
wearos/src/main/res/layout/activity_rya.xml
View file

@ -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"/>
<TextView
android:id="@+id/description_view"
@ -38,8 +38,9 @@
android:id="@+id/rya_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/review_dailies"
style="@style/ChipButton.Purple"
app:chipText="@string/review_dailies"
app:chipColor="@color/watch_purple_100"
app:chipTextColor="@color/watch_black"
android:layout_marginBottom="@dimen/spacing_small"/>
<com.habitrpg.wearos.habitica.ui.views.ConnectedActionChipView
android:id="@+id/phone_button"

2
wearos/src/main/res/values/attrs.xml
View file

@ -16,5 +16,7 @@
<declare-styleable name="TextActionChip">
<attr name="chipText" format="string" />
<attr name="chipImage" format="reference" />
<attr name="chipColor" format="color" />
<attr name="chipTextColor" format="color" />
</declare-styleable>
</resources>

2
wearos/src/main/res/values/styles.xml
View file

@ -96,7 +96,7 @@
<item name="android:letterSpacing">.01</item>
<item name="android:paddingHorizontal">10dp</item>
<item name="android:textColor">@color/watch_white</item>
<item name="android:textSize">14sp</item>
<item name="android:textSize">16sp</item>
</style>
</resources>