upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-09 12:53:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Last changeset for renaming & reorganizing

Browse Source 
- Export
- Generic Strings
- Import
- SD Card
- Share Track

Other fixes
- check spelling
- check spacing
- check order
- clean up section titles
This commit is contained in:
Jimmy Shih
2011-11-09 17:26:50 -08:00
parent 0118a7691f
commit ad139438f9
34 changed files with 487 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
+3 -3
View File
@@ -80,7 +80,7 @@ public class AccountChooser {
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(R.string.send_google_choose_account);
builder.setCancelable(false);
builder.setPositiveButton(R.string.ok,
builder.setPositiveButton(R.string.generic_ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@@ -92,7 +92,7 @@ public class AccountChooser {
handler.onAccountSelected(selectedAccount);
}
});
builder.setNegativeButton(R.string.cancel,
builder.setNegativeButton(R.string.generic_cancel,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@@ -127,7 +127,7 @@ public class AccountChooser {
builder.setTitle(R.string.send_google_no_account);
builder.setMessage(R.string.send_google_no_account_message);
builder.setCancelable(true);
builder.setPositiveButton(R.string.ok,
builder.setPositiveButton(R.string.generic_ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
+1 -1
View File
@@ -57,7 +57,7 @@ class CheckUnits {
}
});
builder.setCancelable(true);
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
recordCheckPerformed(checkUnitsSharedPreferences);
SharedPreferences useMetricPreferences = context.getSharedPreferences(
MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
+4 -4
View File
@@ -51,10 +51,10 @@ public class DeleteAllTracks extends Handler {
AlertDialog dialog = null;
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setMessage(
context.getString(R.string.all_data_will_be_permanently_deleted));
builder.setTitle(context.getString(R.string.confirmation_title_are_you_sure));
context.getString(R.string.track_list_delete_all_confirm_message));
builder.setTitle(context.getString(R.string.generic_confirm_title));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setPositiveButton(context.getString(R.string.yes),
builder.setPositiveButton(context.getString(R.string.generic_yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
@@ -72,7 +72,7 @@ public class DeleteAllTracks extends Handler {
}
}
});
builder.setNegativeButton(context.getString(R.string.no),
builder.setNegativeButton(context.getString(R.string.generic_no),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
+4 -4
View File
@@ -77,11 +77,11 @@ public class DeleteTrack extends Activity
}
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.track_will_be_permanently_deleted));
builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
builder.setMessage(getString(R.string.track_list_delete_track_confirm_message));
builder.setTitle(getString(R.string.generic_confirm_title));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setPositiveButton(getString(R.string.yes), this);
builder.setNegativeButton(getString(R.string.no), this);
builder.setPositiveButton(getString(R.string.generic_yes), this);
builder.setNegativeButton(getString(R.string.generic_no), this);
builder.setOnCancelListener(this);
return builder.create();
}
MyTracks/src/com/google/android/apps/mytracks/Eula.java
+1 -1
View File
@@ -82,7 +82,7 @@ class Eula {
*/
static void showEula(Context context) {
AlertDialog.Builder builder = initDialog(context);
builder.setPositiveButton(R.string.ok, null);
builder.setPositiveButton(R.string.generic_ok, null);
builder.show();
}
MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+4 -4
View File
@@ -80,8 +80,8 @@ public class ExportAllTracks {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setSingleChoiceItems(R.array.export_formats, 0, itemClick);
builder.setPositiveButton(R.string.ok, positiveClick);
builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.generic_ok, positiveClick);
builder.setNegativeButton(R.string.generic_cancel, null);
builder.show();
}
@@ -126,7 +126,7 @@ public class ExportAllTracks {
Log.i(Constants.TAG, "ExportAllTracks: Releasing wake lock.");
}
Log.i(Constants.TAG, "ExportAllTracks: Done");
showToast(R.string.export_done, Toast.LENGTH_SHORT);
showToast(R.string.export_success, Toast.LENGTH_SHORT);
}
private void makeProgressDialog(final int trackCount) {
@@ -183,7 +183,7 @@ public class ExportAllTracks {
TrackWriter writer =
TrackWriterFactory.newWriter(activity, providerUtils, id, format);
if (writer == null) {
showToast(R.string.error_export_generic, Toast.LENGTH_LONG);
showToast(R.string.export_error, Toast.LENGTH_LONG);
return;
}
MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
+4 -4
View File
@@ -126,12 +126,12 @@ public class ImportAllTracks {
Log.i(Constants.TAG, "ImportAllTracks: Done");
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
if (gpxFileCount == 0) {
builder.setMessage(activity.getString(R.string.import_multi_empty, gpxPath));
builder.setMessage(activity.getString(R.string.import_no_file, gpxPath));
} else {
builder.setMessage(activity.getString(R.string.import_multi_done, importSuccessCount, gpxFileCount,
gpxPath));
builder.setMessage(
activity.getString(R.string.import_success, importSuccessCount, gpxFileCount, gpxPath));
}
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (singleTrackSelected) {
MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+4 -4
View File
@@ -293,10 +293,10 @@ public class WaypointsList extends ListActivity
public void deleteWaypoint(final long waypointId) {
AlertDialog dialog = null;
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.marker_will_be_permanently_deleted));
builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
builder.setMessage(getString(R.string.marker_list_delete_marker_confirm_message));
builder.setTitle(getString(R.string.generic_confirm_title));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setPositiveButton(getString(R.string.yes),
builder.setPositiveButton(getString(R.string.generic_yes),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
@@ -305,7 +305,7 @@ public class WaypointsList extends ListActivity
new StringUtils(WaypointsList.this));
}
});
builder.setNegativeButton(getString(R.string.no),
builder.setNegativeButton(getString(R.string.generic_no),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class WelcomeActivity extends Activity {
View view = li.inflate(R.layout.about, null);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setView(view);
builder.setPositiveButton(R.string.ok, null);
builder.setPositiveButton(R.string.generic_ok, null);
builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
+7 -7
View File
@@ -74,12 +74,12 @@ public class BackupActivityHelper {
*/
public void writeBackup() {
if (!fileUtils.isSdCardAvailable()) {
showToast(R.string.io_no_external_storage_found);
showToast(R.string.sd_card_error_no_storage);
return;
}
if (!backup.isBackupsDirectoryAvailable(true)) {
showToast(R.string.io_create_dir_failed);
showToast(R.string.sd_card_error_create_dir);
return;
}
@@ -95,10 +95,10 @@ public class BackupActivityHelper {
public void run() {
try {
backup.writeToDefaultFile();
showToast(R.string.io_write_finished);
showToast(R.string.sd_card_success_write_file);
} catch (IOException e) {
Log.e(Constants.TAG, "Failed to write backup", e);
showToast(R.string.io_write_failed);
showToast(R.string.sd_card_error_write_file);
} finally {
dismissDialog(progressDialog);
}
@@ -114,7 +114,7 @@ public class BackupActivityHelper {
public void restoreBackup() {
// Get the list of existing backups
if (!fileUtils.isSdCardAvailable()) {
showToast(R.string.io_no_external_storage_found);
showToast(R.string.sd_card_error_no_storage);
return;
}
@@ -196,10 +196,10 @@ public class BackupActivityHelper {
public void run() {
try {
backup.restoreFromDate(date);
showToast(R.string.io_read_finished);
showToast(R.string.sd_card_success_read_file);
} catch (IOException e) {
Log.e(Constants.TAG, "Failed to restore backup", e);
showToast(R.string.io_read_failed);
showToast(R.string.sd_card_error_read_file);
} finally {
// Data may have been restored, "reboot" the app to catch it
restartApplication();
MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+2 -2
View File
@@ -169,7 +169,7 @@ public class SaveActivity extends Activity {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(writer.getErrorMessage());
builder.setPositiveButton(R.string.ok, new OnClickListener() {
builder.setPositiveButton(R.string.generic_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int arg1) {
dialog.dismiss();
@@ -185,7 +185,7 @@ public class SaveActivity extends Activity {
});
builder.setIcon(success ? android.R.drawable.ic_dialog_info :
android.R.drawable.ic_dialog_alert);
builder.setTitle(success ? R.string.success : R.string.error);
builder.setTitle(success ? R.string.generic_success : R.string.generic_error);
return builder.create();
}
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+6 -6
View File
@@ -114,7 +114,7 @@ class TrackWriterImpl implements TrackWriter {
private void doWriteTrack() {
// Open the input and output
success = false;
errorMessage = R.string.error_export_generic;
errorMessage = R.string.export_error;
if (track != null) {
if (openFile()) {
try {
@@ -127,7 +127,7 @@ class TrackWriterImpl implements TrackWriter {
}
}
success = false;
errorMessage = R.string.error_export_operation_canceled;
errorMessage = R.string.export_canceled;
}
}
}
@@ -208,7 +208,7 @@ class TrackWriterImpl implements TrackWriter {
writer.prepare(track, newOutputStream(fileName));
} catch (FileNotFoundException e) {
Log.e(Constants.TAG, "Failed to open output file.", e);
errorMessage = R.string.io_write_failed;
errorMessage = R.string.sd_card_error_write_file;
return false;
}
return true;
@@ -226,12 +226,12 @@ class TrackWriterImpl implements TrackWriter {
if (!fileUtils.isSdCardAvailable()) {
Log.i(Constants.TAG, "Could not find SD card.");
errorMessage = R.string.io_no_external_storage_found;
errorMessage = R.string.sd_card_error_no_storage;
return false;
}
if (!fileUtils.ensureDirectoryExists(directory)) {
Log.i(Constants.TAG, "Could not create export directory.");
errorMessage = R.string.io_create_dir_failed;
errorMessage = R.string.sd_card_error_create_dir;
return false;
}
@@ -297,7 +297,7 @@ class TrackWriterImpl implements TrackWriter {
writer.close();
success = true;
Log.d(Constants.TAG, "Done writing track.");
errorMessage = R.string.io_write_finished;
errorMessage = R.string.sd_card_success_write_file;
}
private void writeLocations() throws InterruptedException {
MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
+1 -1
View File
@@ -81,7 +81,7 @@ class WriteProgressController {
dialog.setIcon(android.R.drawable.ic_dialog_info);
dialog.setTitle(activity.getString(R.string.generic_progress_title));
dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
dialog.setMessage(activity.getString(R.string.progress_message_export));
dialog.setMessage(activity.getString(R.string.export_progress_message));
dialog.setIndeterminate(true);
dialog.setOnCancelListener(dialogCancelListener);
return dialog;
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+4 -4
View File
@@ -72,16 +72,16 @@ public class ResultDialogFactory {
.setView(makeDialogContent(activity, results, success));
if (success) {
builder.setTitle(R.string.success);
builder.setTitle(R.string.generic_success);
builder.setIcon(android.R.drawable.ic_dialog_info);
} else {
builder.setTitle(R.string.error);
builder.setTitle(R.string.generic_error);
builder.setIcon(android.R.drawable.ic_dialog_alert);
}
builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
builder.setPositiveButton(activity.getString(R.string.generic_ok), onOkClickListener);
if (onShareClickListener != null) {
builder.setNegativeButton(activity.getString(R.string.share_track_url),
builder.setNegativeButton(activity.getString(R.string.send_google_result_share_url),
onShareClickListener);
}