caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wear: make tile scale to screen and text length

Browse source
This commit is contained in:
Andries Smit 2022-01-14 11:10:48 +01:00
parent e8294b1d10
commit 671086a1aa
1 changed files with 80 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
wear/src/main/java/info/nightscout/androidaps/tile/TileBase.kt
View file

@ -3,21 +3,15 @@ package info.nightscout.androidaps.tile
import android.content.SharedPreferences import android.content.SharedPreferences
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.preference.PreferenceManager
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.preference.PreferenceManager
import androidx.wear.tiles.ActionBuilders import androidx.wear.tiles.ActionBuilders
import androidx.wear.tiles.ColorBuilders.argb import androidx.wear.tiles.ColorBuilders.argb
import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters
import androidx.wear.tiles.DimensionBuilders.SpProp
import androidx.wear.tiles.DimensionBuilders.dp import androidx.wear.tiles.DimensionBuilders.dp
import androidx.wear.tiles.LayoutElementBuilders.Box import androidx.wear.tiles.DimensionBuilders.sp
import androidx.wear.tiles.LayoutElementBuilders.Column import androidx.wear.tiles.LayoutElementBuilders.*
import androidx.wear.tiles.LayoutElementBuilders.FontStyles
import androidx.wear.tiles.LayoutElementBuilders.Image
import androidx.wear.tiles.LayoutElementBuilders.Layout
import androidx.wear.tiles.LayoutElementBuilders.LayoutElement
import androidx.wear.tiles.LayoutElementBuilders.Row
import androidx.wear.tiles.LayoutElementBuilders.Spacer
import androidx.wear.tiles.LayoutElementBuilders.Text
import androidx.wear.tiles.ModifiersBuilders.Background import androidx.wear.tiles.ModifiersBuilders.Background
import androidx.wear.tiles.ModifiersBuilders.Clickable import androidx.wear.tiles.ModifiersBuilders.Clickable
import androidx.wear.tiles.ModifiersBuilders.Corner import androidx.wear.tiles.ModifiersBuilders.Corner
@ -38,14 +32,15 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.guava.future import kotlinx.coroutines.guava.future
import kotlin.math.sqrt
private const val CIRCLE_SIZE = 75f private const val SPACING_ACTIONS = 3f
private val ICON_SIZE = dp(25f) private const val ICON_SIZE_FRACTION = 0.4f // Percentage of button diameter
private val SPACING_ACTIONS = dp(3f)
private const val BUTTON_COLOR = R.color.gray_850 private const val BUTTON_COLOR = R.color.gray_850
const val TAG = "ASTAG-tile" private const val LARGE_SCREEN_WIDTH_DP = 210
interface TileSource { interface TileSource {
fun getActions(): List<Action> fun getActions(): List<Action>
fun getDefaultConfig(): Map<String, String> fun getDefaultConfig(): Map<String, String>
} }
@ -64,7 +59,6 @@ enum class WearControl {
NO_DATA, ENABLED, DISABLED NO_DATA, ENABLED, DISABLED
} }
abstract class TileBase : TileService() { abstract class TileBase : TileService() {
open val resourceVersion = "1" open val resourceVersion = "1"
@ -138,7 +132,7 @@ abstract class TileBase : TileService() {
b.addContent(addRowDouble(actions[1], actions[2], deviceParameters)) b.addContent(addRowDouble(actions[1], actions[2], deviceParameters))
} }
if (actions.size == 4) { if (actions.size == 4) {
b.addContent(Spacer.Builder().setHeight(SPACING_ACTIONS).build()) b.addContent(Spacer.Builder().setHeight(dp(SPACING_ACTIONS)).build())
.addContent(addRowDouble(actions[2], actions[3], deviceParameters)) .addContent(addRowDouble(actions[2], actions[3], deviceParameters))
} }
return b.build() return b.build()
@ -148,15 +142,15 @@ abstract class TileBase : TileService() {
.build() .build()
} }
private fun addRowSingle(action1: Action, deviceParameters: DeviceParameters): LayoutElement = private fun addRowSingle(action: Action, deviceParameters: DeviceParameters): LayoutElement =
Row.Builder() Row.Builder()
.addContent(action(action1, deviceParameters)) .addContent(action(action, deviceParameters))
.build() .build()
private fun addRowDouble(action1: Action, action2: Action, deviceParameters: DeviceParameters): LayoutElement = private fun addRowDouble(action1: Action, action2: Action, deviceParameters: DeviceParameters): LayoutElement =
Row.Builder() Row.Builder()
.addContent(action(action1, deviceParameters)) .addContent(action(action1, deviceParameters))
.addContent(Spacer.Builder().setWidth(SPACING_ACTIONS).build()) .addContent(Spacer.Builder().setWidth(dp(SPACING_ACTIONS)).build())
.addContent(action(action2, deviceParameters)) .addContent(action(action2, deviceParameters))
.build() .build()
@ -176,56 +170,73 @@ abstract class TileBase : TileService() {
.build() .build()
} }
private fun action(action: Action, deviceParameters: DeviceParameters) = Box.Builder() private fun action(action: Action, deviceParameters: DeviceParameters): LayoutElement {
.setWidth(dp(CIRCLE_SIZE)) val circleDiameter = ((sqrt(2f) - 1) * deviceParameters.screenHeightDp) - (2 * SPACING_ACTIONS)
.setHeight(dp(CIRCLE_SIZE)) val iconSize = dp(circleDiameter * ICON_SIZE_FRACTION)
.setModifiers( val text = resources.getString(action.nameRes)
Modifiers.Builder() return Box.Builder()
.setBackground( .setWidth(dp(circleDiameter))
Background.Builder() .setHeight(dp(circleDiameter))
.setColor( .setModifiers(
argb(ContextCompat.getColor(baseContext, BUTTON_COLOR)) Modifiers.Builder()
) .setBackground(
.setCorner( Background.Builder()
Corner.Builder().setRadius(dp(CIRCLE_SIZE / 2)).build() .setColor(
) argb(ContextCompat.getColor(baseContext, BUTTON_COLOR))
.build() )
) .setCorner(
.setSemantics( Corner.Builder().setRadius(dp(circleDiameter / 2)).build()
Semantics.Builder() )
.setContentDescription(resources.getString(action.nameRes)) .build()
.build() )
) .setSemantics(
.setClickable( Semantics.Builder()
Clickable.Builder() .setContentDescription(text)
.setOnClick(doAction(action)) .build()
.build() )
) .setClickable(
.build() Clickable.Builder()
) .setOnClick(doAction(action))
.addContent( .build()
Column.Builder() )
.addContent( .build()
Image.Builder() )
.setWidth(ICON_SIZE) .addContent(
.setHeight(ICON_SIZE) Column.Builder()
.setResourceId(idIconActionPrefix + action.id) .addContent(
.build() Image.Builder()
).addContent( .setWidth(iconSize)
Text.Builder() .setHeight(iconSize)
.setText(resources.getString(action.nameRes)) .setResourceId(idIconActionPrefix + action.id)
.setFontStyle( .build()
FontStyles ).addContent(
.button(deviceParameters) Text.Builder()
.setColor( .setText(text)
argb(ContextCompat.getColor(baseContext, R.color.white)) .setFontStyle(
) FontStyle.Builder()
.build() .setWeight(FONT_WEIGHT_BOLD)
) .setColor(
.build() argb(ContextCompat.getColor(baseContext, R.color.white))
).build() )
) .setSize(buttonTextSize(deviceParameters, text))
.build() .build()
)
.build()
).build()
)
.build()
}
private fun buttonTextSize(deviceParameters: DeviceParameters, text: String): SpProp {
if (text.length > 6) {
return sp(if (isLargeScreen(deviceParameters)) 14f else 12f)
}
return sp(if (isLargeScreen(deviceParameters)) 16f else 14f)
}
private fun isLargeScreen(deviceParameters: DeviceParameters): Boolean {
return deviceParameters.screenWidthDp >= LARGE_SCREEN_WIDTH_DP
}
private fun getWearControl(): WearControl { private fun getWearControl(): WearControl {
val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this) val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)