From d6b4863fa2b7421e6ee297e2bd45d74718801b95 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Wed, 26 Jun 2013 00:07:15 +0400
Subject: [PATCH] sherlock removed from wizard

---
 android-app/res/layout/cpp_wizard.xml                |  1 +
 .../calculator/wizard/CalculatorWizardActivity.java  |  4 ++--
 .../calculator/wizard/ChooseLayoutWizardStep.java    | 12 ++++--------
 .../calculator/wizard/ChooseModeWizardStep.java      |  4 ++--
 .../calculator/wizard/DragButtonWizardStep.java      |  4 ++--
 .../wizard/OnScreenCalculatorWizardStep.java         |  8 +++-----
 .../android/calculator/wizard/WelcomeWizardStep.java |  4 ++--
 7 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/android-app/res/layout/cpp_wizard.xml b/android-app/res/layout/cpp_wizard.xml
index e2c8aa10..993a5629 100644
--- a/android-app/res/layout/cpp_wizard.xml
+++ b/android-app/res/layout/cpp_wizard.xml
@@ -11,6 +11,7 @@
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
 		a:layout_weight="1"
+		a:padding="6dp"
 		a:gravity="center"/>
 
 	<LinearLayout
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivity.java
index 64a0fd4d..a8d9e9d0 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivity.java
@@ -4,10 +4,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import org.solovyev.android.calculator.R;
 
 import javax.annotation.Nonnull;
@@ -22,7 +22,7 @@ import static org.solovyev.android.calculator.wizard.Wizards.STEP;
  * Date: 6/16/13
  * Time: 9:07 PM
  */
-public final class CalculatorWizardActivity extends SherlockFragmentActivity {
+public final class CalculatorWizardActivity extends FragmentActivity {
 
 	/*
 	**********************************************************************
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseLayoutWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseLayoutWizardStep.java
index cbc9d6e5..0a138f0c 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseLayoutWizardStep.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseLayoutWizardStep.java
@@ -1,28 +1,24 @@
 package org.solovyev.android.calculator.wizard;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RadioButton;
+import org.solovyev.android.calculator.R;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.solovyev.android.calculator.R;
-
-import com.actionbarsherlock.app.SherlockFragment;
-
-import static org.solovyev.android.calculator.wizard.CalculatorLayout.big_buttons;
-import static org.solovyev.android.calculator.wizard.CalculatorLayout.getDefaultLayout;
-import static org.solovyev.android.calculator.wizard.CalculatorLayout.optimized;
+import static org.solovyev.android.calculator.wizard.CalculatorLayout.*;
 
 /**
  * User: serso
  * Date: 6/19/13
  * Time: 12:33 AM
  */
-public class ChooseLayoutWizardStep extends SherlockFragment {
+public class ChooseLayoutWizardStep extends Fragment {
 
 	/*
 	**********************************************************************
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseModeWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseModeWizardStep.java
index b28d883d..13b6df81 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseModeWizardStep.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseModeWizardStep.java
@@ -1,11 +1,11 @@
 package org.solovyev.android.calculator.wizard;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RadioButton;
-import com.actionbarsherlock.app.SherlockFragment;
 import org.solovyev.android.calculator.R;
 
 import javax.annotation.Nonnull;
@@ -18,7 +18,7 @@ import static org.solovyev.android.calculator.wizard.CalculatorMode.*;
  * Date: 6/16/13
  * Time: 9:59 PM
  */
-public class ChooseModeWizardStep extends SherlockFragment {
+public class ChooseModeWizardStep extends Fragment {
 
 	/*
 	**********************************************************************
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 a1a4045d..42a9143a 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
@@ -1,12 +1,12 @@
 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;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockFragment;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragButton;
@@ -18,7 +18,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Arrays;
 
-public class DragButtonWizardStep extends SherlockFragment {
+public class DragButtonWizardStep extends Fragment {
 
 	/*
 	**********************************************************************
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
index b7a6e3b1..cf24d912 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
@@ -1,19 +1,17 @@
 package org.solovyev.android.calculator.wizard;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-
-import javax.annotation.Nullable;
-
 import org.solovyev.android.calculator.CalculatorPreferences;
 import org.solovyev.android.calculator.R;
 
-import com.actionbarsherlock.app.SherlockFragment;
+import javax.annotation.Nullable;
 
-public class OnScreenCalculatorWizardStep extends SherlockFragment {
+public class OnScreenCalculatorWizardStep extends Fragment {
 
 	/*
 	**********************************************************************
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
index 8f48c4cf..05988262 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
@@ -1,10 +1,10 @@
 package org.solovyev.android.calculator.wizard;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import com.actionbarsherlock.app.SherlockFragment;
 import org.solovyev.android.calculator.R;
 
 /**
@@ -12,7 +12,7 @@ import org.solovyev.android.calculator.R;
  * Date: 6/16/13
  * Time: 9:44 PM
  */
-public final class WelcomeWizardStep extends SherlockFragment {
+public final class WelcomeWizardStep extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {