caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2880 from Philoul/wear/new_custom_watchface

Browse source 
Wear Remove Cockpit Watchface
This commit is contained in:
Milos Kozak 2023-10-07 09:31:24 +02:00 committed by GitHub
parent c9606d8aa4 75b38523b8
commit dfbcb79b21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 19 additions and 599 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
wear/src/main/AndroidManifest.xml
View file

@ -120,31 +120,6 @@
</intent-filter>
</service>
<service
android:name=".watchfaces.CockpitWatchface"
android:allowEmbedded="true"
android:exported="false"
android:label="@string/label_watchface_cockpit"
android:permission="android.permission.BIND_WALLPAPER">
<meta-data
android:name="android.service.wallpaper"
android:resource="@xml/watch_face" />
<meta-data
android:name="com.google.android.wearable.watchface.preview"
android:resource="@drawable/watchface_cockpit" />
<meta-data
android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
android:value="watch_face_configuration_cockpit" />
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService" />
<category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
<action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
<action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
</intent-filter>
</service>
<service
android:name=".watchfaces.AapsLargeWatchface"
android:allowEmbedded="true"
@ -624,7 +599,6 @@
<!-- action-name must be equal with name of xml-resource where the configuration is describe -->
<action android:name="watch_face_configuration_bigchart" />
<action android:name="watch_face_configuration_circle" />
<action android:name="watch_face_configuration_cockpit" />
<action android:name="watch_face_configuration_custom" />
<action android:name="watch_face_configuration_digitalstyle" />
<action android:name="watch_face_configuration_home" />

2
wear/src/main/kotlin/app/aaps/wear/di/WearServicesModule.kt
View file

@ -24,7 +24,6 @@ import app.aaps.wear.watchfaces.AapsV2Watchface
import app.aaps.wear.watchfaces.AapsWatchface
import app.aaps.wear.watchfaces.BigChartWatchface
import app.aaps.wear.watchfaces.CircleWatchface
import app.aaps.wear.watchfaces.CockpitWatchface
import app.aaps.wear.watchfaces.CustomWatchface
import app.aaps.wear.watchfaces.DigitalStyleWatchface
import app.aaps.wear.watchfaces.NoChartWatchface
@ -57,7 +56,6 @@ abstract class WearServicesModule {
@ContributesAndroidInjector abstract fun contributesAapsV2Watchface(): AapsV2Watchface
@ContributesAndroidInjector abstract fun contributesAapsLargeWatchface(): AapsLargeWatchface
@ContributesAndroidInjector abstract fun contributesDigitalStyleWatchface(): DigitalStyleWatchface
@ContributesAndroidInjector abstract fun contributesCockpitWatchface(): CockpitWatchface
@ContributesAndroidInjector abstract fun contributesBIGChart(): BigChartWatchface
@ContributesAndroidInjector abstract fun contributesNOChart(): NoChartWatchface
@ContributesAndroidInjector abstract fun contributesCircleWatchface(): CircleWatchface

78
wear/src/main/kotlin/app/aaps/wear/watchfaces/CockpitWatchface.kt
View file

@ -1,78 +0,0 @@
package app.aaps.wear.watchfaces
import android.view.LayoutInflater
import android.view.View
import androidx.viewbinding.ViewBinding
import app.aaps.wear.R
import app.aaps.wear.databinding.ActivityCockpitBinding
import app.aaps.wear.watchfaces.utils.BaseWatchFace
/**
* Created by andrew-warrington on 18/11/2017.
* Refactored by MilosKozak 24/04/2022
*/
class CockpitWatchface : BaseWatchFace() {
private lateinit var binding: ActivityCockpitBinding
override fun inflateLayout(inflater: LayoutInflater): ViewBinding {
binding = ActivityCockpitBinding.inflate(inflater)
return binding
}
override fun setColorDark() {
binding.mainLayout.setBackgroundResource(R.drawable.airplane_cockpit_outside_clouds)
setTextSizes()
val led = when (singleBg.sgvLevel) {
1L -> R.drawable.airplane_led_yellow_lit
0L -> R.drawable.airplane_led_grey_unlit
-1L -> R.drawable.airplane_led_red_lit
else -> R.drawable.airplane_led_grey_unlit
}
binding.highLight.setBackgroundResource(led)
binding.lowLight.setBackgroundResource(led)
when (loopLevel) {
-1 -> binding.loop.setBackgroundResource(R.drawable.loop_grey_25)
1 -> binding.loop.setBackgroundResource(R.drawable.loop_green_25)
else -> binding.loop.setBackgroundResource(R.drawable.loop_red_25)
}
invalidate()
}
override fun setColorLowRes() {
binding.mainLayout.setBackgroundResource(R.drawable.airplane_cockpit_outside_clouds_lowres)
}
override fun setColorBright() {
setColorDark()
}
private fun setTextSizes() {
if (detailedIob) {
if (bIsRound) binding.iob2.textSize = 10f
else binding.iob2.textSize = 9f
} else {
if (bIsRound) binding.iob2.textSize = 13f
else binding.iob2.textSize = 12f
}
if (binding.uploaderBattery.visibility != View.GONE && binding.rigBattery.visibility != View.GONE) {
if (bIsRound) {
binding.uploaderBattery.textSize = 12f
binding.rigBattery.textSize = 12f
} else {
binding.uploaderBattery.textSize = 10f
binding.rigBattery.textSize = 10f
}
} else {
if (bIsRound) {
binding.uploaderBattery.textSize = 13f
binding.rigBattery.textSize = 13f
} else {
binding.uploaderBattery.textSize = 12f
binding.rigBattery.textSize = 12f
}
}
}
}

43
wear/src/main/kotlin/app/aaps/wear/watchfaces/utils/WatchfaceViewAdapter.kt
View file

@ -2,7 +2,6 @@ package app.aaps.wear.watchfaces.utils
import androidx.viewbinding.ViewBinding
import app.aaps.wear.databinding.ActivityBigchartBinding
import app.aaps.wear.databinding.ActivityCockpitBinding
import app.aaps.wear.databinding.ActivityCustomBinding
import app.aaps.wear.databinding.ActivityDigitalstyleBinding
import app.aaps.wear.databinding.ActivityHome2Binding
@ -19,14 +18,13 @@ class WatchfaceViewAdapter(
a2: ActivityHome2Binding? = null,
aa: ActivityHomeBinding? = null,
bC: ActivityBigchartBinding? = null,
cp: ActivityCockpitBinding? = null,
ds: ActivityDigitalstyleBinding? = null,
nC: ActivityNochartBinding? = null,
cU: ActivityCustomBinding? = null
) {
init {
if (aL == null && a2 == null && aa == null && bC == null && cp == null && ds == null && nC == null && cU == null) {
if (aL == null && a2 == null && aa == null && bC == null && ds == null && nC == null && cU == null) {
throw IllegalArgumentException("Require at least on Binding parameter")
}
}
@ -35,36 +33,36 @@ class WatchfaceViewAdapter(
// Required attributes
val mainLayout =
aL?.mainLayout ?: a2?.mainLayout ?: aa?.mainLayout ?: bC?.mainLayout ?: bC?.mainLayout ?: cp?.mainLayout ?: ds?.mainLayout ?: nC?.mainLayout ?: cU?.mainLayout
aL?.mainLayout ?: a2?.mainLayout ?: aa?.mainLayout ?: bC?.mainLayout ?: bC?.mainLayout ?: ds?.mainLayout ?: nC?.mainLayout ?: cU?.mainLayout
?: throw IllegalArgumentException(errorMessage)
val timestamp =
aL?.timestamp ?: a2?.timestamp ?: aa?.timestamp ?: bC?.timestamp ?: bC?.timestamp ?: cp?.timestamp ?: ds?.timestamp ?: nC?.timestamp ?: cU?.timestamp
aL?.timestamp ?: a2?.timestamp ?: aa?.timestamp ?: bC?.timestamp ?: bC?.timestamp ?: ds?.timestamp ?: nC?.timestamp ?: cU?.timestamp
?: throw IllegalArgumentException(errorMessage)
val root =
aL?.root ?: a2?.root ?: aa?.root ?: bC?.root ?: bC?.root ?: cp?.root ?: ds?.root ?: nC?.root ?: cU?.root
aL?.root ?: a2?.root ?: aa?.root ?: bC?.root ?: bC?.root ?: ds?.root ?: nC?.root ?: cU?.root
?: throw IllegalArgumentException(errorMessage)
// Optional attributes
val sgv = aL?.sgv ?: a2?.sgv ?: aa?.sgv ?: bC?.sgv ?: bC?.sgv ?: cp?.sgv ?: ds?.sgv ?: nC?.sgv ?: cU?.sgv
val direction = aL?.direction ?: a2?.direction ?: aa?.direction ?: cp?.direction ?: ds?.direction
val loop = a2?.loop ?: cp?.loop ?: cU?.loop
val delta = aL?.delta ?: a2?.delta ?: aa?.delta ?: bC?.delta ?: bC?.delta ?: cp?.delta ?: ds?.delta ?: nC?.delta ?: cU?.delta
val avgDelta = a2?.avgDelta ?: bC?.avgDelta ?: bC?.avgDelta ?: cp?.avgDelta ?: ds?.avgDelta ?: nC?.avgDelta ?: cU?.avgDelta
val uploaderBattery = aL?.uploaderBattery ?: a2?.uploaderBattery ?: aa?.uploaderBattery ?: cp?.uploaderBattery ?: ds?.uploaderBattery ?: cU?.uploaderBattery
val rigBattery = a2?.rigBattery ?: cp?.rigBattery ?: ds?.rigBattery ?: cU?.rigBattery
val basalRate = a2?.basalRate ?: cp?.basalRate ?: ds?.basalRate ?: cU?.basalRate
val sgv = aL?.sgv ?: a2?.sgv ?: aa?.sgv ?: bC?.sgv ?: bC?.sgv ?: ds?.sgv ?: nC?.sgv ?: cU?.sgv
val direction = aL?.direction ?: a2?.direction ?: aa?.direction ?: ds?.direction
val loop = a2?.loop ?: cU?.loop
val delta = aL?.delta ?: a2?.delta ?: aa?.delta ?: bC?.delta ?: bC?.delta ?: ds?.delta ?: nC?.delta ?: cU?.delta
val avgDelta = a2?.avgDelta ?: bC?.avgDelta ?: bC?.avgDelta ?: ds?.avgDelta ?: nC?.avgDelta ?: cU?.avgDelta
val uploaderBattery = aL?.uploaderBattery ?: a2?.uploaderBattery ?: aa?.uploaderBattery ?: ds?.uploaderBattery ?: cU?.uploaderBattery
val rigBattery = a2?.rigBattery ?: ds?.rigBattery ?: cU?.rigBattery
val basalRate = a2?.basalRate ?: ds?.basalRate ?: cU?.basalRate
val bgi = a2?.bgi ?: ds?.bgi ?: cU?.bgi
val AAPSv2 = a2?.AAPSv2 ?: cp?.AAPSv2 ?: ds?.AAPSv2 ?: cU?.AAPSv2
val AAPSv2 = a2?.AAPSv2 ?: ds?.AAPSv2 ?: cU?.AAPSv2
val cob1 = a2?.cob1 ?: ds?.cob1 ?: cU?.cob1
val cob2 = a2?.cob2 ?: cp?.cob2 ?: ds?.cob2 ?: cU?.cob2
val time = aL?.time ?: a2?.time ?: aa?.time ?: bC?.time ?: bC?.time ?: cp?.time ?: nC?.time ?: cU?.time
val cob2 = a2?.cob2 ?: ds?.cob2 ?: cU?.cob2
val time = aL?.time ?: a2?.time ?: aa?.time ?: bC?.time ?: bC?.time ?: nC?.time ?: cU?.time
val second = cU?.second
val minute = ds?.minute ?: cU?.minute
val hour = ds?.hour ?: cU?.hour
val day = a2?.day ?: ds?.day ?: cU?.day
val month = a2?.month ?: ds?.month ?: cU?.month
val iob1 = a2?.iob1 ?: ds?.iob1 ?: cU?.iob1
val iob2 = a2?.iob2 ?: cp?.iob2 ?: ds?.iob2 ?: cU?.iob2
val iob2 = a2?.iob2 ?: ds?.iob2 ?: cU?.iob2
val chart = a2?.chart ?: aa?.chart ?: bC?.chart ?: bC?.chart ?: ds?.chart ?: cU?.chart
val status = aL?.status ?: aa?.status ?: bC?.status ?: bC?.status ?: nC?.status
val timePeriod = ds?.timePeriod ?: aL?.timePeriod ?: nC?.timePeriod ?: bC?.timePeriod ?: cU?.timePeriod
@ -76,8 +74,6 @@ class WatchfaceViewAdapter(
// val minuteHand = cU?.minuteHand
// val secondaryLayout = aL?.secondaryLayout ?: a2?.secondaryLayout ?: aa?.secondaryLayout ?: ds?.secondaryLayout
// val tertiaryLayout = a2?.tertiaryLayout
// val highLight = cp?.highLight
// val lowLight = cp?.lowLight
// val hourHand = cU?.hourHand
companion object {
@ -88,10 +84,9 @@ class WatchfaceViewAdapter(
is ActivityHome2Binding -> WatchfaceViewAdapter(null, bindLayout)
is ActivityHomeBinding -> WatchfaceViewAdapter(null, null, bindLayout)
is ActivityBigchartBinding -> WatchfaceViewAdapter(null, null, null, bindLayout)
is ActivityCockpitBinding -> WatchfaceViewAdapter(null, null, null, null, bindLayout)
is ActivityDigitalstyleBinding -> WatchfaceViewAdapter(null, null, null, null, null, bindLayout)
is ActivityNochartBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, bindLayout)
is ActivityCustomBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout)
is ActivityDigitalstyleBinding -> WatchfaceViewAdapter(null, null, null, null, bindLayout)
is ActivityNochartBinding -> WatchfaceViewAdapter(null, null, null, null, null, bindLayout)
is ActivityCustomBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, bindLayout)
else -> throw IllegalArgumentException("ViewBinding is not implement in WatchfaceViewAdapter")
}
}

BIN
wear/src/main/res/drawable/airplane_cockpit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 651 KiB

BIN
wear/src/main/res/drawable/airplane_cockpit_outside_clouds.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 651 KiB

BIN
wear/src/main/res/drawable/airplane_cockpit_outside_clouds_lowres.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 651 KiB

BIN
wear/src/main/res/drawable/airplane_led_grey_unlit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
wear/src/main/res/drawable/airplane_led_red_lit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
wear/src/main/res/drawable/airplane_led_yellow_lit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
wear/src/main/res/drawable/watchface_cockpit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 60 KiB

444
wear/src/main/res/layout/activity_cockpit.xml
View file

@ -1,444 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/airplane_cockpit_outside_clouds"
tools:context=".watchfaces.CockpitWatchface">
<LinearLayout
android:id="@+id/inside"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/airplane_cockpit"
android:orientation="vertical"
android:weightSum="1">
<View
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="0.095" />
<LinearLayout
android:id="@+id/windows"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="0.2575"
android:orientation="horizontal">
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.47"
tools:ignore="NestedWeights" />
<LinearLayout
android:id="@+id/warnings"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.06"
android:baselineAligned="false"
android:orientation="vertical">
<View
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="0.2" />
<TextView
android:id="@+id/highLight"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/airplane_led_grey_unlit"
android:gravity="center"
android:text="@string/first_char_high"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="8sp"
android:textStyle="bold"
tools:ignore="SmallSp" />
<View
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="2" />
<TextView
android:id="@+id/lowLight"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@drawable/airplane_led_grey_unlit"
android:gravity="center"
android:text="@string/first_char_low"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="8sp"
android:textStyle="bold"
tools:ignore="SmallSp" />
<View
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="0.2" />
</LinearLayout>
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.47" />
</LinearLayout>
<LinearLayout
android:id="@+id/dashboard"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="0.0775"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:id="@+id/instruments"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.57"
android:orientation="horizontal">
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08"
tools:ignore="NestedWeights" />
<LinearLayout
android:id="@+id/panel1"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.275"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.07" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.5"
android:orientation="vertical"
android:weightSum="1">
<TextView
android:id="@+id/sgv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:text="---"
android:textColor="@color/primary_text_dark"
android:textSize="30sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.03" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.276"
android:orientation="horizontal"
android:weightSum="1">
<TextView
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.35"
tools:ignore="NestedWeights" />
<TextView
android:id="@+id/timestamp"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="0.65"
android:gravity="center"
android:text="--'"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.10" />
</LinearLayout>
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.0225" />
<LinearLayout
android:id="@+id/panel2"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.245"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.020" />
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.19"
android:gravity="center"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="18sp"
android:textStyle="bold"
tools:text="12:00" />
<TextView
android:id="@+id/basalRate"
android:layout_width="wrap_content"
android:layout_height="0px"
android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.19"
android:gravity="bottom|center_horizontal"
android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="13sp"
android:textStyle="bold" />
<TextView
android:id="@+id/iob2"
android:layout_width="wrap_content"
android:layout_height="0px"
android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.18"
android:gravity="bottom|center_horizontal"
android:text="@string/no_iob_u"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="13sp"
android:textStyle="bold" />
<TextView
android:id="@+id/cob2"
android:layout_width="wrap_content"
android:layout_height="0px"
android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.185"
android:gravity="bottom|center_horizontal"
android:text="@string/no_cob_g"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="13sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.185"
android:gravity="center"
android:orientation="horizontal"
android:textAlignment="center">
<TextView
android:id="@+id/uploader_battery"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="bottom|center_horizontal"
android:gravity="bottom|center_horizontal"
android:text="--%"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="13sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/rig_battery"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="bottom|center_horizontal"
android:gravity="bottom|center_horizontal"
android:paddingStart="4dp"
android:paddingEnd="0dp"
android:text="--%"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="13sp"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="HardcodedText" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.06" />
</LinearLayout>
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.0225" />
<LinearLayout
android:id="@+id/panel3"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.275"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.07" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.5"
android:gravity="center"
android:orientation="vertical"
android:weightSum="0.5">
<TextView
android:id="@+id/direction"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.333"
android:gravity="center"
android:text="--"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="28sp"
android:textStyle="bold"
tools:ignore="HardcodedText, NestedWeights" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.167"
android:gravity="center"
android:weightSum="2">
<TextView
android:id="@+id/delta"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="+/-"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="13sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/avg_delta"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="@string/abbreviation_average"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="13sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.06" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.250"
android:orientation="horizontal"
android:weightSum="1">
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.1"
tools:ignore="NestedWeights" />
<TextView
android:id="@+id/loop"
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_gravity="start"
android:layout_weight="0.5"
android:background="@drawable/loop_grey_25"
android:gravity="center"
android:text="--'"
android:textAlignment="center"
android:textColor="@color/primary_text_dark"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<View
android:id="@+id/AAPSv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.16" />
</LinearLayout>
<View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

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

@ -8,8 +8,6 @@
<string name="label_watchface_no_chart">AAPS(NoChart)</string>
<string name="label_watchface_circle">AAPS(Circle)</string>
<string name="label_watchface_v2">AAPS(v2)</string>
<string name="label_watchface_cockpit">AAPS(Cockpit)</string>
<string name="label_watchface_steampunk">AAPS(Steampunk)</string>
<string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
<string name="label_watchface_custom">AAPS(Custom)</string>
<string name="label_actions_tile">AAPS(Actions)</string>
@ -62,7 +60,6 @@
<string name="pref_quick_righty">Quick righty</string>
<string name="pref_quick_lefty">Quick lefty</string>
<string name="pref_modern_sparse">Modern Sparse</string>
<string name="pref_delta_granularity">Delta Granularity (Steampunk)</string>
<string name="pref_low">Low</string>
<string name="pref_medium">Medium</string>
<string name="pref_high">High</string>
@ -243,8 +240,6 @@
<string name="key_low_color" translatable="false">lowcolor</string>
<string name="increment">increment</string>
<string name="decrement">decrement</string>
<string name="first_char_high">H</string>
<string name="first_char_low">L</string>
<string name="abbreviation_average">avg</string>
<string name="no_iob_u">--U</string>
<string name="no_cob_g">--g</string>

20
wear/src/main/res/xml/watch_face_configuration_cockpit.xml
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/key_vibrate_hourly"
android:title="@string/pref_vibrate_hourly"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />
<ListPreference
android:defaultValue="off"
android:entries="@array/watchface_simplify_ui_name"
android:entryValues="@array/watchface_simplify_ui_values"
android:key="@string/key_simplify_ui"
android:summary="@string/pref_simplify_ui_sum"
android:title="@string/pref_simplify_ui" />
</PreferenceScreen>