caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: remove wear layout lint warning

Browse source
This commit is contained in:
Andries Smit 2022-06-01 09:45:59 +02:00
parent dceca8d194
commit 366a325279
33 changed files with 3300 additions and 3354 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt
View file

@ -13,11 +13,11 @@ import android.os.Vibrator
import android.support.wearable.watchface.WatchFaceStyle import android.support.wearable.watchface.WatchFaceStyle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup
import android.view.WindowInsets import android.view.WindowInsets
import android.view.WindowManager import android.view.WindowManager
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView import android.widget.TextView
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
@ -100,14 +100,14 @@ abstract class BaseWatchFace : WatchFace() {
var mDay: TextView? = null var mDay: TextView? = null
var mDayName: TextView? = null var mDayName: TextView? = null
var mMonth: TextView? = null var mMonth: TextView? = null
var isAAPSv2: TextView? = null var isAAPSv2: View? = null
var mHighLight: TextView? = null var mHighLight: TextView? = null
var mLowLight: TextView? = null var mLowLight: TextView? = null
var mGlucoseDial: ImageView? = null var mGlucoseDial: ImageView? = null
var mDeltaGauge: ImageView? = null var mDeltaGauge: ImageView? = null
var mHourHand: ImageView? = null var mHourHand: ImageView? = null
var mMinuteHand: ImageView? = null var mMinuteHand: ImageView? = null
var mRelativeLayout: RelativeLayout? = null var mRelativeLayout: ViewGroup? = null
var mLinearLayout: LinearLayout? = null var mLinearLayout: LinearLayout? = null
var mLinearLayout2: LinearLayout? = null var mLinearLayout2: LinearLayout? = null
var mDate: LinearLayout? = null var mDate: LinearLayout? = null

97
wear/src/main/res/layout-notround/activity_bigchart.xml
View file

@ -1,58 +1,61 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:gravity="center_horizontal"
android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:paddingTop="5dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp" android:layout_marginTop="-5dp"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="5dp"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="30sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginEnd="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginEnd="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="30sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="41sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" /> android:gravity="center_horizontal"
android:text="---"
android:textColor="@color/white"
android:textSize="41sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
android:textSize="30sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginStart="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginStart="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="30sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -66,43 +69,43 @@
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="18sp"
android:text="E xU/h IOB: x (x+x)"
android:layout_width="wrap_content"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> android:textColor="@color/white"
android:textSize="18sp"
tools:text="E xU/h IOB: x (x+x)" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="35sp"
android:text="12:00"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_gravity="center_horizontal" /> android:textAlignment="center"
android:textColor="@color/white"
android:textSize="35sp"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="26sp"
android:text="-- '"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_height="wrap_content" /> android:textAlignment="center"
android:textColor="@color/white"
android:textSize="26sp"
tools:text="-- '" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout>

53
wear/src/main/res/layout-notround/activity_bigchart_small.xml
View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:gravity="center_horizontal"
android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -30,8 +30,9 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
@ -40,8 +41,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="34sp" /> android:textSize="34sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -51,8 +53,9 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -62,10 +65,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5sp" android:layout_marginTop="-5sp"
android:text="E xU/h IOB: x (x+x)"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="E xU/h IOB: x (x+x)" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart" android:id="@+id/chart"
@ -90,10 +93,10 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:paddingTop="-5sp" android:paddingTop="-5sp"
android:text="12:00"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="34sp" /> android:textSize="34sp"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -102,10 +105,10 @@
android:layout_gravity="center_vertical|center_horizontal|center" android:layout_gravity="center_vertical|center_horizontal|center"
android:text="--'" android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
</LinearLayout> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

201
wear/src/main/res/layout-notround/activity_cockpit.xml
View file

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.CockpitWatchface" tools:deviceIds="wear_square"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:background="@drawable/airplane_cockpit_outside_clouds"> android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/airplane_cockpit_outside_clouds"
tools:context=".watchfaces.CockpitWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:id="@+id/inside" android:id="@+id/inside"
@ -13,31 +17,21 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:orientation="vertical" android:layout_weight="0.095" />
android:layout_weight="0.095">
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/windows" android:id="@+id/windows"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:orientation="vertical" android:layout_weight="0.2575"
android:layout_weight="0.2575"> android:orientation="horizontal">
<LinearLayout <View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<TextView
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="0.47" /> android:layout_weight="0.47" />
<LinearLayout <LinearLayout
@ -48,10 +42,9 @@
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="vertical">
<TextView <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="bottom"
android:layout_weight="0.2" /> android:layout_weight="0.2" />
<TextView <TextView
@ -62,16 +55,16 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/airplane_led_grey_unlit" android:background="@drawable/airplane_led_grey_unlit"
android:gravity="center" android:gravity="center"
android:text="H" android:text="@string/first_char_high"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="8sp" android:textSize="8sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="bottom"
android:layout_weight="2" /> android:layout_weight="2" />
<TextView <TextView
@ -82,36 +75,33 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/airplane_led_grey_unlit" android:background="@drawable/airplane_led_grey_unlit"
android:gravity="center" android:gravity="center"
android:text="L" android:text="@string/first_char_low"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="8sp" android:textSize="8sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="bottom"
android:layout_weight="0.2" /> android:layout_weight="0.2" />
</LinearLayout> </LinearLayout>
<TextView <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="0.47" /> android:layout_weight="0.47" />
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/dashboard" android:id="@+id/dashboard"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:orientation="vertical" android:layout_weight="0.0775"
android:layout_weight="0.0775"> android:orientation="vertical">
</LinearLayout> </LinearLayout>
@ -120,41 +110,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.57" android:layout_weight="0.57"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08"
android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
</LinearLayout> <View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08" />
<LinearLayout <LinearLayout
android:id="@+id/panel1" android:id="@+id/panel1"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="0.275" android:layout_weight="0.275"
android:baselineAligned="false" android:orientation="vertical">
android:orientation="horizontal"
android:gravity="center"
android:textAlignment="center">
<LinearLayout <View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1">
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.07" /> android:layout_weight="0.07" />
@ -169,12 +139,12 @@
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0px" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1"
android:text="---" android:text="---"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="30sp" /> android:textSize="30sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -201,40 +171,34 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="0.65" android:layout_weight="0.65"
android:text="--'"
android:gravity="center" android:gravity="center"
android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</LinearLayout> <View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.07" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.0225" android:layout_weight="0.0225" />
android:baselineAligned="false"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/panel2" android:id="@+id/panel2"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.245" android:layout_weight="0.245"
android:orientation="horizontal"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1.01">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -248,11 +212,11 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="0.19" android:layout_weight="0.19"
android:gravity="center" android:gravity="center"
android:text="12:00"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/tmpBasal" android:id="@+id/tmpBasal"
@ -261,7 +225,7 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.19" android:layout_weight="0.19"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="12sp" android:textSize="12sp"
@ -274,7 +238,7 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.18" android:layout_weight="0.18"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="--U" android:text="@string/no_iob_u"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="12sp" android:textSize="12sp"
@ -287,9 +251,9 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.185" android:layout_weight="0.185"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="--g" android:text="@string/no_cob_g"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -312,7 +276,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/rig_battery" android:id="@+id/rig_battery"
@ -321,49 +286,37 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp"
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<TextView <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.06" /> android:layout_weight="0.06" />
</LinearLayout> </LinearLayout>
</LinearLayout> <View
<LinearLayout
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.0225" android:layout_weight="0.0225" />
android:baselineAligned="false"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/panel3" android:id="@+id/panel3"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.275" android:layout_weight="0.275"
android:baselineAligned="false" android:orientation="vertical">
android:orientation="horizontal"
android:textAlignment="center">
<LinearLayout <View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1">
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.07" /> android:layout_weight="0.07" />
@ -388,14 +341,15 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="28sp" android:textSize="28sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.167" android:layout_weight="0.167"
android:gravity="center" android:gravity="center"
android:layout_gravity="center"
android:weightSum="2"> android:weightSum="2">
<TextView <TextView
@ -409,7 +363,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -418,7 +373,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="avg" android:text="@string/abbreviation_average"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
@ -431,7 +386,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.03" /> android:layout_weight="0.06" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -440,7 +395,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<TextView <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.1" /> android:layout_weight="0.1" />
@ -452,14 +407,15 @@
android:layout_gravity="start" android:layout_gravity="start"
android:layout_weight="0.5" android:layout_weight="0.5"
android:background="@drawable/loop_grey_25" android:background="@drawable/loop_grey_25"
android:text="--'"
android:gravity="center" android:gravity="center"
android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -468,20 +424,17 @@
</LinearLayout> </LinearLayout>
</LinearLayout> <View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.16" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.08" android:layout_weight="0.08" />
android:baselineAligned="false"
android:orientation="horizontal">
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

153
wear/src/main/res/layout-notround/activity_digitalstyle.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
tools:deviceIds="wear_square"> tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<!-- background-image with shapes elements--> <!-- background-image with shapes elements-->
<LinearLayout <LinearLayout
@ -22,6 +22,7 @@
android:id="@+id/watchface_layout" android:id="@+id/watchface_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"> android:weightSum="8">
@ -34,7 +35,7 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="100"> android:weightSum="100">
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="13.95" /> android:layout_weight="13.95" />
@ -47,7 +48,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="13"> android:weightSum="13">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4.9" /> android:layout_weight="4.9" />
@ -69,7 +70,8 @@
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/activity_carb" android:text="@string/activity_carb"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/cobView" android:id="@+id/cobView"
@ -80,19 +82,20 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:letterSpacing="-0.075" android:letterSpacing="-0.075"
android:lines="1" android:lines="1"
android:text="000g" android:text="@string/cob_000g"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.1" /> android:layout_weight="1.1" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2.87" /> android:layout_weight="2.87" />
@ -105,7 +108,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="13"> android:weightSum="13">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="3.2" /> android:layout_weight="3.2" />
@ -120,6 +123,7 @@
<!-- 1st line with direction and timestamp--> <!-- 1st line with direction and timestamp-->
<LinearLayout <LinearLayout
android:id="@+id/directionLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
@ -129,7 +133,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="10"> android:weightSum="10">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" /> android:layout_weight="2" />
@ -146,7 +150,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -159,12 +164,14 @@
android:fontFamily="sans-serif-condensed-light" android:fontFamily="sans-serif-condensed-light"
android:text="--'" android:text="--'"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="HardcodedText,SmallSp" />
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
<!-- 2nd line with sgv--> <!-- 2nd line with sgv-->
@ -186,21 +193,23 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:letterSpacing="-0.05" android:letterSpacing="-0.05"
android:lines="1" android:lines="1"
android:text="00,0" android:text="@string/svg_00_0"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<Space </LinearLayout>
<View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.1" /> android:layout_weight="1.1" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2.87" /> android:layout_weight="2.87" />
@ -213,7 +222,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="13"> android:weightSum="13">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4.9" /> android:layout_weight="4.9" />
@ -235,7 +244,8 @@
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/activity_IOB" android:text="@string/activity_IOB"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/iobView" android:id="@+id/iobView"
@ -246,22 +256,24 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:letterSpacing="-0.075" android:letterSpacing="-0.075"
android:lines="1" android:lines="1"
android:text="0,00U" android:text="@string/iob_0_00u"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.1" /> android:layout_weight="1.1" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="13.95" /> android:layout_weight="13.95" />
</LinearLayout> </LinearLayout>
<!-- right side 5/8 width --> <!-- right side 5/8 width -->
@ -278,12 +290,13 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginLeft="9dp" android:layout_marginStart="9dp"
android:layout_marginEnd="0dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<!-- right side top - spacer 2/10 --> <!-- right side top - spacer 2/10 -->
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2" /> android:layout_weight="2" />
@ -311,11 +324,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="5" android:layout_weight="5"
android:fontFamily="@font/roboto_condensed_regular" android:fontFamily="@font/roboto_condensed_regular"
android:text="DDD"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/white" android:textColor="@color/white"
android:textFontWeight="400" android:textFontWeight="400"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="DDD" />
<TextView <TextView
android:id="@+id/weeknumber" android:id="@+id/weeknumber"
@ -324,17 +337,18 @@
android:layout_weight="4" android:layout_weight="4"
android:fontFamily="@font/roboto_condensed_light" android:fontFamily="@font/roboto_condensed_light"
android:letterSpacing="-0.1" android:letterSpacing="-0.1"
android:text="ww"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textFontWeight="400" android:textFontWeight="400"
android:textSize="18sp" android:textSize="18sp"
android:visibility="gone" /> android:visibility="gone"
tools:text="ww" />
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="3" /> android:layout_weight="3" />
</LinearLayout> </LinearLayout>
<!-- day number + month (short)--> <!-- day number + month (short)-->
@ -354,10 +368,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/roboto_condensed_regular" android:fontFamily="@font/roboto_condensed_regular"
android:paddingStart="0dp"
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:text="DD"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="DD" />
</LinearLayout> </LinearLayout>
<!-- month short--> <!-- month short-->
<LinearLayout <LinearLayout
@ -368,14 +384,17 @@
android:id="@+id/month" android:id="@+id/month"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginStart="5dp"
android:fontFamily="@font/roboto_condensed_regular" android:fontFamily="@font/roboto_condensed_regular"
android:text="MMM"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="MMM" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- right side top - hour minute 4/10 --> <!-- right side top - hour minute 4/10 -->
@ -383,7 +402,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="4" android:layout_weight="4"
android:gravity="left|center_vertical" android:baselineAligned="false"
android:gravity="start|center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
@ -396,17 +416,18 @@
android:id="@+id/hour" android:id="@+id/hour"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="start"
android:fontFamily="@font/roboto_condensed_bold" android:fontFamily="@font/roboto_condensed_bold"
android:text="HH"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="40sp" android:textSize="40sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="HH" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
@ -416,14 +437,14 @@
android:id="@+id/minute" android:id="@+id/minute"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="start"
android:layout_marginLeft="6sp" android:layout_marginStart="6sp"
android:layout_marginBottom="-8sp" android:layout_marginBottom="-8sp"
android:fontFamily="@font/roboto_condensed_bold" android:fontFamily="@font/roboto_condensed_bold"
android:text="MI"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="26sp" android:textSize="26sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="MI" />
<!-- 12h period AM / PM --> <!-- 12h period AM / PM -->
<TextView <TextView
@ -431,14 +452,18 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="8sp" android:layout_marginStart="8sp"
android:fontFamily="@font/roboto_condensed_bold" android:fontFamily="@font/roboto_condensed_bold"
android:text="AM"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp"
tools:text="AM" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- right side 1/2 height - bottom halft --> <!-- right side 1/2 height - bottom halft -->
@ -449,7 +474,7 @@
android:layout_marginRight="7dp" android:layout_marginRight="7dp"
android:layout_weight="1" android:layout_weight="1"
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="left|top" android:gravity="start|top"
android:orientation="vertical" android:orientation="vertical"
android:weightSum="10"> android:weightSum="10">
@ -472,7 +497,8 @@
android:text="+/-" android:text="+/-"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText,SmallSp" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -480,10 +506,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="avg" android:text="@string/abbreviation_average"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
@ -494,7 +521,8 @@
android:text="--%" android:text="--%"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText,SmallSp" />
<TextView <TextView
android:id="@+id/rig_battery" android:id="@+id/rig_battery"
@ -506,7 +534,8 @@
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText,SmallSp" />
<TextView <TextView
android:id="@+id/tmpBasal" android:id="@+id/tmpBasal"
@ -514,10 +543,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.7" android:layout_weight="1.7"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/bgiView" android:id="@+id/bgiView"
@ -525,11 +555,13 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="bgi"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="SmallSp"
tools:text="bgi" />
</LinearLayout> </LinearLayout>
<!-- right side bottom - diagram 6/10 --> <!-- right side bottom - diagram 6/10 -->
@ -552,21 +584,22 @@
</LinearLayout> </LinearLayout>
<!-- right side bottom - spacer 2/10 --> <!-- right side bottom - spacer 2/10 -->
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- FLAGs --> <!-- FLAGs -->
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"
android:text=""
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

154
wear/src/main/res/layout-notround/activity_home.xml
View file

@ -1,148 +1,152 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textAlignment="center"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:weightSum="1"> android:orientation="vertical"
android:textAlignment="center"
android:weightSum="1"
tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:paddingTop="5dp"
android:weightSum="1"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp" android:layout_marginTop="-5dp"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="5dp"
android:textAlignment="center"
android:weightSum="1">
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="41sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="bottom|right" android:layout_marginEnd="5dp"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-2dp"
android:gravity="bottom"
android:paddingTop="-2dp" android:paddingTop="-2dp"
android:layout_marginEnd="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="41sp"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:weightSum="1"
android:textAlignment="center"
android:baselineAligned="false"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"> android:baselineAligned="false"
android:gravity="center_horizontal"
android:orientation="vertical"
android:textAlignment="center"
android:weightSum="1">
<TextView <TextView
android:id="@+id/direction" android:id="@+id/direction"
android:textSize="30sp"
android:textStyle="bold"
android:text="--"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textAlignment="center"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:gravity="center_horizontal|bottom"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-2dp" android:layout_marginTop="-2dp"
android:paddingTop="1dp" /> android:layout_marginBottom="-5dp"
android:gravity="center_horizontal|bottom"
android:paddingTop="1dp"
android:text="--"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="30sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="10sp"
android:text="--- mg/dl"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:textStyle="bold" /> android:text="@string/delta_na"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold"
tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/secondary_layout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/light_grey" android:background="@color/light_grey"
android:id="@+id/secondary_layout"
android:padding="1dp">
<LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="wrap_content" android:padding="1dp"
android:layout_height="wrap_content" android:textAlignment="center">
android:textAlignment="center"
android:layout_gravity="center_horizontal">
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="10sp"
android:text="-- Minutes ago"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/time_stamp_na_min_ago"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:layout_height="wrap_content" /> android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
android:textSize="10sp"
android:text="Uploader: ---%"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/uploader_na"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/raw" android:id="@+id/raw"
android:textSize="10sp"
android:text=""
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text=""
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="10sp"
android:text="S: no status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/no_status"
</LinearLayout> android:textAlignment="center"
android:textColor="@color/black"
android:textSize="10sp"
tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="35sp"
android:text="12:00"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:textAlignment="center" android:textAlignment="center"
android:layout_gravity="center_horizontal|top" /> android:textColor="@color/white"
android:textSize="35sp"
tools:text="12:00" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart" android:id="@+id/chart"
@ -152,5 +156,3 @@
android:gravity="center_horizontal|top" /> android:gravity="center_horizontal|top" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

147
wear/src/main/res/layout-notround/activity_home_2.xml
View file

@ -1,19 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
tools:context=".watchfaces.AapsV2Watchface"
tools:deviceIds="wear_square">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:weightSum="1"> android:weightSum="1"
tools:context=".watchfaces.AapsV2Watchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:id="@+id/primary_layout" android:id="@+id/primary_layout"
@ -34,9 +31,10 @@
android:gravity="center" android:gravity="center"
android:text="--'" android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
@ -44,22 +42,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-2dp"
android:gravity="bottom|right" android:gravity="bottom|end"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingTop="-2dp" android:paddingTop="-2dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="38sp" /> android:textSize="38sp"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:baselineAligned="false" android:orientation="vertical">
android:gravity="center_vertical"
android:orientation="vertical"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/direction" android:id="@+id/direction"
@ -69,9 +65,10 @@
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:text="--" android:text="--"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -80,9 +77,10 @@
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:gravity="center" android:gravity="center"
android:text="--'" android:text="--'"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -118,9 +116,10 @@
android:gravity="center" android:gravity="center"
android:text="+/-" android:text="+/-"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -129,9 +128,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="avg" android:text="@string/abbreviation_average"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -144,9 +143,10 @@
android:gravity="center" android:gravity="center"
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/rig_battery" android:id="@+id/rig_battery"
@ -157,10 +157,11 @@
android:gravity="center" android:gravity="center"
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/tmpBasal" android:id="@+id/tmpBasal"
@ -169,9 +170,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1.7" android:layout_weight="1.7"
android:gravity="center" android:gravity="center"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -182,19 +183,17 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="bgi"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:text="bgi" />
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"
android:text=""
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
@ -205,27 +204,15 @@
android:id="@+id/tertiary_layout" android:id="@+id/tertiary_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.22" android:layout_weight="0.22"
android:background="@color/black" android:background="@color/black"
android:gravity="center"
android:orientation="vertical"
android:padding="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="1dp"
android:weightSum="7"> android:weightSum="7">
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -242,9 +229,10 @@
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="@string/activity_carb" android:text="@string/activity_carb"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/cobView" android:id="@+id/cobView"
@ -252,19 +240,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="--g" android:text="@string/no_cob_g"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1" />
android:orientation="horizontal" />
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
@ -272,10 +259,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="12:00"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="30sp" /> android:textSize="30sp"
tools:text="12:00" />
<LinearLayout <LinearLayout
android:id="@+id/date_time" android:id="@+id/date_time"
@ -293,10 +280,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="day"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="day" />
<TextView <TextView
android:id="@+id/month" android:id="@+id/month"
@ -304,17 +292,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="mth" android:textColor="@color/white"
android:textColor="#FFFFFF" android:textSize="10sp"
android:textSize="10sp" /> tools:ignore="SmallSp"
tools:text="mth" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -332,9 +320,10 @@
android:gravity="center" android:gravity="center"
android:text="@string/activity_IOB" android:text="@string/activity_IOB"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/iobView" android:id="@+id/iobView"
@ -342,21 +331,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="--U" android:text="@string/no_iob_u"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
@ -368,5 +349,3 @@
android:gravity="center_horizontal|top" /> android:gravity="center_horizontal|top" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

136
wear/src/main/res/layout-notround/activity_home_large.xml
View file

@ -1,138 +1,136 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:textAlignment="center"
android:layout_height="fill_parent" tools:context=".watchfaces.AapsWatchface"
android:textAlignment="center"> tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="147dp" android:layout_width="147dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="15dp" android:paddingTop="15dp"
android:weightSum="1" android:textAlignment="center"
android:layout_gravity="center_horizontal"> android:weightSum="1">
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="50sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="55dp" android:layout_height="55dp"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="bottom|right" /> android:gravity="bottom"
android:text="---"
android:textColor="@color/white"
android:textSize="50sp"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:weightSum="1" android:layout_gravity="center_horizontal"
android:textAlignment="center"
android:baselineAligned="false" android:baselineAligned="false"
android:layout_gravity="center_horizontal"> android:orientation="vertical"
android:textAlignment="center"
android:weightSum="1">
<TextView <TextView
android:id="@+id/direction" android:id="@+id/direction"
android:textSize="27sp"
android:textStyle="bold"
android:text="--"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textAlignment="center"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:paddingTop="1dp" /> android:paddingTop="1dp"
android:text="--"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="27sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="10sp"
android:text="--- mg/dl"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center_horizontal" /> android:gravity="center_horizontal"
android:text="@string/delta_na"
android:textColor="@color/white"
android:textSize="10sp"
tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/secondary_layout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/light_grey" android:background="@color/light_grey"
android:id="@+id/secondary_layout"
android:padding="2dp">
<LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="wrap_content" android:padding="2dp"
android:layout_height="wrap_content" android:textAlignment="center">
android:textAlignment="center"
android:layout_gravity="center_horizontal">
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="12sp"
android:text="-- Minutes ago"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/time_stamp_na_min_ago"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:layout_height="wrap_content" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
android:textSize="12sp"
android:text="Uploader: ---%"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/uploader_na"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12sp" />
<TextView <TextView
android:id="@+id/raw" android:id="@+id/raw"
android:textSize="12sp"
android:text=""
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text=""
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12sp" />
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="12sp"
android:text="S: no status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/no_status"
</LinearLayout> android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="55sp"
android:text="12:00"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:textAlignment="center" android:textAlignment="center"
android:layout_gravity="center_horizontal|top" /> android:textColor="@color/white"
android:textSize="55sp"
tools:text="12:00" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

99
wear/src/main/res/layout-notround/activity_nochart.xml
View file

@ -1,100 +1,103 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:gravity="center_horizontal"
android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:paddingTop="5dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp" android:layout_marginTop="-5dp"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="5dp"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="40sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginEnd="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginEnd="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="40sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="55sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" /> android:gravity="center_horizontal"
android:text="---"
android:textColor="@color/white"
android:textSize="55sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
android:textSize="40sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginStart="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginStart="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="40sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="24sp"
android:text="E xU/h IOB: x (x+x)"
android:layout_width="wrap_content"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
tools:text="E xU/h IOB: x (x+x)"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal|bottom"> android:textColor="@color/white"
android:textSize="24sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal|bottom"
android:orientation="horizontal"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="47sp"
android:text="12:00"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_gravity="center_horizontal" /> tools:text="12:00"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="47sp" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="35sp"
android:text="-- '"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_height="wrap_content" /> android:text="-- '"
</LinearLayout> android:textAlignment="center"
android:textColor="@color/white"
android:textSize="35sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

58
wear/src/main/res/layout-notround/activity_nochart_small.xml
View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:textAlignment="center"> android:textAlignment="center"
tools:context=".watchfaces.NoChartWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -30,8 +30,9 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:gravity="center_vertical|center_horizontal|center" android:gravity="center_vertical|center_horizontal|center"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
@ -40,8 +41,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -51,8 +53,9 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:gravity="center_vertical|center_horizontal|center" android:gravity="center_vertical|center_horizontal|center"
android:text=" ---" android:text=" ---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="26sp" /> android:textSize="26sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -69,19 +72,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="No Loop Status" android:paddingBottom="2dp"
android:text="@string/no_loop_status"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="21sp" /> android:textSize="21sp" />
<View
android:id="@+id/dummy2"
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:layout_weight="0"
android:gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -95,10 +91,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:text="23:24"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp"
tools:text="23:24" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -107,10 +103,10 @@
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:text="--'" android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
</LinearLayout> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

95
wear/src/main/res/layout-notround/activity_steampunk.xml
View file

@ -5,7 +5,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".watchfaces.SteampunkWatchface" tools:context=".watchfaces.SteampunkWatchface"
tools:deviceIds="wear_square"> tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,6 +19,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:importantForAccessibility="no"
android:src="@drawable/steampunk_dial_mgdl" /> android:src="@drawable/steampunk_dial_mgdl" />
</LinearLayout> </LinearLayout>
@ -57,13 +59,10 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center" android:layout_weight="0.05" />
android:layout_weight="0.05"
android:gravity="center"
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -86,7 +85,7 @@
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.16" android:layout_weight="0.165"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -97,10 +96,10 @@
android:gravity="center" android:gravity="center"
android:paddingTop="7dp" android:paddingTop="7dp"
android:rotation="-28" android:rotation="-28"
android:text="--g" android:text="@string/no_cob_g"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="11sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
@ -108,7 +107,7 @@
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.24" android:layout_weight="0.27"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -117,12 +116,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:paddingBottom="12dp" android:paddingBottom="14dp"
android:rotation="-1" android:rotation="0"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="11sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
@ -130,7 +129,7 @@
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.2" android:layout_weight="0.165"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -141,10 +140,10 @@
android:gravity="center" android:gravity="center"
android:paddingTop="6dp" android:paddingTop="6dp"
android:rotation="28" android:rotation="28"
android:text="0.00U" android:text="@string/no_iob_u"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="11sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
@ -170,11 +169,10 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="0.25" />
android:orientation="horizontal" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart" android:id="@+id/chart"
@ -182,7 +180,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.5" /> android:layout_weight="0.5" />
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="0.25"
@ -190,11 +188,10 @@
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.03" android:layout_weight="0.03" />
android:orientation="vertical" />
</LinearLayout> </LinearLayout>
@ -207,26 +204,25 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.15" android:layout_weight="0.15" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="0.21" android:layout_weight="0.21"
android:baselineAligned="false"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.32" android:layout_weight="0.32" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="0px"
@ -240,14 +236,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:paddingEnd="8dp" android:paddingStart="0dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingEnd="8dp"
android:rotation="-24" android:rotation="-24"
android:text="-'" android:text="-'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="10sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -268,9 +266,10 @@
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="10sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
@ -281,8 +280,9 @@
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="10sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -300,28 +300,28 @@
android:gravity="center" android:gravity="center"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingEnd="0dp"
android:rotation="24" android:rotation="24"
android:text="-'" android:text="-'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="10sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.32" android:layout_weight="0.32" />
android:orientation="horizontal" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.64" android:layout_weight="0.64" />
android:orientation="horizontal" />
</LinearLayout> </LinearLayout>
@ -330,8 +330,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/steampunk_cover_plate" android:background="@drawable/steampunk_cover_plate"
android:orientation="vertical"> android:orientation="vertical" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -370,7 +369,7 @@
</LinearLayout> </LinearLayout>
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

97
wear/src/main/res/layout-round/activity_bigchart.xml
View file

@ -1,58 +1,60 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:paddingTop="5dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp" android:layout_marginTop="-2dp"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="5dp"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="30sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginEnd="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginEnd="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="30sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="41sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" /> android:gravity="center_horizontal"
android:text="---"
android:textColor="@color/white"
android:textSize="41sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
android:textSize="30sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginStart="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginStart="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="30sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -66,43 +68,40 @@
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="18sp"
android:text="E xU/h IOB: x (x+x)"
android:layout_width="wrap_content"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> android:textColor="@color/white"
android:textSize="18sp"
tools:text="E xU/h IOB: x (x+x)" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="35sp"
android:text="12:00"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_gravity="center_horizontal" /> android:textColor="@color/white"
android:textSize="35sp"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="26sp"
android:text="-- '"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_height="wrap_content" /> android:text="-- '"
</LinearLayout> android:textColor="@color/white"
android:textSize="26sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

54
wear/src/main/res/layout-round/activity_bigchart_small.xml
View file

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -30,8 +29,9 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
@ -40,8 +40,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="34sp" /> android:textSize="34sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -51,8 +52,9 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -62,10 +64,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5sp" android:layout_marginTop="-5sp"
android:text="E xU/h IOB: x (x+x)"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="E xU/h IOB: x (x+x)" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart" android:id="@+id/chart"
@ -76,7 +78,7 @@
android:gravity="center_horizontal" /> android:gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-5sp" android:layout_marginTop="-5sp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@ -90,10 +92,10 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:paddingTop="-5sp" android:paddingTop="-5sp"
android:text="12:00"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="34sp" /> android:textSize="34sp"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -102,10 +104,10 @@
android:layout_gravity="center_vertical|center_horizontal|center" android:layout_gravity="center_vertical|center_horizontal|center"
android:text="--'" android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
</LinearLayout> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

218
wear/src/main/res/layout-round/activity_cockpit.xml
View file

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.CockpitWatchface" tools:deviceIds="wear_round"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:background="@drawable/airplane_cockpit_outside_clouds"> android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/airplane_cockpit_outside_clouds"
tools:context=".watchfaces.CockpitWatchface"
tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:id="@+id/inside" android:id="@+id/inside"
@ -13,31 +17,21 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:orientation="vertical" android:layout_weight="0.095" />
android:layout_weight="0.095">
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/windows" android:id="@+id/windows"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:orientation="vertical" android:layout_weight="0.2575"
android:layout_weight="0.2575"> android:orientation="horizontal">
<LinearLayout <View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<TextView
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="0.47" /> android:layout_weight="0.47" />
<LinearLayout <LinearLayout
@ -48,10 +42,9 @@
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="vertical">
<TextView <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="bottom"
android:layout_weight="0.2" /> android:layout_weight="0.2" />
<TextView <TextView
@ -62,16 +55,16 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/airplane_led_grey_unlit" android:background="@drawable/airplane_led_grey_unlit"
android:gravity="center" android:gravity="center"
android:text="H" android:text="@string/first_char_high"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="8sp" android:textSize="8sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="bottom"
android:layout_weight="2" /> android:layout_weight="2" />
<TextView <TextView
@ -82,36 +75,33 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/airplane_led_grey_unlit" android:background="@drawable/airplane_led_grey_unlit"
android:gravity="center" android:gravity="center"
android:text="L" android:text="@string/first_char_low"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="8sp" android:textSize="8sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="bottom"
android:layout_weight="0.2" /> android:layout_weight="0.2" />
</LinearLayout> </LinearLayout>
<TextView <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_weight="0.47" /> android:layout_weight="0.47" />
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/dashboard" android:id="@+id/dashboard"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0px" android:layout_height="0px"
android:orientation="vertical" android:layout_weight="0.0775"
android:layout_weight="0.0775"> android:orientation="vertical">
</LinearLayout> </LinearLayout>
@ -120,41 +110,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.57" android:layout_weight="0.57"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08"
android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
</LinearLayout> <View
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08" />
<LinearLayout <LinearLayout
android:id="@+id/panel1" android:id="@+id/panel1"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="0.275" android:layout_weight="0.275"
android:baselineAligned="false" android:orientation="vertical">
android:orientation="horizontal"
android:gravity="center"
android:textAlignment="center">
<LinearLayout <View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1">
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.07" /> android:layout_weight="0.07" />
@ -169,12 +139,12 @@
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0px" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1"
android:text="---" android:text="---"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="30sp" /> android:textSize="30sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -201,40 +171,34 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="0.65" android:layout_weight="0.65"
android:text="--'"
android:gravity="center" android:gravity="center"
android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</LinearLayout> <View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.10" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.0225" android:layout_weight="0.0225" />
android:baselineAligned="false"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/panel2" android:id="@+id/panel2"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.245" android:layout_weight="0.245"
android:orientation="horizontal"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1.01">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -248,11 +212,11 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="0.19" android:layout_weight="0.19"
android:gravity="center" android:gravity="center"
android:text="12:00"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/tmpBasal" android:id="@+id/tmpBasal"
@ -261,7 +225,7 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.19" android:layout_weight="0.19"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
@ -274,7 +238,7 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.18" android:layout_weight="0.18"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="--U" android:text="@string/no_iob_u"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
@ -287,9 +251,9 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_weight="0.185" android:layout_weight="0.185"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="--g" android:text="@string/no_cob_g"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -312,7 +276,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/rig_battery" android:id="@+id/rig_battery"
@ -321,49 +286,37 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp"
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<TextView <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.06" /> android:layout_weight="0.06" />
</LinearLayout> </LinearLayout>
</LinearLayout> <View
<LinearLayout
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.0225" android:layout_weight="0.0225" />
android:baselineAligned="false"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/panel3" android:id="@+id/panel3"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.275" android:layout_weight="0.275"
android:baselineAligned="false" android:orientation="vertical">
android:orientation="horizontal"
android:textAlignment="center">
<LinearLayout <View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1">
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.07" /> android:layout_weight="0.07" />
@ -388,14 +341,15 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="28sp" android:textSize="28sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.167" android:layout_weight="0.167"
android:gravity="center" android:gravity="center"
android:layout_gravity="center"
android:weightSum="2"> android:weightSum="2">
<TextView <TextView
@ -409,7 +363,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -418,7 +373,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="avg" android:text="@string/abbreviation_average"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="13sp" android:textSize="13sp"
@ -431,7 +386,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.03" /> android:layout_weight="0.06" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -440,7 +395,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<TextView <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.1" /> android:layout_weight="0.1" />
@ -457,31 +412,28 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/primary_text_dark" android:textColor="@color/primary_text_dark"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <View
android:id="@+id/AAPSv2" 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_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.4" android:layout_weight="0.08" />
android:visibility="invisible"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="0.08"
android:baselineAligned="false"
android:orientation="horizontal">
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

152
wear/src/main/res/layout-round/activity_digitalstyle.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
tools:deviceIds="wear_round"> tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<!-- background-image with shapes elements--> <!-- background-image with shapes elements-->
<LinearLayout <LinearLayout
@ -22,6 +22,7 @@
android:id="@+id/watchface_layout" android:id="@+id/watchface_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"> android:weightSum="8">
@ -34,7 +35,7 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="100"> android:weightSum="100">
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="13.95" /> android:layout_weight="13.95" />
@ -47,7 +48,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="13"> android:weightSum="13">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4.9" /> android:layout_weight="4.9" />
@ -69,7 +70,8 @@
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/activity_carb" android:text="@string/activity_carb"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/cobView" android:id="@+id/cobView"
@ -80,19 +82,20 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:letterSpacing="-0.075" android:letterSpacing="-0.075"
android:lines="1" android:lines="1"
android:text="000g" android:text="@string/cob_000g"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.1" /> android:layout_weight="1.1" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2.87" /> android:layout_weight="2.87" />
@ -105,7 +108,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="13"> android:weightSum="13">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="3.2" /> android:layout_weight="3.2" />
@ -130,7 +133,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="10"> android:weightSum="10">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" /> android:layout_weight="2" />
@ -147,7 +150,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -160,12 +164,14 @@
android:fontFamily="sans-serif-condensed-light" android:fontFamily="sans-serif-condensed-light"
android:text="--'" android:text="--'"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="HardcodedText,SmallSp" />
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
<!-- 2nd line with sgv--> <!-- 2nd line with sgv-->
@ -187,21 +193,23 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:letterSpacing="-0.05" android:letterSpacing="-0.05"
android:lines="1" android:lines="1"
android:text="00,0" android:text="@string/svg_00_0"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<Space </LinearLayout>
<View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.1" /> android:layout_weight="1.1" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2.87" /> android:layout_weight="2.87" />
@ -214,7 +222,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="13"> android:weightSum="13">
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4.9" /> android:layout_weight="4.9" />
@ -236,7 +244,8 @@
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/activity_IOB" android:text="@string/activity_IOB"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/iobView" android:id="@+id/iobView"
@ -247,22 +256,24 @@
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:letterSpacing="-0.075" android:letterSpacing="-0.075"
android:lines="1" android:lines="1"
android:text="0,00U" android:text="@string/iob_0_00u"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.1" /> android:layout_weight="1.1" />
</LinearLayout> </LinearLayout>
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="13.95" /> android:layout_weight="13.95" />
</LinearLayout> </LinearLayout>
<!-- right side 5/8 width --> <!-- right side 5/8 width -->
@ -279,12 +290,13 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginLeft="9dp" android:layout_marginStart="9dp"
android:layout_marginEnd="0dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<!-- right side top - spacer 2/10 --> <!-- right side top - spacer 2/10 -->
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2" /> android:layout_weight="2" />
@ -312,11 +324,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="5" android:layout_weight="5"
android:fontFamily="@font/roboto_condensed_regular" android:fontFamily="@font/roboto_condensed_regular"
android:text="DDD"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/white" android:textColor="@color/white"
android:textFontWeight="400" android:textFontWeight="400"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="DDD" />
<TextView <TextView
android:id="@+id/weeknumber" android:id="@+id/weeknumber"
@ -325,17 +337,18 @@
android:layout_weight="4" android:layout_weight="4"
android:fontFamily="@font/roboto_condensed_light" android:fontFamily="@font/roboto_condensed_light"
android:letterSpacing="-0.1" android:letterSpacing="-0.1"
android:text="ww"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textFontWeight="400" android:textFontWeight="400"
android:textSize="18sp" android:textSize="18sp"
android:visibility="gone" /> android:visibility="gone"
tools:text="ww" />
<Space <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="3" /> android:layout_weight="3" />
</LinearLayout> </LinearLayout>
<!-- day number + month (short)--> <!-- day number + month (short)-->
@ -355,10 +368,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/roboto_condensed_regular" android:fontFamily="@font/roboto_condensed_regular"
android:paddingStart="0dp"
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:text="DD"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="DD" />
</LinearLayout> </LinearLayout>
<!-- month short--> <!-- month short-->
<LinearLayout <LinearLayout
@ -369,14 +384,17 @@
android:id="@+id/month" android:id="@+id/month"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginStart="5dp"
android:fontFamily="@font/roboto_condensed_regular" android:fontFamily="@font/roboto_condensed_regular"
android:text="MMM"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="18sp" /> android:textSize="18sp"
tools:text="MMM" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- right side top - hour minute 4/10 --> <!-- right side top - hour minute 4/10 -->
@ -384,29 +402,32 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="4" android:layout_weight="4"
android:gravity="left|center_vertical" android:baselineAligned="false"
android:gravity="start|center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="-5dp"> android:layout_marginTop="-5dp">
<!-- hour --> <!-- hour -->
<TextView <TextView
android:id="@+id/hour" android:id="@+id/hour"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="start"
android:fontFamily="@font/roboto_condensed_bold" android:fontFamily="@font/roboto_condensed_bold"
android:text="HH"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="40sp" android:textSize="40sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="HH" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
@ -416,29 +437,33 @@
android:id="@+id/minute" android:id="@+id/minute"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="start"
android:layout_marginLeft="6sp" android:layout_marginStart="6sp"
android:layout_marginBottom="-8sp" android:layout_marginBottom="-8sp"
android:fontFamily="@font/roboto_condensed_bold" android:fontFamily="@font/roboto_condensed_bold"
android:text="MI"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="26sp" android:textSize="26sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="MI" />
<!-- 12h period AM / PM --> <!-- 12h period AM / PM -->
<TextView <TextView
android:id="@+id/timePeriod" android:id="@+id/timePeriod"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8sp" android:layout_marginStart="8sp"
android:fontFamily="@font/roboto_condensed_bold" android:fontFamily="@font/roboto_condensed_bold"
android:gravity="top" android:gravity="top"
android:text="AM"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp"
tools:text="AM" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- right side 1/2 height - bottom halft --> <!-- right side 1/2 height - bottom halft -->
@ -449,7 +474,7 @@
android:layout_marginRight="7dp" android:layout_marginRight="7dp"
android:layout_weight="1" android:layout_weight="1"
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="left|top" android:gravity="start|top"
android:orientation="vertical" android:orientation="vertical"
android:weightSum="10"> android:weightSum="10">
@ -472,7 +497,8 @@
android:text="+/-" android:text="+/-"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText,SmallSp" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -480,10 +506,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="avg" android:text="@string/abbreviation_average"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
@ -494,7 +521,8 @@
android:text="--%" android:text="--%"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText,SmallSp" />
<TextView <TextView
android:id="@+id/rig_battery" android:id="@+id/rig_battery"
@ -506,7 +534,8 @@
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText,SmallSp" />
<TextView <TextView
android:id="@+id/tmpBasal" android:id="@+id/tmpBasal"
@ -514,10 +543,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.7" android:layout_weight="1.7"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/bgiView" android:id="@+id/bgiView"
@ -525,11 +555,13 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="bgi"
android:textColor="@color/light_grey" android:textColor="@color/light_grey"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="SmallSp"
tools:text="bgi" />
</LinearLayout> </LinearLayout>
<!-- right side bottom - diagram 6/10 --> <!-- right side bottom - diagram 6/10 -->
@ -552,22 +584,22 @@
</LinearLayout> </LinearLayout>
<!-- right side bottom - spacer 2/10 --> <!-- right side bottom - spacer 2/10 -->
<Space <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="2" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- FLAGs --> <!-- FLAGs -->
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"
android:text=""
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

151
wear/src/main/res/layout-round/activity_home.xml
View file

@ -1,129 +1,142 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_round" android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
android:id="@+id/main_layout"> android:orientation="vertical"
android:textAlignment="center"
android:weightSum="1"
tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingTop="15dp"
android:textAlignment="center" android:textAlignment="center"
android:weightSum="1"> android:weightSum="1">
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:paddingTop="15dp"
android:weightSum="1"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:layout_marginTop="-5dp">
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="41sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:gravity="bottom|right"
android:paddingEnd="5dp"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-2dp"
android:paddingTop="-2dp" /> android:gravity="bottom|end"
android:paddingStart="0dp"
android:paddingTop="-2dp"
android:paddingEnd="5dp"
android:text="---"
android:textColor="@color/white"
android:textSize="41sp"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:weightSum="1" android:layout_gravity="center_horizontal"
android:textAlignment="center"
android:baselineAligned="false" android:baselineAligned="false"
android:layout_gravity="center_horizontal"> android:orientation="vertical"
android:textAlignment="center"
android:weightSum="1">
<TextView <TextView
android:id="@+id/direction" android:id="@+id/direction"
android:textSize="30sp"
android:text="--"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textAlignment="center"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:gravity="center_horizontal|bottom"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-2dp" android:layout_marginTop="-2dp"
android:textStyle="bold" /> android:layout_marginBottom="-5dp"
android:gravity="center_horizontal|bottom"
android:text="--"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="30sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="10sp"
android:text="--- mg/dl"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:textStyle="bold" /> android:text="@string/delta_na"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold"
tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/secondary_layout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/light_grey" android:background="@color/light_grey"
android:id="@+id/secondary_layout" android:orientation="vertical"
android:padding="1dp"> android:padding="1dp">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:layout_gravity="center_horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="8sp"
android:text="-- Minutes ago"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/time_stamp_na_min_ago"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:layout_height="wrap_content" /> android:textSize="8sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
android:textSize="8sp"
android:text="Uploader: ---%"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/uploader_na"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="8sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/raw" android:id="@+id/raw"
android:textSize="8sp"
android:text=""
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text=""
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="8sp"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="8sp"
android:text="S: no status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/no_status"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="8sp"
tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>
@ -131,17 +144,15 @@
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="30sp"
android:text="12:00"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-2dp" android:layout_marginTop="-2dp"
android:layout_marginBottom="-3dp" /> android:layout_marginBottom="-3dp"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="30sp"
tools:text="12:00" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart" android:id="@+id/chart"
@ -151,5 +162,3 @@
android:gravity="center_horizontal|top" /> android:gravity="center_horizontal|top" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

147
wear/src/main/res/layout-round/activity_home_2.xml
View file

@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
tools:context=".watchfaces.AapsV2Watchface"
tools:deviceIds="wear_round">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:weightSum="1.1"> android:weightSum="1.1"
tools:context=".watchfaces.AapsV2Watchface"
tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<LinearLayout <View
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.05" android:layout_weight="0.05"
@ -40,9 +37,10 @@
android:gravity="center" android:gravity="center"
android:text="--'" android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
@ -50,13 +48,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-2dp"
android:gravity="bottom|right" android:gravity="bottom|end"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingTop="-2dp" android:paddingTop="-2dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="38sp" /> android:textSize="38sp"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -65,8 +64,8 @@
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="4dp" android:paddingStart="0dp"
android:textAlignment="center"> android:paddingEnd="4dp">
<TextView <TextView
android:id="@+id/direction" android:id="@+id/direction"
@ -76,9 +75,10 @@
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:text="--" android:text="--"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -87,9 +87,10 @@
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:gravity="center" android:gravity="center"
android:text="--'" android:text="--'"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -125,9 +126,10 @@
android:gravity="center" android:gravity="center"
android:text="+/-" android:text="+/-"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -136,9 +138,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="avg" android:text="@string/abbreviation_average"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -151,9 +153,10 @@
android:gravity="center" android:gravity="center"
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/rig_battery" android:id="@+id/rig_battery"
@ -164,10 +167,11 @@
android:gravity="center" android:gravity="center"
android:text="--%" android:text="--%"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/tmpBasal" android:id="@+id/tmpBasal"
@ -176,9 +180,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1.7" android:layout_weight="1.7"
android:gravity="center" android:gravity="center"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -189,19 +193,17 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="bgi"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:text="bgi" />
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"
android:text=""
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
@ -212,27 +214,15 @@
android:id="@+id/tertiary_layout" android:id="@+id/tertiary_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center"
android:layout_weight="0.22" android:layout_weight="0.22"
android:background="@color/black" android:background="@color/black"
android:gravity="center"
android:orientation="vertical"
android:padding="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:baselineAligned="false" android:baselineAligned="false"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="1dp"
android:weightSum="7"> android:weightSum="7">
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -249,9 +239,10 @@
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="@string/activity_carb" android:text="@string/activity_carb"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/cobView" android:id="@+id/cobView"
@ -259,19 +250,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="--g" android:text="@string/no_cob_g"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1" />
android:orientation="horizontal" />
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
@ -279,10 +269,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="12:00"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="30sp" /> android:textSize="30sp"
tools:text="12:00" />
<LinearLayout <LinearLayout
android:id="@+id/date_time" android:id="@+id/date_time"
@ -300,10 +290,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="day"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="12sp" /> android:textSize="12sp"
tools:text="day" />
<TextView <TextView
android:id="@+id/month" android:id="@+id/month"
@ -311,17 +301,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="mth" android:textColor="@color/white"
android:textColor="#FFFFFF" android:textSize="12sp"
android:textSize="12sp" /> tools:text="mth" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -339,9 +328,10 @@
android:gravity="center" android:gravity="center"
android:text="@string/activity_IOB" android:text="@string/activity_IOB"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="SmallSp" />
<TextView <TextView
android:id="@+id/iobView" android:id="@+id/iobView"
@ -349,20 +339,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="--U" android:text="@string/no_iob_u"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
</LinearLayout>
</LinearLayout> </LinearLayout>
@ -374,12 +357,10 @@
android:layout_weight="0.41" android:layout_weight="0.41"
android:gravity="center_horizontal|top" /> android:gravity="center_horizontal|top" />
<LinearLayout <View
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.05" android:layout_weight="0.05"
android:orientation="vertical" /> android:orientation="vertical" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

146
wear/src/main/res/layout-round/activity_home_large.xml
View file

@ -1,138 +1,138 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_round" android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black" android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:textAlignment="center"
android:layout_height="fill_parent" tools:context=".watchfaces.AapsWatchface"
android:textAlignment="center"> tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="147dp" android:layout_width="147dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:paddingTop="29dp" android:gravity="center_vertical|center_horizontal"
android:weightSum="1" android:orientation="horizontal"
android:layout_gravity="center_horizontal"> android:paddingTop="30dp"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="50sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="55dp" android:layout_height="wrap_content"
android:textColor="#FFFFFF" android:paddingStart="0dp"
android:layout_gravity="bottom" android:paddingEnd="10dp"
android:gravity="bottom|right" /> android:paddingBottom="3dp"
android:text="8.8"
android:textColor="@color/white"
android:textSize="50sp"
tools:ignore="HardcodedText" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:weightSum="1" android:layout_gravity="center_horizontal"
android:textAlignment="center"
android:baselineAligned="false" android:baselineAligned="false"
android:layout_gravity="center_horizontal"> android:orientation="vertical"
android:textAlignment="center"
android:weightSum="1">
<TextView <TextView
android:id="@+id/direction" android:id="@+id/direction"
android:textSize="27sp"
android:textStyle="bold"
android:text="--"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textAlignment="center"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:paddingTop="1dp" /> android:paddingTop="1dp"
android:text="--"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="27sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="10sp"
android:text="--- mg/dl"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center_horizontal" /> android:gravity="center_horizontal"
android:text="@string/delta_na"
android:textColor="@color/white"
android:textSize="10sp"
tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/secondary_layout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/light_grey" android:background="@color/light_grey"
android:id="@+id/secondary_layout" android:gravity="center_horizontal"
android:padding="2dp">
<LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="wrap_content" android:padding="2dp">
android:layout_height="wrap_content"
android:textAlignment="center"
android:layout_gravity="center_horizontal">
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="12sp"
android:text="-- Minutes ago"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="@color/black"
android:layout_height="wrap_content" /> android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
android:textSize="12sp"
android:text="Uploader: ---%"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/uploader_na"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/raw" android:id="@+id/raw"
android:textSize="12sp"
android:text=""
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text=""
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="12sp"
android:text="S: no status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#000000"
android:paddingStart="10sp" android:paddingStart="10sp"
android:layout_height="wrap_content" /> android:paddingEnd="0sp"
android:text="@string/no_status"
</LinearLayout> android:textAlignment="center"
android:textColor="@color/black"
android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="55sp"
android:text="12:00"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:textAlignment="center" android:textAlignment="center"
android:layout_gravity="center_horizontal|top" /> android:textColor="@color/white"
android:textSize="55sp"
tools:text="12:00" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

99
wear/src/main/res/layout-round/activity_nochart.xml
View file

@ -1,100 +1,101 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal"> tools:context=".watchfaces.NoChartWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:paddingTop="5dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp" android:layout_marginTop="-15dp"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:orientation="horizontal"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/delta" android:id="@+id/delta"
android:textSize="40sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginEnd="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginEnd="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="40sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
android:textSize="55sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" /> android:gravity="center_horizontal"
android:text="---"
android:textColor="@color/white"
android:textSize="55sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
android:textSize="40sp"
android:text="---"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginStart="5dp"
android:gravity="center_horizontal|bottom" android:gravity="center_horizontal|bottom"
android:layout_marginStart="5dp" /> android:text="---"
android:textColor="@color/white"
android:textSize="40sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/externaltstatus" android:id="@+id/externaltstatus"
android:textSize="24sp"
android:text="E xU/h IOB: x (x+x)"
android:layout_width="wrap_content"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal|bottom"> android:textColor="@color/white"
android:textSize="24sp"
tools:text="E xU/h IOB: x (x+x)" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal|bottom"
android:orientation="horizontal"
android:textAlignment="center">
<TextView <TextView
android:id="@+id/watch_time" android:id="@+id/watch_time"
android:textSize="47sp"
android:text="12:00"
android:textColor="#FFFFFF"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_gravity="center_horizontal" /> android:textAlignment="center"
android:textColor="@color/white"
android:textSize="47sp"
tools:text="12:00" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
android:textSize="35sp"
android:text="-- '"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textAlignment="center" android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_height="wrap_content" /> android:text="-- '"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="35sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout>

62
wear/src/main/res/layout-round/activity_nochart_small.xml
View file

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square" android:id="@+id/main_layout"
android:background="@color/black"
android:id="@+id/main_layout">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/black"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:textAlignment="center"> tools:context=".watchfaces.AapsWatchface"
tools:deviceIds="wear_square"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-5dp" android:layout_marginTop="-15dp"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="5dp" android:paddingTop="5dp"
@ -28,10 +28,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginBottom="-15dp"
android:gravity="center_vertical|center_horizontal|center" android:gravity="center_vertical|center_horizontal|center"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="22sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/sgv" android:id="@+id/sgv"
@ -40,8 +42,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="---" android:text="---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="42sp"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/avgdelta" android:id="@+id/avgdelta"
@ -49,10 +52,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginBottom="-15dp"
android:gravity="center_vertical|center_horizontal|center" android:gravity="center_vertical|center_horizontal|center"
android:text=" ---" android:text=" ---"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="26sp" /> android:textSize="22sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -69,19 +74,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="No Loop Status" android:paddingBottom="2dp"
android:text="@string/no_loop_status"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="21sp" /> android:textSize="21sp" />
<View
android:id="@+id/dummy2"
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:layout_weight="0"
android:gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -95,10 +93,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:text="23:24"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="43sp"
tools:text="23:24" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/timestamp"
@ -107,10 +105,10 @@
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:text="--'" android:text="--'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="@color/white"
android:textSize="24sp" /> android:textSize="24sp"
</LinearLayout> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

71
wear/src/main/res/layout-round/activity_steampunk.xml
View file

@ -5,7 +5,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".watchfaces.SteampunkWatchface" tools:context=".watchfaces.SteampunkWatchface"
tools:deviceIds="wear_round"> tools:deviceIds="wear_round"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,6 +19,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:importantForAccessibility="no"
android:src="@drawable/steampunk_dial_mgdl" /> android:src="@drawable/steampunk_dial_mgdl" />
</LinearLayout> </LinearLayout>
@ -57,13 +59,10 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center" android:layout_weight="0.05" />
android:layout_weight="0.05"
android:gravity="center"
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -97,7 +96,7 @@
android:gravity="center" android:gravity="center"
android:paddingTop="7dp" android:paddingTop="7dp"
android:rotation="-28" android:rotation="-28"
android:text="--g" android:text="@string/no_cob_g"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="13sp" android:textSize="13sp"
@ -119,7 +118,7 @@
android:gravity="center" android:gravity="center"
android:paddingBottom="14dp" android:paddingBottom="14dp"
android:rotation="0" android:rotation="0"
android:text="-.--U/h" android:text="@string/no_tmp_basal_u_h"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="13sp" android:textSize="13sp"
@ -141,7 +140,7 @@
android:gravity="center" android:gravity="center"
android:paddingTop="6dp" android:paddingTop="6dp"
android:rotation="28" android:rotation="28"
android:text="0.00U" android:text="@string/no_iob_u"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="13sp" android:textSize="13sp"
@ -170,11 +169,10 @@
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="0.25" />
android:orientation="horizontal" />
<lecho.lib.hellocharts.view.LineChartView <lecho.lib.hellocharts.view.LineChartView
android:id="@+id/chart" android:id="@+id/chart"
@ -182,7 +180,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.5" /> android:layout_weight="0.5" />
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="0.25"
@ -190,11 +188,10 @@
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.03" android:layout_weight="0.03" />
android:orientation="vertical" />
</LinearLayout> </LinearLayout>
@ -207,26 +204,25 @@
android:orientation="vertical" android:orientation="vertical"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.15" android:layout_weight="0.15" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="0.21" android:layout_weight="0.21"
android:baselineAligned="false"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1"> android:weightSum="1">
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.32" android:layout_weight="0.32" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="0px"
@ -240,14 +236,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:paddingEnd="8dp" android:paddingStart="0dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingEnd="8dp"
android:rotation="-24" android:rotation="-24"
android:text="-'" android:text="-'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -270,7 +268,8 @@
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" /> android:visibility="gone"
tools:ignore="HardcodedText" />
<TextView <TextView
android:id="@+id/uploader_battery" android:id="@+id/uploader_battery"
@ -282,7 +281,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -300,28 +300,28 @@
android:gravity="center" android:gravity="center"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingEnd="0dp"
android:rotation="24" android:rotation="24"
android:text="-'" android:text="-'"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black_86p" android:textColor="@color/black_86p"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.32" android:layout_weight="0.32" />
android:orientation="horizontal" />
</LinearLayout> </LinearLayout>
<LinearLayout <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="0.64" android:layout_weight="0.64" />
android:orientation="horizontal" />
</LinearLayout> </LinearLayout>
@ -330,8 +330,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/steampunk_cover_plate" android:background="@drawable/steampunk_cover_plate"
android:orientation="vertical"> android:orientation="vertical" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -370,7 +369,7 @@
</LinearLayout> </LinearLayout>
<TextView <View
android:id="@+id/AAPSv2" android:id="@+id/AAPSv2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

7
wear/src/main/res/layout-v26/list_item.xml
View file

@ -12,9 +12,9 @@
android:layout_width="35dp" android:layout_width="35dp"
android:layout_height="35dp" android:layout_height="35dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:importantForAccessibility="no"
android:src="@drawable/circle" /> android:src="@drawable/circle" />
<TextView <TextView
@ -24,14 +24,13 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_toEndOf="@+id/menuItemIcon" android:layout_toEndOf="@+id/menuItemIcon"
android:layout_toRightOf="@+id/menuItemIcon"
android:autoSizeMaxTextSize="32sp" android:autoSizeMaxTextSize="32sp"
android:autoSizeMinTextSize="12sp" android:autoSizeMinTextSize="12sp"
android:autoSizeStepGranularity="2sp" android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:text="action item"
android:textColor="@color/dark_statusView" android:textColor="@color/dark_statusView"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="action item" />
</RelativeLayout> </RelativeLayout>

18
wear/src/main/res/layout/action_confirm_ok.xml
View file

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
@ -15,12 +11,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="10sp"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:src="@drawable/ic_confirm" android:contentDescription="@string/action_confirm"
android:tint="#ffffff"
android:padding="25sp" android:padding="25sp"
android:layout_margin="10sp"/> android:src="@drawable/ic_confirm"
app:tint="@color/white" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

14
wear/src/main/res/layout/action_confirm_text.xml
View file

@ -1,5 +1,6 @@
<androidx.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -11,18 +12,21 @@
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:id="@+id/message_scroll" android:id="@+id/message_scroll"
android:focusable="true"
android:focusableInTouchMode="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:focusable="true"
android:focusableInTouchMode="true">
<TextView <TextView
android:id="@+id/message" android:id="@+id/message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="message"
android:textAppearance="@style/TextAppearance.Wearable.Small" android:textAppearance="@style/TextAppearance.Wearable.Small"
android:textColor="@color/white" /> android:textColor="@color/white"
tools:text="message" />
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</FrameLayout> </FrameLayout>
</androidx.wear.widget.BoxInsetLayout> </androidx.wear.widget.BoxInsetLayout>

38
wear/src/main/res/layout/action_editplusminus_item.xml
View file

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center"
android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/minusbutton" android:id="@+id/minusbutton"
@ -16,15 +13,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/decrement"
android:src="@drawable/ic_action_minus" android:src="@drawable/ic_action_minus"
android:tint="#ffffff" /> android:tint="@color/white" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"> android:layout_gravity="center"
android:orientation="vertical">
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
@ -36,9 +34,9 @@
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="50dp" android:minWidth="50dp"
android:padding="10dp" android:padding="10dp"
android:text="112"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp"
tools:text="112" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
@ -46,21 +44,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="label" android:labelFor="@+id/amountfield"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp"
tools:ignore="LabelFor"
tools:text="label" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/plusbutton" android:id="@+id/plusbutton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/increment"
android:src="@drawable/ic_action_add" android:src="@drawable/ic_action_add"
android:tint="#ffffff" /> android:tint="@color/white" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

37
wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
View file

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center"
android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/plusbutton" android:id="@+id/plusbutton"
@ -16,16 +13,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/increment"
android:src="@drawable/ic_action_add" android:src="@drawable/ic_action_add"
android:tint="#ffffff" /> android:tint="@color/white" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center"
android:orientation="vertical">
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
@ -37,9 +35,9 @@
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="100dp" android:minWidth="100dp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="112"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp"
tools:text="112" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
@ -47,10 +45,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="label" android:labelFor="@+id/amountfield"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp"
tools:ignore="LabelFor"
tools:text="label" />
<ImageView <ImageView
android:id="@+id/minusbutton" android:id="@+id/minusbutton"
@ -58,12 +58,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/decrement"
android:src="@drawable/ic_action_minus" android:src="@drawable/ic_action_minus"
android:tint="#ffffff" /> android:tint="@color/white" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout>

37
wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
View file

@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center"
android:orientation="vertical">
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
@ -27,9 +24,9 @@
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="100dp" android:minWidth="100dp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="112"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp"
tools:text="112" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
@ -37,10 +34,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="label" android:labelFor="@+id/amountfield"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp"
tools:ignore="LabelFor"
tools:text="label" />
<ImageView <ImageView
android:id="@+id/minusbutton" android:id="@+id/minusbutton"
@ -48,9 +47,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/decrement"
android:src="@drawable/ic_action_minus" android:src="@drawable/ic_action_minus"
android:tint="#ffffff" /> android:tint="@color/white" />
</LinearLayout> </LinearLayout>
@ -60,10 +60,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/increment"
android:src="@drawable/ic_action_add" android:src="@drawable/ic_action_add"
android:tint="#ffffff" /> android:tint="@color/white" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

46
wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
View file

@ -1,36 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="left|center_vertical" android:layout_gravity="start|center_vertical"
android:gravity="center" android:gravity="center"
android:labelFor="@+id/amountfield"
android:rotation="90" android:rotation="90"
android:text="labelx"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp"
tools:ignore="LabelFor"
tools:text="labelx" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical|center_horizontal" android:layout_gravity="start|center_vertical|center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
@ -38,9 +30,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/increment"
android:src="@drawable/ic_action_add" android:src="@drawable/ic_action_add"
android:tint="#ffffff" /> android:tint="@color/white" />
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
@ -53,19 +46,22 @@
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="50dp" android:minWidth="50dp"
android:padding="10dp" android:padding="10dp"
android:text="112"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp"
tools:text="112" />
<ImageView <ImageView
android:id="@+id/minusbutton" android:id="@+id/minusbutton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:backgroundTint="#ffffff" android:backgroundTint="@color/white"
android:contentDescription="@string/decrement"
android:src="@drawable/ic_action_minus" android:src="@drawable/ic_action_minus"
android:tint="#ffffff" /> android:tint="@color/white" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</RelativeLayout>

13
wear/src/main/res/layout/actions_list_activity.xml
View file

@ -1,9 +1,9 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.wear.widget.WearableRecyclerView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.wear.widget.WearableRecyclerView
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/action_list" android:id="@+id/action_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -26,16 +26,17 @@
android:autoSizeMinTextSize="12sp" android:autoSizeMinTextSize="12sp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:gravity="center" android:gravity="center"
android:text="Title" android:textSize="18sp"
android:textSize="18sp" /> tools:text="Title" />
</LinearLayout> </LinearLayout>
<androidx.wear.widget.CurvedTextView <androidx.wear.widget.CurvedTextView
android:id="@+id/title_curved" android:id="@+id/title_curved"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Title"
android:textSize="18sp" android:textSize="18sp"
android:visibility="gone" /> android:visibility="gone"
tools:text="Title" />
</FrameLayout> </FrameLayout>

55
wear/src/main/res/layout/activity_circle.xml
View file

@ -1,53 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentStart="true"> android:gravity="center_vertical|center_horizontal"
android:orientation="vertical">
<TextView android:id="@+id/agoString" <TextView
android:id="@+id/agoString"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="99'"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginBottom="-5dp" /> android:layout_marginBottom="-5dp"
android:textSize="18sp"
tools:text="99'" />
<TextView android:id="@+id/sgvString" <TextView
android:id="@+id/sgvString"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="55sp" android:textSize="55sp"
android:layout_centerHorizontal="true" tools:text="999" />
android:layout_centerVertical="true"
android:text="999"
android:layout_gravity="center" />
<TextView android:id="@+id/statusString" <TextView
android:id="@+id/statusString"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp" android:layout_gravity="center"
android:layout_centerHorizontal="true" android:layout_marginTop="-5dp"
android:layout_centerVertical="true"
android:text="@string/activity_no_status" android:text="@string/activity_no_status"
android:layout_gravity="center" android:textSize="18sp" />
android:layout_marginTop="-5dp" />
<TextView android:id="@+id/deltaString" <TextView
android:id="@+id/deltaString"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="+99"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="-5dp" /> android:layout_marginTop="-5dp"
android:textSize="18sp"
tools:text="+99" />
</LinearLayout> </LinearLayout>
</RelativeLayout>

13
wear/src/main/res/layout/grid_layout.xml
View file

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.wear.widget.CurvedTextView <androidx.wear.widget.CurvedTextView
android:id="@+id/title_curved" android:id="@+id/title_curved"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Title"
android:textSize="18sp" android:textSize="18sp"
android:visibility="gone" /> android:visibility="gone"
tools:text="Title" />
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -20,8 +21,8 @@
android:autoSizeMinTextSize="12sp" android:autoSizeMinTextSize="12sp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:gravity="center" android:gravity="center"
android:text="Title" android:textSize="18sp"
android:textSize="18sp" /> tools:text="Title" />
<android.support.wearable.view.GridViewPager <android.support.wearable.view.GridViewPager
android:id="@+id/pager" android:id="@+id/pager"

8
wear/src/main/res/layout/list_item.xml
View file

@ -11,10 +11,9 @@
android:id="@+id/menuItemIcon" android:id="@+id/menuItemIcon"
android:layout_width="35dp" android:layout_width="35dp"
android:layout_height="35dp" android:layout_height="35dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:importantForAccessibility="no"
android:src="@drawable/circle" /> android:src="@drawable/circle" />
<TextView <TextView
@ -24,10 +23,9 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_toEndOf="@+id/menuItemIcon" android:layout_toEndOf="@+id/menuItemIcon"
android:layout_toRightOf="@+id/menuItemIcon"
android:text="action item"
android:textColor="@color/dark_statusView" android:textColor="@color/dark_statusView"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:text="action item" />
</RelativeLayout> </RelativeLayout>

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

@ -222,5 +222,21 @@
<string name="key_dark" translatable="false">dark</string> <string name="key_dark" translatable="false">dark</string>
<string name="key_input_design" translatable="false">input_design</string> <string name="key_input_design" translatable="false">input_design</string>
<string name="key_complication_tap_action" translatable="false">complication_tap_action</string> <string name="key_complication_tap_action" translatable="false">complication_tap_action</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>
<string name="no_tmp_basal_u_h">-.--U/h</string>
<string name="uploader_na">Uploader: ---%</string>
<string name="no_status">S: no status</string>
<string name="time_stamp_na_min_ago">-- Minutes ago</string>
<string name="delta_na">--- mg/dl</string>
<string name="no_loop_status">No Loop Status</string>
<string name="cob_000g">000g</string>
<string name="svg_00_0">00,0</string>
<string name="iob_0_00u">0,00U</string>
</resources> </resources>