caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: fix merge conficts

Browse source
This commit is contained in:
Andries Smit 2022-02-11 10:15:37 +01:00
parent 22a1a68e95
commit 0dce111e4e
4 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
View file

@ -105,8 +105,8 @@ class BgQualityCheckPlugin @Inject constructor(
fun stateDescription(): String = fun stateDescription(): String =
when (state) { when (state) {
State.RECALCULATED -> rh.gs(R.string.a11_bg_quality_recalculated) State.RECALCULATED -> rh.gs(R.string.a11y_bg_quality_recalculated)
State.DOUBLED -> rh.gs(R.string.a11_bg_quality_doubles) State.DOUBLED -> rh.gs(R.string.a11y_bg_quality_doubles)
else -> "" else -> ""
} }
} }

1
app/src/main/res/layout/careportal_stats_fragment_lowres.xml
View file

@ -124,6 +124,7 @@
android:focusable="true"> android:focusable="true">
<TextView <TextView
android:id="@+id/cannula_or_patch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="25dp" android:layout_height="25dp"
android:gravity="center_vertical" android:gravity="center_vertical"

1
app/src/main/res/layout/overview_statuslights_layout.xml
View file

@ -20,6 +20,7 @@
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<ImageView <ImageView
android:id="@+id/cannula_or_patch"
android:layout_width="38dp" android:layout_width="38dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:contentDescription="@string/statuslights_cannula_age" android:contentDescription="@string/statuslights_cannula_age"

25
app/src/main/res/values/strings.xml
View file

@ -1140,29 +1140,12 @@
<string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string> <string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string>
<string name="identification">Identification (email, FB or Discord nick etc)</string> <string name="identification">Identification (email, FB or Discord nick etc)</string>
<string name="identification_not_set">Identification not set in dev mode</string> <string name="identification_not_set">Identification not set in dev mode</string>
<string name="a11y_high">heigh</string>
<string name="a11y_inrange">in range</string>
<string name="a11y_low">low</string>
<string name="a11y_arrow_double_down">down fast</string>
<string name="a11y_arrow_single_down">down</string>
<string name="a11y_arrow_forty_five_down">down trending</string>
<string name="a11y_arrow_flat">flat</string>
<string name="a11y_arrow_forty_five_up">up trending</string>
<string name="a11y_arrow_single_up">up</string>
<string name="a11y_arrow_double_up">up fast</string>
<string name="a11y_arrow_none">none</string>
<string name="a11y_arrow_unknown">unknown</string>
<string name="a11y_graph">graph</string>
<string name="a11y_bg_quality">Blood glucose quality</string>
<string name="a11_bg_quality_recalculated">recalculated</string>
<string name="a11_bg_quality_doubles">double entries</string>
<string name="a11y_insulin_label">insulin</string>
<string name="a11y_dialog">dialog</string> <string name="a11y_dialog">dialog</string>
<string name="a11y_current_bg">current blood glucode</string> <string name="a11y_current_bg">current blood glucose</string>
<string name="a11_correction_percentage">correct outcome with %</string> <string name="a11_correction_percentage">correct outcome with %</string>
<string name="a11_correction_units">correct outcome with units</string> <string name="a11_correction_units">correct outcome with units</string>
<string name="not_available_full">Not available</string> <string name="not_available_full">Not available</string>
<string name="a11y_high">heigh</string> <string name="a11y_high">high</string>
<string name="a11y_inrange">in range</string> <string name="a11y_inrange">in range</string>
<string name="a11y_low">low</string> <string name="a11y_low">low</string>
<string name="a11y_arrow_double_down">falling rapidly</string> <string name="a11y_arrow_double_down">falling rapidly</string>
@ -1176,8 +1159,8 @@
<string name="a11y_arrow_unknown">unknown</string> <string name="a11y_arrow_unknown">unknown</string>
<string name="a11y_graph">graph</string> <string name="a11y_graph">graph</string>
<string name="a11y_bg_quality">blood glucose quality</string> <string name="a11y_bg_quality">blood glucose quality</string>
<string name="a11_bg_quality_recalculated">recalculated</string> <string name="a11y_bg_quality_recalculated">recalculated</string>
<string name="a11_bg_quality_doubles">double entries</string> <string name="a11y_bg_quality_doubles">double entries</string>
<string name="a11y_insulin_label">insulin</string> <string name="a11y_insulin_label">insulin</string>
<string name="a11y_blood_glucose">blood glucose</string> <string name="a11y_blood_glucose">blood glucose</string>
<string name="a11y_bg_outdated">outdated</string> <string name="a11y_bg_outdated">outdated</string>