diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt index 887fe53072..d78cbe069d 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt @@ -52,7 +52,7 @@ class AapsV2Watchface : BaseWatchFace() { binding.rigBattery.setTextColor(dividerTxtColor) binding.delta.setTextColor(dividerTxtColor) binding.avgDelta.setTextColor(dividerTxtColor) - binding.basalRate?.setTextColor(dividerTxtColor) + binding.basalRate.setTextColor(dividerTxtColor) binding.bgi.setTextColor(dividerTxtColor) when (loopLevel) { -1 -> binding.loop.setBackgroundResource(R.drawable.loop_grey_25) @@ -85,7 +85,7 @@ class AapsV2Watchface : BaseWatchFace() { binding.avgDelta.setTextColor(dividerTxtColor) binding.rigBattery.setTextColor(dividerTxtColor) binding.uploaderBattery.setTextColor(dividerTxtColor) - binding.basalRate?.setTextColor(dividerTxtColor) + binding.basalRate.setTextColor(dividerTxtColor) binding.bgi.setTextColor(dividerTxtColor) binding.iob1.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor)) binding.iob2.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor)) @@ -138,7 +138,7 @@ class AapsV2Watchface : BaseWatchFace() { binding.rigBattery.setTextColor(dividerTxtColor) binding.delta.setTextColor(dividerTxtColor) binding.avgDelta.setTextColor(dividerTxtColor) - binding.basalRate?.setTextColor(dividerTxtColor) + binding.basalRate.setTextColor(dividerTxtColor) binding.bgi.setTextColor(dividerTxtColor) when (loopLevel) { -1 -> binding.loop.setBackgroundResource(R.drawable.loop_grey_25) diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt index 4086d479ec..4fb3bfc30e 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt @@ -19,6 +19,7 @@ class AapsWatchface : BaseWatchFace() { } override fun setColorDark() { + binding.mainLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.dark_background)) binding.secondaryLayout.setBackgroundColor(ContextCompat.getColor(this, if (dividerMatchesBg) R.color.dark_background else R.color.dark_statusView)) binding.time.setTextColor(ContextCompat.getColor(this, R.color.dark_mTime)) val color = when (singleBg.sgvLevel) { diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt index f6b472797b..dedba92761 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt @@ -9,7 +9,6 @@ import androidx.viewbinding.ViewBinding import com.ustwo.clockwise.common.WatchMode import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActivityBigchartBinding -import info.nightscout.androidaps.databinding.ActivityBigchartSmallBinding import info.nightscout.androidaps.watchfaces.utils.BaseWatchFace import info.nightscout.androidaps.watchfaces.utils.WatchfaceViewAdapter @@ -18,11 +17,6 @@ class BigChartWatchface : BaseWatchFace() { private lateinit var binding: WatchfaceViewAdapter override fun inflateLayout(inflater: LayoutInflater): ViewBinding { - if (resources.displayMetrics.widthPixels < SCREEN_SIZE_SMALL || resources.displayMetrics.heightPixels < SCREEN_SIZE_SMALL) { - val layoutBinding = ActivityBigchartSmallBinding.inflate(inflater) - binding = WatchfaceViewAdapter.getBinding(layoutBinding) - return layoutBinding - } val layoutBinding = ActivityBigchartBinding.inflate(inflater) binding = WatchfaceViewAdapter.getBinding(layoutBinding) return layoutBinding @@ -42,6 +36,7 @@ class BigChartWatchface : BaseWatchFace() { binding.delta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor)) binding.avgDelta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor)) binding.timestamp.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp)) + binding.timePeriod?.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp)) highColor = ContextCompat.getColor(this, R.color.dark_midColor) lowColor = ContextCompat.getColor(this, R.color.dark_midColor) @@ -69,6 +64,7 @@ class BigChartWatchface : BaseWatchFace() { val colorTime = if (ageLevel == 1) R.color.dark_Timestamp else R.color.dark_TimestampOld binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime)) + binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime)) highColor = ContextCompat.getColor(this, R.color.dark_highColor) lowColor = ContextCompat.getColor(this, R.color.dark_lowColor) @@ -97,6 +93,7 @@ class BigChartWatchface : BaseWatchFace() { val colorTime = if (ageLevel == 1) R.color.light_mTimestamp1 else R.color.light_mTimestamp binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime)) + binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime)) highColor = ContextCompat.getColor(this, R.color.light_highColor) lowColor = ContextCompat.getColor(this, R.color.light_lowColor) diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt index 70e5a42670..af2fb397cb 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt @@ -67,18 +67,17 @@ class DigitalStyleWatchface : BaseWatchFace() { /* frame styles*/ val mShapesElements = layoutView?.findViewById(R.id.shapes_elements) if (mShapesElements != null) { - val displayFormatType = if (mShapesElements.contentDescription.toString().startsWith("round")) "round" else "rect" val displayStyle = sp.getString(R.string.key_digital_style_frame_style, "full") val displayFrameColor = sp.getString(R.string.key_digital_style_frame_color, "red") val displayFrameColorSaturation = sp.getString(R.string.key_digital_style_frame_color_saturation, "500") val displayFrameColorOpacity = sp.getString(R.string.key_digital_style_frame_color_opacity, "1") // Load image with shapes - val styleDrawableName = "digitalstyle_bg_" + displayStyle + "_" + displayFormatType + val styleDrawableName = "digital_style_bg_" + displayStyle try { mShapesElements.background = ContextCompat.getDrawable(this, resources.getIdentifier(styleDrawableName, "drawable", this.packageName)) } catch (e: Exception) { - aapsLogger.error("digitalstyle_frameStyle", "RESOURCE NOT FOUND >> $styleDrawableName") + aapsLogger.error("digital_style_frameStyle", "RESOURCE NOT FOUND >> $styleDrawableName") } // set background-tint-color @@ -86,13 +85,13 @@ class DigitalStyleWatchface : BaseWatchFace() { mShapesElements.backgroundTintList = null } else { val strColorName = if (displayFrameColor == "white" || displayFrameColor == "black") displayFrameColor else displayFrameColor + "_" + displayFrameColorSaturation - aapsLogger.debug(LTag.WEAR, "digitalstyle_strColorName", strColorName) + aapsLogger.debug(LTag.WEAR, "digital_style_strColorName", strColorName) try { val colorStateList = ContextCompat.getColorStateList(this, resources.getIdentifier(strColorName, "color", this.packageName)) mShapesElements.backgroundTintList = colorStateList } catch (e: Exception) { mShapesElements.backgroundTintList = null - aapsLogger.error("digitalstyle_colorName", "COLOR NOT FOUND >> $strColorName") + aapsLogger.error("digital_style_colorName", "COLOR NOT FOUND >> $strColorName") } } diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt index e277945540..ac160baaf3 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt @@ -6,9 +6,7 @@ import androidx.viewbinding.ViewBinding import com.ustwo.clockwise.common.WatchMode import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActivityBigchartBinding -import info.nightscout.androidaps.databinding.ActivityBigchartSmallBinding import info.nightscout.androidaps.databinding.ActivityNochartBinding -import info.nightscout.androidaps.databinding.ActivityNochartSmallBinding import info.nightscout.androidaps.watchfaces.utils.BaseWatchFace import info.nightscout.androidaps.watchfaces.utils.WatchfaceViewAdapter @@ -17,11 +15,6 @@ class NoChartWatchface : BaseWatchFace() { private lateinit var binding: WatchfaceViewAdapter override fun inflateLayout(inflater: LayoutInflater): ViewBinding { - if (resources.displayMetrics.widthPixels < SCREEN_SIZE_SMALL || resources.displayMetrics.heightPixels < SCREEN_SIZE_SMALL) { - val layoutBinding = ActivityNochartSmallBinding.inflate(inflater) - binding = WatchfaceViewAdapter.getBinding(layoutBinding) - return layoutBinding - } val layoutBinding = ActivityNochartBinding.inflate(inflater) binding = WatchfaceViewAdapter.getBinding(layoutBinding) return layoutBinding @@ -35,6 +28,7 @@ class NoChartWatchface : BaseWatchFace() { binding.delta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor)) binding.avgDelta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor)) binding.timestamp.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp)) + binding.timePeriod?.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp)) } override fun setColorDark() { @@ -52,6 +46,7 @@ class NoChartWatchface : BaseWatchFace() { binding.avgDelta?.setTextColor(ContextCompat.getColor(this, color)) val colorTime = if (ageLevel == 1) R.color.dark_Timestamp else R.color.dark_TimestampOld binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime)) + binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime)) } override fun setColorBright() { @@ -70,6 +65,7 @@ class NoChartWatchface : BaseWatchFace() { binding.avgDelta?.setTextColor(ContextCompat.getColor(this, color)) val colorTime = if (ageLevel == 1) R.color.light_mTimestamp1 else R.color.light_mTimestamp binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime)) + binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime)) } else { setColorDark() diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt index a2a7399c1e..dab8d0b7be 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt @@ -423,7 +423,7 @@ abstract class BaseWatchFace : WatchFace() { } private fun setDateAndTime() { - binding.time?.text = dateUtil.timeString() + binding.time?.text = if(binding.timePeriod == null) dateUtil.timeString() else dateUtil.hourString() + ":" + dateUtil.minuteString() binding.hour?.text = dateUtil.hourString() binding.minute?.text = dateUtil.minuteString() binding.dateTime?.visibility = sp.getBoolean(R.string.key_show_date, false).toVisibility() @@ -524,6 +524,5 @@ abstract class BaseWatchFace : WatchFace() { var iFilter = IntentFilter(Intent.ACTION_BATTERY_CHANGED) val NORMAL_TYPEFACE: Typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.NORMAL) val BOLD_TYPEFACE: Typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) - const val SCREEN_SIZE_SMALL = 280 } } diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt index af60e9e3f3..6a2f78d954 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt @@ -5,7 +5,6 @@ import info.nightscout.androidaps.databinding.ActivityHomeLargeBinding import info.nightscout.androidaps.databinding.ActivityHome2Binding import info.nightscout.androidaps.databinding.ActivityHomeBinding import info.nightscout.androidaps.databinding.ActivityBigchartBinding -import info.nightscout.androidaps.databinding.ActivityBigchartSmallBinding import info.nightscout.androidaps.databinding.ActivityCockpitBinding import info.nightscout.androidaps.databinding.ActivityDigitalstyleBinding import info.nightscout.androidaps.databinding.ActivityNochartBinding @@ -20,7 +19,6 @@ class WatchfaceViewAdapter( a2: ActivityHome2Binding? = null, aa: ActivityHomeBinding? = null, bC: ActivityBigchartBinding? = null, - bCs: ActivityBigchartSmallBinding? = null, cp: ActivityCockpitBinding? = null, ds: ActivityDigitalstyleBinding? = null, nC: ActivityNochartBinding? = null, @@ -28,7 +26,7 @@ class WatchfaceViewAdapter( ) { init { - if (aL == null && a2 == null && aa == null && bC == null && bCs == null && cp == null && ds == null && nC == null && sP == null) { + if (aL == null && a2 == null && aa == null && bC == null && cp == null && ds == null && nC == null && sP == null) { throw IllegalArgumentException("Require at least on Binding parameter") } } @@ -67,7 +65,7 @@ class WatchfaceViewAdapter( val iob2 = a2?.iob2 ?: cp?.iob2 ?: ds?.iob2 ?: sP?.iob2 val chart = a2?.chart ?: aa?.chart ?: bC?.chart ?: bC?.chart ?: ds?.chart ?: sP?.chart val status = aL?.status ?: aa?.status ?: bC?.status ?: bC?.status ?: nC?.status - val timePeriod = ds?.timePeriod + val timePeriod = ds?.timePeriod ?: aL?.timePeriod ?: nC?.timePeriod ?: bC?.timePeriod val dayName = ds?.dayName val mainMenuTap = ds?.mainMenuTap ?: sP?.mainMenuTap val chartZoomTap = ds?.chartZoomTap ?: sP?.chartZoomTap @@ -89,11 +87,10 @@ class WatchfaceViewAdapter( is ActivityHome2Binding -> WatchfaceViewAdapter(null, bindLayout) is ActivityHomeBinding -> WatchfaceViewAdapter(null, null, bindLayout) is ActivityBigchartBinding -> WatchfaceViewAdapter(null, null, null, bindLayout) - is ActivityBigchartSmallBinding -> WatchfaceViewAdapter(null, null, null, null, bindLayout) - is ActivityCockpitBinding -> WatchfaceViewAdapter(null, null, null, null, null, bindLayout) - is ActivityDigitalstyleBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, bindLayout) - is ActivityNochartBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout) - is ActivitySteampunkBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, null, bindLayout) + is ActivityCockpitBinding -> WatchfaceViewAdapter(null, null, null, null, bindLayout) + is ActivityDigitalstyleBinding -> WatchfaceViewAdapter(null, null, null, null, null, bindLayout) + is ActivityNochartBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, bindLayout) + is ActivitySteampunkBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout) else -> throw IllegalArgumentException("ViewBinding is not implement in WatchfaceViewAdapter") } } diff --git a/wear/src/main/res/layout/action_confirm_ok.xml b/wear/src/main/res/layout/action_confirm_ok.xml index 097dc75adb..c7ac3796bc 100644 --- a/wear/src/main/res/layout/action_confirm_ok.xml +++ b/wear/src/main/res/layout/action_confirm_ok.xml @@ -11,11 +11,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_margin="10sp" + android:layout_margin="10dp" android:background="@drawable/circle" android:backgroundTint="@color/white" android:contentDescription="@string/action_confirm" - android:padding="25sp" + android:padding="25dp" android:src="@drawable/ic_confirm" app:tint="@color/white" /> diff --git a/wear/src/main/res/layout/activity_bigchart.xml b/wear/src/main/res/layout/activity_bigchart.xml index 4e4a6c351b..675c526f93 100644 --- a/wear/src/main/res/layout/activity_bigchart.xml +++ b/wear/src/main/res/layout/activity_bigchart.xml @@ -1,60 +1,46 @@ - + tools:context=".watchfaces.BigChartWatchface"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:gravity="bottom" + android:textSize="@dimen/watch_face_big_chart_delta_text_size" + tools:text="---" /> + android:layout_marginHorizontal="4dp" + android:textSize="@dimen/watch_face_big_chart_svg_text_size" + tools:text="---" /> + android:textSize="@dimen/watch_face_big_chart_delta_text_size" + tools:text="---" /> @@ -62,46 +48,63 @@ android:id="@+id/chart" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_gravity="bottom" - android:layout_weight="1" - android:gravity="center_horizontal" /> + app:layout_constraintBottom_toTopOf="@+id/status" + app:layout_constraintTop_toBottomOf="@+id/linearLayout3" /> + android:paddingBottom="6dp" + app:layout_constraintBottom_toBottomOf="parent"> - + android:orientation="vertical"> + + + + + + - + diff --git a/wear/src/main/res/layout/activity_bigchart_small.xml b/wear/src/main/res/layout/activity_bigchart_small.xml deleted file mode 100644 index b2f56b5e38..0000000000 --- a/wear/src/main/res/layout/activity_bigchart_small.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wear/src/main/res/layout/activity_circle.xml b/wear/src/main/res/layout/activity_circle.xml index 57a9c6325a..f255957ab3 100644 --- a/wear/src/main/res/layout/activity_circle.xml +++ b/wear/src/main/res/layout/activity_circle.xml @@ -6,7 +6,8 @@ android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:gravity="center_vertical|center_horizontal" - android:orientation="vertical"> + android:orientation="vertical" + tools:context=".watchfaces.CircleWatchface"> + tools:context=".watchfaces.CockpitWatchface"> + tools:context=".watchfaces.DigitalStyleWatchface"> + android:background="@drawable/digital_style_bg_full" + android:orientation="horizontal" /> + android:textSize="@dimen/watch_face_digital_sub_text_size" /> @@ -150,7 +149,7 @@ android:text="--" android:textAlignment="center" android:textColor="@color/white" - android:textSize="16sp" + android:textSize="@dimen/watch_face_digital_direction_text_size" android:textStyle="bold" tools:ignore="HardcodedText" /> @@ -163,9 +162,10 @@ android:layout_marginBottom="2dp" android:layout_weight="3" android:fontFamily="sans-serif-condensed-light" + android:maxLines="1" android:text="--'" android:textColor="@color/light_grey" - android:textSize="10sp" + android:textSize="@dimen/watch_face_digital_timestamp_text_size" tools:ignore="HardcodedText,SmallSp" /> @@ -240,6 +240,7 @@ android:id="@+id/iob1" android:layout_width="match_parent" android:layout_height="0dp" + android:layout_marginTop="1dp" android:layout_weight="2" android:fontFamily="@font/roboto_slab_light" android:gravity="bottom|center_horizontal" @@ -252,14 +253,16 @@ android:id="@+id/iob2" android:layout_width="match_parent" android:layout_height="0dp" + android:layout_marginTop="-1dp" android:layout_weight="3" android:fontFamily="@font/roboto_slab_light" android:gravity="top|center_horizontal" + android:letterSpacing="-0.075" android:lines="1" android:text="@string/iob_0_00u" android:textColor="@color/white" - android:textSize="14sp" /> + android:textSize="@dimen/watch_face_digital_sub_text_size" /> @@ -342,7 +345,6 @@ android:textColor="@color/light_grey" android:textFontWeight="400" android:textSize="18sp" - android:visibility="gone" tools:text="ww" /> - + tools:context=".watchfaces.AapsWatchface"> + app:layout_constraintBottom_toTopOf="@+id/secondary_layout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + tools:text="---" /> + android:orientation="vertical"> + tools:text="--" /> + tools:text="1" /> @@ -80,65 +53,59 @@ + android:layout_gravity="center_horizontal" + android:background="?android:colorForeground" + android:gravity="center_horizontal" + android:paddingVertical="1dp" + app:layout_constraintBottom_toTopOf="@+id/time"> - + android:textAlignment="center" + android:textColor="?android:textColorPrimaryInverse" + android:textSize="11sp" + android:textStyle="bold" + tools:text="@string/time_stamp_na_min_ago" /> - + - + - - - - - + @@ -146,19 +113,23 @@ android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="-2dp" - android:layout_marginBottom="-3dp" + android:layout_gravity="center_horizontal|top" android:textAlignment="center" - android:textColor="@color/white" - android:textSize="30sp" + + android:textSize="35sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:text="12:00" /> + android:layout_height="0dp" + android:layout_marginTop="-5dp" + android:paddingBottom="7dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/time" /> - + diff --git a/wear/src/main/res/layout/activity_home_2.xml b/wear/src/main/res/layout/activity_home_2.xml index 31c5ebf10f..0244393e33 100644 --- a/wear/src/main/res/layout/activity_home_2.xml +++ b/wear/src/main/res/layout/activity_home_2.xml @@ -1,96 +1,64 @@ - - - + tools:context=".watchfaces.AapsV2Watchface"> + app:layout_constraintBottom_toTopOf="@+id/secondary_layout" + app:layout_constraintTop_toTopOf="parent"> + tools:text="--'" /> + tools:text="---" /> + android:orientation="vertical"> + tools:text="--" /> + tools:text="--'" /> @@ -99,50 +67,39 @@ + android:layout_height="wrap_content" + android:background="?android:colorForeground" + android:paddingVertical="1dp" + app:layout_constraintBottom_toTopOf="@+id/tertiary_layout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + android:paddingHorizontal="5dp"> + tools:text="+/-" /> + android:textStyle="bold" + tools:text="@string/abbreviation_average" /> + tools:text="--%" /> + android:visibility="visible" + tools:text="--%" /> + android:textStyle="bold" + tools:text="@string/no_tmp_basal_u_h" /> + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:weightSum="7" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:orientation="vertical"> + android:textSize="11sp" /> @@ -268,10 +203,7 @@ android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" android:textAlignment="center" - android:textColor="@color/white" android:textSize="30sp" tools:text="12:00" /> @@ -279,10 +211,8 @@ android:id="@+id/date_time" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="center" android:gravity="center" android:orientation="vertical" - android:textAlignment="center" android:visibility="gone"> @@ -302,7 +231,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:textColor="@color/white" android:textSize="12sp" tools:text="mth" /> @@ -327,12 +255,9 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:text="@string/activity_IOB" android:textAlignment="center" - android:textColor="@color/white" - android:textSize="10sp" - android:textStyle="bold" - tools:ignore="SmallSp" /> + android:textSize="11sp" + tools:text="@string/activity_IOB" /> + android:textStyle="bold" + tools:text="@string/no_iob_u" /> - + android:layout_height="0dp" + android:layout_marginTop="-5dp" + android:layout_marginBottom="7dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tertiary_layout" /> - - - + diff --git a/wear/src/main/res/layout/activity_home_large.xml b/wear/src/main/res/layout/activity_home_large.xml index 82809cd93b..5fa271ba53 100644 --- a/wear/src/main/res/layout/activity_home_large.xml +++ b/wear/src/main/res/layout/activity_home_large.xml @@ -1,24 +1,18 @@ - + tools:context=".watchfaces.AapsLargeWatchface"> + app:layout_constraintBottom_toTopOf="@+id/secondary_layout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + tools:text="18.8" /> + android:layout_height="match_parent" + android:orientation="vertical"> + tools:text="--" /> + android:textSize="11sp" + tools:text="@string/delta_na" /> @@ -72,23 +50,23 @@ + android:padding="2dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:textColor="?android:textColorPrimaryInverse" + android:textSize="@dimen/watch_face_large_status_size" + tools:text="--'" /> + android:textColor="?android:textColorPrimaryInverse" + android:textSize="@dimen/watch_face_large_status_size" + tools:text="@string/uploader_na" /> + android:textColor="?android:textColorPrimaryInverse" + android:textSize="@dimen/watch_face_large_status_size" + tools:text="" /> + android:textColor="?android:textColorPrimaryInverse" + android:textSize="14sp" + tools:text="@string/no_status" /> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/secondary_layout"> - + + + + + + + diff --git a/wear/src/main/res/layout/activity_nochart.xml b/wear/src/main/res/layout/activity_nochart.xml index a241d5319b..de9874145c 100644 --- a/wear/src/main/res/layout/activity_nochart.xml +++ b/wear/src/main/res/layout/activity_nochart.xml @@ -1,60 +1,46 @@ - + tools:context=".watchfaces.NoChartWatchface"> + android:paddingBottom="5dp" + app:layout_constraintBottom_toTopOf="@+id/status" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + android:maxLines="1" + android:textSize="@dimen/watch_face_delta_text_size" + tools:text="+0.0" /> + android:maxLines="1" + android:paddingHorizontal="3dp" + android:textSize="@dimen/watch_face_svg_text_size" + tools:text="10.1" /> + android:maxLines="1" + android:textSize="@dimen/watch_face_delta_text_size" + tools:text="+0.0" /> @@ -62,40 +48,55 @@ android:id="@+id/status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:textAlignment="center" - android:textColor="@color/white" - android:textSize="24sp" + android:maxLines="1" + android:textSize="@dimen/watch_face_no_chart_status_size" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:text="E xU/h IOB: x (x+x)" /> + android:paddingTop="5dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/status"> - + android:orientation="vertical"> + + + + + + + - + diff --git a/wear/src/main/res/layout/activity_nochart_small.xml b/wear/src/main/res/layout/activity_nochart_small.xml deleted file mode 100644 index b721bc1424..0000000000 --- a/wear/src/main/res/layout/activity_nochart_small.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wear/src/main/res/layout/activity_steampunk.xml b/wear/src/main/res/layout/activity_steampunk.xml index 2ce33bdc9a..df28e95d6f 100644 --- a/wear/src/main/res/layout/activity_steampunk.xml +++ b/wear/src/main/res/layout/activity_steampunk.xml @@ -4,9 +4,7 @@ android:id="@+id/main_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".watchfaces.SteampunkWatchface" - tools:deviceIds="wear_round" - tools:ignore="MissingDefaultResource"> + tools:context=".watchfaces.SteampunkWatchface"> + android:layout_weight="0.55" /> + + + + 50sp + 25sp + 45sp + 25sp + 12sp + 18sp + + + 24sp + 35sp + 29sp + 23sp + 17sp + 14sp + 15sp + + 55sp + 29sp + 13sp + 55sp + 13sp + + diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml index 0eaedf5064..8158388929 100644 --- a/wear/src/main/res/values/dimens.xml +++ b/wear/src/main/res/values/dimens.xml @@ -1,8 +1,48 @@ + + 50sp 35sp 35sp 5dp + + + 40sp + 20sp + 35sp + 17sp + 11sp + 16sp + + 20sp + 30sp + 25sp + + 20sp + 16sp + 10sp + 14sp + + 50sp + 27sp + 11sp + 50sp + 11sp + 14sp + diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml index 2c05f1d147..14a6114494 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -216,9 +216,9 @@ --U --g -.--U/h - Uploader: ---% - S: no status - -- Minutes ago + U: --% + S: -- + -- Min. ago --- mg/dl No Loop Status 000g