зеркало из https://github.com/mozilla/gecko-dev.git
Bug 870062 - Provide an async way to use the PromptService. r=blassey
--HG-- rename : mobile/android/base/PromptService.java => mobile/android/base/Prompt.java
This commit is contained in:
Wes Johnston
Родитель
e7d3493647
Коммит
7a92c462bd
|
|
@ -66,7 +66,7 @@ public class ActivityHandlerHelper {
|
|||
return mActivityResultHandlerMap.put(aHandler);
|
||||
}
|
||||
|
||||
private int addIntentActivitiesToList(Context context, Intent intent, ArrayList<PromptService.PromptListItem> items, ArrayList<Intent> aIntents) {
|
||||
private int addIntentActivitiesToList(Context context, Intent intent, ArrayList<Prompt.PromptListItem> items, ArrayList<Intent> aIntents) {
|
||||
PackageManager pm = context.getPackageManager();
|
||||
List<ResolveInfo> lri = pm.queryIntentActivityOptions(GeckoApp.mAppContext.getComponentName(), null, intent, 0);
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ public class ActivityHandlerHelper {
|
|||
ri.activityInfo.applicationInfo.packageName,
|
||||
ri.activityInfo.name));
|
||||
|
||||
PromptService.PromptListItem item = new PromptService.PromptListItem(ri.loadLabel(pm).toString());
|
||||
Prompt.PromptListItem item = new Prompt.PromptListItem(ri.loadLabel(pm).toString());
|
||||
item.icon = ri.loadIcon(pm);
|
||||
items.add(item);
|
||||
aIntents.add(rintent);
|
||||
|
|
@ -89,7 +89,7 @@ public class ActivityHandlerHelper {
|
|||
return lri.size();
|
||||
}
|
||||
|
||||
private int addFilePickingActivities(Context context, ArrayList<PromptService.PromptListItem> aItems, String aType, ArrayList<Intent> aIntents) {
|
||||
private int addFilePickingActivities(Context context, ArrayList<Prompt.PromptListItem> aItems, String aType, ArrayList<Intent> aIntents) {
|
||||
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
|
||||
intent.setType(aType);
|
||||
intent.addCategory(Intent.CATEGORY_OPENABLE);
|
||||
|
|
@ -97,8 +97,8 @@ public class ActivityHandlerHelper {
|
|||
return addIntentActivitiesToList(context, intent, aItems, aIntents);
|
||||
}
|
||||
|
||||
private PromptService.PromptListItem[] getItemsAndIntentsForFilePicker(Context context, String aMimeType, ArrayList<Intent> aIntents) {
|
||||
ArrayList<PromptService.PromptListItem> items = new ArrayList<PromptService.PromptListItem>();
|
||||
private Prompt.PromptListItem[] getItemsAndIntentsForFilePicker(Context context, String aMimeType, ArrayList<Intent> aIntents) {
|
||||
ArrayList<Prompt.PromptListItem> items = new ArrayList<Prompt.PromptListItem>();
|
||||
|
||||
if (aMimeType.equals("audio/*")) {
|
||||
if (addFilePickingActivities(context, items, "audio/*", aIntents) <= 0) {
|
||||
|
|
@ -134,7 +134,7 @@ public class ActivityHandlerHelper {
|
|||
addFilePickingActivities(context, items, "*/*", aIntents);
|
||||
}
|
||||
|
||||
return items.toArray(new PromptService.PromptListItem[] {});
|
||||
return items.toArray(new Prompt.PromptListItem[] {});
|
||||
}
|
||||
|
||||
private String getFilePickerTitle(Context context, String aMimeType) {
|
||||
|
|
@ -151,7 +151,7 @@ public class ActivityHandlerHelper {
|
|||
|
||||
private Intent getFilePickerIntent(Context context, String aMimeType) {
|
||||
ArrayList<Intent> intents = new ArrayList<Intent>();
|
||||
final PromptService.PromptListItem[] items =
|
||||
final Prompt.PromptListItem[] items =
|
||||
getItemsAndIntentsForFilePicker(context, aMimeType, intents);
|
||||
|
||||
if (intents.size() == 0) {
|
||||
|
|
@ -170,11 +170,11 @@ public class ActivityHandlerHelper {
|
|||
// context menu UI using the PromptService.
|
||||
ThreadUtils.postToUiThread(new Runnable() {
|
||||
@Override public void run() {
|
||||
ps.show(title, "", items, false);
|
||||
ps.show(title, "", items, false, null);
|
||||
}
|
||||
});
|
||||
|
||||
String promptServiceResult = ps.getResponse();
|
||||
String promptServiceResult = ps.getResponse(null);
|
||||
int itemId = -1;
|
||||
try {
|
||||
itemId = new JSONObject(promptServiceResult).getInt("button");
|
||||
|
|
|
|||
|
|
@ -807,8 +807,7 @@ abstract public class GeckoApp
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getResponse() {
|
||||
public String getResponse(JSONObject origMessage) {
|
||||
String res = mCurrentResponse;
|
||||
mCurrentResponse = "";
|
||||
return res;
|
||||
|
|
@ -1585,7 +1584,7 @@ abstract public class GeckoApp
|
|||
SmsManager.getInstance().start();
|
||||
}
|
||||
|
||||
mPromptService = new PromptService();
|
||||
mPromptService = new PromptService(this);
|
||||
|
||||
mTextSelection = new TextSelection((TextSelectionHandle) findViewById(R.id.start_handle),
|
||||
(TextSelectionHandle) findViewById(R.id.middle_handle),
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ class JavaAddonManager implements GeckoEventListener {
|
|||
}
|
||||
|
||||
@Override
|
||||
public String getResponse() {
|
||||
public String getResponse(JSONObject origMessage) {
|
||||
String response = mBundle.getString("response");
|
||||
mBundle = null;
|
||||
return response;
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@ FENNEC_JAVA_FILES = \
|
|||
PrivateDataPreference.java \
|
||||
PrivateTab.java \
|
||||
ProfileMigrator.java \
|
||||
Prompt.java \
|
||||
PromptService.java \
|
||||
Restarter.java \
|
||||
SearchEngine.java \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,743 @@
|
|||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import org.mozilla.gecko.util.GeckoEventResponder;
|
||||
import org.mozilla.gecko.util.ThreadUtils;
|
||||
import org.mozilla.gecko.widget.DateTimePicker;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
import org.json.JSONException;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.DialogInterface.OnCancelListener;
|
||||
import android.content.DialogInterface.OnClickListener;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.text.Html;
|
||||
import android.text.InputType;
|
||||
import android.text.TextUtils;
|
||||
import android.text.format.DateFormat;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.ViewGroup.LayoutParams;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemClickListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CheckedTextView;
|
||||
import android.widget.DatePicker;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
import android.widget.TimePicker;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.GregorianCalendar;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class Prompt implements OnClickListener, OnCancelListener, OnItemClickListener {
|
||||
private static final String LOGTAG = "GeckoPromptService";
|
||||
|
||||
private String[] mButtons;
|
||||
private PromptInput[] mInputs;
|
||||
private boolean[] mSelected;
|
||||
private AlertDialog mDialog;
|
||||
|
||||
private final LayoutInflater mInflater;
|
||||
private ConcurrentLinkedQueue<String> mPromptQueue;
|
||||
private final Context mContext;
|
||||
private PromptCallback mCallback;
|
||||
private String mGuid;
|
||||
|
||||
private static boolean mInitialized = false;
|
||||
private static int mGroupPaddingSize;
|
||||
private static int mLeftRightTextWithIconPadding;
|
||||
private static int mTopBottomTextWithIconPadding;
|
||||
private static int mIconTextPadding;
|
||||
private static int mIconSize;
|
||||
private static int mInputPaddingSize;
|
||||
private static int mMinRowSize;
|
||||
|
||||
|
||||
public Prompt(Context context, ConcurrentLinkedQueue<String> queue) {
|
||||
this(context);
|
||||
mCallback = null;
|
||||
mPromptQueue = queue;
|
||||
}
|
||||
|
||||
public Prompt(Context context, PromptCallback callback) {
|
||||
this(context);
|
||||
mCallback = callback;
|
||||
mPromptQueue = null;
|
||||
}
|
||||
|
||||
private Prompt(Context context) {
|
||||
mContext = context;
|
||||
mInflater = LayoutInflater.from(mContext);
|
||||
|
||||
if (!mInitialized) {
|
||||
Resources res = mContext.getResources();
|
||||
mGroupPaddingSize = (int) (res.getDimension(R.dimen.prompt_service_group_padding_size));
|
||||
mLeftRightTextWithIconPadding = (int) (res.getDimension(R.dimen.prompt_service_left_right_text_with_icon_padding));
|
||||
mTopBottomTextWithIconPadding = (int) (res.getDimension(R.dimen.prompt_service_top_bottom_text_with_icon_padding));
|
||||
mIconTextPadding = (int) (res.getDimension(R.dimen.prompt_service_icon_text_padding));
|
||||
mIconSize = (int) (res.getDimension(R.dimen.prompt_service_icon_size));
|
||||
mInputPaddingSize = (int) (res.getDimension(R.dimen.prompt_service_inputs_padding));
|
||||
mMinRowSize = (int) (res.getDimension(R.dimen.prompt_service_min_list_item_height));
|
||||
mInitialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
private static String formatDateString(String dateFormat, Calendar calendar) {
|
||||
return new SimpleDateFormat(dateFormat).format(calendar.getTime());
|
||||
}
|
||||
|
||||
private class PromptInput {
|
||||
private final JSONObject mJSONInput;
|
||||
|
||||
private final String mLabel;
|
||||
private final String mType;
|
||||
private final String mId;
|
||||
private final String mHint;
|
||||
private final boolean mAutofocus;
|
||||
private final String mValue;
|
||||
|
||||
private View mView;
|
||||
|
||||
public PromptInput(JSONObject aJSONInput) {
|
||||
mJSONInput = aJSONInput;
|
||||
mLabel = getSafeString(aJSONInput, "label");
|
||||
mType = getSafeString(aJSONInput, "type");
|
||||
String id = getSafeString(aJSONInput, "id");
|
||||
mId = TextUtils.isEmpty(id) ? mType : id;
|
||||
mHint = getSafeString(aJSONInput, "hint");
|
||||
mValue = getSafeString(aJSONInput, "value");
|
||||
mAutofocus = getSafeBool(aJSONInput, "autofocus");
|
||||
}
|
||||
|
||||
public View getView() throws UnsupportedOperationException {
|
||||
if (mType.equals("checkbox")) {
|
||||
CheckBox checkbox = new CheckBox(mContext);
|
||||
checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
|
||||
checkbox.setText(mLabel);
|
||||
checkbox.setChecked(getSafeBool(mJSONInput, "checked"));
|
||||
mView = (View)checkbox;
|
||||
} else if (mType.equals("date")) {
|
||||
try {
|
||||
DateTimePicker input = new DateTimePicker(mContext, "yyyy-MM-dd", mValue,
|
||||
DateTimePicker.PickersState.DATE);
|
||||
input.toggleCalendar(true);
|
||||
mView = (View)input;
|
||||
} catch (UnsupportedOperationException ex) {
|
||||
// We can't use our custom version of the DatePicker widget because the sdk is too old.
|
||||
// But we can fallback on the native one.
|
||||
DatePicker input = new DatePicker(mContext);
|
||||
try {
|
||||
if (!TextUtils.isEmpty(mValue)) {
|
||||
GregorianCalendar calendar = new GregorianCalendar();
|
||||
calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(mValue));
|
||||
input.updateDate(calendar.get(Calendar.YEAR),
|
||||
calendar.get(Calendar.MONTH),
|
||||
calendar.get(Calendar.DAY_OF_MONTH));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e(LOGTAG, "error parsing format string: " + e);
|
||||
}
|
||||
mView = (View)input;
|
||||
}
|
||||
} else if (mType.equals("week")) {
|
||||
DateTimePicker input = new DateTimePicker(mContext, "yyyy-'W'ww", mValue,
|
||||
DateTimePicker.PickersState.WEEK);
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("time")) {
|
||||
TimePicker input = new TimePicker(mContext);
|
||||
input.setIs24HourView(DateFormat.is24HourFormat(mContext));
|
||||
|
||||
GregorianCalendar calendar = new GregorianCalendar();
|
||||
if (!TextUtils.isEmpty(mValue)) {
|
||||
try {
|
||||
calendar.setTime(new SimpleDateFormat("kk:mm").parse(mValue));
|
||||
} catch (Exception e) { }
|
||||
}
|
||||
input.setCurrentHour(calendar.get(GregorianCalendar.HOUR_OF_DAY));
|
||||
input.setCurrentMinute(calendar.get(GregorianCalendar.MINUTE));
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("datetime-local") || mType.equals("datetime")) {
|
||||
DateTimePicker input = new DateTimePicker(mContext, "yyyy-MM-dd kk:mm", mValue,
|
||||
DateTimePicker.PickersState.DATETIME);
|
||||
input.toggleCalendar(true);
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("month")) {
|
||||
DateTimePicker input = new DateTimePicker(mContext, "yyyy-MM", mValue,
|
||||
DateTimePicker.PickersState.MONTH);
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("textbox") || mType.equals("password")) {
|
||||
EditText input = new EditText(mContext);
|
||||
int inputtype = InputType.TYPE_CLASS_TEXT;
|
||||
if (mType.equals("password")) {
|
||||
inputtype |= InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
|
||||
}
|
||||
input.setInputType(inputtype);
|
||||
input.setText(mValue);
|
||||
|
||||
if (!TextUtils.isEmpty(mHint)) {
|
||||
input.setHint(mHint);
|
||||
}
|
||||
|
||||
if (mAutofocus) {
|
||||
input.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
if (hasFocus) {
|
||||
((InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(v, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
input.requestFocus();
|
||||
}
|
||||
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("menulist")) {
|
||||
Spinner spinner = new Spinner(mContext);
|
||||
try {
|
||||
String[] listitems = getStringArray(mJSONInput, "values");
|
||||
if (listitems.length > 0) {
|
||||
ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, listitems);
|
||||
spinner.setAdapter(adapter);
|
||||
int selectedIndex = getSafeInt(mJSONInput, "selected");
|
||||
spinner.setSelection(selectedIndex);
|
||||
}
|
||||
} catch(Exception ex) { }
|
||||
mView = (View)spinner;
|
||||
} else if (mType.equals("label")) {
|
||||
// not really an input, but a way to add labels and such to the dialog
|
||||
TextView view = new TextView(mContext);
|
||||
view.setText(Html.fromHtml(mLabel));
|
||||
mView = view;
|
||||
}
|
||||
return mView;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return mId;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
if (mType.equals("checkbox")) {
|
||||
CheckBox checkbox = (CheckBox)mView;
|
||||
return checkbox.isChecked() ? "true" : "false";
|
||||
} else if (mType.equals("textbox") || mType.equals("password")) {
|
||||
EditText edit = (EditText)mView;
|
||||
return edit.getText().toString();
|
||||
} else if (mType.equals("menulist")) {
|
||||
Spinner spinner = (Spinner)mView;
|
||||
return Integer.toString(spinner.getSelectedItemPosition());
|
||||
} else if (mType.equals("time")) {
|
||||
TimePicker tp = (TimePicker)mView;
|
||||
GregorianCalendar calendar =
|
||||
new GregorianCalendar(0,0,0,tp.getCurrentHour(),tp.getCurrentMinute());
|
||||
return formatDateString("kk:mm",calendar);
|
||||
} else if (mType.equals("label")) {
|
||||
return "";
|
||||
} else if (android.os.Build.VERSION.SDK_INT < 11 && mType.equals("date")) {
|
||||
// We can't use the custom DateTimePicker with a sdk older than 11.
|
||||
// Fallback on the native DatePicker.
|
||||
DatePicker dp = (DatePicker)mView;
|
||||
GregorianCalendar calendar =
|
||||
new GregorianCalendar(dp.getYear(),dp.getMonth(),dp.getDayOfMonth());
|
||||
return formatDateString("yyyy-MM-dd",calendar);
|
||||
} else {
|
||||
DateTimePicker dp = (DateTimePicker)mView;
|
||||
GregorianCalendar calendar = new GregorianCalendar();
|
||||
calendar.setTimeInMillis(dp.getTimeInMillis());
|
||||
if (mType.equals("date")) {
|
||||
return formatDateString("yyyy-MM-dd",calendar);
|
||||
} else if (mType.equals("week")) {
|
||||
return formatDateString("yyyy-'W'ww",calendar);
|
||||
} else if (mType.equals("datetime-local")) {
|
||||
return formatDateString("yyyy-MM-dd kk:mm",calendar);
|
||||
} else if (mType.equals("datetime")) {
|
||||
calendar.set(GregorianCalendar.ZONE_OFFSET,0);
|
||||
calendar.setTimeInMillis(dp.getTimeInMillis());
|
||||
return formatDateString("yyyy-MM-dd kk:mm",calendar);
|
||||
} else if (mType.equals("month")) {
|
||||
return formatDateString("yyyy-MM",calendar);
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
private View applyInputStyle(View view) {
|
||||
view.setPadding(mInputPaddingSize, 0, mInputPaddingSize, 0);
|
||||
return view;
|
||||
}
|
||||
|
||||
public void show(JSONObject message) {
|
||||
processMessage(message);
|
||||
}
|
||||
|
||||
public void show(String aTitle, String aText, PromptListItem[] aMenuList, boolean aMultipleSelection) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
|
||||
// treat actions that show a dialog as if preventDefault by content to prevent panning
|
||||
if (mContext instanceof GeckoApp) {
|
||||
((GeckoApp)mContext).getLayerView().abortPanning();
|
||||
}
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
|
||||
if (!TextUtils.isEmpty(aTitle)) {
|
||||
builder.setTitle(aTitle);
|
||||
}
|
||||
|
||||
if (!TextUtils.isEmpty(aText)) {
|
||||
builder.setMessage(aText);
|
||||
}
|
||||
|
||||
int length = mInputs == null ? 0 : mInputs.length;
|
||||
if (aMenuList != null && aMenuList.length > 0) {
|
||||
int resourceId = android.R.layout.simple_list_item_1;
|
||||
if (mSelected != null && mSelected.length > 0) {
|
||||
if (aMultipleSelection) {
|
||||
resourceId = R.layout.select_dialog_multichoice;
|
||||
} else {
|
||||
resourceId = R.layout.select_dialog_singlechoice;
|
||||
}
|
||||
}
|
||||
PromptListAdapter adapter = new PromptListAdapter(mContext, resourceId, aMenuList);
|
||||
if (mSelected != null && mSelected.length > 0) {
|
||||
if (aMultipleSelection) {
|
||||
adapter.listView = (ListView) mInflater.inflate(R.layout.select_dialog_list, null);
|
||||
adapter.listView.setOnItemClickListener(this);
|
||||
builder.setInverseBackgroundForced(true);
|
||||
adapter.listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
|
||||
adapter.listView.setAdapter(adapter);
|
||||
builder.setView(adapter.listView);
|
||||
} else {
|
||||
int selectedIndex = -1;
|
||||
for (int i = 0; i < mSelected.length; i++) {
|
||||
if (mSelected[i]) {
|
||||
selectedIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
mSelected = null;
|
||||
builder.setSingleChoiceItems(adapter, selectedIndex, this);
|
||||
}
|
||||
} else {
|
||||
builder.setAdapter(adapter, this);
|
||||
mSelected = null;
|
||||
}
|
||||
} else if (length == 1) {
|
||||
try {
|
||||
ScrollView view = new ScrollView(mContext);
|
||||
view.addView(mInputs[0].getView());
|
||||
builder.setView(applyInputStyle(view));
|
||||
} catch(UnsupportedOperationException ex) {
|
||||
// We cannot display these input widgets with this sdk version,
|
||||
// do not display any dialog and finish the prompt now.
|
||||
try {
|
||||
finishDialog(new JSONObject("{\"button\": -1}"));
|
||||
} catch(JSONException e) { }
|
||||
return;
|
||||
}
|
||||
} else if (length > 1) {
|
||||
try {
|
||||
LinearLayout linearLayout = new LinearLayout(mContext);
|
||||
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
for (int i = 0; i < length; i++) {
|
||||
View content = mInputs[i].getView();
|
||||
linearLayout.addView(content);
|
||||
}
|
||||
ScrollView view = new ScrollView(mContext);
|
||||
view.addView(linearLayout);
|
||||
builder.setView(applyInputStyle(view));
|
||||
} catch(UnsupportedOperationException ex) {
|
||||
// We cannot display these input widgets with this sdk version,
|
||||
// do not display any dialog and finish the prompt now.
|
||||
try {
|
||||
finishDialog(new JSONObject("{\"button\": -1}"));
|
||||
} catch(JSONException e) { }
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
length = mButtons == null ? 0 : mButtons.length;
|
||||
if (length > 0) {
|
||||
builder.setPositiveButton(mButtons[0], this);
|
||||
if (length > 1) {
|
||||
builder.setNeutralButton(mButtons[1], this);
|
||||
if (length > 2) {
|
||||
builder.setNegativeButton(mButtons[2], this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mDialog = builder.create();
|
||||
mDialog.setOnCancelListener(Prompt.this);
|
||||
mDialog.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface aDialog, int aWhich) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
JSONObject ret = new JSONObject();
|
||||
try {
|
||||
int button = -1;
|
||||
ListView list = mDialog.getListView();
|
||||
if (list != null || mSelected != null) {
|
||||
button = aWhich;
|
||||
if (mSelected != null) {
|
||||
JSONArray selected = new JSONArray();
|
||||
for (int i = 0; i < mSelected.length; i++) {
|
||||
selected.put(mSelected[i]);
|
||||
}
|
||||
ret.put("button", selected);
|
||||
} else {
|
||||
ret.put("button", button);
|
||||
}
|
||||
} else {
|
||||
switch(aWhich) {
|
||||
case DialogInterface.BUTTON_POSITIVE : button = 0; break;
|
||||
case DialogInterface.BUTTON_NEUTRAL : button = 1; break;
|
||||
case DialogInterface.BUTTON_NEGATIVE : button = 2; break;
|
||||
}
|
||||
ret.put("button", button);
|
||||
}
|
||||
if (mInputs != null) {
|
||||
for (int i = 0; i < mInputs.length; i++) {
|
||||
ret.put(mInputs[i].getId(), mInputs[i].getValue());
|
||||
}
|
||||
}
|
||||
} catch(Exception ex) {
|
||||
Log.i(LOGTAG, "Error building return: " + ex);
|
||||
}
|
||||
|
||||
if (mDialog != null) {
|
||||
mDialog.dismiss();
|
||||
}
|
||||
|
||||
finishDialog(ret);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
mSelected[position] = !mSelected[position];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCancel(DialogInterface aDialog) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
JSONObject ret = new JSONObject();
|
||||
try {
|
||||
ret.put("button", -1);
|
||||
} catch(Exception ex) { }
|
||||
finishDialog(ret);
|
||||
}
|
||||
|
||||
public void finishDialog(JSONObject aReturn) {
|
||||
mInputs = null;
|
||||
mButtons = null;
|
||||
mDialog = null;
|
||||
mSelected = null;
|
||||
try {
|
||||
aReturn.put("guid", mGuid);
|
||||
} catch(JSONException ex) { }
|
||||
|
||||
if (mPromptQueue != null) {
|
||||
mPromptQueue.offer(aReturn.toString());
|
||||
}
|
||||
|
||||
// poke the Gecko thread in case it's waiting for new events
|
||||
GeckoAppShell.sendEventToGecko(GeckoEvent.createNoOpEvent());
|
||||
|
||||
if (mCallback != null) {
|
||||
mCallback.onPromptFinished(aReturn.toString());
|
||||
}
|
||||
mGuid = null;
|
||||
}
|
||||
|
||||
private void processMessage(JSONObject geckoObject) {
|
||||
String title = getSafeString(geckoObject, "title");
|
||||
String text = getSafeString(geckoObject, "text");
|
||||
mGuid = getSafeString(geckoObject, "guid");
|
||||
|
||||
mButtons = getStringArray(geckoObject, "buttons");
|
||||
|
||||
JSONArray inputs = getSafeArray(geckoObject, "inputs");
|
||||
mInputs = new PromptInput[inputs.length()];
|
||||
for (int i = 0; i < mInputs.length; i++) {
|
||||
try {
|
||||
mInputs[i] = new PromptInput(inputs.getJSONObject(i));
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
|
||||
PromptListItem[] menuitems = getListItemArray(geckoObject, "listitems");
|
||||
mSelected = getBooleanArray(geckoObject, "selected");
|
||||
boolean multiple = getSafeBool(geckoObject, "multiple");
|
||||
show(title, text, menuitems, multiple);
|
||||
}
|
||||
|
||||
private static String getSafeString(JSONObject json, String key) {
|
||||
try {
|
||||
return json.getString(key);
|
||||
} catch (Exception e) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
private static JSONArray getSafeArray(JSONObject json, String key) {
|
||||
try {
|
||||
return json.getJSONArray(key);
|
||||
} catch (Exception e) {
|
||||
return new JSONArray();
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean getSafeBool(JSONObject json, String key) {
|
||||
try {
|
||||
return json.getBoolean(key);
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static int getSafeInt(JSONObject json, String key ) {
|
||||
try {
|
||||
return json.getInt(key);
|
||||
} catch (Exception e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private String[] getStringArray(JSONObject aObject, String aName) {
|
||||
JSONArray items = getSafeArray(aObject, aName);
|
||||
int length = items.length();
|
||||
String[] list = new String[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
try {
|
||||
list[i] = items.getString(i);
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private boolean[] getBooleanArray(JSONObject aObject, String aName) {
|
||||
JSONArray items = new JSONArray();
|
||||
try {
|
||||
items = aObject.getJSONArray(aName);
|
||||
} catch(Exception ex) { return null; }
|
||||
int length = items.length();
|
||||
boolean[] list = new boolean[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
try {
|
||||
list[i] = items.getBoolean(i);
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private PromptListItem[] getListItemArray(JSONObject aObject, String aName) {
|
||||
JSONArray items = getSafeArray(aObject, aName);
|
||||
int length = items.length();
|
||||
PromptListItem[] list = new PromptListItem[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
try {
|
||||
list[i] = new PromptListItem(items.getJSONObject(i));
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public static class PromptListItem {
|
||||
public final String label;
|
||||
public final boolean isGroup;
|
||||
public final boolean inGroup;
|
||||
public final boolean disabled;
|
||||
public final int id;
|
||||
public final boolean isParent;
|
||||
|
||||
// This member can't be accessible from JS, see bug 733749.
|
||||
public Drawable icon;
|
||||
|
||||
PromptListItem(JSONObject aObject) {
|
||||
label = getSafeString(aObject, "label");
|
||||
isGroup = getSafeBool(aObject, "isGroup");
|
||||
inGroup = getSafeBool(aObject, "inGroup");
|
||||
disabled = getSafeBool(aObject, "disabled");
|
||||
id = getSafeInt(aObject, "id");
|
||||
isParent = getSafeBool(aObject, "isParent");
|
||||
}
|
||||
|
||||
public PromptListItem(String aLabel) {
|
||||
label = aLabel;
|
||||
isGroup = false;
|
||||
inGroup = false;
|
||||
disabled = false;
|
||||
id = 0;
|
||||
isParent = false;
|
||||
}
|
||||
}
|
||||
|
||||
public interface PromptCallback {
|
||||
public void onPromptFinished(String jsonResult);
|
||||
}
|
||||
|
||||
public class PromptListAdapter extends ArrayAdapter<PromptListItem> {
|
||||
private static final int VIEW_TYPE_ITEM = 0;
|
||||
private static final int VIEW_TYPE_GROUP = 1;
|
||||
private static final int VIEW_TYPE_COUNT = 2;
|
||||
|
||||
public ListView listView;
|
||||
private int mResourceId = -1;
|
||||
private Drawable mBlankDrawable = null;
|
||||
private Drawable mMoreDrawable = null;
|
||||
|
||||
PromptListAdapter(Context context, int textViewResourceId, PromptListItem[] objects) {
|
||||
super(context, textViewResourceId, objects);
|
||||
mResourceId = textViewResourceId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemViewType(int position) {
|
||||
PromptListItem item = getItem(position);
|
||||
return (item.isGroup ? VIEW_TYPE_GROUP : VIEW_TYPE_ITEM);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getViewTypeCount() {
|
||||
return VIEW_TYPE_COUNT;
|
||||
}
|
||||
|
||||
private Drawable getMoreDrawable(Resources res) {
|
||||
if (mMoreDrawable == null) {
|
||||
mMoreDrawable = res.getDrawable(android.R.drawable.ic_menu_more);
|
||||
}
|
||||
return mMoreDrawable;
|
||||
}
|
||||
|
||||
private Drawable getBlankDrawable(Resources res) {
|
||||
if (mBlankDrawable == null) {
|
||||
mBlankDrawable = res.getDrawable(R.drawable.blank);
|
||||
}
|
||||
return mBlankDrawable;
|
||||
}
|
||||
|
||||
private void maybeUpdateIcon(PromptListItem item, TextView t) {
|
||||
if (item.icon == null && !item.inGroup && !item.isParent) {
|
||||
t.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
|
||||
return;
|
||||
}
|
||||
|
||||
Drawable d = null;
|
||||
Resources res = mContext.getResources();
|
||||
// Set the padding between the icon and the text.
|
||||
t.setCompoundDrawablePadding(mIconTextPadding);
|
||||
if (item.icon != null) {
|
||||
// We want the icon to be of a specific size. Some do not
|
||||
// follow this rule so we have to resize them.
|
||||
Bitmap bitmap = ((BitmapDrawable) item.icon).getBitmap();
|
||||
d = new BitmapDrawable(Bitmap.createScaledBitmap(bitmap, mIconSize, mIconSize, true));
|
||||
} else if (item.inGroup) {
|
||||
// We don't currently support "indenting" items with icons
|
||||
d = getBlankDrawable(res);
|
||||
}
|
||||
|
||||
Drawable moreDrawable = null;
|
||||
if (item.isParent) {
|
||||
moreDrawable = getMoreDrawable(res);
|
||||
}
|
||||
|
||||
if (d != null || moreDrawable != null) {
|
||||
t.setCompoundDrawablesWithIntrinsicBounds(d, null, moreDrawable, null);
|
||||
}
|
||||
}
|
||||
|
||||
private void maybeUpdateCheckedState(int position, PromptListItem item, ViewHolder viewHolder) {
|
||||
viewHolder.textView.setEnabled(!item.disabled && !item.isGroup);
|
||||
viewHolder.textView.setClickable(item.isGroup || item.disabled);
|
||||
|
||||
if (mSelected == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
CheckedTextView ct;
|
||||
try {
|
||||
ct = (CheckedTextView) viewHolder.textView;
|
||||
// Apparently just using ct.setChecked(true) doesn't work, so this
|
||||
// is stolen from the android source code as a way to set the checked
|
||||
// state of these items
|
||||
if (listView != null) {
|
||||
listView.setItemChecked(position, mSelected[position]);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
PromptListItem item = getItem(position);
|
||||
ViewHolder viewHolder = null;
|
||||
|
||||
if (convertView == null) {
|
||||
int resourceId = mResourceId;
|
||||
if (item.isGroup) {
|
||||
resourceId = R.layout.list_item_header;
|
||||
}
|
||||
|
||||
convertView = mInflater.inflate(resourceId, null);
|
||||
convertView.setMinimumHeight(mMinRowSize);
|
||||
|
||||
TextView tv = (TextView) convertView.findViewById(android.R.id.text1);
|
||||
viewHolder = new ViewHolder(tv, tv.getPaddingLeft(), tv.getPaddingRight(),
|
||||
tv.getPaddingTop(), tv.getPaddingBottom());
|
||||
|
||||
convertView.setTag(viewHolder);
|
||||
} else {
|
||||
viewHolder = (ViewHolder) convertView.getTag();
|
||||
}
|
||||
|
||||
viewHolder.textView.setText(item.label);
|
||||
maybeUpdateCheckedState(position, item, viewHolder);
|
||||
maybeUpdateIcon(item, viewHolder.textView);
|
||||
|
||||
return convertView;
|
||||
}
|
||||
|
||||
private class ViewHolder {
|
||||
public final TextView textView;
|
||||
public final int paddingLeft;
|
||||
public final int paddingRight;
|
||||
public final int paddingTop;
|
||||
public final int paddingBottom;
|
||||
|
||||
ViewHolder(TextView aTextView, int aLeft, int aRight, int aTop, int aBottom) {
|
||||
textView = aTextView;
|
||||
paddingLeft = aLeft;
|
||||
paddingRight = aRight;
|
||||
paddingTop = aTop;
|
||||
paddingBottom = aBottom;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7,266 +7,44 @@ package org.mozilla.gecko;
|
|||
|
||||
import org.mozilla.gecko.util.GeckoEventResponder;
|
||||
import org.mozilla.gecko.util.ThreadUtils;
|
||||
import org.mozilla.gecko.widget.DateTimePicker;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.DialogInterface.OnCancelListener;
|
||||
import android.content.DialogInterface.OnClickListener;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.text.Html;
|
||||
import android.text.InputType;
|
||||
import android.text.TextUtils;
|
||||
import android.text.format.DateFormat;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.ViewGroup.LayoutParams;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemClickListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CheckedTextView;
|
||||
import android.widget.DatePicker;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
import android.widget.TimePicker;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.GregorianCalendar;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class PromptService implements OnClickListener, OnCancelListener, OnItemClickListener, GeckoEventResponder {
|
||||
public class PromptService implements GeckoEventResponder {
|
||||
private static final String LOGTAG = "GeckoPromptService";
|
||||
|
||||
private String[] mButtons;
|
||||
private PromptInput[] mInputs;
|
||||
private boolean[] mSelected;
|
||||
private AlertDialog mDialog;
|
||||
|
||||
private final LayoutInflater mInflater;
|
||||
private final ConcurrentLinkedQueue<String> mPromptQueue;
|
||||
private final int mGroupPaddingSize;
|
||||
private final int mLeftRightTextWithIconPadding;
|
||||
private final int mTopBottomTextWithIconPadding;
|
||||
private final int mIconTextPadding;
|
||||
private final int mIconSize;
|
||||
private final int mInputPaddingSize;
|
||||
private final int mMinRowSize;
|
||||
|
||||
PromptService() {
|
||||
mInflater = LayoutInflater.from(GeckoApp.mAppContext);
|
||||
mPromptQueue = new ConcurrentLinkedQueue<String>();
|
||||
|
||||
Resources res = GeckoApp.mAppContext.getResources();
|
||||
mGroupPaddingSize = (int) (res.getDimension(R.dimen.prompt_service_group_padding_size));
|
||||
mLeftRightTextWithIconPadding = (int) (res.getDimension(R.dimen.prompt_service_left_right_text_with_icon_padding));
|
||||
mTopBottomTextWithIconPadding = (int) (res.getDimension(R.dimen.prompt_service_top_bottom_text_with_icon_padding));
|
||||
mIconTextPadding = (int) (res.getDimension(R.dimen.prompt_service_icon_text_padding));
|
||||
mIconSize = (int) (res.getDimension(R.dimen.prompt_service_icon_size));
|
||||
mInputPaddingSize = (int) (res.getDimension(R.dimen.prompt_service_inputs_padding));
|
||||
mMinRowSize = (int) (res.getDimension(R.dimen.prompt_service_min_list_item_height));
|
||||
private final Context mContext;
|
||||
|
||||
public PromptService(Context context) {
|
||||
GeckoAppShell.getEventDispatcher().registerEventListener("Prompt:Show", this);
|
||||
mPromptQueue = new ConcurrentLinkedQueue<String>();
|
||||
mContext = context;
|
||||
}
|
||||
|
||||
void destroy() {
|
||||
GeckoAppShell.getEventDispatcher().unregisterEventListener("Prompt:Show", this);
|
||||
}
|
||||
|
||||
private static String formatDateString(String dateFormat, Calendar calendar) {
|
||||
return new SimpleDateFormat(dateFormat).format(calendar.getTime());
|
||||
}
|
||||
|
||||
private class PromptInput {
|
||||
private final JSONObject mJSONInput;
|
||||
|
||||
private final String mLabel;
|
||||
private final String mType;
|
||||
private final String mId;
|
||||
private final String mHint;
|
||||
private final boolean mAutofocus;
|
||||
private final String mValue;
|
||||
|
||||
private View mView;
|
||||
|
||||
public PromptInput(JSONObject aJSONInput) {
|
||||
mJSONInput = aJSONInput;
|
||||
mLabel = getSafeString(aJSONInput, "label");
|
||||
mType = getSafeString(aJSONInput, "type");
|
||||
String id = getSafeString(aJSONInput, "id");
|
||||
mId = TextUtils.isEmpty(id) ? mType : id;
|
||||
mHint = getSafeString(aJSONInput, "hint");
|
||||
mValue = getSafeString(aJSONInput, "value");
|
||||
mAutofocus = getSafeBool(aJSONInput, "autofocus");
|
||||
}
|
||||
|
||||
public View getView() throws UnsupportedOperationException {
|
||||
if (mType.equals("checkbox")) {
|
||||
CheckBox checkbox = new CheckBox(GeckoApp.mAppContext);
|
||||
checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
|
||||
checkbox.setText(mLabel);
|
||||
checkbox.setChecked(getSafeBool(mJSONInput, "checked"));
|
||||
mView = (View)checkbox;
|
||||
} else if (mType.equals("date")) {
|
||||
try {
|
||||
DateTimePicker input = new DateTimePicker(GeckoApp.mAppContext, "yyyy-MM-dd", mValue,
|
||||
DateTimePicker.PickersState.DATE);
|
||||
input.toggleCalendar(true);
|
||||
mView = (View)input;
|
||||
} catch (UnsupportedOperationException ex) {
|
||||
// We can't use our custom version of the DatePicker widget because the sdk is too old.
|
||||
// But we can fallback on the native one.
|
||||
DatePicker input = new DatePicker(GeckoApp.mAppContext);
|
||||
try {
|
||||
if (!TextUtils.isEmpty(mValue)) {
|
||||
GregorianCalendar calendar = new GregorianCalendar();
|
||||
calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(mValue));
|
||||
input.updateDate(calendar.get(Calendar.YEAR),
|
||||
calendar.get(Calendar.MONTH),
|
||||
calendar.get(Calendar.DAY_OF_MONTH));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.e(LOGTAG, "error parsing format string: " + e);
|
||||
}
|
||||
mView = (View)input;
|
||||
}
|
||||
} else if (mType.equals("week")) {
|
||||
DateTimePicker input = new DateTimePicker(GeckoApp.mAppContext, "yyyy-'W'ww", mValue,
|
||||
DateTimePicker.PickersState.WEEK);
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("time")) {
|
||||
TimePicker input = new TimePicker(GeckoApp.mAppContext);
|
||||
input.setIs24HourView(DateFormat.is24HourFormat(GeckoApp.mAppContext));
|
||||
|
||||
GregorianCalendar calendar = new GregorianCalendar();
|
||||
if (!TextUtils.isEmpty(mValue)) {
|
||||
try {
|
||||
calendar.setTime(new SimpleDateFormat("kk:mm").parse(mValue));
|
||||
} catch (Exception e) { }
|
||||
}
|
||||
input.setCurrentHour(calendar.get(GregorianCalendar.HOUR_OF_DAY));
|
||||
input.setCurrentMinute(calendar.get(GregorianCalendar.MINUTE));
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("datetime-local") || mType.equals("datetime")) {
|
||||
DateTimePicker input = new DateTimePicker(GeckoApp.mAppContext, "yyyy-MM-dd kk:mm", mValue,
|
||||
DateTimePicker.PickersState.DATETIME);
|
||||
input.toggleCalendar(true);
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("month")) {
|
||||
DateTimePicker input = new DateTimePicker(GeckoApp.mAppContext, "yyyy-MM", mValue,
|
||||
DateTimePicker.PickersState.MONTH);
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("textbox") || mType.equals("password")) {
|
||||
EditText input = new EditText(GeckoApp.mAppContext);
|
||||
int inputtype = InputType.TYPE_CLASS_TEXT;
|
||||
if (mType.equals("password")) {
|
||||
inputtype |= InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
|
||||
}
|
||||
input.setInputType(inputtype);
|
||||
input.setText(mValue);
|
||||
|
||||
if (!TextUtils.isEmpty(mHint)) {
|
||||
input.setHint(mHint);
|
||||
}
|
||||
|
||||
if (mAutofocus) {
|
||||
input.setOnFocusChangeListener(new View.OnFocusChangeListener() {
|
||||
public void show(final String aTitle, final String aText, final Prompt.PromptListItem[] aMenuList,
|
||||
final boolean aMultipleSelection, final Prompt.PromptCallback callback) {
|
||||
// The dialog must be created on the UI thread.
|
||||
ThreadUtils.postToUiThread(new Runnable() {
|
||||
@Override
|
||||
public void onFocusChange(View v, boolean hasFocus) {
|
||||
if (hasFocus) {
|
||||
((InputMethodManager) GeckoApp.mAppContext.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(v, 0);
|
||||
public void run() {
|
||||
Prompt p;
|
||||
if (callback != null) {
|
||||
p = new Prompt(mContext, callback);
|
||||
} else {
|
||||
p = new Prompt(mContext, mPromptQueue);
|
||||
}
|
||||
p.show(aTitle, aText, aMenuList, aMultipleSelection);
|
||||
}
|
||||
});
|
||||
input.requestFocus();
|
||||
}
|
||||
|
||||
mView = (View)input;
|
||||
} else if (mType.equals("menulist")) {
|
||||
Spinner spinner = new Spinner(GeckoApp.mAppContext);
|
||||
try {
|
||||
String[] listitems = getStringArray(mJSONInput, "values");
|
||||
if (listitems.length > 0) {
|
||||
ArrayAdapter<String> adapter = new ArrayAdapter<String>(GeckoApp.mAppContext, R.layout.simple_dropdown_item_1line, listitems);
|
||||
spinner.setAdapter(adapter);
|
||||
int selectedIndex = getSafeInt(mJSONInput, "selected");
|
||||
spinner.setSelection(selectedIndex);
|
||||
}
|
||||
} catch(Exception ex) { }
|
||||
mView = (View)spinner;
|
||||
} else if (mType.equals("label")) {
|
||||
// not really an input, but a way to add labels and such to the dialog
|
||||
TextView view = new TextView(GeckoApp.mAppContext);
|
||||
view.setText(Html.fromHtml(mLabel));
|
||||
mView = view;
|
||||
}
|
||||
return mView;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return mId;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
if (mType.equals("checkbox")) {
|
||||
CheckBox checkbox = (CheckBox)mView;
|
||||
return checkbox.isChecked() ? "true" : "false";
|
||||
} else if (mType.equals("textbox") || mType.equals("password")) {
|
||||
EditText edit = (EditText)mView;
|
||||
return edit.getText().toString();
|
||||
} else if (mType.equals("menulist")) {
|
||||
Spinner spinner = (Spinner)mView;
|
||||
return Integer.toString(spinner.getSelectedItemPosition());
|
||||
} else if (mType.equals("time")) {
|
||||
TimePicker tp = (TimePicker)mView;
|
||||
GregorianCalendar calendar =
|
||||
new GregorianCalendar(0,0,0,tp.getCurrentHour(),tp.getCurrentMinute());
|
||||
return formatDateString("kk:mm",calendar);
|
||||
} else if (mType.equals("label")) {
|
||||
return "";
|
||||
} else if (android.os.Build.VERSION.SDK_INT < 11 && mType.equals("date")) {
|
||||
// We can't use the custom DateTimePicker with a sdk older than 11.
|
||||
// Fallback on the native DatePicker.
|
||||
DatePicker dp = (DatePicker)mView;
|
||||
GregorianCalendar calendar =
|
||||
new GregorianCalendar(dp.getYear(),dp.getMonth(),dp.getDayOfMonth());
|
||||
return formatDateString("yyyy-MM-dd",calendar);
|
||||
} else {
|
||||
DateTimePicker dp = (DateTimePicker)mView;
|
||||
GregorianCalendar calendar = new GregorianCalendar();
|
||||
calendar.setTimeInMillis(dp.getTimeInMillis());
|
||||
if (mType.equals("date")) {
|
||||
return formatDateString("yyyy-MM-dd",calendar);
|
||||
} else if (mType.equals("week")) {
|
||||
return formatDateString("yyyy-'W'ww",calendar);
|
||||
} else if (mType.equals("datetime-local")) {
|
||||
return formatDateString("yyyy-MM-dd kk:mm",calendar);
|
||||
} else if (mType.equals("datetime")) {
|
||||
calendar.set(GregorianCalendar.ZONE_OFFSET,0);
|
||||
calendar.setTimeInMillis(dp.getTimeInMillis());
|
||||
return formatDateString("yyyy-MM-dd kk:mm",calendar);
|
||||
} else if (mType.equals("month")) {
|
||||
return formatDateString("yyyy-MM",calendar);
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
// GeckoEventListener implementation
|
||||
|
|
@ -276,14 +54,29 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
|
|||
ThreadUtils.postToUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
processMessage(message);
|
||||
boolean isAsync = message.optBoolean("async");
|
||||
Prompt p;
|
||||
if (isAsync) {
|
||||
p = new Prompt(mContext, new Prompt.PromptCallback() {
|
||||
public void onPromptFinished(String jsonResult) {
|
||||
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Prompt:Reply", jsonResult));
|
||||
}
|
||||
});
|
||||
} else {
|
||||
p = new Prompt(mContext, mPromptQueue);
|
||||
}
|
||||
p.show(message);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// GeckoEventResponder implementation
|
||||
@Override
|
||||
public String getResponse() {
|
||||
public String getResponse(final JSONObject origMessage) {
|
||||
if (origMessage.optBoolean("async")) {
|
||||
return "";
|
||||
}
|
||||
|
||||
// we only handle one kind of message in handleMessage, and this is the
|
||||
// response we provide for that message
|
||||
String result;
|
||||
|
|
@ -292,431 +85,4 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
|
|||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private View applyInputStyle(View view) {
|
||||
view.setPadding(mInputPaddingSize, 0, mInputPaddingSize, 0);
|
||||
return view;
|
||||
}
|
||||
|
||||
public void show(String aTitle, String aText, PromptListItem[] aMenuList, boolean aMultipleSelection) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
|
||||
// treat actions that show a dialog as if preventDefault by content to prevent panning
|
||||
GeckoApp.mAppContext.getLayerView().abortPanning();
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(GeckoApp.mAppContext);
|
||||
if (!TextUtils.isEmpty(aTitle)) {
|
||||
builder.setTitle(aTitle);
|
||||
}
|
||||
|
||||
if (!TextUtils.isEmpty(aText)) {
|
||||
builder.setMessage(aText);
|
||||
}
|
||||
|
||||
int length = mInputs == null ? 0 : mInputs.length;
|
||||
if (aMenuList != null && aMenuList.length > 0) {
|
||||
int resourceId = android.R.layout.simple_list_item_1;
|
||||
if (mSelected != null && mSelected.length > 0) {
|
||||
if (aMultipleSelection) {
|
||||
resourceId = R.layout.select_dialog_multichoice;
|
||||
} else {
|
||||
resourceId = R.layout.select_dialog_singlechoice;
|
||||
}
|
||||
}
|
||||
PromptListAdapter adapter = new PromptListAdapter(GeckoApp.mAppContext, resourceId, aMenuList);
|
||||
if (mSelected != null && mSelected.length > 0) {
|
||||
if (aMultipleSelection) {
|
||||
adapter.listView = (ListView) mInflater.inflate(R.layout.select_dialog_list, null);
|
||||
adapter.listView.setOnItemClickListener(this);
|
||||
builder.setInverseBackgroundForced(true);
|
||||
adapter.listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
|
||||
adapter.listView.setAdapter(adapter);
|
||||
builder.setView(adapter.listView);
|
||||
} else {
|
||||
int selectedIndex = -1;
|
||||
for (int i = 0; i < mSelected.length; i++) {
|
||||
if (mSelected[i]) {
|
||||
selectedIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
mSelected = null;
|
||||
builder.setSingleChoiceItems(adapter, selectedIndex, this);
|
||||
}
|
||||
} else {
|
||||
builder.setAdapter(adapter, this);
|
||||
mSelected = null;
|
||||
}
|
||||
} else if (length == 1) {
|
||||
try {
|
||||
ScrollView view = new ScrollView(GeckoApp.mAppContext);
|
||||
view.addView(mInputs[0].getView());
|
||||
builder.setView(applyInputStyle(view));
|
||||
} catch(UnsupportedOperationException ex) {
|
||||
// We cannot display these input widgets with this sdk version,
|
||||
// do not display any dialog and finish the prompt now.
|
||||
finishDialog("{\"button\": -1}");
|
||||
return;
|
||||
}
|
||||
} else if (length > 1) {
|
||||
try {
|
||||
LinearLayout linearLayout = new LinearLayout(GeckoApp.mAppContext);
|
||||
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
for (int i = 0; i < length; i++) {
|
||||
View content = mInputs[i].getView();
|
||||
linearLayout.addView(content);
|
||||
}
|
||||
ScrollView view = new ScrollView(GeckoApp.mAppContext);
|
||||
view.addView(linearLayout);
|
||||
builder.setView(applyInputStyle(view));
|
||||
} catch(UnsupportedOperationException ex) {
|
||||
// We cannot display these input widgets with this sdk version,
|
||||
// do not display any dialog and finish the prompt now.
|
||||
finishDialog("{\"button\": -1}");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
length = mButtons == null ? 0 : mButtons.length;
|
||||
if (length > 0) {
|
||||
builder.setPositiveButton(mButtons[0], this);
|
||||
if (length > 1) {
|
||||
builder.setNeutralButton(mButtons[1], this);
|
||||
if (length > 2) {
|
||||
builder.setNegativeButton(mButtons[2], this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mDialog = builder.create();
|
||||
mDialog.setOnCancelListener(PromptService.this);
|
||||
mDialog.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface aDialog, int aWhich) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
JSONObject ret = new JSONObject();
|
||||
try {
|
||||
int button = -1;
|
||||
ListView list = mDialog.getListView();
|
||||
if (list != null || mSelected != null) {
|
||||
button = aWhich;
|
||||
if (mSelected != null) {
|
||||
JSONArray selected = new JSONArray();
|
||||
for (int i = 0; i < mSelected.length; i++) {
|
||||
selected.put(mSelected[i]);
|
||||
}
|
||||
ret.put("button", selected);
|
||||
} else {
|
||||
ret.put("button", button);
|
||||
}
|
||||
} else {
|
||||
switch(aWhich) {
|
||||
case DialogInterface.BUTTON_POSITIVE : button = 0; break;
|
||||
case DialogInterface.BUTTON_NEUTRAL : button = 1; break;
|
||||
case DialogInterface.BUTTON_NEGATIVE : button = 2; break;
|
||||
}
|
||||
ret.put("button", button);
|
||||
}
|
||||
if (mInputs != null) {
|
||||
for (int i = 0; i < mInputs.length; i++) {
|
||||
ret.put(mInputs[i].getId(), mInputs[i].getValue());
|
||||
}
|
||||
}
|
||||
} catch(Exception ex) {
|
||||
Log.i(LOGTAG, "Error building return: " + ex);
|
||||
}
|
||||
|
||||
if (mDialog != null) {
|
||||
mDialog.dismiss();
|
||||
}
|
||||
|
||||
finishDialog(ret.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
mSelected[position] = !mSelected[position];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCancel(DialogInterface aDialog) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
JSONObject ret = new JSONObject();
|
||||
try {
|
||||
ret.put("button", -1);
|
||||
} catch(Exception ex) { }
|
||||
finishDialog(ret.toString());
|
||||
}
|
||||
|
||||
public void finishDialog(String aReturn) {
|
||||
mInputs = null;
|
||||
mButtons = null;
|
||||
mDialog = null;
|
||||
mSelected = null;
|
||||
mPromptQueue.offer(aReturn);
|
||||
// poke the Gecko thread in case it's waiting for new events
|
||||
GeckoAppShell.sendEventToGecko(GeckoEvent.createNoOpEvent());
|
||||
}
|
||||
|
||||
private void processMessage(JSONObject geckoObject) {
|
||||
String title = getSafeString(geckoObject, "title");
|
||||
String text = getSafeString(geckoObject, "text");
|
||||
|
||||
mButtons = getStringArray(geckoObject, "buttons");
|
||||
|
||||
JSONArray inputs = getSafeArray(geckoObject, "inputs");
|
||||
mInputs = new PromptInput[inputs.length()];
|
||||
for (int i = 0; i < mInputs.length; i++) {
|
||||
try {
|
||||
mInputs[i] = new PromptInput(inputs.getJSONObject(i));
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
|
||||
PromptListItem[] menuitems = getListItemArray(geckoObject, "listitems");
|
||||
mSelected = getBooleanArray(geckoObject, "selected");
|
||||
boolean multiple = getSafeBool(geckoObject, "multiple");
|
||||
show(title, text, menuitems, multiple);
|
||||
}
|
||||
|
||||
private static String getSafeString(JSONObject json, String key) {
|
||||
try {
|
||||
return json.getString(key);
|
||||
} catch (Exception e) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
private static JSONArray getSafeArray(JSONObject json, String key) {
|
||||
try {
|
||||
return json.getJSONArray(key);
|
||||
} catch (Exception e) {
|
||||
return new JSONArray();
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean getSafeBool(JSONObject json, String key) {
|
||||
try {
|
||||
return json.getBoolean(key);
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static int getSafeInt(JSONObject json, String key ) {
|
||||
try {
|
||||
return json.getInt(key);
|
||||
} catch (Exception e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private String[] getStringArray(JSONObject aObject, String aName) {
|
||||
JSONArray items = getSafeArray(aObject, aName);
|
||||
int length = items.length();
|
||||
String[] list = new String[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
try {
|
||||
list[i] = items.getString(i);
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private boolean[] getBooleanArray(JSONObject aObject, String aName) {
|
||||
JSONArray items = new JSONArray();
|
||||
try {
|
||||
items = aObject.getJSONArray(aName);
|
||||
} catch(Exception ex) { return null; }
|
||||
int length = items.length();
|
||||
boolean[] list = new boolean[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
try {
|
||||
list[i] = items.getBoolean(i);
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private PromptListItem[] getListItemArray(JSONObject aObject, String aName) {
|
||||
JSONArray items = getSafeArray(aObject, aName);
|
||||
int length = items.length();
|
||||
PromptListItem[] list = new PromptListItem[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
try {
|
||||
list[i] = new PromptListItem(items.getJSONObject(i));
|
||||
} catch(Exception ex) { }
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public static class PromptListItem {
|
||||
public final String label;
|
||||
public final boolean isGroup;
|
||||
public final boolean inGroup;
|
||||
public final boolean disabled;
|
||||
public final int id;
|
||||
public final boolean isParent;
|
||||
|
||||
// This member can't be accessible from JS, see bug 733749.
|
||||
public Drawable icon;
|
||||
|
||||
PromptListItem(JSONObject aObject) {
|
||||
label = getSafeString(aObject, "label");
|
||||
isGroup = getSafeBool(aObject, "isGroup");
|
||||
inGroup = getSafeBool(aObject, "inGroup");
|
||||
disabled = getSafeBool(aObject, "disabled");
|
||||
id = getSafeInt(aObject, "id");
|
||||
isParent = getSafeBool(aObject, "isParent");
|
||||
}
|
||||
|
||||
public PromptListItem(String aLabel) {
|
||||
label = aLabel;
|
||||
isGroup = false;
|
||||
inGroup = false;
|
||||
disabled = false;
|
||||
id = 0;
|
||||
isParent = false;
|
||||
}
|
||||
}
|
||||
|
||||
public class PromptListAdapter extends ArrayAdapter<PromptListItem> {
|
||||
private static final int VIEW_TYPE_ITEM = 0;
|
||||
private static final int VIEW_TYPE_GROUP = 1;
|
||||
private static final int VIEW_TYPE_COUNT = 2;
|
||||
|
||||
public ListView listView;
|
||||
private int mResourceId = -1;
|
||||
private Drawable mBlankDrawable = null;
|
||||
private Drawable mMoreDrawable = null;
|
||||
|
||||
PromptListAdapter(Context context, int textViewResourceId, PromptListItem[] objects) {
|
||||
super(context, textViewResourceId, objects);
|
||||
mResourceId = textViewResourceId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemViewType(int position) {
|
||||
PromptListItem item = getItem(position);
|
||||
return (item.isGroup ? VIEW_TYPE_GROUP : VIEW_TYPE_ITEM);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getViewTypeCount() {
|
||||
return VIEW_TYPE_COUNT;
|
||||
}
|
||||
|
||||
private Drawable getMoreDrawable(Resources res) {
|
||||
if (mMoreDrawable == null) {
|
||||
mMoreDrawable = res.getDrawable(android.R.drawable.ic_menu_more);
|
||||
}
|
||||
return mMoreDrawable;
|
||||
}
|
||||
|
||||
private Drawable getBlankDrawable(Resources res) {
|
||||
if (mBlankDrawable == null) {
|
||||
mBlankDrawable = res.getDrawable(R.drawable.blank);
|
||||
}
|
||||
return mBlankDrawable;
|
||||
}
|
||||
|
||||
private void maybeUpdateIcon(PromptListItem item, TextView t) {
|
||||
if (item.icon == null && !item.inGroup && !item.isParent) {
|
||||
t.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
|
||||
return;
|
||||
}
|
||||
|
||||
Drawable d = null;
|
||||
Resources res = GeckoApp.mAppContext.getResources();
|
||||
// Set the padding between the icon and the text.
|
||||
t.setCompoundDrawablePadding(mIconTextPadding);
|
||||
if (item.icon != null) {
|
||||
// We want the icon to be of a specific size. Some do not
|
||||
// follow this rule so we have to resize them.
|
||||
Bitmap bitmap = ((BitmapDrawable) item.icon).getBitmap();
|
||||
d = new BitmapDrawable(Bitmap.createScaledBitmap(bitmap, mIconSize, mIconSize, true));
|
||||
} else if (item.inGroup) {
|
||||
// We don't currently support "indenting" items with icons
|
||||
d = getBlankDrawable(res);
|
||||
}
|
||||
|
||||
Drawable moreDrawable = null;
|
||||
if (item.isParent) {
|
||||
moreDrawable = getMoreDrawable(res);
|
||||
}
|
||||
|
||||
if (d != null || moreDrawable != null) {
|
||||
t.setCompoundDrawablesWithIntrinsicBounds(d, null, moreDrawable, null);
|
||||
}
|
||||
}
|
||||
|
||||
private void maybeUpdateCheckedState(int position, PromptListItem item, ViewHolder viewHolder) {
|
||||
viewHolder.textView.setEnabled(!item.disabled && !item.isGroup);
|
||||
viewHolder.textView.setClickable(item.isGroup || item.disabled);
|
||||
|
||||
if (mSelected == null)
|
||||
return;
|
||||
|
||||
CheckedTextView ct;
|
||||
try {
|
||||
ct = (CheckedTextView) viewHolder.textView;
|
||||
// Apparently just using ct.setChecked(true) doesn't work, so this
|
||||
// is stolen from the android source code as a way to set the checked
|
||||
// state of these items
|
||||
if (listView != null)
|
||||
listView.setItemChecked(position, mSelected[position]);
|
||||
} catch (Exception e) {
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
PromptListItem item = getItem(position);
|
||||
ViewHolder viewHolder = null;
|
||||
|
||||
if (convertView == null) {
|
||||
int resourceId = mResourceId;
|
||||
if (item.isGroup) {
|
||||
resourceId = R.layout.list_item_header;
|
||||
}
|
||||
|
||||
convertView = mInflater.inflate(resourceId, null);
|
||||
convertView.setMinimumHeight(mMinRowSize);
|
||||
|
||||
TextView tv = (TextView) convertView.findViewById(android.R.id.text1);
|
||||
viewHolder = new ViewHolder(tv, tv.getPaddingLeft(), tv.getPaddingRight(),
|
||||
tv.getPaddingTop(), tv.getPaddingBottom());
|
||||
|
||||
convertView.setTag(viewHolder);
|
||||
} else {
|
||||
viewHolder = (ViewHolder) convertView.getTag();
|
||||
}
|
||||
|
||||
viewHolder.textView.setText(item.label);
|
||||
maybeUpdateCheckedState(position, item, viewHolder);
|
||||
maybeUpdateIcon(item, viewHolder.textView);
|
||||
|
||||
return convertView;
|
||||
}
|
||||
|
||||
private class ViewHolder {
|
||||
public final TextView textView;
|
||||
public final int paddingLeft;
|
||||
public final int paddingRight;
|
||||
public final int paddingTop;
|
||||
public final int paddingBottom;
|
||||
|
||||
ViewHolder(TextView aTextView, int aLeft, int aRight, int aTop, int aBottom) {
|
||||
textView = aTextView;
|
||||
paddingLeft = aLeft;
|
||||
paddingRight = aRight;
|
||||
paddingTop = aTop;
|
||||
paddingBottom = aBottom;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ public final class SharedPreferencesHelper
|
|||
}
|
||||
|
||||
@Override
|
||||
public String getResponse() {
|
||||
public String getResponse(JSONObject origMessage) {
|
||||
return mResponse;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public final class EventDispatcher {
|
|||
for (GeckoEventListener listener : listeners) {
|
||||
listener.handleMessage(type, json);
|
||||
if (listener instanceof GeckoEventResponder) {
|
||||
String newResponse = ((GeckoEventResponder)listener).getResponse();
|
||||
String newResponse = ((GeckoEventResponder)listener).getResponse(json);
|
||||
if (response != null && newResponse != null) {
|
||||
Log.e(LOGTAG, "Received two responses for message of type " + type);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
package org.mozilla.gecko.util;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
public interface GeckoEventResponder extends GeckoEventListener {
|
||||
String getResponse();
|
||||
String getResponse(JSONObject response);
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче