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

Focus on new parameter

Browse Source
This commit is contained in:
serso 2016-01-23 14:20:22 +01:00
parent 2e19256941
commit 18b7ac83c1
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
View File

@ -96,7 +96,9 @@ public class FunctionParamsView extends LinearLayout {
addButton.setOnClickListener(new View.OnClickListener() { addButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
addParam(null); final LinearLayout rowView = addParam(null);
final EditText paramView = getParamView(rowView);
paramView.requestFocus();
} }
}); });
headerView.addView(addButton, makeButtonParams()); headerView.addView(addButton, makeButtonParams());
@ -132,11 +134,13 @@ public class FunctionParamsView extends LinearLayout {
} }
} }
public void addParam(@Nullable String param) { @NonNull
addParam(param, maxRowId++); public LinearLayout addParam(@Nullable String param) {
return addParam(param, maxRowId++);
} }
private void addParam(@Nullable String param, final int id) { @NonNull
private LinearLayout addParam(@Nullable String param, final int id) {
final Context context = getContext(); final Context context = getContext();
final LinearLayout rowView = makeRowView(context); final LinearLayout rowView = makeRowView(context);
@ -183,6 +187,7 @@ public class FunctionParamsView extends LinearLayout {
// for row is added at 0 position, the consequent rows // for row is added at 0 position, the consequent rows
addView(rowView, Math.max(0, getChildCount() - 1), new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); addView(rowView, Math.max(0, getChildCount() - 1), new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
return rowView;
} }
@NonNull @NonNull
@ -243,7 +248,14 @@ public class FunctionParamsView extends LinearLayout {
@Nonnull @Nonnull
private EditText getParamView(@Nonnull ViewGroup row) { private EditText getParamView(@Nonnull ViewGroup row) {
final TextInputLayout paramLabel = getParamLabel(row); final TextInputLayout paramLabel = getParamLabel(row);
return (EditText) paramLabel.getChildAt(0); for (int i = 0; i < paramLabel.getChildCount(); i++) {
final View child = paramLabel.getChildAt(i);
if (child instanceof EditText) {
return (EditText) child;
}
}
Check.shouldNotHappen();
return null;
} }
@Nonnull @Nonnull