caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: wear remove bg multi plus

Browse source
This commit is contained in:
Andries Smit 2022-06-30 08:53:42 +02:00
parent 0200e93677
commit 6f6b168056
7 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.kt
View file

@ -84,8 +84,7 @@ class ECarbActivity : ViewSelectorActivity() {
val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false)
val confirmButton = view.findViewById<ImageView>(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()),

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.kt
View file

@ -52,7 +52,7 @@ class FillActivity : ViewSelectorActivity() {
val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false)
val confirmButton = view.findViewById<ImageView>(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)

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/ProfileSwitchActivity.kt
View file

@ -75,7 +75,7 @@ class ProfileSwitchActivity : ViewSelectorActivity() {
val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false)
val confirmButton = view.findViewById<ImageView>(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))

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.kt
View file

@ -98,7 +98,7 @@ class TempTargetActivity : ViewSelectorActivity() {
val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false)
val confirmButton = view.findViewById<ImageView>(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,

2
wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt
View file

@ -73,7 +73,7 @@ class TreatmentActivity : ViewSelectorActivity() {
val view = LayoutInflater.from(applicationContext).inflate(R.layout.action_confirm_ok, container, false)
val confirmButton = view.findViewById<ImageView>(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))

22
wear/src/main/res/layout/action_editplusmin_quicklefty_multi.xml
View file

@ -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" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/min_button"
@ -57,7 +57,7 @@
android:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="215"
app:layout_constraintCircleAngle="145"
app:layout_constraintCircleRadius="70dp"
app:layout_constraintLeft_toLeftOf="parent" />
@ -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" />
<androidx.appcompat.widget.AppCompatImageView
<View
android:id="@+id/value_background"
android:layout_width="108dp"
android:layout_height="108dp"
android:layout_gravity="center"
android:background="@drawable/circle"
android:backgroundTint="@color/gray_700"
android:importantForAccessibility="no"
app:layout_constraintBottom_toTopOf="@+id/min_button"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="305"
app:layout_constraintCircleAngle="55"
app:layout_constraintCircleRadius="40dp"
app:layout_constraintRight_toLeftOf="@id/plus_button1" />
app:layout_constraintLeft_toRightOf="@id/plus_button3" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/plus_button1"
@ -121,7 +117,7 @@
android:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="145"
app:layout_constraintCircleAngle="215"
app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent" />

9
wear/src/main/res/layout/action_editplusmin_quickrighty_multi.xml
View file

@ -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" />
<androidx.appcompat.widget.AppCompatImageView
<View
android:id="@+id/value_background"
android:layout_width="108dp"
android:layout_height="108dp"
android:layout_gravity="center"
android:layout_marginBottom="8dp"
android:background="@drawable/circle"
android:backgroundTint="@color/gray_700"
android:contentDescription="@string/increment"
app:layout_constraintBottom_toTopOf="@+id/min_button"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="305"