From 366a325279db4ab3d59de1d7097382d1e16ae8cc Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Wed, 1 Jun 2022 09:45:59 +0200 Subject: [PATCH] chore: remove wear layout lint warning --- .../androidaps/watchfaces/BaseWatchFace.kt | 8 +- .../res/layout-notround/activity_bigchart.xml | 193 ++--- .../activity_bigchart_small.xml | 195 ++--- .../res/layout-notround/activity_cockpit.xml | 795 ++++++++---------- .../layout-notround/activity_digitalstyle.xml | 153 ++-- .../res/layout-notround/activity_home.xml | 274 +++--- .../res/layout-notround/activity_home_2.xml | 675 +++++++-------- .../layout-notround/activity_home_large.xml | 252 +++--- .../res/layout-notround/activity_nochart.xml | 177 ++-- .../activity_nochart_small.xml | 196 +++-- .../layout-notround/activity_steampunk.xml | 97 ++- .../res/layout-round/activity_bigchart.xml | 189 +++-- .../layout-round/activity_bigchart_small.xml | 194 ++--- .../res/layout-round/activity_cockpit.xml | 794 ++++++++--------- .../layout-round/activity_digitalstyle.xml | 150 ++-- .../main/res/layout-round/activity_home.xml | 289 ++++--- .../main/res/layout-round/activity_home_2.xml | 701 ++++++++------- .../res/layout-round/activity_home_large.xml | 250 +++--- .../res/layout-round/activity_nochart.xml | 175 ++-- .../layout-round/activity_nochart_small.xml | 198 +++-- .../res/layout-round/activity_steampunk.xml | 73 +- wear/src/main/res/layout-v26/list_item.xml | 7 +- .../src/main/res/layout/action_confirm_ok.xml | 40 +- .../main/res/layout/action_confirm_text.xml | 16 +- .../res/layout/action_editplusminus_item.xml | 104 +-- .../action_editplusminus_item_quicklefty.xml | 111 ++- .../action_editplusminus_item_quickrighty.xml | 101 ++- .../action_editplusminus_item_viktoria.xml | 112 ++- .../main/res/layout/actions_list_activity.xml | 13 +- wear/src/main/res/layout/activity_circle.xml | 83 +- wear/src/main/res/layout/grid_layout.xml | 15 +- wear/src/main/res/layout/list_item.xml | 8 +- wear/src/main/res/values/strings.xml | 16 + 33 files changed, 3300 insertions(+), 3354 deletions(-) diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt index a25d320dd4..07fbc4d63d 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt @@ -13,11 +13,11 @@ import android.os.Vibrator import android.support.wearable.watchface.WatchFaceStyle import android.view.LayoutInflater import android.view.View +import android.view.ViewGroup import android.view.WindowInsets import android.view.WindowManager import android.widget.ImageView import android.widget.LinearLayout -import android.widget.RelativeLayout import android.widget.TextView import androidx.annotation.LayoutRes import androidx.core.content.ContextCompat @@ -100,14 +100,14 @@ abstract class BaseWatchFace : WatchFace() { var mDay: TextView? = null var mDayName: TextView? = null var mMonth: TextView? = null - var isAAPSv2: TextView? = null + var isAAPSv2: View? = null var mHighLight: TextView? = null var mLowLight: TextView? = null var mGlucoseDial: ImageView? = null var mDeltaGauge: ImageView? = null var mHourHand: ImageView? = null var mMinuteHand: ImageView? = null - var mRelativeLayout: RelativeLayout? = null + var mRelativeLayout: ViewGroup? = null var mLinearLayout: LinearLayout? = null var mLinearLayout2: LinearLayout? = null var mDate: LinearLayout? = null @@ -594,4 +594,4 @@ abstract class BaseWatchFace : WatchFace() { val BOLD_TYPEFACE: Typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) const val SCREEN_SIZE_SMALL = 280 } -} \ No newline at end of file +} diff --git a/wear/src/main/res/layout-notround/activity_bigchart.xml b/wear/src/main/res/layout-notround/activity_bigchart.xml index d610c6f38b..8c3a136e6a 100644 --- a/wear/src/main/res/layout-notround/activity_bigchart.xml +++ b/wear/src/main/res/layout-notround/activity_bigchart.xml @@ -1,108 +1,111 @@ - + android:gravity="center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-5dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:paddingTop="5dp" + android:textAlignment="center"> - - + android:layout_gravity="bottom" + android:layout_marginEnd="5dp" + android:gravity="center_horizontal|bottom" + android:text="---" + android:textColor="@color/white" + android:textSize="30sp" + tools:ignore="HardcodedText" /> - + - - + - + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_bigchart_small.xml b/wear/src/main/res/layout-notround/activity_bigchart_small.xml index 3a271e9ea0..9462a35612 100644 --- a/wear/src/main/res/layout-notround/activity_bigchart_small.xml +++ b/wear/src/main/res/layout-notround/activity_bigchart_small.xml @@ -1,111 +1,114 @@ - + android:gravity="center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-5dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:paddingTop="5dp" + android:textAlignment="center"> + + + android:gravity="center_horizontal" + android:text="---" + android:textColor="@color/white" + android:textSize="34sp" + tools:ignore="HardcodedText" /> - - - - - - - - + android:layout_gravity="center_vertical|center_horizontal|center" + android:layout_marginStart="5dp" + android:gravity="center_horizontal|bottom" + android:text="---" + android:textColor="@color/white" + android:textSize="24sp" + tools:ignore="HardcodedText" /> - + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_cockpit.xml b/wear/src/main/res/layout-notround/activity_cockpit.xml index 75290deb00..9170bc9880 100644 --- a/wear/src/main/res/layout-notround/activity_cockpit.xml +++ b/wear/src/main/res/layout-notround/activity_cockpit.xml @@ -1,9 +1,13 @@ + 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"> - - - + android:layout_weight="0.095" /> + android:layout_weight="0.2575" + android:orientation="horizontal"> + + + android:layout_weight="0.06" + android:baselineAligned="false" + android:orientation="vertical"> + + + android:id="@+id/highLight" + android:layout_width="fill_parent" + android:layout_height="0px" + android:layout_gravity="center" + android:layout_weight="1" + android:background="@drawable/airplane_led_grey_unlit" + android:gravity="center" + android:text="@string/first_char_high" + android:textAlignment="center" + android:textColor="@color/primary_text_dark" + android:textSize="8sp" + android:textStyle="bold" + tools:ignore="SmallSp" /> - - - - - - - - - - - - - + + android:id="@+id/lowLight" + android:layout_width="fill_parent" + android:layout_height="0px" + android:layout_gravity="center" + android:layout_weight="1" + android:background="@drawable/airplane_led_grey_unlit" + android:gravity="center" + android:text="@string/first_char_low" + android:textAlignment="center" + android:textColor="@color/primary_text_dark" + android:textSize="8sp" + android:textStyle="bold" + tools:ignore="SmallSp" /> + + + + + android:layout_weight="0.0775" + android:orientation="vertical"> @@ -120,369 +110,332 @@ android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="0.57" - android:orientation="vertical"> + android:orientation="horizontal"> + + + android:layout_weight="0.275" + android:orientation="vertical"> + + + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="0.5" + android:orientation="vertical" + android:weightSum="1"> + + + + + android:weightSum="1"> - + android:layout_weight="0.35" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center" + android:layout_weight="0.65" + android:gravity="center" + android:text="--'" + android:textAlignment="center" + android:textColor="@color/primary_text_dark" + android:textSize="14sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_digitalstyle.xml b/wear/src/main/res/layout-notround/activity_digitalstyle.xml index 87352b783a..1967a03571 100644 --- a/wear/src/main/res/layout-notround/activity_digitalstyle.xml +++ b/wear/src/main/res/layout-notround/activity_digitalstyle.xml @@ -1,12 +1,12 @@ - + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> @@ -34,7 +35,7 @@ android:orientation="vertical" android:weightSum="100"> - @@ -47,7 +48,7 @@ android:orientation="horizontal" android:weightSum="13"> - @@ -69,7 +70,8 @@ android:gravity="bottom|center_horizontal" android:text="@string/activity_carb" android:textColor="@color/light_grey" - android:textSize="10sp" /> + android:textSize="10sp" + tools:ignore="SmallSp" /> + - - @@ -105,7 +108,7 @@ android:orientation="horizontal" android:weightSum="13"> - @@ -120,6 +123,7 @@ - @@ -146,7 +150,8 @@ android:textAlignment="center" android:textColor="@color/white" android:textSize="16sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:ignore="HardcodedText" /> + android:textSize="10sp" + tools:ignore="HardcodedText,SmallSp" /> - + @@ -186,21 +193,23 @@ android:gravity="top|center_horizontal" android:letterSpacing="-0.05" android:lines="1" - android:text="00,0" + android:text="@string/svg_00_0" android:textColor="@color/white" android:textSize="20sp" android:textStyle="bold" /> + + - - @@ -213,7 +222,7 @@ android:orientation="horizontal" android:weightSum="13"> - @@ -235,7 +244,8 @@ android:gravity="bottom|center_horizontal" android:text="@string/activity_IOB" android:textColor="@color/light_grey" - android:textSize="10sp" /> + android:textSize="10sp" + tools:ignore="SmallSp" /> + - - + @@ -278,12 +290,13 @@ - @@ -311,11 +324,11 @@ android:layout_height="match_parent" android:layout_weight="5" android:fontFamily="@font/roboto_condensed_regular" - android:text="DDD" android:textAllCaps="true" android:textColor="@color/white" android:textFontWeight="400" - android:textSize="18sp" /> + android:textSize="18sp" + tools:text="DDD" /> + android:visibility="gone" + tools:text="ww" /> - + @@ -354,10 +368,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/roboto_condensed_regular" + android:paddingStart="0dp" android:paddingEnd="4dp" - android:text="DD" android:textColor="@color/light_grey" - android:textSize="18sp" /> + android:textSize="18sp" + tools:text="DD" /> + + android:textSize="18sp" + tools:text="MMM" /> + + + @@ -383,7 +402,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="4" - android:gravity="left|center_vertical" + android:baselineAligned="false" + android:gravity="start|center_vertical" android:orientation="horizontal"> + android:textStyle="bold" + tools:text="HH" /> + @@ -416,29 +437,33 @@ android:id="@+id/minute" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginLeft="6sp" + android:layout_gravity="start" + android:layout_marginStart="6sp" android:layout_marginBottom="-8sp" android:fontFamily="@font/roboto_condensed_bold" - android:text="MI" android:textColor="@color/light_grey" android:textSize="26sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:text="MI" /> - + + android:textStyle="bold" + tools:ignore="SmallSp" + tools:text="AM" /> + + + @@ -449,7 +474,7 @@ android:layout_marginRight="7dp" android:layout_weight="1" android:baselineAligned="false" - android:gravity="left|top" + android:gravity="start|top" android:orientation="vertical" android:weightSum="10"> @@ -472,7 +497,8 @@ android:text="+/-" android:textColor="@color/light_grey" android:textSize="10sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:ignore="HardcodedText,SmallSp" /> + android:textStyle="bold" + tools:ignore="SmallSp" /> + android:textStyle="bold" + tools:ignore="HardcodedText,SmallSp" /> + android:visibility="gone" + tools:ignore="HardcodedText,SmallSp" /> + android:textStyle="bold" + tools:ignore="SmallSp" /> + android:visibility="gone" + tools:ignore="SmallSp" + tools:text="bgi" /> + @@ -552,21 +584,22 @@ - + + + - diff --git a/wear/src/main/res/layout-notround/activity_home.xml b/wear/src/main/res/layout-notround/activity_home.xml index dd700fcf5c..b20301ae4a 100644 --- a/wear/src/main/res/layout-notround/activity_home.xml +++ b/wear/src/main/res/layout-notround/activity_home.xml @@ -1,156 +1,158 @@ - + android:gravity="center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + android:weightSum="1" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - + + + android:baselineAligned="false" + android:gravity="center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + android:weightSum="1"> + + - - - - - - - - + android:gravity="center_horizontal|bottom" + android:text="@string/delta_na" + android:textColor="@color/white" + android:textSize="10sp" + android:textStyle="bold" + tools:ignore="SmallSp" /> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_home_2.xml b/wear/src/main/res/layout-notround/activity_home_2.xml index 60ae6c3cf6..faaaca080e 100644 --- a/wear/src/main/res/layout-notround/activity_home_2.xml +++ b/wear/src/main/res/layout-notround/activity_home_2.xml @@ -1,372 +1,351 @@ - + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> + android:id="@+id/primary_layout" + android:layout_width="fill_parent" + android:layout_height="0px" + android:layout_gravity="center_horizontal" + android:layout_weight="0.27" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:textAlignment="center"> + + + + + android:orientation="vertical"> - - + android:gravity="center_horizontal|bottom" + android:text="--" + android:textAlignment="center" + android:textColor="@color/white" + android:textSize="22sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="--'" + android:textColor="@color/white" + android:textSize="14sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_home_large.xml b/wear/src/main/res/layout-notround/activity_home_large.xml index a3ffe072f3..9595976def 100644 --- a/wear/src/main/res/layout-notround/activity_home_large.xml +++ b/wear/src/main/res/layout-notround/activity_home_large.xml @@ -1,138 +1,136 @@ - + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_width="147dp" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:orientation="horizontal" + android:paddingTop="15dp" + android:textAlignment="center" + android:weightSum="1"> + + + android:weightSum="1"> + + + + + + - + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_nochart.xml b/wear/src/main/res/layout-notround/activity_nochart.xml index 41f44e4404..6f4da2c1b5 100644 --- a/wear/src/main/res/layout-notround/activity_nochart.xml +++ b/wear/src/main/res/layout-notround/activity_nochart.xml @@ -1,100 +1,103 @@ - + android:gravity="center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-5dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:paddingTop="5dp" + android:textAlignment="center"> - - + android:layout_gravity="bottom" + android:layout_marginEnd="5dp" + android:gravity="center_horizontal|bottom" + android:text="---" + android:textColor="@color/white" + android:textSize="40sp" + tools:ignore="HardcodedText" /> - + - - + - + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_nochart_small.xml b/wear/src/main/res/layout-notround/activity_nochart_small.xml index c8f82fad03..a02a672216 100644 --- a/wear/src/main/res/layout-notround/activity_nochart_small.xml +++ b/wear/src/main/res/layout-notround/activity_nochart_small.xml @@ -1,116 +1,112 @@ - + android:gravity="center_vertical|center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.NoChartWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - + + - - - - - - - - - - + android:text="---" + android:textColor="@color/white" + android:textSize="45sp" + tools:ignore="HardcodedText" /> - - - - - - - - - + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:layout_marginStart="5dp" + android:gravity="center_vertical|center_horizontal|center" + android:text=" ---" + android:textColor="@color/white" + android:textSize="26sp" + tools:ignore="HardcodedText" /> - \ No newline at end of file + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-notround/activity_steampunk.xml b/wear/src/main/res/layout-notround/activity_steampunk.xml index e56d515d1b..531bf99513 100644 --- a/wear/src/main/res/layout-notround/activity_steampunk.xml +++ b/wear/src/main/res/layout-notround/activity_steampunk.xml @@ -5,7 +5,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".watchfaces.SteampunkWatchface" - tools:deviceIds="wear_square"> + tools:deviceIds="wear_round" + tools:ignore="MissingDefaultResource"> @@ -57,13 +59,10 @@ android:orientation="vertical" android:weightSum="1"> - + android:layout_weight="0.05" /> @@ -108,7 +107,7 @@ @@ -130,7 +129,7 @@ @@ -170,11 +169,10 @@ android:orientation="horizontal" android:weightSum="1"> - + android:layout_weight="0.25" /> - - + android:layout_weight="0.03" /> @@ -207,26 +204,25 @@ android:orientation="vertical" android:weightSum="1"> - + android:layout_weight="0.15" /> - + android:layout_weight="0.32" /> + android:textSize="12sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> @@ -268,9 +266,10 @@ android:text="--%" android:textAlignment="center" android:textColor="@color/black_86p" - android:textSize="10sp" + android:textSize="12sp" android:textStyle="bold" - android:visibility="gone" /> + android:visibility="gone" + tools:ignore="HardcodedText" /> + android:textSize="12sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> @@ -300,28 +300,28 @@ android:gravity="center" android:paddingStart="10dp" android:paddingTop="8dp" + android:paddingEnd="0dp" android:rotation="24" android:text="-'" android:textAlignment="center" android:textColor="@color/black_86p" - android:textSize="10sp" - android:textStyle="bold" /> + android:textSize="12sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - + android:layout_weight="0.32" /> - + android:layout_weight="0.64" /> @@ -330,8 +330,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/steampunk_cover_plate" - android:orientation="vertical"> - + android:orientation="vertical" /> - + android:visibility="gone" /> diff --git a/wear/src/main/res/layout-round/activity_bigchart.xml b/wear/src/main/res/layout-round/activity_bigchart.xml index d610c6f38b..58c7a609a7 100644 --- a/wear/src/main/res/layout-round/activity_bigchart.xml +++ b/wear/src/main/res/layout-round/activity_bigchart.xml @@ -1,108 +1,107 @@ - + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-2dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:paddingTop="5dp" + android:textAlignment="center"> - - + android:layout_gravity="bottom" + android:layout_marginEnd="5dp" + android:gravity="center_horizontal|bottom" + android:text="---" + android:textColor="@color/white" + android:textSize="30sp" + tools:ignore="HardcodedText" /> - + - - + - + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_bigchart_small.xml b/wear/src/main/res/layout-round/activity_bigchart_small.xml index 3a271e9ea0..c705f913dd 100644 --- a/wear/src/main/res/layout-round/activity_bigchart_small.xml +++ b/wear/src/main/res/layout-round/activity_bigchart_small.xml @@ -1,111 +1,113 @@ - + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-5dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:paddingTop="5dp" + android:textAlignment="center"> + + + android:gravity="center_horizontal" + android:text="---" + android:textColor="@color/white" + android:textSize="34sp" + tools:ignore="HardcodedText" /> - - - - - - - - + android:layout_gravity="center_vertical|center_horizontal|center" + android:layout_marginStart="5dp" + android:gravity="center_horizontal|bottom" + android:text="---" + android:textColor="@color/white" + android:textSize="24sp" + tools:ignore="HardcodedText" /> - + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_cockpit.xml b/wear/src/main/res/layout-round/activity_cockpit.xml index 8486b4d211..8c93675cc1 100644 --- a/wear/src/main/res/layout-round/activity_cockpit.xml +++ b/wear/src/main/res/layout-round/activity_cockpit.xml @@ -1,9 +1,13 @@ + 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"> - - - + android:layout_weight="0.095" /> + android:layout_weight="0.2575" + android:orientation="horizontal"> + + + android:layout_weight="0.06" + android:baselineAligned="false" + android:orientation="vertical"> + + + android:id="@+id/highLight" + android:layout_width="fill_parent" + android:layout_height="0px" + android:layout_gravity="center" + android:layout_weight="1" + android:background="@drawable/airplane_led_grey_unlit" + android:gravity="center" + android:text="@string/first_char_high" + android:textAlignment="center" + android:textColor="@color/primary_text_dark" + android:textSize="8sp" + android:textStyle="bold" + tools:ignore="SmallSp" /> - - - - - - - - - - - - - + + android:id="@+id/lowLight" + android:layout_width="fill_parent" + android:layout_height="0px" + android:layout_gravity="center" + android:layout_weight="1" + android:background="@drawable/airplane_led_grey_unlit" + android:gravity="center" + android:text="@string/first_char_low" + android:textAlignment="center" + android:textColor="@color/primary_text_dark" + android:textSize="8sp" + android:textStyle="bold" + tools:ignore="SmallSp" /> + + + + + android:layout_weight="0.0775" + android:orientation="vertical"> @@ -120,369 +110,331 @@ android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="0.57" - android:orientation="vertical"> + android:orientation="horizontal"> + + + android:layout_weight="0.275" + android:orientation="vertical"> + + + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="0.5" + android:orientation="vertical" + android:weightSum="1"> + + + + + android:weightSum="1"> - + android:layout_weight="0.35" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center" + android:layout_weight="0.65" + android:gravity="center" + android:text="--'" + android:textAlignment="center" + android:textColor="@color/primary_text_dark" + android:textSize="14sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_digitalstyle.xml b/wear/src/main/res/layout-round/activity_digitalstyle.xml index bc21b8d326..cb696ccc84 100644 --- a/wear/src/main/res/layout-round/activity_digitalstyle.xml +++ b/wear/src/main/res/layout-round/activity_digitalstyle.xml @@ -1,12 +1,12 @@ - + tools:deviceIds="wear_round" + tools:ignore="MissingDefaultResource"> @@ -34,7 +35,7 @@ android:orientation="vertical" android:weightSum="100"> - @@ -47,7 +48,7 @@ android:orientation="horizontal" android:weightSum="13"> - @@ -69,7 +70,8 @@ android:gravity="bottom|center_horizontal" android:text="@string/activity_carb" android:textColor="@color/light_grey" - android:textSize="10sp" /> + android:textSize="10sp" + tools:ignore="SmallSp" /> + - - @@ -105,7 +108,7 @@ android:orientation="horizontal" android:weightSum="13"> - @@ -130,7 +133,7 @@ android:orientation="horizontal" android:weightSum="10"> - @@ -147,7 +150,8 @@ android:textAlignment="center" android:textColor="@color/white" android:textSize="16sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:ignore="HardcodedText" /> + android:textSize="10sp" + tools:ignore="HardcodedText,SmallSp" /> - + @@ -187,21 +193,23 @@ android:gravity="top|center_horizontal" android:letterSpacing="-0.05" android:lines="1" - android:text="00,0" + android:text="@string/svg_00_0" android:textColor="@color/white" android:textSize="20sp" android:textStyle="bold" /> + + - - @@ -214,7 +222,7 @@ android:orientation="horizontal" android:weightSum="13"> - @@ -236,7 +244,8 @@ android:gravity="bottom|center_horizontal" android:text="@string/activity_IOB" android:textColor="@color/light_grey" - android:textSize="10sp" /> + android:textSize="10sp" + tools:ignore="SmallSp" /> + - - + @@ -279,12 +290,13 @@ - @@ -312,11 +324,11 @@ android:layout_height="match_parent" android:layout_weight="5" android:fontFamily="@font/roboto_condensed_regular" - android:text="DDD" android:textAllCaps="true" android:textColor="@color/white" android:textFontWeight="400" - android:textSize="18sp" /> + android:textSize="18sp" + tools:text="DDD" /> + android:visibility="gone" + tools:text="ww" /> - + @@ -355,10 +368,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/roboto_condensed_regular" + android:paddingStart="0dp" android:paddingEnd="4dp" - android:text="DD" android:textColor="@color/light_grey" - android:textSize="18sp" /> + android:textSize="18sp" + tools:text="DD" /> + + android:textSize="18sp" + tools:text="MMM" /> + + + @@ -384,29 +402,32 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="4" - android:gravity="left|center_vertical" + android:baselineAligned="false" + android:gravity="start|center_vertical" android:orientation="horizontal"> + + android:textStyle="bold" + tools:text="HH" /> + @@ -416,29 +437,33 @@ android:id="@+id/minute" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginLeft="6sp" + android:layout_gravity="start" + android:layout_marginStart="6sp" android:layout_marginBottom="-8sp" android:fontFamily="@font/roboto_condensed_bold" - android:text="MI" android:textColor="@color/light_grey" android:textSize="26sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:text="MI" /> + android:textStyle="bold" + tools:ignore="SmallSp" + tools:text="AM" /> + + + @@ -449,7 +474,7 @@ android:layout_marginRight="7dp" android:layout_weight="1" android:baselineAligned="false" - android:gravity="left|top" + android:gravity="start|top" android:orientation="vertical" android:weightSum="10"> @@ -472,7 +497,8 @@ android:text="+/-" android:textColor="@color/light_grey" android:textSize="10sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:ignore="HardcodedText,SmallSp" /> + android:textStyle="bold" + tools:ignore="SmallSp" /> + android:textStyle="bold" + tools:ignore="HardcodedText,SmallSp" /> + android:visibility="gone" + tools:ignore="HardcodedText,SmallSp" /> + android:textStyle="bold" + tools:ignore="SmallSp" /> + android:visibility="gone" + tools:ignore="SmallSp" + tools:text="bgi" /> + @@ -552,22 +584,22 @@ - + + - diff --git a/wear/src/main/res/layout-round/activity_home.xml b/wear/src/main/res/layout-round/activity_home.xml index 008ed7d129..e886eada50 100644 --- a/wear/src/main/res/layout-round/activity_home.xml +++ b/wear/src/main/res/layout-round/activity_home.xml @@ -1,155 +1,164 @@ - + android:orientation="vertical" + android:textAlignment="center" + android:weightSum="1" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_round" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="-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" /> - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_home_2.xml b/wear/src/main/res/layout-round/activity_home_2.xml index 64e6a411f0..2972ac5430 100644 --- a/wear/src/main/res/layout-round/activity_home_2.xml +++ b/wear/src/main/res/layout-round/activity_home_2.xml @@ -1,385 +1,366 @@ - + tools:deviceIds="wear_round" + tools:ignore="MissingDefaultResource"> + + + android:id="@+id/primary_layout" + android:layout_width="fill_parent" + android:layout_height="0px" + android:layout_gravity="center_horizontal" + android:layout_weight="0.27" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:textAlignment="center"> + + + + - - + android:baselineAligned="false" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingStart="0dp" + android:paddingEnd="4dp"> - - + android:gravity="center_horizontal|bottom" + android:text="--" + android:textAlignment="center" + android:textColor="@color/white" + android:textSize="22sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="--'" + android:textColor="@color/white" + android:textSize="14sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_home_large.xml b/wear/src/main/res/layout-round/activity_home_large.xml index 40f26dc17c..35bb86cdf1 100644 --- a/wear/src/main/res/layout-round/activity_home_large.xml +++ b/wear/src/main/res/layout-round/activity_home_large.xml @@ -1,138 +1,138 @@ - + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_round" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + android:weightSum="1"> + + + + + + - + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_nochart.xml b/wear/src/main/res/layout-round/activity_nochart.xml index 41f44e4404..0ae2e794e0 100644 --- a/wear/src/main/res/layout-round/activity_nochart.xml +++ b/wear/src/main/res/layout-round/activity_nochart.xml @@ -1,100 +1,101 @@ - + android:gravity="center_vertical|center_horizontal" + android:orientation="vertical" + android:textAlignment="center" + tools:context=".watchfaces.NoChartWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-15dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:textAlignment="center"> - - + android:layout_gravity="bottom" + android:layout_marginEnd="5dp" + android:gravity="center_horizontal|bottom" + android:text="---" + android:textColor="@color/white" + android:textSize="40sp" + tools:ignore="HardcodedText" /> - + - - + - + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_nochart_small.xml b/wear/src/main/res/layout-round/activity_nochart_small.xml index c8f82fad03..070d9baf38 100644 --- a/wear/src/main/res/layout-round/activity_nochart_small.xml +++ b/wear/src/main/res/layout-round/activity_nochart_small.xml @@ -1,116 +1,114 @@ - + android:gravity="center_vertical|center_horizontal" + android:orientation="vertical" + tools:context=".watchfaces.AapsWatchface" + tools:deviceIds="wear_square" + tools:ignore="MissingDefaultResource"> - + + - - - - - - - - - - + android:text="---" + android:textColor="@color/white" + android:textSize="42sp" + tools:ignore="HardcodedText" /> - - - - - - - - - + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:layout_marginStart="5dp" + android:layout_marginBottom="-15dp" + android:gravity="center_vertical|center_horizontal|center" + android:text=" ---" + android:textColor="@color/white" + android:textSize="22sp" + tools:ignore="HardcodedText" /> - \ No newline at end of file + + + + + + + + + + + + + diff --git a/wear/src/main/res/layout-round/activity_steampunk.xml b/wear/src/main/res/layout-round/activity_steampunk.xml index 78f9c52383..531bf99513 100644 --- a/wear/src/main/res/layout-round/activity_steampunk.xml +++ b/wear/src/main/res/layout-round/activity_steampunk.xml @@ -5,7 +5,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".watchfaces.SteampunkWatchface" - tools:deviceIds="wear_round"> + tools:deviceIds="wear_round" + tools:ignore="MissingDefaultResource"> @@ -57,13 +59,10 @@ android:orientation="vertical" android:weightSum="1"> - + android:layout_weight="0.05" /> - + android:layout_weight="0.25" /> - - + android:layout_weight="0.03" /> @@ -207,26 +204,25 @@ android:orientation="vertical" android:weightSum="1"> - + android:layout_weight="0.15" /> - + android:layout_weight="0.32" /> + android:textStyle="bold" + tools:ignore="HardcodedText" /> @@ -270,7 +268,8 @@ android:textColor="@color/black_86p" android:textSize="12sp" android:textStyle="bold" - android:visibility="gone" /> + android:visibility="gone" + tools:ignore="HardcodedText" /> + android:textStyle="bold" + tools:ignore="HardcodedText" /> @@ -300,28 +300,28 @@ android:gravity="center" android:paddingStart="10dp" android:paddingTop="8dp" + android:paddingEnd="0dp" android:rotation="24" android:text="-'" android:textAlignment="center" android:textColor="@color/black_86p" android:textSize="12sp" - android:textStyle="bold" /> + android:textStyle="bold" + tools:ignore="HardcodedText" /> - + android:layout_weight="0.32" /> - + android:layout_weight="0.64" /> @@ -330,8 +330,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/steampunk_cover_plate" - android:orientation="vertical"> - + android:orientation="vertical" /> - + android:visibility="gone" /> diff --git a/wear/src/main/res/layout-v26/list_item.xml b/wear/src/main/res/layout-v26/list_item.xml index 7e5efb671f..2616da7efb 100644 --- a/wear/src/main/res/layout-v26/list_item.xml +++ b/wear/src/main/res/layout-v26/list_item.xml @@ -12,9 +12,9 @@ android:layout_width="35dp" android:layout_height="35dp" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_marginStart="10dp" + android:importantForAccessibility="no" android:src="@drawable/circle" /> + android:textStyle="bold" + tools:text="action item" /> diff --git a/wear/src/main/res/layout/action_confirm_ok.xml b/wear/src/main/res/layout/action_confirm_ok.xml index fd0d4c89b9..097dc75adb 100644 --- a/wear/src/main/res/layout/action_confirm_ok.xml +++ b/wear/src/main/res/layout/action_confirm_ok.xml @@ -1,26 +1,22 @@ - + - + android:layout_margin="10sp" + android:background="@drawable/circle" + android:backgroundTint="@color/white" + android:contentDescription="@string/action_confirm" + android:padding="25sp" + android:src="@drawable/ic_confirm" + app:tint="@color/white" /> - - - - + diff --git a/wear/src/main/res/layout/action_confirm_text.xml b/wear/src/main/res/layout/action_confirm_text.xml index 031d98d1e2..9fde2356c6 100644 --- a/wear/src/main/res/layout/action_confirm_text.xml +++ b/wear/src/main/res/layout/action_confirm_text.xml @@ -1,5 +1,6 @@ @@ -11,18 +12,21 @@ + android:layout_height="match_parent" + android:focusable="true" + android:focusableInTouchMode="true"> + + android:textColor="@color/white" + tools:text="message" /> + - \ No newline at end of file + + diff --git a/wear/src/main/res/layout/action_editplusminus_item.xml b/wear/src/main/res/layout/action_editplusminus_item.xml index be5b622dbe..c3cbe263ba 100644 --- a/wear/src/main/res/layout/action_editplusminus_item.xml +++ b/wear/src/main/res/layout/action_editplusminus_item.xml @@ -1,66 +1,68 @@ - + + + + android:orientation="vertical"> - + android:cursorVisible="false" + android:gravity="center_horizontal" + android:inputType="numberDecimal" + android:minWidth="50dp" + android:padding="10dp" + android:textColor="@color/white" + android:textSize="45sp" + tools:text="112" /> - - - - - - - + android:gravity="center" + android:labelFor="@+id/amountfield" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/white" + android:textSize="25sp" + tools:ignore="LabelFor" + tools:text="label" /> - + + + + diff --git a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml index 980677522c..bf3418ca2c 100644 --- a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml +++ b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml @@ -1,69 +1,68 @@ - + + + + android:gravity="center" + android:orientation="vertical"> + + + + - - - - - - - - - - + android:backgroundTint="@color/white" + android:contentDescription="@string/decrement" + android:src="@drawable/ic_action_minus" + android:tint="@color/white" /> - + diff --git a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml index a1b2107768..78c5d7e817 100644 --- a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml +++ b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml @@ -1,69 +1,68 @@ - + + android:gravity="center" + android:orientation="vertical"> - + android:cursorVisible="false" + android:gravity="center_horizontal" + android:inputType="numberDecimal" + android:minWidth="100dp" + android:paddingTop="10dp" + android:textColor="@color/white" + android:textSize="45sp" + tools:text="112" /> - - - - - - - + + android:backgroundTint="@color/white" + android:contentDescription="@string/decrement" + android:src="@drawable/ic_action_minus" + android:tint="@color/white" /> - + + + diff --git a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml index 357fa7c4f2..0b396d8b7f 100644 --- a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml +++ b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml @@ -1,71 +1,67 @@ - + android:orientation="horizontal"> + + - + + + android:layout_gravity="center_vertical|center_horizontal" + android:background="@android:color/transparent" + android:cursorVisible="false" + android:gravity="center_vertical|center_horizontal" + android:inputType="numberDecimal" + android:minWidth="50dp" + android:padding="10dp" + android:textColor="@color/white" + android:textSize="45sp" + tools:text="112" /> - + - - - - - - - - - - + + + + diff --git a/wear/src/main/res/layout/actions_list_activity.xml b/wear/src/main/res/layout/actions_list_activity.xml index 45037c8337..4acdee7c25 100644 --- a/wear/src/main/res/layout/actions_list_activity.xml +++ b/wear/src/main/res/layout/actions_list_activity.xml @@ -1,9 +1,9 @@ - + android:textSize="18sp" + tools:text="Title" /> + + android:visibility="gone" + tools:text="Title" /> diff --git a/wear/src/main/res/layout/activity_circle.xml b/wear/src/main/res/layout/activity_circle.xml index 9837a8a2aa..57a9c6325a 100644 --- a/wear/src/main/res/layout/activity_circle.xml +++ b/wear/src/main/res/layout/activity_circle.xml @@ -1,53 +1,46 @@ - - + - - - + + + tools:text="999" /> - + - + - - - + diff --git a/wear/src/main/res/layout/grid_layout.xml b/wear/src/main/res/layout/grid_layout.xml index 26f1e92a6a..51091b08c4 100644 --- a/wear/src/main/res/layout/grid_layout.xml +++ b/wear/src/main/res/layout/grid_layout.xml @@ -1,16 +1,17 @@ + android:layout_height="match_parent"> + android:visibility="gone" + tools:text="Title" /> + android:textSize="18sp" + tools:text="Title" /> + app:dotFadeOutDelay="100000" /> diff --git a/wear/src/main/res/layout/list_item.xml b/wear/src/main/res/layout/list_item.xml index c5fd3b2433..2c5fbb2653 100644 --- a/wear/src/main/res/layout/list_item.xml +++ b/wear/src/main/res/layout/list_item.xml @@ -11,10 +11,9 @@ android:id="@+id/menuItemIcon" android:layout_width="35dp" android:layout_height="35dp" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_marginStart="10dp" + android:importantForAccessibility="no" android:src="@drawable/circle" /> + android:textStyle="bold" + tools:text="action item" /> diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml index 1869913e37..d5331aa883 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -222,5 +222,21 @@ dark input_design complication_tap_action + increment + decrement + H + L + avg + --U + --g + -.--U/h + Uploader: ---% + S: no status + -- Minutes ago + --- mg/dl + No Loop Status + 000g + 00,0 + 0,00U