Merge pull request #1641 from Andries-Smit/chore/triple-newlines

Chore: triple newlines
This commit is contained in:
Milos Kozak 2022-04-19 17:37:43 +02:00 committed by GitHub
commit 25a108db1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 38 additions and 113 deletions

View file

@ -111,5 +111,4 @@
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -177,7 +177,6 @@
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
</LinearLayout>
</ScrollView>

View file

@ -112,7 +112,6 @@
android:paddingEnd="2dp"
android:textSize="14sp" />
<TextView
android:id="@+id/insulin_level_label"
android:layout_width="wrap_content"

View file

@ -242,7 +242,6 @@
android:text="+20"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout

View file

@ -115,7 +115,6 @@
</LinearLayout>
<include
android:id="@+id/okcancel"
layout="@layout/okcancel" />

View file

@ -46,7 +46,6 @@
android:orientation="horizontal"
android:padding="5dp" />
<LinearLayout
android:id="@+id/overview_loop"
android:layout_width="fill_parent"
@ -177,7 +176,6 @@
android:text="@string/suspendloop"
android:textAppearance="?android:attr/textAppearanceLarge" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_resume"
style="@style/ButtonSmallFontStyle"
@ -229,7 +227,6 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_suspend_3h"
style="@style/ButtonSmallFontStyle"
@ -244,7 +241,6 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_suspend_10h"
style="@style/ButtonSmallFontStyle"

View file

@ -61,7 +61,6 @@
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:id="@+id/reuselayout"
android:layout_width="match_parent"
@ -234,4 +233,3 @@
</LinearLayout>
</ScrollView>

View file

@ -476,7 +476,6 @@
android:checked="false"
android:text="@string/bg_trend_label" />
<TextView
android:id="@+id/bg_trend"
android:layout_width="wrap_content"

View file

@ -72,7 +72,6 @@
</com.google.android.material.textfield.TextInputLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"

View file

@ -137,7 +137,6 @@
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"

View file

@ -347,5 +347,3 @@
</LinearLayout>
</ScrollView>

View file

@ -13,7 +13,6 @@
android:textSize="12sp"
tools:text="TYPE" />
<CheckBox
android:id="@+id/logsettings_visibility"
android:layout_width="wrap_content"

View file

@ -84,7 +84,6 @@
android:text="@string/nav_import"
android:textColor="?attr/treatmentButton" />
<com.google.android.material.button.MaterialButton
android:id="@+id/export_csv"
style="@style/GrayButton"

View file

@ -246,7 +246,6 @@
</RadioGroup>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"

View file

@ -42,7 +42,6 @@
app:layout_constraintTop_toTopOf="@+id/bg"
tools:ignore="HardcodedText" />
<LinearLayout
android:id="@+id/arrows_layout"
android:layout_width="wrap_content"

View file

@ -147,7 +147,6 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>

View file

@ -1,6 +1,5 @@
<resources>
<!--
Refer to App Widget Documentation for margin information
http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout

View file

@ -13,8 +13,6 @@
<style name="AppTheme.Launcher.AppWidgetContainer" parent="AppTheme.Launcher.AppWidgetContainerParent">
<!-- Apply padding to avoid the content of the widget colliding with the rounded corners -->
<item name="appWidgetPadding">16dp</item>
<item name="icBolusColor">@color/colorInsulinButton</item>
<item name="icBolusCarbsColor">@color/colorCarbsButton</item>
<item name="defaultTextColor">@color/white</item>

View file

@ -113,14 +113,12 @@
validate:minNumber="15"
validate:testType="numericRange" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_use_uam"
android:summary="@string/enableuam_summary"
android:title="@string/enableuam" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/key_sensitivity_raises_target"

View file

@ -124,14 +124,12 @@
validate:minNumber="15"
validate:testType="numericRange" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/key_use_uam"
android:summary="@string/enableuam_summary"
android:title="@string/enableuam" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/key_sensitivity_raises_target"

View file

@ -164,7 +164,6 @@
validate:floatminNumber="4.0"
validate:testType="floatNumericRange" />
<info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="number"
@ -174,7 +173,6 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
@ -202,7 +200,6 @@
validate:floatminNumber="6.0"
validate:testType="floatNumericRange" />
</androidx.preference.PreferenceScreen>
<androidx.preference.PreferenceScreen
@ -236,7 +233,6 @@
validate:floatminNumber="0.05"
validate:testType="floatNumericRange" />
</androidx.preference.PreferenceScreen>
<androidx.preference.PreferenceScreen

View file

@ -25,7 +25,6 @@
validate:floatminNumber="0.1"
validate:testType="floatNumericRange" />
<EditTextPreference
android:defaultValue="48"
android:inputType="numberDecimal"

View file

@ -109,7 +109,6 @@
android:layout_marginTop="5dp"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View file

@ -146,7 +146,6 @@
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View file

@ -70,7 +70,6 @@
<color name="list_delimiter">#505050</color>
<color name="basal">#00ffff</color>
<!-- Loop -->
<color name="loopDisconnected">#939393</color>
<color name="loopClosed">#00C03E</color>

View file

@ -45,7 +45,6 @@
<color name="ic_local_reset">#E93057</color>
<color name="ic_local_save">#67E86A</color>
<!-- Fragments-->
<color name="pumpStatusBackground">#CCCCCC</color>
@ -71,7 +70,6 @@
<color name="list_delimiter">#505050</color>
<color name="basal">#00ffff</color>
<!-- Loop -->
<color name="loopDisconnected">#939393</color>
<color name="loopClosed">#00C03E</color>

View file

@ -54,7 +54,6 @@
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
</LinearLayout>
<View
@ -105,7 +104,6 @@
android:textSize="14sp"
tools:ignore="HardcodedText,RtlSymmetry" />
</LinearLayout>
<View
@ -154,7 +152,6 @@
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
</LinearLayout>
<View
@ -672,7 +669,6 @@
android:paddingEnd="0dp"
android:text="@string/viewprofile" />
<com.google.android.material.button.MaterialButton
android:id="@+id/history"
style="@style/ButtonSmallFontStyle"

View file

@ -8,7 +8,6 @@
android:layout_height="fill_parent"
tools:context="info.nightscout.androidaps.dana.activities.DanaHistoryActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header"
android:layout_width="0dp"

View file

@ -65,7 +65,6 @@
android:text="@string/num2pin"
android:textAppearance="@style/TextAppearance.AppCompat.Large" />
<EditText
android:id="@+id/rs_v3_pin2"
android:layout_width="match_parent"

View file

@ -5,7 +5,6 @@
android:paddingTop="5dp"
tools:context="info.nightscout.androidaps.diaconn.DiaconnG8Fragment">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -73,7 +72,6 @@
android:paddingStart="5dp"
android:textSize="14sp" />
</LinearLayout>
<View
@ -122,7 +120,6 @@
android:textSize="20dp"
tools:ignore="HardcodedText" />
</LinearLayout>
<TextView
@ -177,7 +174,6 @@
android:paddingStart="5dp"
android:textSize="20sp" />
</LinearLayout>
<View

View file

@ -6,7 +6,6 @@
android:layout_height="fill_parent"
tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity">
<RelativeLayout
android:id="@+id/header"
android:layout_width="match_parent"

View file

@ -44,5 +44,4 @@
<item>3</item>
</string-array>
</resources>

View file

@ -167,5 +167,4 @@
<string name="diaconn_g8_errorcode_35">Tempbasal start is rejected when tempbasal is running</string>
<string name="diaconn_g8_errorcode_36">Tempbasal stop is rejected when tempbasal is not running</string>
</resources>

View file

@ -104,5 +104,4 @@
android:text="@string/exit" />
</LinearLayout>
</FrameLayout>

View file

@ -79,7 +79,6 @@
<!-- <string name="medtronic_history_group_all">All</string>-->
<string name="medtronic_pump_history">Medtronic Pump History</string>
<!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
<string name="medtronic_cmd_cancel_bolus_not_supported">You cancelled Bolus, after it was already set on Pump. Since Medtronic Pump doesn\'t support cancel, you will need to manually cancel it. Put the Pump into Suspend mode and then do Resume (if you still want to cancel). Application will pick up changes, on next update (in less than 5 minutes).</string>
<string name="medtronic_cmd_cant_read_tbr">Could not read current TBR.</string>

View file

@ -18,7 +18,6 @@
validate:testErrorString="@string/error_mustbe6digitnumber"
validate:testType="regexp" />
<ListPreference
android:defaultValue="1"
android:entries="@array/medtronicPumpTypeArray"
@ -26,7 +25,6 @@
android:key="@string/key_medtronic_pump_type"
android:title="@string/medtronic_pump_type" />
<ListPreference
android:defaultValue="@string/key_medtronic_pump_frequency_us_ca"
android:entries="@array/medtronicPumpFreqArray"

View file

@ -28,7 +28,6 @@
android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/omnipod_dash_bluetooth_address"
android:layout_width="match_parent"
@ -160,6 +159,7 @@
android:textSize="14sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
@ -168,4 +168,5 @@
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
</merge>

View file

@ -28,5 +28,4 @@
<string name="history_group_alarm">Alarms</string>
<string name="history_group_glucose">Glucose</string>
</resources>

View file

@ -114,7 +114,6 @@
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -143,7 +142,6 @@
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -335,7 +333,6 @@
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -392,7 +389,6 @@
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View file

@ -8,5 +8,4 @@
<item android:drawable="@drawable/nslogo_background" />
</layer-list>

View file

@ -3,7 +3,6 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -61,5 +60,7 @@
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_add"
android:tint="#ffffff" />
</LinearLayout>
</RelativeLayout>

View file

@ -3,7 +3,6 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -64,5 +63,7 @@
android:tint="#ffffff" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

View file

@ -3,7 +3,6 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -54,6 +53,7 @@
android:tint="#ffffff" />
</LinearLayout>
<ImageView
android:id="@+id/plusbutton"
android:layout_width="wrap_content"
@ -63,5 +63,7 @@
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_add"
android:tint="#ffffff" />
</LinearLayout>
</RelativeLayout>

View file

@ -3,13 +3,13 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center">
<ImageView
android:id="@+id/confirmbutton"
android:layout_width="wrap_content"
@ -22,7 +22,5 @@
android:padding="25sp"
android:layout_margin="10sp"/>
</LinearLayout>
</RelativeLayout>

View file

@ -9,7 +9,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentStart="true">
<TextView android:id="@+id/agoString"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -50,4 +49,5 @@
android:layout_marginTop="-5dp" />
</LinearLayout>
</RelativeLayout>

View file

@ -73,7 +73,6 @@
android:gravity="center_horizontal|bottom"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>

View file

@ -324,7 +324,6 @@
android:orientation="vertical"
android:textAlignment="center">
<TextView
android:id="@+id/iob_text"
android:layout_width="wrap_content"

View file

@ -117,7 +117,6 @@
android:paddingStart="10sp"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

View file

@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:background="@drawable/airplane_cockpit_outside_clouds">
<LinearLayout
android:id="@+id/inside"
android:layout_width="fill_parent"

View file

@ -89,7 +89,6 @@
android:layout_weight="0.16"
android:orientation="horizontal">
<TextView
android:id="@+id/cobView"
android:layout_width="match_parent"
@ -334,7 +333,6 @@
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

View file

@ -331,7 +331,6 @@
android:orientation="vertical"
android:textAlignment="center">
<TextView
android:id="@+id/iob_text"
android:layout_width="wrap_content"

View file

@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:background="@drawable/airplane_cockpit_outside_clouds">
<LinearLayout
android:id="@+id/inside"
android:layout_width="fill_parent"

View file

@ -89,7 +89,6 @@
android:layout_weight="0.165"
android:orientation="horizontal">
<TextView
android:id="@+id/cobView"
android:layout_width="match_parent"
@ -334,7 +333,6 @@
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

View file

@ -4,7 +4,6 @@
<color name="cardObjectiveText">#779ECB</color>
<color name="titleHeader">#D9000000</color>
<!-- light colors -->
<color name="light_bigchart_time">@color/black</color>
<color name="light_bigchart_status">@color/black</color>
@ -46,7 +45,6 @@
<color name="colorTemptButton">#CF8BFE</color>
<color name="colorPrimeButton">#FBC02D</color>
<color name="inrange">#00FF00</color>
<color name="exercise">#67DFE8</color>
<color name="carbs">#FFFB8C00</color>
@ -186,4 +184,5 @@
<!-- Black / White-->
<color name="black">#000000</color>
<color name="white">#FFFFFF</color>
</resources>

View file

@ -60,7 +60,6 @@
<item>multicolor</item>
</string-array>
<string-array name="digitalstyle_color_saturation">
<item>100</item>
<item>500</item>
@ -68,7 +67,6 @@
<item>900</item>
</string-array>
<string-array name="digitalstyle_color_opacity_name">
<item>10%</item>
<item>20%</item>
@ -94,5 +92,4 @@
<item>1</item>
</string-array>
</resources>

View file

@ -2,7 +2,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<CheckBoxPreference
android:defaultValue="true"
android:key="dark"

View file

@ -2,7 +2,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<ListPreference
android:defaultValue="full"
android:entries="@array/digitalstyle_styles_name"

View file

@ -10,7 +10,6 @@
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />
<CheckBoxPreference
android:defaultValue="false"
android:key="vibrate_Hourly"