From 525165a0c8047dab750f7886030a0685a832659a Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Thu, 18 Jul 2013 11:38:33 +0400
Subject: [PATCH] wizard fixes

---
 android-app/res/layout/cpp_wizard.xml         | 52 +++++++++++--------
 .../layout/cpp_wizard_step_drag_button.xml    |  3 +-
 android-app/res/xml/preferences.xml           |  4 ++
 android-app/res/xml/preferences_other.xml     |  4 --
 .../CalculatorPreferencesActivity.java        | 14 +++--
 .../wizard/DragButtonWizardStep.java          | 24 ++++++---
 6 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/android-app/res/layout/cpp_wizard.xml b/android-app/res/layout/cpp_wizard.xml
index e03cd5a4..72b3a2ec 100644
--- a/android-app/res/layout/cpp_wizard.xml
+++ b/android-app/res/layout/cpp_wizard.xml
@@ -23,37 +23,43 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/wizard_layout"
-			  style="?cpp_dialog_style"
-			  a:orientation="vertical">
+	a:id="@+id/wizard_layout"
+	style="?cpp_dialog_style"
+	a:orientation="vertical">
 
 	<FrameLayout
-			a:orientation="vertical"
-			a:id="@+id/wizard_content"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"
-			a:layout_weight="1"
-			a:padding="6dp"
-			a:gravity="center"/>
+		a:orientation="vertical"
+		a:id="@+id/wizard_content"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:padding="6dp"
+		a:gravity="center" />
 
 	<LinearLayout
-			a:orientation="horizontal"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content">
+		a:orientation="horizontal"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content">
 
 		<Button
-				a:id="@+id/wizard_prev_button"
-				a:layout_height="wrap_content"
-				a:layout_width="0dp"
-				a:layout_weight="1"
-				a:text="@string/cpp_wizard_back"/>
+			a:id="@+id/wizard_prev_button"
+			a:layout_height="wrap_content"
+			a:layout_width="0dp"
+			a:layout_weight="1"
+			a:singleLine="true"
+			a:lines="1"
+			a:maxLines="1"
+			a:text="@string/cpp_wizard_back" />
 
 		<Button
-				a:id="@+id/wizard_next_button"
-				a:layout_height="wrap_content"
-				a:layout_width="0dp"
-				a:layout_weight="1"
-				a:text="@string/cpp_wizard_next"/>
+			a:id="@+id/wizard_next_button"
+			a:layout_height="wrap_content"
+			a:layout_width="0dp"
+			a:layout_weight="1"
+			a:singleLine="true"
+			a:lines="1"
+			a:maxLines="1"
+			a:text="@string/cpp_wizard_next" />
 
 	</LinearLayout>
 
diff --git a/android-app/res/layout/cpp_wizard_step_drag_button.xml b/android-app/res/layout/cpp_wizard_step_drag_button.xml
index 54daa6db..b049312e 100644
--- a/android-app/res/layout/cpp_wizard_step_drag_button.xml
+++ b/android-app/res/layout/cpp_wizard_step_drag_button.xml
@@ -29,6 +29,7 @@
 			  a:orientation="vertical">
 
 	<TextView
+			a:id="@+id/wizard_dragbutton_description_textview"
 			a:text="@string/cpp_wizard_dragbutton_description"
 			a:layout_height="wrap_content"
 			a:layout_width="match_parent"/>
@@ -42,7 +43,7 @@
 			a:layout_width="match_parent"/>
 
 	<org.solovyev.android.view.drag.DirectionDragButton
-			a:layout_margin="30dp"
+			a:layout_margin="10dp"
 			a:layout_height="100dp"
 			a:layout_width="100dp"
 			a:minWidth="100dp"
diff --git a/android-app/res/xml/preferences.xml b/android-app/res/xml/preferences.xml
index a58ea9c6..e31eef1b 100644
--- a/android-app/res/xml/preferences.xml
+++ b/android-app/res/xml/preferences.xml
@@ -32,4 +32,8 @@
 
 	<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
 
+	<Preference
+		a:key="restart_wizard"
+		a:title="@string/cpp_restart_wizard"/>
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android-app/res/xml/preferences_other.xml b/android-app/res/xml/preferences_other.xml
index 2407d5d8..7495f7f9 100644
--- a/android-app/res/xml/preferences_other.xml
+++ b/android-app/res/xml/preferences_other.xml
@@ -45,10 +45,6 @@
 				a:summary="@string/c_clear_billing_info_summary"
 				a:title="@string/c_clear_billing_info_title"/>
 
-		<Preference
-				a:key="restart_wizard"
-				a:title="@string/cpp_restart_wizard"/>
-
 	</PreferenceScreen>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/preferences/CalculatorPreferencesActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/preferences/CalculatorPreferencesActivity.java
index 64ece97d..45e0205e 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/preferences/CalculatorPreferencesActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/preferences/CalculatorPreferencesActivity.java
@@ -31,29 +31,27 @@ import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
-
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
-
 import net.robotmedia.billing.BillingController;
 import net.robotmedia.billing.IBillingObserver;
 import net.robotmedia.billing.ResponseCode;
 import net.robotmedia.billing.helper.AbstractBillingObserver;
 import net.robotmedia.billing.model.Transaction;
-
-import javax.annotation.Nonnull;
-
 import org.solovyev.android.Activities;
 import org.solovyev.android.App;
 import org.solovyev.android.ads.AdsController;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
-import org.solovyev.android.calculator.wizard.CalculatorWizardActivity;
-import org.solovyev.android.calculator.wizard.Wizards;
 import org.solovyev.android.msg.AndroidMessage;
 import org.solovyev.android.view.VibratorContainer;
 import org.solovyev.common.msg.Message;
 import org.solovyev.common.msg.MessageType;
 
+import javax.annotation.Nonnull;
+
+import static org.solovyev.android.calculator.wizard.CalculatorWizardActivity.startWizard;
+import static org.solovyev.android.calculator.wizard.Wizards.DEFAULT_WIZARD_FLOW;
+
 /**
  * User: serso
  * Date: 7/16/11
@@ -81,7 +79,7 @@ public class CalculatorPreferencesActivity extends SherlockPreferenceActivity im
 		restartWizardPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 			@Override
 			public boolean onPreferenceClick(Preference preference) {
-				CalculatorWizardActivity.startWizard(Wizards.DEFAULT_WIZARD_FLOW, CalculatorPreferencesActivity.this);
+				startWizard(DEFAULT_WIZARD_FLOW, CalculatorPreferencesActivity.this);
 				return true;
 			}
 		});
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 a1810847..7098e444 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
@@ -29,7 +29,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
@@ -39,9 +38,10 @@ import org.solovyev.common.math.Point2d;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.Arrays;
 
+import static android.view.View.GONE;
+
 public class DragButtonWizardStep extends Fragment {
 
 	/*
@@ -68,15 +68,14 @@ public class DragButtonWizardStep extends Fragment {
 	@Nullable
 	private TextView actionTextView;
 
+	@Nonnull
+	private TextView descriptionTextView;
+
 	private DragButtonAction action = DragButtonAction.center;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-
-		if (savedInstanceState != null) {
-			action = (DragButtonAction) savedInstanceState.getSerializable(ACTION);
-		}
 	}
 
 	@Override
@@ -92,8 +91,11 @@ public class DragButtonWizardStep extends Fragment {
 		dragButton.setOnClickListener(new DragButtonOnClickListener());
 		dragButton.setOnDragListener(new SimpleOnDragListener(new DragButtonProcessor(), SimpleOnDragListener.getDefaultPreferences(getActivity())));
 		actionTextView = (TextView) root.findViewById(R.id.wizard_dragbutton_action_textview);
+		descriptionTextView = (TextView) root.findViewById(R.id.wizard_dragbutton_description_textview);
 
-		actionTextView.setText(action.actionTextResId);
+		if (savedInstanceState != null) {
+			setAction((DragButtonAction) savedInstanceState.getSerializable(ACTION));
+		}
 	}
 
 	@Override
@@ -173,6 +175,14 @@ public class DragButtonWizardStep extends Fragment {
 			if (actionTextView != null) {
 				actionTextView.setText(this.action.actionTextResId);
 			}
+
+			boolean firstChange = false;
+			if (action != DragButtonAction.center) {
+				firstChange = true;
+			}
+			if (firstChange) {
+				descriptionTextView.setVisibility(GONE);
+			}
 		}
 	}
 }