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

Fragment moved and renamed

Browse Source
This commit is contained in:
serso 2016-01-30 11:24:38 +01:00
parent b15856e08f
commit bb6ac5f144
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java → app/src/main/java/org/solovyev/android/calculator/variables/EditVariableFragment.java
View File

@ -20,7 +20,7 @@
* Site: http://se.solovyev.org * Site: http://se.solovyev.org
*/ */
package org.solovyev.android.calculator.math.edit; package org.solovyev.android.calculator.variables;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.os.Build; import android.os.Build;
@ -32,30 +32,19 @@ import android.text.TextWatcher;
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.Button; import android.widget.*;
import android.widget.EditText; import jscl.math.function.IConstant;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import org.solovyev.android.Views; import org.solovyev.android.Views;
import org.solovyev.android.calculator.App; import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.CalculatorEventData; import org.solovyev.android.calculator.math.edit.MathEntityRemover;
import org.solovyev.android.calculator.CalculatorEventListener; import org.solovyev.android.calculator.math.edit.VarEditorSaver;
import org.solovyev.android.calculator.CalculatorEventType;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.variables.OldVar;
import org.solovyev.common.text.Strings; import org.solovyev.common.text.Strings;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Arrays;
import jscl.math.function.IConstant; import java.util.List;
import java.util.Locale;
import static android.graphics.Paint.UNDERLINE_TEXT_FLAG; import static android.graphics.Paint.UNDERLINE_TEXT_FLAG;
import static android.view.View.GONE; import static android.view.View.GONE;
@ -65,20 +54,20 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE;
import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.HORIZONTAL;
public class VarEditDialogFragment extends DialogFragment implements CalculatorEventListener { public class EditVariableFragment extends DialogFragment implements CalculatorEventListener {
private final static String greekAlphabet = "αβγδεζηθικλμνξοπρστυφχψω"; private final static String greekAlphabet = "αβγδεζηθικλμνξοπρστυφχψω";
private final static List<Character> acceptableChars = Arrays.asList(Strings.toObjects(("1234567890abcdefghijklmnopqrstuvwxyzйцукенгшщзхъфывапролджэячсмитьбюё_" + greekAlphabet).toCharArray())); private final static List<Character> acceptableChars = Arrays.asList(Strings.toObjects(("1234567890abcdefghijklmnopqrstuvwxyzйцукенгшщзхъфывапролджэячсмитьбюё_" + greekAlphabet).toCharArray()));
private Input input; private Input input;
public VarEditDialogFragment() { public EditVariableFragment() {
input = Input.newInstance(); input = Input.newInstance();
} }
@Nonnull @Nonnull
public static VarEditDialogFragment create(@Nonnull Input input) { public static EditVariableFragment create(@Nonnull Input input) {
final VarEditDialogFragment fragment = new VarEditDialogFragment(); final EditVariableFragment fragment = new EditVariableFragment();
fragment.input = input; fragment.input = input;
return fragment; return fragment;
} }
@ -174,7 +163,7 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
// EDIT MODE // EDIT MODE
getDialog().setTitle(R.string.c_var_edit_var); getDialog().setTitle(R.string.c_var_edit_var);
root.findViewById(R.id.remove_button).setOnClickListener(MathEntityRemover.newConstantRemover(constant, null, getActivity(), VarEditDialogFragment.this)); root.findViewById(R.id.remove_button).setOnClickListener(MathEntityRemover.newConstantRemover(constant, null, getActivity(), EditVariableFragment.this));
} }
} }