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

Provide default parameter names

Browse Source
This commit is contained in:
serso
2016-02-26 15:07:49 +01:00
parent c437c2d0c9
commit b03a0df74e
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java
View File

@@ -48,6 +48,7 @@ import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Nonnull;
@@ -60,6 +61,7 @@ public class FunctionParamsView extends LinearLayout {
@Nonnull
public static final String PARAM_VIEW_TAG = "param-view";
private static final List<String> PARAM_NAMES = Arrays.asList("x", "y", "z", "t", "a", "b", "c");
private static final int FOOTERS = 1;
private static final int PARAM_VIEW_INDEX = 3;
private static final int START_ROW_ID = App.generateViewId();
@@ -106,7 +108,7 @@ public class FunctionParamsView extends LinearLayout {
addButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final LinearLayout rowView = addParam(null);
final LinearLayout rowView = addParam(generateParamName());
final EditText paramView = getParamView(rowView);
paramView.requestFocus();
}
@@ -116,6 +118,13 @@ public class FunctionParamsView extends LinearLayout {
addView(headerView, new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
}
@Nullable
private String generateParamName() {
final List<String> available = new ArrayList<>(PARAM_NAMES);
available.removeAll(getParams());
return available.size() > 0 ? available.get(0) : null;
}
@NonNull
private ImageButton makeButton(int icon) {
final ImageButton addButton = new ImageButton(getContext());
@@ -187,6 +196,7 @@ public class FunctionParamsView extends LinearLayout {
paramView.setText(param);
}
paramView.setOnFocusChangeListener(getOnFocusChangeListener());
paramView.setSelectAllOnFocus(true);
paramView.setInputType(EditorInfo.TYPE_CLASS_TEXT);
paramView.setId(id);
paramView.setTag(PARAM_VIEW_TAG);