diff options
Diffstat (limited to 'navit/android/src/org/navitproject/navit/NavitDialogs.java')
| -rw-r--r-- | navit/android/src/org/navitproject/navit/NavitDialogs.java | 141 |
1 files changed, 70 insertions, 71 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitDialogs.java b/navit/android/src/org/navitproject/navit/NavitDialogs.java index 41cac61da..8a9d6de65 100644 --- a/navit/android/src/org/navitproject/navit/NavitDialogs.java +++ b/navit/android/src/org/navitproject/navit/NavitDialogs.java @@ -1,5 +1,7 @@ package org.navitproject.navit; +import static org.navitproject.navit.NavitAppConfig.getTstring; + import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; @@ -14,11 +16,12 @@ import android.widget.ArrayAdapter; import android.widget.Toast; import java.io.File; + public class NavitDialogs extends Handler { // Dialogs - public static final int DIALOG_MAPDOWNLOAD = 1; - public static final int DIALOG_BACKUP_RESTORE = 2; + static final int DIALOG_MAPDOWNLOAD = 1; + static final int DIALOG_BACKUP_RESTORE = 2; // dialog messages static final int MSG_MAP_DOWNLOAD_FINISHED = 0; static final int MSG_PROGRESS_BAR = 1; @@ -27,30 +30,30 @@ public class NavitDialogs extends Handler { static final int MSG_START_MAP_DOWNLOAD = 7; private static final int DIALOG_SELECT_BACKUP = 3; private static final int MSG_REMOVE_DIALOG_GENERIC = 99; - private static Handler mHandler; - private final String TAG = this.getClass().getName(); - private ProgressDialog mapdownloader_dialog = null; - private NavitMapDownloader mapdownloader = null; - private Navit mActivity; + private static Handler sHandler; + private static final String TAG = "NavitDialogs"; + private ProgressDialog mMapdownloaderDialog = null; + private NavitMapDownloader mMapdownloader = null; + private final Navit mActivity; NavitDialogs(Navit activity) { super(); mActivity = activity; - mHandler = this; + sHandler = this; } - static public void sendDialogMessage(int what, String title, String text, int dialog_num, + static void sendDialogMessage(int what, String title, String text, int dialogNum, int value1, int value2) { - Message msg = mHandler.obtainMessage(what); Bundle data = new Bundle(); data.putString("title", title); data.putString("text", text); data.putInt("value1", value1); data.putInt("value2", value2); - data.putInt("dialog_num", dialog_num); + data.putInt("dialog_num", dialogNum); + Message msg = sHandler.obtainMessage(what); msg.setData(data); - mHandler.sendMessage(msg); + sHandler.sendMessage(msg); } @Override @@ -61,32 +64,32 @@ public class NavitDialogs extends Handler { mActivity.dismissDialog(DIALOG_MAPDOWNLOAD); mActivity.removeDialog(DIALOG_MAPDOWNLOAD); if (msg.getData().getInt("value1") == 1) { - Message msg_out = Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler, - NavitGraphics.msg_type.CLB_LOAD_MAP.ordinal()); - msg_out.setData(msg.getData()); - msg_out.sendToTarget(); - - msg_out = Message - .obtain(Navit.getInstance().getNavitGraphics().callback_handler, - NavitGraphics.msg_type.CLB_CALL_CMD.ordinal()); + Message msgOut = Message.obtain(NavitGraphics.sCallbackHandler, + NavitGraphics.MsgType.CLB_LOAD_MAP.ordinal()); + msgOut.setData(msg.getData()); + msgOut.sendToTarget(); + + msgOut = Message + .obtain(NavitGraphics.sCallbackHandler, + NavitGraphics.MsgType.CLB_CALL_CMD.ordinal()); Bundle b = new Bundle(); int mi = msg.getData().getInt("value2"); - double lon = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon1) + Double - .parseDouble(NavitMapDownloader.osm_maps[mi].lon2)) / 2.0; - double lat = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat1) + Double - .parseDouble(NavitMapDownloader.osm_maps[mi].lat2)) / 2.0; + double lon = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].mLon1) + Double + .parseDouble(NavitMapDownloader.osm_maps[mi].mLon2)) / 2.0; + double lat = (Double.parseDouble(NavitMapDownloader.osm_maps[mi].mLat1) + Double + .parseDouble(NavitMapDownloader.osm_maps[mi].mLat2)) / 2.0; b.putString("cmd", "set_center(\"" + lon + " " + lat + "\",1); zoom=256"); - msg_out.setData(b); - msg_out.sendToTarget(); + msgOut.setData(b); + msgOut.sendToTarget(); } break; } case MSG_PROGRESS_BAR: // change progressbar values - mapdownloader_dialog.setMax(msg.getData().getInt("value1")); - mapdownloader_dialog.setProgress(msg.getData().getInt("value2")); - mapdownloader_dialog.setTitle(msg.getData().getString(("title"))); - mapdownloader_dialog.setMessage(msg.getData().getString(("text"))); + mMapdownloaderDialog.setMax(msg.getData().getInt("value1")); + mMapdownloaderDialog.setProgress(msg.getData().getInt("value2")); + mMapdownloaderDialog.setTitle(msg.getData().getString(("title"))); + mMapdownloaderDialog.setMessage(msg.getData().getString(("text"))); break; case MSG_TOAST: Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_SHORT).show(); @@ -95,14 +98,14 @@ public class NavitDialogs extends Handler { Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_LONG).show(); break; case MSG_START_MAP_DOWNLOAD: { - int download_map_id = msg.arg1; - Log.d(TAG, "PRI id=" + download_map_id); + int downloadMapId = msg.arg1; + Log.d(TAG, "PRI id=" + downloadMapId); // set map id to download // show the map download progressbar, and download the map - if (download_map_id > -1) { - mapdownloader = new NavitMapDownloader(download_map_id); + if (downloadMapId > -1) { + mMapdownloader = new NavitMapDownloader(downloadMapId); mActivity.showDialog(NavitDialogs.DIALOG_MAPDOWNLOAD); - mapdownloader.start(); + mMapdownloader.start(); } } break; @@ -111,6 +114,8 @@ public class NavitDialogs extends Handler { mActivity.dismissDialog(msg.getData().getInt("dialog_num")); mActivity.removeDialog(msg.getData().getInt("dialog_num")); break; + default: + Log.e(TAG,"Unexpected value: " + msg.what); } } @@ -119,53 +124,45 @@ public class NavitDialogs extends Handler { switch (id) { case DIALOG_MAPDOWNLOAD: - mapdownloader_dialog = new ProgressDialog(mActivity); - mapdownloader_dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - mapdownloader_dialog.setTitle("--"); - mapdownloader_dialog.setMessage("--"); - mapdownloader_dialog.setCancelable(true); - mapdownloader_dialog.setProgress(0); - mapdownloader_dialog.setMax(200); + mMapdownloaderDialog = new ProgressDialog(mActivity); + mMapdownloaderDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + mMapdownloaderDialog.setTitle("--"); + mMapdownloaderDialog.setMessage("--"); + mMapdownloaderDialog.setCancelable(true); + mMapdownloaderDialog.setProgress(0); + mMapdownloaderDialog.setMax(200); DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() { public void onDismiss(DialogInterface dialog) { - Log.e(TAG, "onDismiss: mapdownloader_dialog"); - if (mapdownloader != null) { - mapdownloader.stop_thread(); + Log.e(TAG, "onDismiss: mMapdownloaderDialog"); + if (mMapdownloader != null) { + mMapdownloader.stop_thread(); } } }; - mapdownloader_dialog.setOnDismissListener(onDismissListener); + mMapdownloaderDialog.setOnDismissListener(onDismissListener); // show license for OSM maps Toast.makeText(mActivity.getApplicationContext(), - Navit.getInstance().getString(R.string.osm_copyright), - Toast.LENGTH_LONG).show(); - return mapdownloader_dialog; + R.string.osm_copyright, Toast.LENGTH_LONG).show(); + return mMapdownloaderDialog; case DIALOG_BACKUP_RESTORE: /* Create a Dialog that Displays Options wether to Backup or Restore */ - builder.setTitle(mActivity.getTstring(R.string.choose_an_action)). - setCancelable(true). - setItems(R.array.dialog_backup_restore_items, - new DialogInterface.OnClickListener() { + builder.setTitle(getTstring(R.string.choose_an_action)) + .setCancelable(true) + .setItems(R.array.dialog_backup_restore_items, + new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { /* Notify User if no SD Card present */ if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { - Toast.makeText(mActivity, mActivity - .getTstring(R.string.please_insert_an_sd_card), + Toast.makeText(mActivity, getTstring(R.string.please_insert_an_sd_card), Toast.LENGTH_LONG).show(); } - - switch (which) { - case 0: - /* Backup */ - new NavitBackupTask(mActivity).execute(); - break; - case 1: - /* Restore */ - mActivity.showDialog(DIALOG_SELECT_BACKUP); - break; + if (which == 0) { /* Backup */ + new NavitBackupTask(mActivity).execute(); + } else if (which == 1) { /* Restore */ + mActivity.showDialog(DIALOG_SELECT_BACKUP); } } }); @@ -183,13 +180,13 @@ public class NavitDialogs extends Handler { if (backups == null || backups.length == 0) { /* No Backups were found */ - builder.setTitle(mActivity.getTstring(R.string.no_backup_found)); - builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null); + builder.setTitle(getTstring(R.string.no_backup_found)); + builder.setNegativeButton(getTstring(android.R.string.cancel), null); return builder.create(); } - builder.setTitle(mActivity.getTstring(R.string.select_backup)); - final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity, + builder.setTitle(getTstring(R.string.select_backup)); + final ArrayAdapter<String> adapter = new ArrayAdapter<>(mActivity, android.R.layout.simple_spinner_item, backups); builder.setAdapter(adapter, new OnClickListener() { @@ -198,15 +195,17 @@ public class NavitDialogs extends Handler { new NavitRestoreTask(mActivity, adapter.getItem(which)).execute(); } }); - builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null); + builder.setNegativeButton(getTstring(android.R.string.cancel), null); return builder.create(); + default: + Log.e(TAG,"Unexpected value: " + id); } // should never get here!! return null; } - public void prepareDialog(int id) { + void prepareDialog(int id) { /* Remove the Dialog to force Android to rerun onCreateDialog */ if (id == DIALOG_SELECT_BACKUP) { |