这是indexloc提供的服务，不要输入任何密码
Skip to content

Value Array and Indexed result #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2018
Merged

Value Array and Indexed result #212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8d0df9
Added values array and indexs
Epictek Aug 14, 2018
2a129c2
Merge branch 'master' into values
fornwall Aug 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions app/src/main/java/com/termux/api/DialogActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import com.termux.api.util.TermuxApiLogger;
import com.termux.api.util.TermuxApiPermissionActivity;

import java.util.ArrayList;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.List;
Expand Down Expand Up @@ -127,7 +128,20 @@ public void writeJson(JsonWriter out) throws Exception {

out.name("code").value(result.code);
out.name("text").value(result.text);

if(result.index > -1) {
out.name("index").value(result.index);
}
if (result.values.size() > 0) {
out.name("values");
out.beginArray();
for (Value value : result.values) {
out.beginObject();
out.name("index").value(value.index);
out.name("text").value(value.text);
out.endObject();
}
out.endArray();
}
if (!result.error.equals("")) {
out.name("error").value(result.error);
}
Expand Down Expand Up @@ -205,9 +219,16 @@ static class InputResult {
public String text = "";
public String error = "";
public int code = 0;
public static int index = -1;
public List<Value> values = new ArrayList<>();
}


public static class Value {
public int index = -1;
public String text = "";
}

/**
* --------------------------------------
* InputMethod Implementations
Expand Down Expand Up @@ -255,15 +276,21 @@ LinearLayout createWidgetView(AppCompatActivity activity) {
String getResult() {
int checkBoxCount = widgetView.getChildCount();

List<Value> values = new ArrayList<>();
StringBuilder sb = new StringBuilder();
sb.append("[");

for (int j = 0; j < checkBoxCount; ++j) {
CheckBox box = widgetView.findViewById(j);
if (box.isChecked()) {
Value value = new Value();
value.index = j;
value.text = box.getText().toString();
values.add(value);
sb.append(box.getText().toString()).append(", ");
}
}
inputResult.values = values;
// remove trailing comma and add closing bracket
return sb.toString().replaceAll(", $", "") + "]";
}
Expand Down Expand Up @@ -563,6 +590,7 @@ RadioGroup createWidgetView(AppCompatActivity activity) {
String getResult() {
int radioIndex = radioGroup.indexOfChild(widgetView.findViewById(radioGroup.getCheckedRadioButtonId()));
RadioButton radioButton = (RadioButton) radioGroup.getChildAt(radioIndex);
InputResult.index = radioIndex;
return (radioButton != null) ? radioButton.getText().toString() : "";
}
}
Expand Down Expand Up @@ -619,17 +647,19 @@ public void setupDialog(final Dialog dialog, int style) {
NestedScrollView scrollView = new NestedScrollView(getContext());
final String[] values = getInputValues(Objects.requireNonNull(getActivity()).getIntent());

for (final String value : values) {
for (int i = 0; i < values.length; ++i) {
final int j = i;
final TextView textView = new TextView(getContext());
textView.setText(value);
textView.setText(values[j]);
textView.setTextSize(20);
textView.setPadding(56, 56, 56, 56);
textView.setOnClickListener(new View.OnClickListener() {

@Override
public void onClick(View view) {
InputResult result = new InputResult();
result.text = value;
result.text = values[j];
result.index = j;
dialog.dismiss();
resultListener.onResult(result);
}
Expand Down Expand Up @@ -700,6 +730,7 @@ static class SpinnerInputMethod extends InputDialog<Spinner> {

@Override
String getResult() {
InputResult.index = widgetView.getSelectedItemPosition();
return widgetView.getSelectedItem().toString();
}

Expand Down