Material Design and Buttons
This commit is contained in:
parent
7d29c3a433
commit
4eaa2c6f1d
11 changed files with 21 additions and 6 deletions
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/loop_run"
|
android:id="@+id/loop_run"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/openapsma_run" />
|
android:text="@string/openapsma_run" />
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/lowsuspend_run"
|
android:id="@+id/lowsuspend_run"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/openapsma_run" />
|
android:text="@string/openapsma_run" />
|
||||||
|
|
|
@ -99,6 +99,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/objectives_start"
|
android:id="@+id/objectives_start"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/objectives_button_start" />
|
android:text="@string/objectives_button_start" />
|
||||||
|
@ -131,6 +132,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/objectives_verify"
|
android:id="@+id/objectives_verify"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/objectives_button_verify" />
|
android:text="@string/objectives_button_verify" />
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/openapsma_run"
|
android:id="@+id/openapsma_run"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/openapsma_run" />
|
android:text="@string/openapsma_run" />
|
||||||
|
|
|
@ -60,11 +60,12 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_canceltemp"
|
android:id="@+id/overview_canceltemp"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:background="@color/colorCancelTempButton"
|
android:textColor="@color/colorCancelTempButton"
|
||||||
android:text="Cancel temp basal" />
|
android:text="Cancel temp basal" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -77,20 +78,22 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_settempbasal"
|
android:id="@+id/overview_settempbasal"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:background="@color/colorSetTempButton"
|
android:textColor="@color/colorSetTempButton"
|
||||||
android:text="TempBasal" />
|
android:text="TempBasal" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_extendedbolus"
|
android:id="@+id/overview_extendedbolus"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:background="@color/colorSetExtendedButton"
|
android:textColor="@color/colorSetExtendedButton"
|
||||||
android:text="Extended Bolus" />
|
android:text="Extended Bolus" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -101,20 +104,22 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_treatment"
|
android:id="@+id/overview_treatment"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:background="@color/colorTreatmentButton"
|
android:textColor="@color/colorTreatmentButton"
|
||||||
android:text="@string/overview_treatment_label" />
|
android:text="@string/overview_treatment_label" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_wizard"
|
android:id="@+id/overview_wizard"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="10dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:background="@color/colorWizardButton"
|
android:textColor="@color/colorWizardButton"
|
||||||
android:text="@string/overview_calculator_label" />
|
android:text="@string/overview_calculator_label" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_newextendedbolus_okbutton"
|
android:id="@+id/overview_newextendedbolus_okbutton"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="10dp"
|
android:padding="10dp"
|
||||||
|
|
|
@ -98,6 +98,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/overview_newtempbasal_okbutton"
|
android:id="@+id/overview_newtempbasal_okbutton"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="10dp"
|
android:padding="10dp"
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/treatments_newtreatment_deliverbutton"
|
android:id="@+id/treatments_newtreatment_deliverbutton"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="OK"
|
android:text="OK"
|
||||||
|
|
|
@ -317,6 +317,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/treatments_wizard_deliverButton"
|
android:id="@+id/treatments_wizard_deliverButton"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="SEND TO PUMP"
|
android:text="SEND TO PUMP"
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Refresh treatments from Nightscout"
|
android:text="Refresh treatments from Nightscout"
|
||||||
android:id="@+id/treatments_reshreshfromnightscout"
|
android:id="@+id/treatments_reshreshfromnightscout"
|
||||||
|
style="?android:attr/borderlessButtonStyle"
|
||||||
android:layout_gravity="center_horizontal" />
|
android:layout_gravity="center_horizontal" />
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<android.support.v7.widget.RecyclerView
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<!-- Base application theme. -->
|
<!-- Base application theme. -->
|
||||||
<style name="AppTheme" parent="AppTheme.base">
|
<style name="AppTheme" parent="android:Theme.Material">
|
||||||
<!-- Customize your theme here. -->
|
<!-- Customize your theme here. -->
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
|
Loading…
Reference in a new issue