changes

calculatorpp/src/main/java/org/solovyev/android/AndroidUtils2.java

@@ -0,0 +1,35 @@
+package org.solovyev.android;
+
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * User: Solovyev_S
+ * Date: 03.10.12
+ * Time: 10:48
+ */
+public final class AndroidUtils2 {
+
+    private AndroidUtils2() {
+        throw new AssertionError();
+    }
+
+    public static void showDialog(@NotNull DialogFragment dialogFragment,
+                                  @NotNull String fragmentTag,
+                                  @NotNull FragmentManager fm) {
+        final FragmentTransaction ft = fm.beginTransaction();
+
+        Fragment prev = fm.findFragmentByTag(fragmentTag);
+        if (prev != null) {
+            ft.remove(prev);
+        }
+        ft.addToBackStack(null);
+
+        // Create and show the dialog.
+        dialogFragment.show(ft, fragmentTag);
+
+    }
+}

calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java

@@ -7,6 +7,7 @@ import jscl.math.Generic;
 import jscl.math.function.Constant;
 import org.achartengine.ChartFactory;
 import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.AndroidUtils2;
 import org.solovyev.android.calculator.about.CalculatorAboutTabActivity;
 import org.solovyev.android.calculator.help.CalculatorHelpTabActivity;
 import org.solovyev.android.calculator.history.CalculatorHistoryFragmentActivity;
@@ -66,7 +67,7 @@ public class CalculatorActivityLauncher {
 			if (!StringUtils.isEmpty(varValue)) {
 				if (CalculatorVarsFragment.isValidValue(varValue)) {
                     if (context instanceof SherlockFragmentActivity) {
-                        VarEditDialogFragment.createEditVariableDialog(VarEditDialogFragment.Input.newFromValue(varValue), ((SherlockFragmentActivity) context).getSupportFragmentManager());
+                        VarEditDialogFragment.showDialog(VarEditDialogFragment.Input.newFromValue(varValue), ((SherlockFragmentActivity) context).getSupportFragmentManager());
                     } else {
                         final Intent intent = new Intent(context, CalculatorVarsFragmentActivity.class);
                         intent.putExtra(CalculatorVarsFragment.CREATE_VAR_EXTRA_STRING, varValue);

calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java

@@ -16,6 +16,7 @@ import com.actionbarsherlock.view.MenuItem;
 import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.AndroidUtils2;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.menu.AMenuItem;
@@ -50,7 +51,7 @@ public class CalculatorVarsFragment extends AbstractMathEntityListFragment<ICons
         if (bundle != null) {
             final String varValue = bundle.getString(CREATE_VAR_EXTRA_STRING);
             if (!StringUtils.isEmpty(varValue)) {
-                VarEditDialogFragment.createEditVariableDialog(VarEditDialogFragment.Input.newFromValue(varValue), this.getActivity().getSupportFragmentManager());
+                VarEditDialogFragment.showDialog(VarEditDialogFragment.Input.newFromValue(varValue), this.getActivity().getSupportFragmentManager());
 
                 // in order to stop intent for other tabs
                 bundle.remove(CREATE_VAR_EXTRA_STRING);
@@ -99,7 +100,7 @@ public class CalculatorVarsFragment extends AbstractMathEntityListFragment<ICons
 
     @SuppressWarnings({"UnusedDeclaration"})
     public void addVarButtonClickHandler(@NotNull View v) {
-        VarEditDialogFragment.createEditVariableDialog(VarEditDialogFragment.Input.newInstance(), this.getActivity().getSupportFragmentManager());
+        VarEditDialogFragment.showDialog(VarEditDialogFragment.Input.newInstance(), this.getActivity().getSupportFragmentManager());
     }
 
     @NotNull
@@ -146,7 +147,7 @@ public class CalculatorVarsFragment extends AbstractMathEntityListFragment<ICons
 
         switch (item.getItemId()) {
             case R.id.var_menu_add_var:
-                VarEditDialogFragment.createEditVariableDialog(VarEditDialogFragment.Input.newInstance(), this.getActivity().getSupportFragmentManager());
+                VarEditDialogFragment.showDialog(VarEditDialogFragment.Input.newInstance(), this.getActivity().getSupportFragmentManager());
                 result = true;
                 break;
             default:
@@ -232,7 +233,7 @@ public class CalculatorVarsFragment extends AbstractMathEntityListFragment<ICons
         edit(R.string.c_edit) {
             @Override
             public void onClick(@NotNull IConstant constant, @NotNull Context context) {
-                VarEditDialogFragment.createEditVariableDialog(VarEditDialogFragment.Input.newFromConstant(constant), ((SherlockFragmentActivity) context).getSupportFragmentManager());
+                VarEditDialogFragment.showDialog(VarEditDialogFragment.Input.newFromConstant(constant), ((SherlockFragmentActivity) context).getSupportFragmentManager());
             }
         },
 

calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java

@@ -16,6 +16,7 @@ import android.widget.Toast;
 import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.AndroidUtils2;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.model.Var;
 
@@ -37,21 +38,6 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
         this.input = input;
     }
 
-    public static void createEditVariableDialog(@NotNull Input input, @NotNull FragmentManager fm) {
-        final FragmentTransaction ft = fm.beginTransaction();
-
-        Fragment prev = fm.findFragmentByTag("constant-editor");
-        if (prev != null) {
-            ft.remove(prev);
-        }
-        ft.addToBackStack(null);
-
-        // Create and show the dialog.
-        final DialogFragment newFragment = new VarEditDialogFragment(input);
-        newFragment.show(ft, "constant-editor");
-
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(R.layout.var_edit, container, false);
@@ -155,6 +141,18 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
         }
     }
 
+    /*
+    **********************************************************************
+    *
+    *                           STATIC
+    *
+    **********************************************************************
+    */
+
+    public static void showDialog(@NotNull Input input, @NotNull FragmentManager fm) {
+        AndroidUtils2.showDialog(new VarEditDialogFragment(input), "constant-editor", fm);
+    }
+
     public static class Input {
 
         @Nullable