Merge pull request #1756 from Andries-Smit/chore/fix-lint-warning-layout-2

Chore fix lint warning layout 2
This commit is contained in:
Milos Kozak 2022-05-21 11:54:58 +02:00 committed by GitHub
commit 9259be46d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 880 additions and 798 deletions

View file

@ -7,7 +7,8 @@
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<application>
<application
android:supportsRtl="true">
<activity
android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity"
android:theme="@style/AppTheme" />

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="wrap_content"
android:gravity="center"
@ -15,19 +16,23 @@
android:id="@+id/icon"
android:layout_width="48dp"
android:layout_height="48dp"
app:tint="#FFFFFF" />
android:src="@drawable/ic_error"
android:importantForAccessibility="no"
app:tint="?attr/colorControlNormal" />
<TextView
android:id="@+id/error_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="code"/>
<TextView
android:id="@+id/error_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="title"/>
<TextView
android:id="@+id/error_description"
@ -35,7 +40,8 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="description"/>
<LinearLayout
android:layout_width="match_parent"
@ -64,5 +70,7 @@
android:layout_height="wrap_content"
android:onClick="confirmClicked"
android:text="@string/confirm" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View file

@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="info.nightscout.androidaps.plugins.pump.medtronic">
<application>
<application
android:supportsRtl="true">
<service
android:name=".service.RileyLinkMedtronicService"
android:enabled="true"

View file

@ -55,7 +55,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/rileylink_status"
android:textSize="14sp"
@ -77,7 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:text="{fa-bluetooth-b}"
android:textSize="14sp"
@ -107,7 +107,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/rl_battery_label"
android:textSize="14sp"
@ -130,7 +130,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:text=""
android:textSize="14sp"
@ -157,7 +157,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/medtronic_pump_status"
android:textSize="14sp"
@ -179,7 +179,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:text="{fa-bluetooth-b}"
android:textSize="14sp"
@ -213,7 +213,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/battery_label"
android:textSize="14sp"
@ -235,7 +235,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:text=""
android:textSize="14sp"
@ -262,7 +262,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/lastconnection_label"
android:textSize="14sp"
@ -284,7 +284,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@ -310,7 +310,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/lastbolus_label"
android:textSize="14sp"
@ -332,7 +332,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@ -358,7 +358,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/basebasalrate_label"
android:textSize="14sp"
@ -380,7 +380,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@ -406,7 +406,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/tempbasal_label"
android:textSize="14sp"
@ -428,7 +428,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@ -454,7 +454,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/reservoir_label"
android:textSize="14sp"
@ -476,7 +476,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@ -502,7 +502,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingEnd="5dp"
android:text="@string/medtronic_errors"
android:textSize="14sp"
@ -524,7 +524,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />

View file

@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:paddingEnd="0dp"
android:paddingStart="20dp">
<TextView

View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="info.nightscout.androidaps.plugins.pump.omnipod.common">
<manifest package="info.nightscout.androidaps.plugins.pump.omnipod.common"
xmlns:android="http://schemas.android.com/apk/res/android">
<application></application>
<application
android:supportsRtl="true">
</application>
</manifest>

View file

@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_unique_id"
@ -38,7 +38,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -56,7 +56,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_lot_number"
@ -78,7 +78,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -95,7 +95,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_sequence_number"
@ -117,7 +117,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -134,7 +134,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_firmware_version"
@ -156,7 +156,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -173,7 +173,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_time_on_pod"
@ -195,7 +195,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -213,7 +213,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_expiry_date"
@ -235,7 +235,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -253,7 +253,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_status"
@ -275,7 +275,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text=""
@ -309,7 +309,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_last_connection"
@ -331,7 +331,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -357,7 +357,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_last_bolus"
@ -379,7 +379,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -405,7 +405,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_base_basal_rate"
@ -427,7 +427,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -453,7 +453,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_temp_basal_rate"
@ -475,7 +475,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -501,7 +501,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_reservoir"
@ -523,7 +523,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -549,7 +549,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_total_delivered"
@ -571,7 +571,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -597,7 +597,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_errors"
@ -619,7 +619,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -645,7 +645,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_active_alerts"
@ -667,7 +667,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />

View file

@ -29,8 +29,9 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
app:srcCompat="@drawable/ic_omnipod_wizard_success"
android:visibility="gone" />
android:contentDescription="@string/success"
android:visibility="gone"
app:srcCompat="@drawable/ic_omnipod_wizard_success" />
<TextView
android:id="@+id/omnipod_wizard_action_error"
@ -49,7 +50,8 @@
android:layout_height="wrap_content"
android:gravity="end"
android:orientation="horizontal"
android:paddingEnd="50dp">
android:paddingEnd="50dp"
android:paddingStart="0dp">
<com.google.android.material.button.MaterialButton
style="@style/GrayButton"
@ -77,5 +79,7 @@
android:layout_marginStart="10dp"
android:text="@string/omnipod_common_wizard_button_retry"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View file

@ -8,7 +8,8 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<application>
<application
android:supportsRtl="true">
<activity android:name=".ui.wizard.activation.DashPodActivationWizardActivity" />
<activity android:name=".ui.wizard.deactivation.DashPodDeactivationWizardActivity" />
<activity android:name=".ui.DashPodManagementActivity" />

View file

@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_bluetooth_address"
@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp" />
@ -49,7 +49,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_bluetooth_status"
@ -71,7 +71,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp"
@ -90,7 +90,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_bluetooth_connection_quality"
@ -112,7 +112,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp"
@ -131,7 +131,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_delivery_status"
@ -153,7 +153,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:textSize="14sp"

View file

@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="info.nightscout.androidaps.plugins.pump.omnipod.eros">
<application>
<application
android:supportsRtl="true">
<service
android:name=".rileylink.service.RileyLinkOmnipodService"
android:enabled="true"

View file

@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:textAlignment="viewEnd"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/rileylink_status"
@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:textAlignment="viewStart"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="{fa-bluetooth-b}"
@ -50,4 +50,5 @@
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
</merge>
</merge>

View file

@ -32,6 +32,7 @@
<ImageView
android:layout_width="160dp"
android:layout_height="160dp"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/open_humans" />
@ -41,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="Welcome to Open Humans"
android:text="@string/welcome_to_open_humans"
android:textAppearance="?textAppearanceHeadline5"
android:textColor="?colorPrimary"
app:layout_constraintEnd_toEndOf="parent"
@ -61,7 +62,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="To setup data upload, click 'Next'."
android:text="@string/setup_data_upload"
android:textAppearance="?textAppearanceSubtitle1"
android:textColor="?colorSecondary" />
@ -70,7 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Next" />
android:text="@string/next" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
@ -92,7 +93,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Consent"
android:text="@string/consent"
android:textAppearance="?textAppearanceHeadline5"
android:textColor="?colorPrimary" />
@ -100,7 +101,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Please carefully read the following information and accept the terms of use to proceed."
android:text="@string/please_read__information"
android:textAppearance="?textAppearanceSubtitle1"
android:textColor="?colorSecondary" />
@ -109,14 +110,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:text="Terms of Use"
android:text="@string/terms_of_use"
android:textAppearance="?textAppearanceHeadline6"
android:textColor="?colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="This is an open source tool that will copy your data to Open Humans. We retain no rights to share your data with third parties without your explicit authorization. The data the project and app receive are identified via a random user ID and will only be securely transmitted to an Open Humans account with your authorization of that process. You can stop uploading and delete your upload data at any time via www.openhumans.org."
android:text="@string/info_openhumans"
android:textAppearance="?textAppearanceBody2"
android:textColor="?colorOnBackground" />
@ -125,7 +126,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:text="Data Uploaded"
android:text="@string/data_uploaded"
android:textAppearance="?textAppearanceHeadline6"
android:textColor="?colorPrimary" />
@ -147,7 +148,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Glucose values"
android:text="@string/glucose_values"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -170,7 +171,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Boluses"
android:text="@string/boluses"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -193,7 +194,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Extended boluses"
android:text="@string/extended_boluses"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -216,7 +217,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Carbohydrates"
android:text="@string/carbohydrates"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -239,7 +240,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Careportal Events (except notes)"
android:text="@string/careportal_events"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -262,7 +263,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Profile Switches"
android:text="@string/profile_switches"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -285,7 +286,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Total Daily Doses"
android:text="@string/total_daily_doses"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -308,7 +309,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Temporary Basal Rates"
android:text="@string/temporary_basal_rates"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -331,7 +332,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Temporary Targets"
android:text="@string/temporary_targets"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -354,7 +355,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Settings"
android:text="@string/settings"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -377,7 +378,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Application Version"
android:text="@string/application_version"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -400,7 +401,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Device Model"
android:text="@string/device_model"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -423,7 +424,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Screen Dimensions"
android:text="@string/screen_dimensions"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -446,7 +447,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Algorithm Debug Data"
android:text="@string/algorithm_debug_data"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -456,7 +457,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:text="Data NOT Uploaded"
android:text="@string/data_not_uploaded"
android:textAppearance="?textAppearanceHeadline6"
android:textColor="?colorPrimary" />
@ -478,7 +479,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Passwords"
android:text="@string/passwords"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -501,7 +502,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Nightscout URL"
android:text="@string/nightscout_url"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -524,7 +525,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Nightscout API Secret"
android:text="@string/nightscout_api_secret"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -547,7 +548,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="Free Text Fields"
android:text="@string/free_text_fields"
android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" />
</LinearLayout>
@ -557,7 +558,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="I understand and agree." />
android:text="@string/agree" />
<com.google.android.material.button.MaterialButton
android:id="@+id/login"
@ -567,7 +568,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="32dp"
android:enabled="false"
android:text="Login to Open Humans" />
android:text="@string/login_open_humans" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
@ -590,7 +591,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Final touches"
android:text="@string/final_touches"
android:textAppearance="?textAppearanceHeadline4"
android:textColor="?colorPrimary" />
@ -599,7 +600,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="You are just one step away from uploading your data to Open Humans. Do you want to proceed?"
android:text="@string/uploading_proceed"
android:textAppearance="?textAppearanceBody1" />
<LinearLayout
@ -614,14 +615,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="Cancel" />
android:text="@string/cancel" />
<com.google.android.material.button.MaterialButton
android:id="@+id/proceed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="Proceed" />
android:text="@string/proceed" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
@ -645,7 +646,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Finishing..."
android:text="@string/finishing"
android:textAppearance="?textAppearanceHeadline4"
android:textColor="?colorPrimary" />
@ -654,7 +655,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="This may take a few seconds."
android:text="@string/this_may_take_a_few_seconds"
android:textAppearance="?textAppearanceBody1" />
<com.google.android.material.progressindicator.LinearProgressIndicator
@ -683,6 +684,7 @@
<ImageView
android:layout_width="160dp"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:srcCompat="@drawable/tick_mark" />
<TextView
@ -690,7 +692,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="We're done!"
android:text="@string/we_re_done"
android:textAppearance="?textAppearanceHeadline4"
android:textColor="?colorPrimary" />
@ -699,7 +701,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="From now on, your phone will silently upload data in the background from time to time."
android:text="@string/silently_upload_date_note"
android:textAppearance="?textAppearanceBody1" />
<com.google.android.material.button.MaterialButton
@ -707,7 +709,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Close" />
android:text="@string/close" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</FrameLayout>

View file

@ -17,4 +17,42 @@
<string name="you_have_been_signed_out_of_open_humans">You have been signed out of Open Humans</string>
<string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in again if this wasn\'t on purpose.</string>
<string name="upload_now">Upload now</string>
<string name="next">Next</string>
<string name="welcome_to_open_humans">Welcome to Open Humans</string>
<string name="setup_data_upload">To setup data upload, click \'Next\'.</string>
<string name="consent">Consent</string>
<string name="terms_of_use">Terms of Use</string>
<string name="please_read__information">Please carefully read the following information and accept the terms of use to proceed.</string>
<string name="info_openhumans">This is an open source tool that will copy your data to Open Humans. We retain no rights to share your data with third parties without your explicit authorization. The data the project and app receive are identified via a random user ID and will only be securely transmitted to an Open Humans account with your authorization of that process. You can stop uploading and delete your upload data at any time via www.openhumans.org.</string>
<string name="data_uploaded">Data Uploaded</string>
<string name="glucose_values">Glucose values</string>
<string name="boluses">Boluses</string>
<string name="extended_boluses">Extended boluses</string>
<string name="carbohydrates">Carbohydrates</string>
<string name="careportal_events">Careportal Events (except notes)</string>
<string name="profile_switches">Profile Switches</string>
<string name="total_daily_doses">Total Daily Doses</string>
<string name="temporary_basal_rates">Temporary Basal Rates</string>
<string name="temporary_targets">Temporary Targets</string>
<string name="settings">Settings</string>
<string name="application_version">Application Version</string>
<string name="device_model">Device Model</string>
<string name="screen_dimensions">Screen Dimensions</string>
<string name="algorithm_debug_data">Algorithm Debug Data</string>
<string name="data_not_uploaded">Data NOT Uploaded</string>
<string name="passwords">Passwords</string>
<string name="nightscout_url">Nightscout URL</string>
<string name="nightscout_api_secret">Nightscout API Secret</string>
<string name="free_text_fields">Free Text Fields</string>
<string name="agree">I understand and agree.</string>
<string name="login_open_humans">Login to Open Humans</string>
<string name="final_touches">Final touches</string>
<string name="uploading_proceed">You are just one step away from uploading your data to Open Humans. Do you want to proceed?</string>
<string name="cancel">Cancel</string>
<string name="proceed">Proceed</string>
<string name="finishing">Finishing...</string>
<string name="this_may_take_a_few_seconds">This may take a few seconds.</string>
<string name="we_re_done">We\'re done!</string>
<string name="silently_upload_date_note">From now on, your phone will silently upload data in the background from time to time.</string>
<string name="close">Close</string>
</resources>