caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: fix lint warnings

Browse source
This commit is contained in:
Andries Smit 2022-04-19 12:31:20 +02:00
parent adcf92ea68
commit 6a0f6091f1
32 changed files with 162 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/layout/activity_profilehelper.xml
View file

@ -27,8 +27,7 @@
android:gravity="center"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="1"
tools:ignore="HardcodedText" />
android:text="Profile 1" />
<TextView
android:id="@+id/menu2"
@ -38,8 +37,7 @@
android:gravity="center"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="2"
tools:ignore="HardcodedText" />
android:text="Profile 2" />
</LinearLayout>

7
automation/src/main/res/layout/automation_action_item.xml
View file

@ -2,6 +2,7 @@
<RelativeLayout
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_height="wrap_content"
android:layout_width="match_parent"
android:background="?attr/ribbonDefaultColor"
@ -30,12 +31,14 @@
android:layout_alignParentBottom="true"
android:layout_toStartOf="@id/automation_iconTrash"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/automation_action_image"
android:layout_width="24dp"
android:layout_height="24dp"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_action_orange_48dp" />
<TextView
@ -48,4 +51,4 @@
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

4
automation/src/main/res/layout/automation_dialog_action.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
tools:context=".plugins.general.automation.dialogs.EditActionDialog">
tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog">
<LinearLayout
android:layout_width="match_parent"
@ -56,4 +56,4 @@
</LinearLayout>
</ScrollView>
</ScrollView>

6
automation/src/main/res/layout/automation_dialog_choose_action.xml
View file

@ -2,12 +2,10 @@
<ScrollView 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_height="match_parent"
android:focusableInTouchMode="true"
tools:context=".plugins.general.automation.dialogs.EditEventDialog">
tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
<LinearLayout
android:layout_width="match_parent"
@ -56,4 +54,4 @@
</LinearLayout>
</ScrollView>
</ScrollView>

4
automation/src/main/res/layout/automation_dialog_choose_trigger.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
tools:context=".plugins.general.automation.dialogs.EditEventDialog">
tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
<LinearLayout
android:layout_width="match_parent"
@ -48,4 +48,4 @@
</LinearLayout>
</ScrollView>
</ScrollView>

13
automation/src/main/res/layout/automation_dialog_event.xml
View file

@ -26,7 +26,7 @@
app:srcCompat="@drawable/ic_action_orange_48dp" />
<TextView
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="10dp"
@ -66,6 +66,7 @@
android:id="@+id/imageButton"
android:layout_width="27dp"
android:layout_height="match_parent"
android:importantForAccessibility="no"
android:scaleX="0.7"
android:scaleY="0.7"
android:src="@drawable/ic_danar_useropt" />
@ -93,6 +94,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerVertical="true"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_trigger_green_48dp" />
<TextView
@ -113,7 +115,8 @@
android:layout_centerVertical="true"
android:background="?attr/activity_title_backgroundColor"
android:padding="8dp"
android:text="@string/edit_short" />
android:text="@string/edit_short"
tools:ignore="RelativeOverlap" />
</RelativeLayout>
@ -156,6 +159,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerVertical="true"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_action_orange_48dp" />
<TextView
@ -176,7 +180,8 @@
android:layout_centerVertical="true"
android:background="?attr/activity_title_backgroundColor"
android:padding="8dp"
android:text="@string/add_short" />
android:text="@string/add_short"
tools:ignore="RelativeOverlap" />
</RelativeLayout>
@ -195,4 +200,4 @@
</LinearLayout>
</ScrollView>
</ScrollView>

13
core/src/main/res/layout/datetime.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingTop="2dp">
<TextView
android:layout_width="wrap_content"
@ -24,10 +25,10 @@
android:layout_gravity="center"
android:layout_marginEnd="20dp"
android:background="@drawable/background_input_border"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:padding="10dp"
android:text="2017/05/05" />
tools:text="2017/05/05" />
<TextView
android:id="@+id/eventtime"
@ -35,9 +36,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/background_input_border"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:padding="10dp"
android:text="08:20pm" />
tools:text="08:20pm" />
</LinearLayout>

3
core/src/main/res/layout/dialog_alert_custom_title.xml
View file

@ -18,6 +18,7 @@
android:id="@+id/alertdialog_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:tint="?dialogTitleIconTint" />
<TextView
@ -48,4 +49,4 @@
android:orientation="horizontal"
android:padding="5dp" />
</LinearLayout>
</LinearLayout>

18
core/src/main/res/layout/maintenance_import_list_item.xml
View file

@ -27,7 +27,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="true"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="18dp"
@ -36,6 +37,7 @@
android:layout_marginTop="4dp"
android:layout_marginEnd="6dp"
android:layout_marginBottom="1dp"
android:contentDescription="@string/a11y_file"
app:srcCompat="@drawable/ic_meta_format"
app:tint="?attr/importListFileNameColor" />
@ -46,6 +48,7 @@
android:layout_weight="1"
android:ellipsize="none"
android:maxLines="2"
android:paddingStart="0dp"
android:paddingEnd="10dp"
android:scrollHorizontally="false"
android:text="File name here"
@ -53,7 +56,6 @@
android:textColor="?attr/importListFileNameColor"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout
@ -70,7 +72,7 @@
android:layout_weight="1"
android:ellipsize="none"
android:maxLines="2"
android:paddingStart="0dp"
android:paddingEnd="10dp"
android:scrollHorizontally="false"
android:text="File dir here"
@ -79,7 +81,6 @@
android:textSize="11sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout
@ -87,16 +88,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="6dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="30dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="1dp"
android:contentDescription="@string/a11y_user"
app:srcCompat="@drawable/ic_meta_name"
app:tint="?attr/importListAdditionalInfoColor" />
@ -110,17 +112,14 @@
android:textColor="?attr/importListAdditionalInfoColor"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="3dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/meta_date_time_icon"
android:layout_width="16dp"
@ -129,6 +128,7 @@
android:layout_marginTop="1dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="1dp"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_meta_date"
app:tint="?attr/importListAdditionalInfoColor" />

5
core/src/main/res/layout/passwordprompt.xml
View file

@ -21,9 +21,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password_hint"
android:importantForAutofill="no"
android:inputType="textPassword">
<requestFocus />
</EditText>
<EditText
@ -31,6 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password_hint"
android:importantForAutofill="no"
android:inputType="textPassword" />
</LinearLayout>
</LinearLayout>

7
core/src/main/res/layout/toast.xml
View file

@ -26,8 +26,9 @@
android:layout_marginTop="4dp"
android:layout_marginEnd="18dp"
android:layout_marginBottom="4dp"
android:text="Toast goes here..."
android:textColor="?attr/toastBaseTextColor"
android:textSize="18sp"
tools:ignore="HardcodedText,RtlHardcoded" />
</LinearLayout>
tools:ignore="RtlHardcoded"
tools:text="Toast goes here..." />
</LinearLayout>

2
core/src/main/res/values/strings.xml
View file

@ -561,6 +561,8 @@
<string name="remove_items">Remove Items</string>
<string name="sort_items">Sort Items</string>
<string name="remove_selected_items">Remove Selected Items</string>
<string name="a11y_file">file</string>
<string name="a11y_user">user</string>
<plurals name="days">
<item quantity="one">%1$d day</item>

12
dana/src/main/res/layout/danar_history_item.xml
View file

@ -14,7 +14,6 @@
app:cardUseCompatPadding="true"
android:layout_gravity="center">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -26,7 +25,6 @@
android:baselineAligned="true"
android:orientation="horizontal">
<TextView
android:id="@+id/time"
android:layout_width="120dp"
@ -39,7 +37,7 @@
android:id="@+id/value"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:paddingStart="5dp"
android:text="0.25"
tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
@ -64,7 +62,7 @@
android:id="@+id/duration"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:paddingStart="5dp"
android:text="30"
tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
@ -73,7 +71,7 @@
android:id="@+id/daily_basal"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:paddingStart="5dp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -81,7 +79,7 @@
android:id="@+id/daily_bolus"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:paddingStart="5dp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -89,7 +87,7 @@
android:id="@+id/daily_total"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:paddingStart="10dp"
android:visibility="gone"
tools:ignore="RtlHardcoded,RtlSymmetry" />

23
dana/src/main/res/layout/danar_user_options_activity.xml
View file

@ -8,7 +8,6 @@
android:focusableInTouchMode="true"
tools:context="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -49,16 +48,16 @@
android:orientation="horizontal"
android:padding="5dp" />
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/timeformat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:showText="true"
android:text="@string/danar_timedisplay"
android:textOff="@string/timeformat12h"
android:textOn="@string/timeformat24h" />
android:textOn="@string/timeformat24h"
app:showText="true" />
<View
android:layout_width="fill_parent"
@ -69,7 +68,7 @@
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/buttonscroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -77,7 +76,8 @@
android:layout_marginEnd="20dp"
android:text="@string/danar_buttonscroll"
android:textOff="@string/option_off"
android:textOn="@string/option_on" />
android:textOn="@string/option_on"
app:showText="true" />
<View
android:layout_width="fill_parent"
@ -88,7 +88,7 @@
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/beep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -96,7 +96,8 @@
android:layout_marginEnd="20dp"
android:text="@string/danar_beep"
android:textOff="@string/option_off"
android:textOn="@string/option_on" />
android:textOn="@string/option_on"
app:showText="true" />
<View
android:layout_width="fill_parent"
@ -232,17 +233,17 @@
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/units"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:showText="true"
android:splitTrack="false"
android:text="@string/danar_glucoseunits"
android:textOff="@string/mgdl"
android:textOn="@string/mmol" />
android:textOn="@string/mmol"
app:showText="true" />
<View
android:layout_width="fill_parent"

2
danars/src/main/res/layout/danars_pairing_progress_dialog.xml
View file

@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:text="STATUS" />
tools:text="STATUS" />
<ProgressBar
android:id="@+id/danars_pairingprogress_progressbar"

47
diaconn/src/main/res/layout/diaconn_g8_history_item.xml
View file

@ -1,18 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/Widget.MaterialComponents.CardView"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/danar_history_card"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"
android:layout_gravity="center">
app:contentPadding="2dp">
<LinearLayout
android:layout_width="match_parent"
@ -20,73 +19,79 @@
android:baselineAligned="true"
android:orientation="horizontal">
<TextView
android:id="@+id/diaconn_g8_history_time"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:paddingStart="5dp"
android:text="27.06.2016 18:00" />
android:paddingEnd="0dp"
tools:text="27.06.2016 18:00" />
<TextView
android:id="@+id/diaconn_g8_history_value"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="5dp"
android:text="0.25"
android:gravity="right" />
android:paddingEnd="0dp"
tools:text="0.25" />
<TextView
android:id="@+id/diaconn_g8_history_bolustype"
android:layout_width="20dp"
android:layout_height="wrap_content"
android:paddingStart="5dp"
android:text="E"
/>
android:paddingEnd="0dp"
tools:text="E" />
<TextView
android:id="@+id/diaconn_g8_history_stringvalue"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:paddingStart="5dp"
android:text="XXXXXXX"
/>
android:paddingEnd="0dp"
tools:text="XXXXXXX" />
<TextView
android:id="@+id/diaconn_g8_history_duration"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="5dp"
android:text="30"
android:gravity="right" />
android:paddingEnd="0dp"
tools:text="30" />
<TextView
android:id="@+id/diaconn_g8_history_dailybasal"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="5dp"
android:gravity="right" />
android:paddingEnd="0dp" />
<TextView
android:id="@+id/diaconn_g8_history_dailybolus"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="5dp"
android:gravity="right" />
android:paddingEnd="0dp" />
<TextView
android:id="@+id/diaconn_g8_history_dailytotal"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="10dp"
android:gravity="right"
android:visibility="gone"/>
android:paddingEnd="0dp"
android:visibility="gone" />
<TextView
android:id="@+id/diaconn_g8_history_alarm"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:paddingStart="5dp" />
android:paddingStart="5dp"
android:paddingEnd="0dp" />
</LinearLayout>

24
diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
View file

@ -8,7 +8,6 @@
android:focusableInTouchMode="true"
tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -110,16 +109,11 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:padding="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:orientation="horizontal">
@ -191,17 +185,11 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:padding="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:orientation="horizontal">
@ -273,16 +261,11 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:padding="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:orientation="horizontal">
@ -306,7 +289,6 @@
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

13
insight/src/main/res/layout/bluetooth_device.xml
View file

@ -2,10 +2,11 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:paddingStart="16dp"
android:textSize="20sp"
android:gravity="center_vertical"
android:textColor="#FFFFFF"
tools:text="Test"
android:layout_height="56dp"
android:background="?selectableItemBackground"
android:layout_height="56dp" />
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="0dp"
android:textColor="#FFFFFF"
android:textSize="20sp"
tools:text="Test" />

9
insight/src/main/res/layout/local_insight_status_item.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
@ -10,6 +11,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -21,7 +23,8 @@
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp" />
android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/value"
@ -30,6 +33,8 @@
android:layout_weight="1"
android:gravity="start"
android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

16
medtronic/src/main/res/layout/medtronic_fragment.xml
View file

@ -4,14 +4,12 @@
android:layout_height="match_parent"
tools:context="info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/buttons"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -38,7 +36,6 @@
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
@ -86,10 +83,8 @@
android:textSize="14sp"
tools:ignore="HardcodedText,RtlSymmetry" />
</LinearLayout>
<View
android:id="@+id/rl_battery_view"
android:layout_width="fill_parent"
@ -141,10 +136,8 @@
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
@ -192,7 +185,6 @@
android:textSize="14sp"
tools:ignore="HardcodedText,RtlSymmetry" />
</LinearLayout>
<TextView
@ -249,7 +241,6 @@
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
</LinearLayout>
<View
@ -348,7 +339,6 @@
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
@ -454,7 +444,6 @@
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -494,7 +483,6 @@
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
@ -581,7 +569,6 @@
android:paddingEnd="0dp"
android:text="@string/refresh" />
<com.google.android.material.button.MaterialButton
android:id="@+id/history"
style="@style/ButtonSmallFontStyle"
@ -602,8 +589,7 @@
android:drawableTop="@drawable/ic_danarstats"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:text="RL Stats" />
android:text="@string/riley_statistics" />
</LinearLayout>

8
medtronic/src/main/res/layout/medtronic_history_activity.xml
View file

@ -7,7 +7,6 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity">
<LinearLayout
android:id="@+id/medtronic_historytop"
android:layout_width="match_parent"
@ -20,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginEnd="20dp"
android:text="Type:"
android:text="@string/medtronic_history_type"
android:textAppearance="?android:attr/textAppearanceSmall" />
<Spinner
@ -30,16 +29,15 @@
android:layout_marginEnd="20dp" />
<TextView
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@drawable/pillborder"
android:gravity="center_horizontal"
android:text="@string/medtronic_pump_history" />
</LinearLayout>
<TextView

18
medtronic/src/main/res/layout/medtronic_history_item.xml
View file

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:paddingStart="20dp">
<TextView
android:id="@+id/medtronic_history_time"
android:layout_width="88dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="Date"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Date" />
<TextView
android:id="@+id/medtronic_history_source"
android:layout_width="132dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="Source"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Source" />
<TextView
android:id="@+id/medtronic_history_description"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:text="Description"
android:gravity="center_vertical"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Description" />
</LinearLayout>
</LinearLayout>

2
medtronic/src/main/res/values/strings.xml
View file

@ -123,5 +123,7 @@
<string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min remaining)</string>
<string name="sixdigitnumber" translatable="false">^\\d{6}</string>
<string name="invalid_history_data">Invalid pump history data detected. Open new issue and provide logs.</string>
<string name="riley_statistics">RL Stats</string>
<string name="medtronic_history_type">Type:</string>
</resources>

2
omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml
View file

@ -29,7 +29,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@drawable/pillborder"

2
omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml
View file

@ -29,7 +29,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@drawable/pillborder"

3
rileylink/src/main/res/layout/riley_link_ble_config_activity.xml
View file

@ -27,6 +27,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:textSize="16sp" />
<TextView
@ -34,7 +35,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:textSize="12sp" />
</LinearLayout>
<com.google.android.material.button.MaterialButton

3
rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml
View file

@ -5,6 +5,7 @@
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingTop="5dp"
android:paddingEnd="0dp"
android:paddingBottom="5dp">
<TextView
@ -21,4 +22,4 @@
android:layout_height="wrap_content"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>

6
rileylink/src/main/res/layout/rileylink_status.xml
View file

@ -5,7 +5,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity">
<com.google.android.material.appbar.AppBarLayout
@ -21,8 +20,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
@ -32,14 +31,13 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:layout_editor_absoluteY="55dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/rileylink_settings_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:contentDescription="@string/refresh"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/ic_refresh" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

5
rileylink/src/main/res/layout/rileylink_status_device.xml
View file

@ -2,7 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".plugins.pump.medtronic.dialog.RileyLinkStatusDevice">
tools:context="info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusDevice">
<LinearLayout
android:layout_width="match_parent"
@ -15,6 +15,7 @@
android:id="@+id/rileyLinkDeviceList"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="8dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

18
rileylink/src/main/res/layout/rileylink_status_device_item.xml
View file

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="40dp"
android:paddingStart="15dp">
android:orientation="horizontal"
android:paddingStart="15dp"
android:paddingEnd="0dp">
<TextView
android:id="@+id/rileylink_device_label"
android:layout_width="184dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="Command"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Command" />
<com.google.android.material.button.MaterialButton
style="@style/GrayButton"
android:id="@+id/rileylink_device_action"
style="@style/GrayButton"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:text="Description"
android:gravity="center_vertical"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Description" />
</LinearLayout>
</LinearLayout>

8
rileylink/src/main/res/layout/rileylink_status_history.xml
View file

@ -12,17 +12,15 @@
<TextView
android:id="@+id/rileylink_historystatus"
android:layout_width="match_parent"
android:layout_height="10px"
android:layout_below="@+id/medtronic_historytop"
android:layout_height="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rileylink_history_list"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_below="@+id/rileylink_historystatus" />
android:layout_height="fill_parent"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

21
rileylink/src/main/res/layout/rileylink_status_history_item.xml
View file

@ -1,33 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="40dp"
android:paddingStart="20dp">
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="0dp">
<TextView
android:id="@+id/rileylink_history_time"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="Date"
android:gravity="center_vertical"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Date" />
<TextView
android:id="@+id/rileylink_history_source"
android:layout_width="80dp"
android:layout_height="match_parent"
android:text="Source"
android:gravity="center_vertical"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Source" />
<TextView
android:id="@+id/rileylink_history_description"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:text="Description"
android:gravity="center_vertical"
android:textSize="12dp" />
android:textSize="12sp"
tools:text="Description" />
</LinearLayout>
</LinearLayout>