caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

remove duplicate IDs and indentation fix

Browse source
This commit is contained in:
AdrianLxM 2017-07-22 02:15:55 +02:00
parent 10d27f0b6a
commit 3d4fa0cebf
1 changed files with 120 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

243
app/src/main/res/layout/careportal_fragment.xml
View file

@ -22,10 +22,9 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/textView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="15dp" android:paddingStart="15dp"
android:text="@string/careportal_activity_label" /> android:text="@string/careportal_activity_label" />
<android.support.v7.widget.GridLayout <android.support.v7.widget.GridLayout
@ -76,131 +75,129 @@
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="0" /> app:layout_row="0" />
</android.support.v7.widget.GridLayout> </android.support.v7.widget.GridLayout>
<TextView <TextView
android:id="@+id/textView" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:paddingStart="15dp"
android:paddingStart="15dp" android:text="@string/careportal_carbsandbolus_label" />
android:text="@string/careportal_carbsandbolus_label" />
<android.support.v7.widget.GridLayout <android.support.v7.widget.GridLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:padding="10dip" android:padding="10dip"
app:columnCount="3"> app:columnCount="3">
<Button <Button
android:id="@+id/careportal_snackbolus" android:id="@+id/careportal_snackbolus"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_snack" android:drawableTop="@drawable/icon_cp_bolus_snack"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_snackbolus" android:text="@string/careportal_snackbolus"
app:layout_column="0" app:layout_column="0"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="1" /> app:layout_row="1" />
<Button <Button
android:id="@+id/careportal_mealbolus" android:id="@+id/careportal_mealbolus"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_meal" android:drawableTop="@drawable/icon_cp_bolus_meal"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_mealbolus" android:text="@string/careportal_mealbolus"
app:layout_column="1" app:layout_column="1"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="1" /> app:layout_row="1" />
<Button <Button
android:id="@+id/careportal_correctionbolus" android:id="@+id/careportal_correctionbolus"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_correction" android:drawableTop="@drawable/icon_cp_bolus_correction"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_correctionbolus" android:text="@string/careportal_correctionbolus"
app:layout_column="2" app:layout_column="2"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="1" /> app:layout_row="1" />
<Button <Button
android:id="@+id/careportal_carbscorrection" android:id="@+id/careportal_carbscorrection"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_carbs" android:drawableTop="@drawable/icon_cp_bolus_carbs"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_carbscorrection" android:text="@string/careportal_carbscorrection"
app:layout_column="0" app:layout_column="0"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="2" /> app:layout_row="2" />
<Button <Button
android:id="@+id/careportal_combobolus" android:id="@+id/careportal_combobolus"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_correction" android:drawableTop="@drawable/icon_cp_bolus_correction"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_combobolus" android:text="@string/careportal_combobolus"
app:layout_column="1" app:layout_column="1"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="2" /> app:layout_row="2" />
<Button <Button
android:id="@+id/careportal_tempbasalstart" android:id="@+id/careportal_tempbasalstart"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_basal_start" android:drawableTop="@drawable/icon_cp_basal_start"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_tempbasalstart" android:text="@string/careportal_tempbasalstart"
app:layout_column="2" app:layout_column="2"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="2" /> app:layout_row="2" />
<Button <Button
android:id="@+id/careportal_tempbasalend" android:id="@+id/careportal_tempbasalend"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_basal_end" android:drawableTop="@drawable/icon_cp_basal_end"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_tempbasalend" android:text="@string/careportal_tempbasalend"
app:layout_column="0" app:layout_column="0"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="3" /> app:layout_row="3" />
</android.support.v7.widget.GridLayout> </android.support.v7.widget.GridLayout>
<TextView <TextView
android:id="@+id/textView" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:paddingStart="15dp"
android:paddingStart="15dp" android:text="@string/careportal_cgm_label" />
android:text="@string/careportal_cgm_label" /> <android.support.v7.widget.GridLayout
<android.support.v7.widget.GridLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -275,16 +272,16 @@ app:layout_row="3" />
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="4" /> app:layout_row="4" />
</android.support.v7.widget.GridLayout> </android.support.v7.widget.GridLayout>
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="15dp" android:paddingStart="15dp"
android:text="@string/careportal_pump_label" /> android:text="@string/careportal_pump_label" />
<android.support.v7.widget.GridLayout <android.support.v7.widget.GridLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"