TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Material buttons are now used in a wizard

Browse Source
This commit is contained in:
serso
2015-01-30 22:01:52 +01:00
parent 99033ab216
commit 983d6eb2f9
9 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
View File

@@ -39,8 +39,8 @@
a:textStyle="bold"
a:text="@string/cpp_wizard_dragbutton_action_center"
style="@style/WizardLabel"
a:minLines="2"
a:maxLines="2"/>
a:minLines="3"
a:maxLines="3"/>
<org.solovyev.android.view.drag.DirectionDragButton
a:layout_margin="0dp"
@@ -51,7 +51,7 @@
a:layout_weight="0"
a:layout_gravity="center"
a:id="@+id/wizard_dragbutton"
a:background="@drawable/metro_material_button"
a:background="@drawable/cpp_wizard_button_selector"
a:text="9"
c:textDown="^2"
c:textUp="%"

7
android-app/src/main/res/layout/fragment_wizard_buttons.xml
View File

@@ -3,16 +3,19 @@
<LinearLayout
style="@style/WizardButtons"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:my="http://schemas.android.com/apk/res-auto"
a:layout_gravity="center_horizontal|bottom"
a:gravity="center">
<Button
<org.solovyev.android.material.MaterialButton
style="@style/MaterialButton.Wizard"
a:id="@+id/wizard_prev"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />
<Button
<org.solovyev.android.material.MaterialButton
style="@style/MaterialButton.Wizard"
a:id="@+id/wizard_next"
a:layout_width="0dp"
a:layout_height="wrap_content"