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

Reduce strings by removing strings specific for a file type.

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-11 16:03:08 -08:00
parent ed3e3c9c41
commit 52eb7bffb6
18 changed files with 64 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+9 -1
View File
@@ -78,8 +78,16 @@ public class ExportAllTracks {
this.activity = activity;
Log.i(Constants.TAG, "ExportAllTracks: Starting");
String exportFileFormat = activity.getString(R.string.track_list_export_file);
String formats[] = activity.getResources().getStringArray(R.array.file_formats);
String[] choices = new String[formats.length];
for (int i = 0; i < formats.length; i++) {
choices[i] = String.format(exportFileFormat, formats[i]);
}
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setSingleChoiceItems(R.array.export_formats, 0, itemClick);
builder.setSingleChoiceItems(choices, 0, itemClick);
builder.setPositiveButton(R.string.generic_ok, positiveClick);
builder.setNegativeButton(R.string.generic_cancel, null);
builder.show();
MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+16 -16
View File
@@ -362,31 +362,31 @@ public class MapActivity extends com.google.android.maps.MapActivity
menu.add(0, Constants.MENU_EDIT, 0,
R.string.track_list_edit_track);
if (!dataHub.isRecordingSelected()) {
String saveFileFormat = getString(R.string.track_list_save_file);
String shareFileFormat = getString(R.string.track_list_share_file);
String formats[] = getResources().getStringArray(R.array.file_formats);
menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
R.string.track_list_send_google);
SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
R.string.track_list_share_track);
share.add(0, Constants.MENU_SHARE_LINK, 0,
R.string.track_list_share_url);
share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
R.string.track_list_share_gpx_file);
share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
R.string.track_list_share_kml_file);
share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
R.string.track_list_share_csv_file);
share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
R.string.track_list_share_tcx_file);
share.add(
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, formats[0]));
share.add(
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, formats[1]));
share.add(
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, formats[2]));
share.add(
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, formats[3]));
SubMenu save = menu.addSubMenu(0,
Constants.MENU_WRITE_TO_SD_CARD, 0,
R.string.track_list_save_sd);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
R.string.track_list_save_gpx_file);
save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
R.string.track_list_save_kml_file);
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
R.string.track_list_save_csv_file);
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
R.string.track_list_save_tcx_file);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, formats[0]));
save.add(0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, formats[1]));
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, formats[2]));
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, formats[3]));
menu.add(0, Constants.MENU_CLEAR_MAP, 0,
R.string.track_list_clear_map);
menu.add(0, Constants.MENU_DELETE, 0,
MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+16 -16
View File
@@ -86,31 +86,31 @@ public class TrackList extends ListActivity
menu.add(0, Constants.MENU_EDIT, 0,
R.string.track_list_edit_track);
if (!isRecording() || trackId != recordingTrackId) {
String saveFileFormat = getString(R.string.track_list_save_file);
String shareFileFormat = getString(R.string.track_list_share_file);
String formats[] = getResources().getStringArray(R.array.file_formats);
menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
R.string.track_list_send_google);
SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
R.string.track_list_share_track);
share.add(0, Constants.MENU_SHARE_LINK, 0,
R.string.track_list_share_url);
share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
R.string.track_list_share_gpx_file);
share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
R.string.track_list_share_kml_file);
share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
R.string.track_list_share_csv_file);
share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
R.string.track_list_share_tcx_file);
share.add(
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, formats[0]));
share.add(
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, formats[1]));
share.add(
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, formats[2]));
share.add(
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, formats[3]));
SubMenu save = menu.addSubMenu(0,
Constants.MENU_WRITE_TO_SD_CARD, 0,
R.string.track_list_save_sd);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
R.string.track_list_save_gpx_file);
save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
R.string.track_list_save_kml_file);
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
R.string.track_list_save_csv_file);
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
R.string.track_list_save_tcx_file);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, formats[0]));
save.add(0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, formats[1]));
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, formats[2]));
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, formats[3]));
menu.add(0, Constants.MENU_DELETE, 0,
R.string.track_list_delete_track);
}