caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2677 from Philoul/wear/new_custom_watchface

Browse source 
Custom Watchface 0.7
This commit is contained in:
Milos Kozak 2023-08-18 11:26:56 +02:00 committed by GitHub
commit fe5455f4e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 97 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt
View file

@ -17,11 +17,13 @@ import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream import java.util.zip.ZipInputStream
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
val CUSTOM_VERSION = "0.5" val CUSTOM_VERSION = "0.7"
enum class CustomWatchfaceDrawableDataKey(val key: String, @DrawableRes val icon: Int?, val fileName: String) { enum class CustomWatchfaceDrawableDataKey(val key: String, @DrawableRes val icon: Int?, val fileName: String) {
UNKNOWN("unknown", null, "Unknown"), UNKNOWN("unknown", null, "Unknown"),
CUSTOM_WATCHFACE("customWatchface", R.drawable.watchface_custom, "CustomWatchface"), CUSTOM_WATCHFACE("customWatchface", R.drawable.watchface_custom, "CustomWatchface"),
BACKGROUND("background", R.drawable.background, "Background"), BACKGROUND("background", R.drawable.background, "Background"),
BACKGROUND_HIGH("background", R.drawable.background, "BackgroundHigh"),
BACKGROUND_LOW("background", R.drawable.background, "BackgroundLow"),
COVERCHART("cover_chart", null, "CoverChart"), COVERCHART("cover_chart", null, "CoverChart"),
COVERPLATE("cover_plate", R.drawable.simplified_dial, "CoverPlate"), COVERPLATE("cover_plate", R.drawable.simplified_dial, "CoverPlate"),
HOURHAND("hour_hand", R.drawable.hour_hand, "HourHand"), HOURHAND("hour_hand", R.drawable.hour_hand, "HourHand"),

9
plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
View file

@ -68,8 +68,7 @@ class WearFragment : DaggerFragment() {
updateGui() updateGui()
} }
binding.exportCustom.setOnClickListener { binding.exportCustom.setOnClickListener {
wearPlugin.savedCustomWatchface?.let { importExportPrefs.exportCustomWatchface(it) } rxBus.send(EventMobileToWear(EventData.ActionrequestCustomWatchface(true)))
?: apply { rxBus.send(EventMobileToWear(EventData.ActionrequestCustomWatchface(true)))}
} }
} }
@ -79,10 +78,12 @@ class WearFragment : DaggerFragment() {
.toObservable(EventWearUpdateGui::class.java) .toObservable(EventWearUpdateGui::class.java)
.observeOn(aapsSchedulers.main) .observeOn(aapsSchedulers.main)
.subscribe({ .subscribe({
it.customWatchfaceData?.let { loadCustom(it) }
if (it.exportFile) if (it.exportFile)
ToastUtils.okToast(activity, rh.gs(R.string.wear_new_custom_watchface_exported)) ToastUtils.okToast(activity, rh.gs(R.string.wear_new_custom_watchface_exported))
updateGui() else {
it.customWatchfaceData?.let { loadCustom(it) }
updateGui()
}
}, fabricPrivacy::logException) }, fabricPrivacy::logException)
if (wearPlugin.savedCustomWatchface == null) if (wearPlugin.savedCustomWatchface == null)
rxBus.send(EventMobileToWear(EventData.ActionrequestCustomWatchface(false))) rxBus.send(EventMobileToWear(EventData.ActionrequestCustomWatchface(false)))

2
plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt
View file

@ -95,7 +95,7 @@ class WearPlugin @Inject constructor(
disposable += rxBus disposable += rxBus
.toObservable(EventWearUpdateGui::class.java) .toObservable(EventWearUpdateGui::class.java)
.observeOn(aapsSchedulers.main) .observeOn(aapsSchedulers.main)
.subscribe({ it.customWatchfaceData?.let { cwf -> savedCustomWatchface = cwf } }, fabricPrivacy::logException) .subscribe({ it.customWatchfaceData?.let { cwf -> if (!it.exportFile) savedCustomWatchface = cwf } }, fabricPrivacy::logException)
} }
override fun onStop() { override fun onStop() {

4
plugins/main/src/main/res/values/strings.xml
View file

@ -364,8 +364,8 @@
<string name="wear_custom_watchface">Custom Watchface: %1$s</string> <string name="wear_custom_watchface">Custom Watchface: %1$s</string>
<string name="wear_load_watchface">Load Watchface</string> <string name="wear_load_watchface">Load Watchface</string>
<string name="wear_send_watchface">Send Watchface</string> <string name="wear_send_watchface">Send Watchface</string>
<string name="wear_export_watchface">Export Watchface</string> <string name="wear_export_watchface">Export template</string>
<string name="wear_new_custom_watchface_exported">Custom watchface exported</string> <string name="wear_new_custom_watchface_exported">Custom watchface template exported</string>
<string name="resend_all_data">Resend All Data</string> <string name="resend_all_data">Resend All Data</string>
<string name="open_settings_on_wear">Open Settings on Wear</string> <string name="open_settings_on_wear">Open Settings on Wear</string>

4
wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
View file

@ -204,8 +204,8 @@ class DataHandlerWear @Inject constructor(
.toObservable(EventData.ActionrequestCustomWatchface::class.java) .toObservable(EventData.ActionrequestCustomWatchface::class.java)
.observeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.io)
.subscribe { eventData -> .subscribe { eventData ->
aapsLogger.debug(LTag.WEAR, "Custom Watchface requested from ${eventData.sourceNodeId}") aapsLogger.debug(LTag.WEAR, "Custom Watchface requested from ${eventData.sourceNodeId} export ${eventData.exportFile}")
persistence.readCustomWatchface()?.let { persistence.readCustomWatchface(eventData.exportFile)?.let {
rxBus.send(EventWearDataToMobile(EventData.ActionGetCustomWatchface(it, eventData.exportFile))) rxBus.send(EventWearDataToMobile(EventData.ActionGetCustomWatchface(it, eventData.exportFile)))
} }
} }

113
wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
View file

@ -2,6 +2,7 @@
package info.nightscout.androidaps.watchfaces package info.nightscout.androidaps.watchfaces
import android.annotation.SuppressLint
import android.app.ActionBar.LayoutParams import android.app.ActionBar.LayoutParams
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
@ -81,9 +82,10 @@ class CustomWatchface : BaseWatchFace() {
.build() .build()
} }
@SuppressLint("UseCompatLoadingForDrawables")
override fun setDataFields() { override fun setDataFields() {
super.setDataFields() super.setDataFields()
binding.direction2.setImageDrawable(resources.getDrawable(TrendArrow.icon(singleBg.slopeArrow))) binding.direction2.setImageDrawable(this.resources.getDrawable(TrendArrow.icon(singleBg.slopeArrow)))
// rotate the second hand. // rotate the second hand.
binding.secondHand.rotation = TimeOfDay().secondOfMinute * 6f binding.secondHand.rotation = TimeOfDay().secondOfMinute * 6f
// rotate the minute hand. // rotate the minute hand.
@ -119,11 +121,14 @@ class CustomWatchface : BaseWatchFace() {
} }
override fun setSecond() { override fun setSecond() {
binding.time.text = "${dateUtil.hourString()}:${dateUtil.minuteString()}" + if (showSecond) ":${dateUtil.secondString()}" else "" binding.time.text = if (showSecond)
getString(R.string.hour_minute_second, dateUtil.hourString(), dateUtil.minuteString(), dateUtil.secondString())
else
getString(R.string.hour_minute, dateUtil.hourString(), dateUtil.minuteString())
//binding.time.text = "${dateUtil.hourString()}:${dateUtil.minuteString()}" + if (showSecond) ":${dateUtil.secondString()}" else ""
binding.second.text = dateUtil.secondString() binding.second.text = dateUtil.secondString()
// rotate the second hand. // rotate the second hand.
binding.secondHand.rotation = TimeOfDay().secondOfMinute * 6f binding.secondHand.rotation = TimeOfDay().secondOfMinute * 6f
//aapsLogger.debug("XXXXX SetSecond $watchModeString")
} }
override fun updateSecondVisibility() { override fun updateSecondVisibility() {
@ -131,6 +136,7 @@ class CustomWatchface : BaseWatchFace() {
binding.secondHand.visibility = showSecond.toVisibility() binding.secondHand.visibility = showSecond.toVisibility()
} }
@SuppressLint("UseCompatLoadingForDrawables")
private fun setWatchfaceStyle() { private fun setWatchfaceStyle() {
val customWatchface = persistence.readCustomWatchface() ?: persistence.readCustomWatchface(true) val customWatchface = persistence.readCustomWatchface() ?: persistence.readCustomWatchface(true)
customWatchface?.let { customWatchface?.let {
@ -154,46 +160,56 @@ class CustomWatchface : BaseWatchFace() {
-1L -> lowColor -1L -> lowColor
else -> midColor else -> midColor
} }
val backGroundDrawable = when (singleBg.sgvLevel) {
1L -> drawableDataMap[CustomWatchfaceDrawableDataKey.BACKGROUND_HIGH]?.toDrawable(resources) ?: drawableDataMap[CustomWatchfaceDrawableDataKey.BACKGROUND]?.toDrawable(resources)
0L -> drawableDataMap[CustomWatchfaceDrawableDataKey.BACKGROUND]?.toDrawable(resources)
-1L -> drawableDataMap[CustomWatchfaceDrawableDataKey.BACKGROUND_LOW]?.toDrawable(resources) ?: drawableDataMap[CustomWatchfaceDrawableDataKey.BACKGROUND]?.toDrawable(resources)
else -> drawableDataMap[CustomWatchfaceDrawableDataKey.BACKGROUND]?.toDrawable(resources)
}
binding.mainLayout.forEach { view -> binding.mainLayout.forEach { view ->
CustomViews.fromId(view.id)?.let { id -> CustomViews.fromId(view.id)?.let { id ->
if (json.has(id.key)) { if (json.has(id.key)) {
var viewjson = json.getJSONObject(id.key) val viewJson = json.getJSONObject(id.key)
var wrapContent = LayoutParams.WRAP_CONTENT val wrapContent = LayoutParams.WRAP_CONTENT
val width = if (viewjson.has("width")) (viewjson.getInt("width") * zoomFactor).toInt() else wrapContent val width = if (viewJson.has("width")) (viewJson.getInt("width") * zoomFactor).toInt() else wrapContent
val height = if (viewjson.has("height")) (viewjson.getInt("height") * zoomFactor).toInt() else wrapContent val height = if (viewJson.has("height")) (viewJson.getInt("height") * zoomFactor).toInt() else wrapContent
var params = FrameLayout.LayoutParams(width, height) val params = FrameLayout.LayoutParams(width, height)
params.topMargin = if (viewjson.has("topmargin")) (viewjson.getInt("topmargin") * zoomFactor).toInt() else 0 params.topMargin = if (viewJson.has("topmargin")) (viewJson.getInt("topmargin") * zoomFactor).toInt() else 0
params.leftMargin = if (viewjson.has("leftmargin")) (viewjson.getInt("leftmargin") * zoomFactor).toInt() else 0 params.leftMargin = if (viewJson.has("leftmargin")) (viewJson.getInt("leftmargin") * zoomFactor).toInt() else 0
view.setLayoutParams(params) view.layoutParams = params
view.visibility = if (viewjson.has("visibility")) setVisibility(viewjson.getString("visibility"), id.visibility(sp)) else View.GONE view.visibility = if (viewJson.has("visibility")) setVisibility(viewJson.getString("visibility"), id.visibility(sp)) else View.GONE
if (view is TextView) { if (view is TextView) {
view.rotation = if (viewjson.has("rotation")) viewjson.getInt("rotation").toFloat() else 0F view.rotation = if (viewJson.has("rotation")) viewJson.getInt("rotation").toFloat() else 0F
view.setTextSize(TypedValue.COMPLEX_UNIT_PX, ((if (viewjson.has("textsize")) viewjson.getInt("textsize") else 22) * zoomFactor).toFloat()) view.setTextSize(TypedValue.COMPLEX_UNIT_PX, ((if (viewJson.has("textsize")) viewJson.getInt("textsize") else 22) * zoomFactor).toFloat())
view.gravity = GravityMap.gravity(if (viewjson.has("gravity")) viewjson.getString("gravity") else GravityMap.CENTER.key) view.gravity = GravityMap.gravity(if (viewJson.has("gravity")) viewJson.getString("gravity") else GravityMap.CENTER.key)
view.setTypeface( view.setTypeface(
FontMap.font(if (viewjson.has("font")) viewjson.getString("font") else FontMap.DEFAULT.key), FontMap.font(if (viewJson.has("font")) viewJson.getString("font") else FontMap.DEFAULT.key),
StyleMap.style(if (viewjson.has("fontStyle")) viewjson.getString("fontStyle") else StyleMap.NORMAL.key) StyleMap.style(if (viewJson.has("fontStyle")) viewJson.getString("fontStyle") else StyleMap.NORMAL.key)
) )
if (viewjson.has("fontColor")) if (viewJson.has("fontColor"))
view.setTextColor(getColor(viewjson.getString("fontColor"))) view.setTextColor(getColor(viewJson.getString("fontColor")))
if (viewjson.has("textvalue")) if (viewJson.has("textvalue"))
view.text = viewjson.getString("textvalue") view.text = viewJson.getString("textvalue")
} }
if (view is ImageView) { if (view is ImageView) {
view.clearColorFilter() view.clearColorFilter()
drawableDataMap[CustomWatchfaceDrawableDataKey.fromKey(id.key)]?.toDrawable(resources)?.also { val drawable = if (id.key == CustomWatchfaceDrawableDataKey.BACKGROUND.key)
if (viewjson.has("color")) backGroundDrawable
it.colorFilter = changeDrawableColor(getColor(viewjson.getString("color"))) else
drawableDataMap[CustomWatchfaceDrawableDataKey.fromKey(id.key)]?.toDrawable(resources)
drawable?.let {
if (viewJson.has("color"))
it.colorFilter = changeDrawableColor(getColor(viewJson.getString("color")))
else else
it.clearColorFilter() it.clearColorFilter()
view.setImageDrawable(it) view.setImageDrawable(it)
} ?: apply { } ?: apply {
view.setImageDrawable(CustomWatchfaceDrawableDataKey.fromKey(id.key).icon?.let { context.getDrawable(it) }) view.setImageDrawable(CustomWatchfaceDrawableDataKey.fromKey(id.key).icon?.let { context.getDrawable(it) })
if (viewjson.has("color")) if (viewJson.has("color"))
view.setColorFilter(getColor(viewjson.getString("color"))) view.setColorFilter(getColor(viewJson.getString("color")))
else else
view.clearColorFilter() view.clearColorFilter()
} }
@ -315,23 +331,19 @@ class CustomWatchface : BaseWatchFace() {
else -> "gone" else -> "gone"
} }
fun getResourceByteArray(resourceId: Int): ByteArray? { private fun getResourceByteArray(resourceId: Int): ByteArray? {
val inputStream = resources.openRawResource(resourceId) val inputStream = resources.openRawResource(resourceId)
val byteArrayOutputStream = ByteArrayOutputStream() val byteArrayOutputStream = ByteArrayOutputStream()
try { val buffer = ByteArray(1024)
val buffer = ByteArray(1024) var count: Int
var count: Int while (inputStream.read(buffer).also { count = it } != -1) {
while (inputStream.read(buffer).also { count = it } != -1) { byteArrayOutputStream.write(buffer, 0, count)
byteArrayOutputStream.write(buffer, 0, count)
}
byteArrayOutputStream.close()
inputStream.close()
return byteArrayOutputStream.toByteArray()
} catch (e: Exception) {
} }
return null byteArrayOutputStream.close()
inputStream.close()
return byteArrayOutputStream.toByteArray()
} }
private fun changeDrawableColor(color: Int): ColorFilter { private fun changeDrawableColor(color: Int): ColorFilter {
@ -351,16 +363,11 @@ class CustomWatchface : BaseWatchFace() {
return ColorMatrixColorFilter(colorMatrix) return ColorMatrixColorFilter(colorMatrix)
} }
private fun getColor(color: String): Int { private fun getColor(color: String): Int =
if (color == "bgColor") if (color == "bgColor")
return bgColor bgColor
else else
return try { try { Color.parseColor(color) } catch (e: Exception) { Color.GRAY }
Color.parseColor(color)
} catch (e: Exception) {
Color.GRAY
}
}
private enum class CustomViews(val key: String, @IdRes val id: Int, @StringRes val pref: Int?) { private enum class CustomViews(val key: String, @IdRes val id: Int, @StringRes val pref: Int?) {
@ -369,6 +376,8 @@ class CustomWatchface : BaseWatchFace() {
COVER_CHART(CustomWatchfaceDrawableDataKey.COVERCHART.key, R.id.cover_chart, null), COVER_CHART(CustomWatchfaceDrawableDataKey.COVERCHART.key, R.id.cover_chart, null),
FREETEXT1("freetext1", R.id.freetext1, null), FREETEXT1("freetext1", R.id.freetext1, null),
FREETEXT2("freetext2", R.id.freetext2, null), FREETEXT2("freetext2", R.id.freetext2, null),
FREETEXT3("freetext3", R.id.freetext3, null),
FREETEXT4("freetext4", R.id.freetext4, null),
IOB1("iob1", R.id.iob1, R.string.key_show_iob), IOB1("iob1", R.id.iob1, R.string.key_show_iob),
IOB2("iob2", R.id.iob2, R.string.key_show_iob), IOB2("iob2", R.id.iob2, R.string.key_show_iob),
COB1("cob1", R.id.cob1, R.string.key_show_cob), COB1("cob1", R.id.cob1, R.string.key_show_cob),
@ -398,7 +407,6 @@ class CustomWatchface : BaseWatchFace() {
companion object { companion object {
fun fromKey(key: String): CustomViews? = values().firstOrNull { it.key == key }
fun fromId(id: Int): CustomViews? = values().firstOrNull { it.id == id } fun fromId(id: Int): CustomViews? = values().firstOrNull { it.id == id }
} }
@ -443,13 +451,12 @@ class CustomWatchface : BaseWatchFace() {
DEFAULT_BOLD("default-bold", Typeface.DEFAULT_BOLD, null), DEFAULT_BOLD("default-bold", Typeface.DEFAULT_BOLD, null),
MONOSPACE("monospace", Typeface.MONOSPACE, null), MONOSPACE("monospace", Typeface.MONOSPACE, null),
SERIF("serif", Typeface.SERIF, null), SERIF("serif", Typeface.SERIF, null),
ROBOTO_CONDENSED_BOLD("roboto-condensed-bold", Typeface.DEFAULT, R.font.roboto_condensed_bold), ROBOTO_CONDENSED_BOLD("roboto_condensed_bold", Typeface.DEFAULT, R.font.roboto_condensed_bold),
ROBOTO_CONDENSED_LIGHT("roboto-condensed-light", Typeface.DEFAULT, R.font.roboto_condensed_light), ROBOTO_CONDENSED_LIGHT("roboto_condensed_light", Typeface.DEFAULT, R.font.roboto_condensed_light),
ROBOTO_CONDENSED_REGULAR("roboto-condensed-regular", Typeface.DEFAULT, R.font.roboto_condensed_regular), ROBOTO_CONDENSED_REGULAR("roboto_condensed_regular", Typeface.DEFAULT, R.font.roboto_condensed_regular),
ROBOTO_SLAB_LIGHT("roboto-slab-light", Typeface.DEFAULT, R.font.roboto_slab_light); ROBOTO_SLAB_LIGHT("roboto_slab_light", Typeface.DEFAULT, R.font.roboto_slab_light);
companion object { companion object {
fun init(context: Context) = values().forEach { it.font = it.fontRessources?.let { font -> ResourcesCompat.getFont(context, font) } ?: it.font } fun init(context: Context) = values().forEach { it.font = it.fontRessources?.let { font -> ResourcesCompat.getFont(context, font) } ?: it.font }
fun font(key: String) = values().firstOrNull { it.key == key }?.font ?: DEFAULT.font fun font(key: String) = values().firstOrNull { it.key == key }?.font ?: DEFAULT.font
fun key() = DEFAULT.key fun key() = DEFAULT.key

22
wear/src/main/res/layout/activity_custom.xml
View file

@ -56,6 +56,28 @@
android:visibility="gone" android:visibility="gone"
android:textColor="@color/light_grey" /> android:textColor="@color/light_grey" />
<TextView
android:id="@+id/freetext3"
android:layout_width="0px"
android:layout_height="0px"
android:layout_marginTop="0px"
android:layout_marginLeft="0px"
android:textSize="21px"
android:gravity="center"
android:visibility="gone"
android:textColor="@color/light_grey" />
<TextView
android:id="@+id/freetext4"
android:layout_width="0px"
android:layout_height="0px"
android:layout_marginTop="0px"
android:layout_marginLeft="0px"
android:textSize="21px"
android:gravity="center"
android:visibility="gone"
android:textColor="@color/light_grey" />
<TextView <TextView
android:id="@+id/iob1" android:id="@+id/iob1"
android:layout_width="130px" android:layout_width="130px"

2
wear/src/main/res/values/strings.xml
View file

@ -240,6 +240,8 @@
<string name="week_short">w</string> <string name="week_short">w</string>
<string name="day_short">d</string> <string name="day_short">d</string>
<string name="hour_short">h</string> <string name="hour_short">h</string>
<string name="hour_minute">%1$s:%2$s</string>
<string name="hour_minute_second">%1$s:%2$s:%3$s</string>
<string name="old">old</string> <string name="old">old</string>
<string name="old_warning">!old!</string> <string name="old_warning">!old!</string>
<string name="error">!err!</string> <string name="error">!err!</string>