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

wizard

Browse Source
This commit is contained in:
Sergey Solovyev 2013-06-17 18:35:54 +04:00
parent 7e945fb487
commit 6ef4354f2c
6 changed files with 105 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
android-app-core/res/values/text_wizard.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<resources>
<string name="cpp_wizard_mode_simple">Simple</string>
<string name="cpp_wizard_mode_simple_description">In simple mode only basic functionality will be available from the main screen.
Result is rounded up to 5 digits.</string>
<string name="cpp_wizard_mode_engineer">Engineer</string>
<string name="cpp_wizard_mode_engineer_description">In engineer mode special functions will be used on the main screen.
Result is is not rounded and is presented in engineer notation.</string>
</resources>

4
android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -133,10 +133,6 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
if (Objects.areEqual(savedVersion, CalculatorPreferences.appVersion.getDefaultValue())) { if (Objects.areEqual(savedVersion, CalculatorPreferences.appVersion.getDefaultValue())) {
// new start // new start
context.startActivity(new Intent(context, CalculatorWizardActivity.class)); context.startActivity(new Intent(context, CalculatorWizardActivity.class));
final AlertDialog.Builder builder = new AlertDialog.Builder(context).setMessage(R.string.c_first_start_text);
builder.setPositiveButton(android.R.string.ok, null);
builder.setTitle(R.string.c_first_start_text_title);
builder.create().show();
dialogShown = true; dialogShown = true;
} else { } else {
if (savedVersion < appVersion) { if (savedVersion < appVersion) {

106
android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseModeWizardStep.java
View File

@ -7,22 +7,25 @@ import android.preference.PreferenceManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import com.actionbarsherlock.app.SherlockFragment; import jscl.AngleUnit;
import org.solovyev.android.calculator.CalculatorPreferences;
import org.solovyev.android.calculator.R;
import org.solovyev.android.list.ListItem;
import org.solovyev.android.list.ListItemAdapter;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.solovyev.android.calculator.CalculatorPreferences;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.list.ListItem;
import org.solovyev.android.list.ListItemAdapter;
import com.actionbarsherlock.app.SherlockFragment;
import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.main_calculator; import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.main_calculator;
import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.main_calculator_mobile;
import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.simple; import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.simple;
/** /**
@ -30,7 +33,10 @@ import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.s
* Date: 6/16/13 * Date: 6/16/13
* Time: 9:59 PM * Time: 9:59 PM
*/ */
public final class ChooseModeWizardStep extends SherlockFragment { public final class ChooseModeWizardStep extends SherlockFragment implements WizardStepFragment {
@Nullable
private Spinner layoutSpinner;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -41,27 +47,35 @@ public final class ChooseModeWizardStep extends SherlockFragment {
public void onViewCreated(View root, Bundle savedInstanceState) { public void onViewCreated(View root, Bundle savedInstanceState) {
super.onViewCreated(root, savedInstanceState); super.onViewCreated(root, savedInstanceState);
final Spinner layoutSpinner = (Spinner) root.findViewById(R.id.wizard_mode_spinner); layoutSpinner = (Spinner) root.findViewById(R.id.wizard_mode_spinner);
final List<ModeListItem> listItems = new ArrayList<ModeListItem>(); final List<ModeListItem> listItems = new ArrayList<ModeListItem>();
listItems.add(new ModeListItem(main_calculator)); for (Mode mode : Mode.values()) {
listItems.add(new ModeListItem(main_calculator_mobile)); listItems.add(new ModeListItem(mode));
listItems.add(new ModeListItem(simple)); }
final ListItemAdapter<ModeListItem> adapter = ListItemAdapter.newInstance(getActivity(), listItems); layoutSpinner.setAdapter(ListItemAdapter.newInstance(getActivity(), listItems));
layoutSpinner.setAdapter(adapter);
layoutSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long l) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
final ModeListItem item = adapter.getItem(position);
CalculatorPreferences.Gui.layout.putPreference(preferences, item.layout);
} }
@Override @Override
public void onNothingSelected(AdapterView<?> parent) { public boolean onNext() {
if (layoutSpinner != null) {
final int position = layoutSpinner.getSelectedItemPosition();
final Mode mode;
if (position >= 0 && position < Mode.values().length) {
mode = Mode.values()[position];
} else {
mode = Mode.Simple;
} }
});
mode.apply(PreferenceManager.getDefaultSharedPreferences(getActivity()));
}
return true;
}
@Override
public boolean onPrev() {
return true;
} }
/* /*
@ -75,10 +89,10 @@ public final class ChooseModeWizardStep extends SherlockFragment {
private static final class ModeListItem implements ListItem { private static final class ModeListItem implements ListItem {
@Nonnull @Nonnull
private final CalculatorPreferences.Gui.Layout layout; private final Mode mode;
private ModeListItem(@Nonnull CalculatorPreferences.Gui.Layout layout) { private ModeListItem(@Nonnull Mode mode) {
this.layout = layout; this.mode = mode;
} }
@Nullable @Nullable
@ -103,8 +117,42 @@ public final class ChooseModeWizardStep extends SherlockFragment {
@Override @Override
public View build(@Nonnull Context context) { public View build(@Nonnull Context context) {
final TextView textView = new TextView(context); final TextView textView = new TextView(context);
textView.setText(layout.getNameResId()); textView.setText(mode.getNameResId());
return textView; return textView;
} }
} }
private static enum Mode {
Simple(R.string.cpp_wizard_mode_simple) {
@Override
protected void apply(@Nonnull SharedPreferences preferences) {
CalculatorPreferences.Gui.layout.putPreference(preferences, simple);
CalculatorPreferences.Calculations.preferredAngleUnits.putPreference(preferences, AngleUnit.deg);
AndroidCalculatorEngine.Preferences.scienceNotation.putPreference(preferences, false);
AndroidCalculatorEngine.Preferences.roundResult.putPreference(preferences, true);
}
},
Engineer(R.string.cpp_wizard_mode_engineer) {
@Override
protected void apply(@Nonnull SharedPreferences preferences) {
CalculatorPreferences.Gui.layout.putPreference(preferences, main_calculator);
CalculatorPreferences.Calculations.preferredAngleUnits.putPreference(preferences, AngleUnit.rad);
AndroidCalculatorEngine.Preferences.scienceNotation.putPreference(preferences, true);
AndroidCalculatorEngine.Preferences.roundResult.putPreference(preferences, false);
}
};
private final int nameResId;
Mode(int nameResId) {
this.nameResId = nameResId;
}
private int getNameResId() {
return nameResId;
}
protected abstract void apply(@Nonnull SharedPreferences preferences);
}
} }

3
android-app/src/main/java/org/solovyev/android/calculator/wizard/FirstTimeWizardFlow.java
View File

@ -5,6 +5,7 @@ import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.solovyev.android.calculator.wizard.WizardStep.choose_mode;
import static org.solovyev.android.calculator.wizard.WizardStep.welcome; import static org.solovyev.android.calculator.wizard.WizardStep.welcome;
/** /**
@ -22,7 +23,7 @@ final class FirstTimeWizardFlow implements WizardFlow {
FirstTimeWizardFlow() { FirstTimeWizardFlow() {
final List<WizardStep> wizardSteps = new ArrayList<WizardStep>(); final List<WizardStep> wizardSteps = new ArrayList<WizardStep>();
wizardSteps.add(welcome); wizardSteps.add(welcome);
//wizardSteps.add(choose_mode); wizardSteps.add(choose_mode);
this.listWizardFlow = new ListWizardFlow(NAME, wizardSteps); this.listWizardFlow = new ListWizardFlow(NAME, wizardSteps);
} }

8
android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardStepFragment.java Normal file
View File

@ -0,0 +1,8 @@
package org.solovyev.android.calculator.wizard;
public interface WizardStepFragment {
public boolean onNext();
public boolean onPrev();
}

2
pom.xml
View File

@ -178,7 +178,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.11</version>
</dependency> </dependency>
<dependency> <dependency>