From 6f6b16805632b1b286948e447c2be06a4bbbb79d Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Thu, 30 Jun 2022 08:53:42 +0200 Subject: [PATCH] chore: wear remove bg multi plus --- .../interaction/actions/ECarbActivity.kt | 3 +-- .../interaction/actions/FillActivity.kt | 2 +- .../actions/ProfileSwitchActivity.kt | 2 +- .../interaction/actions/TempTargetActivity.kt | 2 +- .../interaction/actions/TreatmentActivity.kt | 2 +- .../action_editplusmin_quicklefty_multi.xml | 24 ++++++++----------- .../action_editplusmin_quickrighty_multi.xml | 9 ++----- 7 files changed, 17 insertions(+), 27 deletions(-) diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.kt index 0a643e9bff..919d92b1dd 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.kt @@ -84,8 +84,7 @@ class ECarbActivity : ViewSelectorActivity() { val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false) val confirmButton = view.findViewById(R.id.confirmbutton) confirmButton.setOnClickListener { - - //check if it can happen that the fragment is never created that hold data? + // check if it can happen that the fragment is never created that hold data? // (you have to swipe past them anyways - but still) val bolus = ActionECarbsPreCheck( stringToInt(editCarbs?.editText?.text.toString()), diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.kt index 2525033df0..9fdfa97d26 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.kt @@ -52,7 +52,7 @@ class FillActivity : ViewSelectorActivity() { val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false) val confirmButton = view.findViewById(R.id.confirmbutton) confirmButton.setOnClickListener { - //check if it can happen that the fragment is never created that hold data? + // check if it can happen that the fragment is never created that hold data? // (you have to swipe past them anyways - but still) rxBus.send(EventWearToMobile(ActionFillPreCheck(stringToDouble(editInsulin?.editText?.text.toString())))) showToast(this@FillActivity, R.string.action_fill_confirmation) diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ProfileSwitchActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ProfileSwitchActivity.kt index c6498f2638..8aa2a26437 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ProfileSwitchActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ProfileSwitchActivity.kt @@ -75,7 +75,7 @@ class ProfileSwitchActivity : ViewSelectorActivity() { val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false) val confirmButton = view.findViewById(R.id.confirmbutton) confirmButton.setOnClickListener { - //check if it can happen that the fragment is never created that hold data? + // check if it can happen that the fragment is never created that hold data? // (you have to swipe past them anyways - but still) val ps = ActionProfileSwitchPreCheck(SafeParse.stringToInt(editTimeshift?.editText?.text.toString()), SafeParse.stringToInt(editPercentage?.editText?.text.toString())) rxBus.send(EventWearToMobile(ps)) diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.kt index 80180d850a..77f1c256dc 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.kt @@ -98,7 +98,7 @@ class TempTargetActivity : ViewSelectorActivity() { val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false) val confirmButton = view.findViewById(R.id.confirmbutton) confirmButton.setOnClickListener { - //check if it can happen that the fragment is never created that hold data? + // check if it can happen that the fragment is never created that hold data? // (you have to swipe past them anyways - but still) val action = ActionTempTargetPreCheck( ActionTempTargetPreCheck.TempTargetCommand.MANUAL, diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt index 55805803d4..1cb7c36879 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt @@ -73,7 +73,7 @@ class TreatmentActivity : ViewSelectorActivity() { val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false) val confirmButton = view.findViewById(R.id.confirmbutton) confirmButton.setOnClickListener { - //check if it can happen that the fragment is never created that hold data? + // check if it can happen that the fragment is never created that hold data? // (you have to swipe past them anyways - but still) val bolus = ActionBolusPreCheck(stringToDouble(editInsulin?.editText?.text.toString()), stringToInt(editCarbs?.editText?.text.toString())) rxBus.send(EventWearToMobile(bolus)) diff --git a/wear/src/main/res/layout/action_editplusmin_quicklefty_multi.xml b/wear/src/main/res/layout/action_editplusmin_quicklefty_multi.xml index 5a4e9b10cb..d5acf0460d 100644 --- a/wear/src/main/res/layout/action_editplusmin_quicklefty_multi.xml +++ b/wear/src/main/res/layout/action_editplusmin_quicklefty_multi.xml @@ -19,7 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" - android:layout_marginTop="-10dp" + android:layout_marginTop="-5dp" android:cursorVisible="false" android:gravity="center" android:inputType="numberDecimal" @@ -44,7 +44,7 @@ app:layout_constraintStart_toStartOf="@+id/edit_text" app:layout_constraintTop_toBottomOf="@id/edit_text" tools:ignore="LabelFor" - tools:text="label123" /> + tools:text="label" /> @@ -72,7 +72,7 @@ android:textSize="25sp" android:visibility="visible" app:layout_constraintCircle="@+id/center" - app:layout_constraintCircleAngle="35" + app:layout_constraintCircleAngle="325" app:layout_constraintCircleRadius="70dp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -89,25 +89,21 @@ android:textSize="30sp" app:layout_constraintBottom_toTopOf="@+id/plus_button1" app:layout_constraintCircle="@+id/center" - app:layout_constraintCircleAngle="90" + app:layout_constraintCircleAngle="270" app:layout_constraintCircleRadius="70dp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/plus_button3" tools:text="+5" /> - + app:layout_constraintLeft_toRightOf="@id/plus_button3" /> diff --git a/wear/src/main/res/layout/action_editplusmin_quickrighty_multi.xml b/wear/src/main/res/layout/action_editplusmin_quickrighty_multi.xml index 93840e6869..0cd6b4f344 100644 --- a/wear/src/main/res/layout/action_editplusmin_quickrighty_multi.xml +++ b/wear/src/main/res/layout/action_editplusmin_quickrighty_multi.xml @@ -19,7 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" - android:layout_marginTop="-1dp" + android:layout_marginTop="-5dp" android:cursorVisible="false" android:gravity="center" android:inputType="numberDecimal" @@ -95,15 +95,10 @@ app:layout_constraintTop_toBottomOf="@+id/plus_button3" tools:text="+5" /> -