Merge pull request #733 from MilosKozak/treatmentdialog-smallscreen

Treatmentdialog smallscreen
This commit is contained in:
Milos Kozak 2018-03-06 22:15:22 +01:00 committed by GitHub
commit 3b18413eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions

View file

@ -394,7 +394,9 @@
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/overview_treatment_label" android:text="@string/overview_treatment_label"
android:textColor="@color/colorTreatmentButton" android:textColor="@color/colorTreatmentButton"
android:textSize="10sp" /> android:textSize="10sp"
android:visibility="gone"/>
<info.nightscout.utils.SingleClickButton <info.nightscout.utils.SingleClickButton
android:id="@+id/overview_insulinbutton" android:id="@+id/overview_insulinbutton"
@ -423,7 +425,8 @@
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/overview_carbs_label" android:text="@string/overview_carbs_label"
android:textColor="@color/colorCarbsButton" android:textColor="@color/colorCarbsButton"
android:textSize="10sp" /> android:textSize="10sp"
android:visibility="gone"/>
<info.nightscout.utils.SingleClickButton <info.nightscout.utils.SingleClickButton
android:id="@+id/overview_wizardbutton" android:id="@+id/overview_wizardbutton"
@ -467,7 +470,8 @@
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/overview_cgm" android:text="@string/overview_cgm"
android:textColor="@color/colorCalibrationButton" android:textColor="@color/colorCalibrationButton"
android:textSize="10sp"/> android:textSize="10sp"
android:visibility="gone"/>
<info.nightscout.utils.SingleClickButton <info.nightscout.utils.SingleClickButton
android:id="@+id/overview_quickwizardbutton" android:id="@+id/overview_quickwizardbutton"

View file

@ -34,17 +34,17 @@
<CheckBox <CheckBox
android:id="@+id/newcarbs_activity_tt" android:id="@+id/newcarbs_activity_tt"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="Start activity TT"/> android:text="Start activity TT" />
<CheckBox <CheckBox
android:id="@+id/newcarbs_suspend_loop" android:id="@+id/newcarbs_suspend_loop"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:text="Suspend loop for 30 min"/> android:text="Suspend loop for 30 min" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -122,4 +122,4 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</FrameLayout> </FrameLayout>

View file

@ -34,14 +34,14 @@
<CheckBox <CheckBox
android:id="@+id/newinsulin_start_eating_soon_tt" android:id="@+id/newinsulin_start_eating_soon_tt"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="Start eating soon TT" /> android:text="Start eating soon TT" />
<CheckBox <CheckBox
android:id="@+id/newinsulin_record_only" android:id="@+id/newinsulin_record_only"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="Don't bolus, record only" /> android:text="Don't bolus, record only" />
@ -115,4 +115,4 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</FrameLayout> </FrameLayout>