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

tests added

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-18 16:34:18 +04:00
parent 6ea156457c
commit 12da9d332c
4 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivity.java
View File

@@ -1,5 +1,7 @@
package org.solovyev.android.calculator.wizard;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@@ -20,8 +22,8 @@ import static android.view.View.VISIBLE;
*/
public final class CalculatorWizardActivity extends SherlockFragmentActivity {
private static final String FLOW = "flow";
private static final String STEP = "step";
static final String FLOW = "flow";
static final String STEP = "step";
/*
**********************************************************************
@@ -55,8 +57,8 @@ public final class CalculatorWizardActivity extends SherlockFragmentActivity {
nextButton = findViewById(R.id.wizard_next_button);
finishButton = findViewById(R.id.wizard_finish_button);
String wizardName = null;
WizardStep step = null;
String wizardName = getIntent().getStringExtra(FLOW);
WizardStep step = (WizardStep) getIntent().getSerializableExtra(STEP);
if (savedInstanceState != null) {
wizardName = savedInstanceState.getString(FLOW);
step = (WizardStep) savedInstanceState.getSerializable(STEP);
@@ -71,7 +73,7 @@ public final class CalculatorWizardActivity extends SherlockFragmentActivity {
setStep(step);
}
private void setStep(@Nonnull WizardStep step) {
void setStep(@Nonnull WizardStep step) {
if (this.step == null || !this.step.equals(step)) {
final FragmentManager fm = getSupportFragmentManager();
final FragmentTransaction ft = fm.beginTransaction();
@@ -191,6 +193,7 @@ public final class CalculatorWizardActivity extends SherlockFragmentActivity {
protected void onSaveInstanceState(Bundle out) {
super.onSaveInstanceState(out);
out.putString(FLOW, flow.getName());
out.putSerializable(STEP, step);
}
@@ -201,4 +204,18 @@ public final class CalculatorWizardActivity extends SherlockFragmentActivity {
WizardFlow getFlow() {
return flow;
}
/*
**********************************************************************
*
* STATIC/INNER
*
**********************************************************************
*/
public static void startWizard(@Nonnull String name, @Nonnull Context context) {
final Intent intent = new Intent(context, CalculatorWizardActivity.class);
intent.putExtra(FLOW, name);
context.startActivity(intent);
}
}

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

@@ -22,8 +22,9 @@ final class FirstTimeWizardFlow implements WizardFlow {
FirstTimeWizardFlow() {
final List<WizardStep> wizardSteps = new ArrayList<WizardStep>();
wizardSteps.add(welcome);
wizardSteps.add(choose_mode);
for (WizardStep wizardStep : WizardStep.values()) {
wizardSteps.add(wizardStep);
}
this.listWizardFlow = new ListWizardFlow(NAME, wizardSteps);
}

2
android-app/src/main/java/org/solovyev/android/calculator/wizard/Wizard.java
View File

@@ -17,6 +17,8 @@ public final class Wizard {
public static WizardFlow getWizardFlow(@Nonnull String name) {
if(FirstTimeWizardFlow.NAME.equals(name)) {
return new FirstTimeWizardFlow();
} else if(AppWizardFlow.NAME.equals(name)) {
return new AppWizardFlow();
} else {
throw new IllegalArgumentException("Wizard flow " + name + " is not supported");
}