From 3d358b60bf8eec9acef95123663180a764dc2bd3 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Thu, 29 Jan 2015 20:31:28 +0100
Subject: [PATCH] Calculator-in-a-window wizard step

---
 .../wizard/OnScreenCalculatorWizardStep.java  |  14 +++++++---
 .../drawable-xxhdpi/logo_wizard_window.png    | Bin 0 -> 13052 bytes
 .../layout/cpp_wizard_step_choose_mode.xml    |   9 +++----
 .../res/layout/cpp_wizard_step_onscreen.xml   |  24 ++++++++++--------
 .../src/main/res/values-ru/text_wizard.xml    |   2 +-
 android-app/src/main/res/values/styles.xml    |   1 +
 .../src/main/res/values/text_wizard.xml       |   4 +--
 7 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 android-app/src/main/res/drawable-xxhdpi/logo_wizard_window.png

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 456b0102..0f7aceac 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
@@ -23,18 +23,16 @@
 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 org.solovyev.android.calculator.Preferences;
 import org.solovyev.android.calculator.R;
 
 import javax.annotation.Nullable;
 
-public class OnScreenCalculatorWizardStep extends Fragment {
+public class OnScreenCalculatorWizardStep extends WizardFragment {
 
 	/*
 	**********************************************************************
@@ -74,7 +72,15 @@ public class OnScreenCalculatorWizardStep extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		return inflater.inflate(R.layout.cpp_wizard_step_onscreen, 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_onscreen;
 	}
 
 	@Override
diff --git a/android-app/src/main/res/drawable-xxhdpi/logo_wizard_window.png b/android-app/src/main/res/drawable-xxhdpi/logo_wizard_window.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8029065c953be5e770f8055a535623f3b8ec198
GIT binary patch
literal 13052
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

literal 0
HcmV?d00001

diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
index e0300a4c..bea3c9ef 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
@@ -33,21 +33,18 @@
 		a:layout_height="wrap_content"
 		a:textAppearance="@android:style/TextAppearance.Large"
 		style="@style/WizardLabel"
-		a:text="Choose mode"
-		a:layout_marginBottom="40dp" />
+		a:text="Choose mode"/>
 
 	<Spinner
 		a:id="@+id/wizard_mode_spinner"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		style="@style/WizardLabel"
-		a:layout_marginBottom="40dp" />
+		style="@style/WizardLabel"/>
 
 	<TextView
 		a:id="@+id/wizard_mode_description"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		style="@style/WizardLabel"
-		a:text="Choose mode" />
+		style="@style/WizardLabel"/>
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml b/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
index a1a7f108..a05daeb7 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
@@ -23,19 +23,23 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:gravity="center"
+	a:orientation="vertical">
 
 	<TextView
-			a:text="@string/cpp_wizard_onscreen_description"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"/>
+		a:drawableTop="@drawable/logo_wizard_window"
+		a:text="@string/cpp_wizard_onscreen_description"
+		a:layout_height="wrap_content"
+		a:layout_width="wrap_content"
+		style="@style/WizardLabel" />
 
 	<CheckBox
-			a:id="@+id/wizard_onscreen_app_enabled_checkbox"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:text="@string/cpp_wizard_onscreen_checkbox"/>
+		a:id="@+id/wizard_onscreen_app_enabled_checkbox"
+		a:layout_height="wrap_content"
+		a:layout_width="wrap_content"
+		a:text="@string/cpp_wizard_onscreen_checkbox"
+		style="@style/WizardLabel" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/values-ru/text_wizard.xml b/android-app/src/main/res/values-ru/text_wizard.xml
index e2a1c51f..c44f2fbb 100644
--- a/android-app/src/main/res/values-ru/text_wizard.xml
+++ b/android-app/src/main/res/values-ru/text_wizard.xml
@@ -30,7 +30,7 @@
   <string name="cpp_wizard_final_translate">Перевести язык</string>
   <string name="cpp_wizard_final_contribute">Поучавствовать в разработке</string>
   <string name="cpp_wizard_onscreen_description">Калькулятор в отдельном окне позволяет вам произодить вычисления не закрывая при этом другие приложения</string>
-  <string name="cpp_wizard_onscreen_checkbox">Включить калькулятор в отдельном окне (вторая иконка появится в списке приложений)</string>
+  <string name="cpp_wizard_onscreen_checkbox">Включить</string>
   <string name="cpp_wizard_dragbutton_description">Специально разработанные кнопки позволяют быстро и просто использовать дополнительные возможности калькулятора
 	</string>
   <string name="cpp_wizard_finish_confirmation">Вы действительно хотите завершить визард?</string>
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index f34b171c..732a5360 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -150,6 +150,7 @@
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_gravity">center</item>
 		<item name="android:drawablePadding">40dp</item>
+		<item name="android:layout_marginBottom">40dp</item>
 		<item name="android:gravity">center</item>
 		<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
 	</style>
diff --git a/android-app/src/main/res/values/text_wizard.xml b/android-app/src/main/res/values/text_wizard.xml
index f0f63cb5..4b895384 100644
--- a/android-app/src/main/res/values/text_wizard.xml
+++ b/android-app/src/main/res/values/text_wizard.xml
@@ -41,9 +41,7 @@
   <string name="cpp_wizard_onscreen_description">Calculator in separate window allows you to do calculations while
 		using other apps on your device
 	</string>
-  <string name="cpp_wizard_onscreen_checkbox">Enable calculator in separate window (second icon will appear in the
-		apps list)
-	</string>
+  <string name="cpp_wizard_onscreen_checkbox">Enable</string>
   <string name="cpp_wizard_dragbutton_description">Drag button is an exclusive feature of Calculator++ which provides
 		fast access to the secondary functions
 	</string>