From a9ff72d36f1af0c7a692acbeb1158e97bae74368 Mon Sep 17 00:00:00 2001 From: serso Date: Thu, 29 Jan 2015 21:32:21 +0100 Subject: [PATCH] DragButton wizard fragment --- .../wizard/DragButtonWizardStep.java | 18 +++--- .../drawable-v21/metro_material_button.xml | 28 ++++++++++ .../res/drawable/metro_material_button.xml | 28 ++++++++++ .../drawable/metro_material_button_shape.xml | 26 +++++++++ .../layout/cpp_wizard_step_drag_button.xml | 55 ++++++++++--------- 5 files changed, 121 insertions(+), 34 deletions(-) create mode 100644 android-app/src/main/res/drawable-v21/metro_material_button.xml create mode 100644 android-app/src/main/res/drawable/metro_material_button.xml create mode 100644 android-app/src/main/res/drawable/metro_material_button_shape.xml diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java index 7098e444..4cac0135 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java @@ -23,7 +23,6 @@ package org.solovyev.android.calculator.wizard; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -40,9 +39,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Arrays; -import static android.view.View.GONE; - -public class DragButtonWizardStep extends Fragment { +public class DragButtonWizardStep extends WizardFragment { /* ********************************************************************** @@ -80,7 +77,15 @@ public class DragButtonWizardStep extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.cpp_wizard_step_drag_button, null); + final View view = super.onCreateView(inflater, container, savedInstanceState); + setupNextButton(R.string.acl_wizard_next); + setupPrevButton(R.string.acl_wizard_back); + return view; + } + + @Override + protected int getViewResId() { + return R.layout.cpp_wizard_step_drag_button; } @Override @@ -116,7 +121,6 @@ public class DragButtonWizardStep extends Fragment { private static enum DragButtonAction { center(R.string.cpp_wizard_dragbutton_action_center, null), up(R.string.cpp_wizard_dragbutton_action_up, DragDirection.up), - left(R.string.cpp_wizard_dragbutton_action_left, DragDirection.left), down(R.string.cpp_wizard_dragbutton_action_down, DragDirection.down), end(R.string.cpp_wizard_dragbutton_action_end, null); @@ -181,7 +185,7 @@ public class DragButtonWizardStep extends Fragment { firstChange = true; } if (firstChange) { - descriptionTextView.setVisibility(GONE); + //descriptionTextView.setVisibility(GONE); } } } diff --git a/android-app/src/main/res/drawable-v21/metro_material_button.xml b/android-app/src/main/res/drawable-v21/metro_material_button.xml new file mode 100644 index 00000000..326446fa --- /dev/null +++ b/android-app/src/main/res/drawable-v21/metro_material_button.xml @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/android-app/src/main/res/drawable/metro_material_button.xml b/android-app/src/main/res/drawable/metro_material_button.xml new file mode 100644 index 00000000..bdec8b27 --- /dev/null +++ b/android-app/src/main/res/drawable/metro_material_button.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/android-app/src/main/res/drawable/metro_material_button_shape.xml b/android-app/src/main/res/drawable/metro_material_button_shape.xml new file mode 100644 index 00000000..0c5f3d2e --- /dev/null +++ b/android-app/src/main/res/drawable/metro_material_button_shape.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml index cadb6865..40648df8 100644 --- a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml +++ b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml @@ -23,38 +23,39 @@ --> + xmlns:c="http://schemas.android.com/apk/res-auto" + a:layout_width="match_parent" + a:layout_height="match_parent" + a:gravity="center" + a:orientation="vertical"> + a:id="@+id/wizard_dragbutton_description_textview" + a:text="@string/cpp_wizard_dragbutton_description" + style="@style/WizardLabel" /> + a:id="@+id/wizard_dragbutton_action_textview" + a:textStyle="bold" + a:text="@string/cpp_wizard_dragbutton_action_center" + style="@style/WizardLabel" + a:minLines="2" + a:maxLines="2"/> + a:layout_margin="0dp" + a:layout_height="wrap_content" + a:layout_width="wrap_content" + a:minWidth="100dp" + a:minHeight="100dp" + a:layout_weight="0" + a:layout_gravity="center" + a:id="@+id/wizard_dragbutton" + a:background="@drawable/metro_material_button" + a:text="9" + c:textDown="^2" + c:textUp="%" + c:directionTextScale="0.5;0.5;0.5;0.33" + style="?cpp_control_button_style" />