Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared_string_ok

Browse source
This commit is contained in:
sonora 2015-03-07 21:19:08 +01:00
parent 4509a66b6a
commit 26dc53aa4b
31 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -1965,7 +1965,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="transport_stops_to_pass">stops to pass</string>
<string name="transport_route_distance">Itinerary distance</string>
<string name="transport">Transport</string>
<string name="default_buttons_ok">OK</string>
<string name="show_transport_over_map_description">Show public transport stops on map</string>
<string name="show_transport_over_map">Show transport stops</string>
<string name="hello">Navigation application OsmAnd</string>

2
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -157,7 +157,7 @@ public class AppInitializer {
if (netOsmandWasInstalled) {
// Builder builder = new AccessibleAlertBuilder(this);
// builder.setMessage(R.string.osmand_net_previously_installed);
// builder.setPositiveButton(R.string.default_buttons_ok, null);
// builder.setPositiveButton(R.string.shared_string_ok, null);
// builder.show();
} else {
AlertDialog.Builder builder = new AccessibleAlertBuilder(ctx);

2
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -218,7 +218,7 @@ public class FavouritesDbHelper {
} else {
builder.setMessage(uiContext.getString(R.string.fav_point_dublicate_message, name));
}
builder.setPositiveButton(R.string.default_buttons_ok, null);
builder.setPositiveButton(R.string.shared_string_ok, null);
p.setName(name);
return builder;
}

2
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -426,7 +426,7 @@ public class OsmandApplication extends Application {
}
}
});
builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(uiContext, SettingsActivity.class);

2
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -498,7 +498,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
bld.setTitle(R.string.edit_group);
bld.setView(favEdit);
bld.setNegativeButton(R.string.default_buttons_cancel, null);
bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

2
OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
View file

@ -89,7 +89,7 @@ public class IntermediatePointsDialog {
builder.setView(contentView);
builder.setInverseBackgroundForced(true);
lv.setBackgroundColor(Color.WHITE);
builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if(changeOrder) {

2
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -190,7 +190,7 @@ public class SettingsActivity extends SettingsBaseActivity {
ll.addView(sv);
dialog.setContentView(ll);
dialog.show();
// bld.setPositiveButton(R.string.default_buttons_ok, null);
// bld.setPositiveButton(R.string.shared_string_ok, null);
}

2
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -333,7 +333,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
settings.getExternalStorageDirectory().getAbsolutePath();
editalert.setView(input);
editalert.setNegativeButton(R.string.default_buttons_cancel, null);
editalert.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
editalert.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
warnAboutChangingStorage(input.getText().toString());
}

2
OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
View file

@ -370,7 +370,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
bld.setNegativeButton(R.string.default_buttons_cancel, null);
bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
for (int i = 0; i < prefs.length; i++) {
prefs[i].set(tempPrefs[i]);

2
OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
View file

@ -570,7 +570,7 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
}
});
} else {
createMenuItem(menu, 1, R.string.default_buttons_ok, R.drawable.ic_action_ok_light,
createMenuItem(menu, 1, R.string.shared_string_ok, R.drawable.ic_action_ok_light,
R.drawable.ic_action_ok_dark, MenuItem.SHOW_AS_ACTION_ALWAYS);
}
return super.onCreateOptionsMenu(menu);

2
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -899,7 +899,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
private void showPOIDetails(final Amenity amenity, boolean en) {
AlertDialog.Builder b = new AlertDialog.Builder(SearchPOIActivity.this);
b.setTitle(OsmAndFormatter.getPoiSimpleFormat(amenity, getMyApplication(), en));
b.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
b.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();

2
OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
View file

@ -384,7 +384,7 @@ public class SearchTransportFragment extends Fragment implements SearchActivityC
}
b.setMessage(txt.toString());
b.setPositiveButton(getString(R.string.default_buttons_ok), null);
b.setPositiveButton(getString(R.string.shared_string_ok), null);
b.setNeutralButton(getString(R.string.transport_search_before), new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface dialog, int which) {

2
OsmAnd/src/net/osmand/plus/base/SuggestExternalDirectoryDialog.java
View file

@ -63,7 +63,7 @@ public class SuggestExternalDirectoryDialog {
}
}
});
bld.setPositiveButton(R.string.default_buttons_ok, null);
bld.setPositiveButton(R.string.shared_string_ok, null);
bld.show();
return true;
}

2
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -137,7 +137,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
}
});
b.setTitle(R.string.profile_settings);
b.setPositiveButton(R.string.default_buttons_ok, null);
b.setPositiveButton(R.string.shared_string_ok, null);
b.setView(v);
b.show();
}

2
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -440,7 +440,7 @@ public class ConfigureMapMenu {
bld.setNegativeButton(R.string.default_buttons_cancel, null);
bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
for (int i = 0; i < prefs.size(); i++) {
prefs.get(i).set(tempPrefs[i]);

2
OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
View file

@ -215,7 +215,7 @@ public class FavoriteDialogs {
point.setCategory(categoryStr);
Builder bld = FavouritesDbHelper.checkDublicates(point, helper, activity);
if(bld != null) {
bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
addFavorite(activity, point, helper);

2
OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
View file

@ -364,7 +364,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
pref.set(false);
}
});
builder.setPositiveButton(R.string.default_buttons_ok, null);
builder.setPositiveButton(R.string.shared_string_ok, null);
builder.show();
}

4
OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
View file

@ -177,7 +177,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
AlertDialog.Builder msg = new AlertDialog.Builder(this);
msg.setTitle(R.string.free_version_title);
msg.setMessage(msgTx);
msg.setPositiveButton(R.string.default_buttons_ok, null);
msg.setPositiveButton(R.string.shared_string_ok, null);
msg.show();
} else {
downloadFilesCheckInternet();
@ -307,7 +307,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
}
});
}
msg.setPositiveButton(R.string.default_buttons_ok, null);
msg.setPositiveButton(R.string.shared_string_ok, null);
msg.show();
}
}

2
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -305,7 +305,7 @@ public class GpxUiHelper {
};
b.setAdapter(listAdapter, onClickListener);
if (multipleChoice) {
b.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
b.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

4
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -769,7 +769,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
});
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
builder.setView(listView);
builder.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
builder.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@ -812,7 +812,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
});
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
builder.setView(listView);
builder.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
builder.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

2
OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
View file

@ -374,7 +374,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
LinearLayout ll = createIntervalChooseLayout(uiCtx, patternMsg, seconds, minutes,
choice, v, dm);
dlg.setView(ll);
dlg.setPositiveButton(R.string.default_buttons_ok, onclick);
dlg.setPositiveButton(R.string.shared_string_ok, onclick);
dlg.setNegativeButton(R.string.default_buttons_cancel, null);
dlg.show();
}

2
OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
View file

@ -276,7 +276,7 @@ public class SelectedGPXFragment extends ListFragment {
bld.setView(view);
bld.setNegativeButton(R.string.default_buttons_cancel, null);
bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

2
OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
View file

@ -56,7 +56,7 @@ public class NauticalMapsPlugin extends OsmandPlugin {
IndexConstants.BINARY_MAP_INDEX_EXT)){
Builder dlg = new AlertDialog.Builder(activity);
dlg.setMessage(net.osmand.plus.R.string.nautical_maps_missing);
dlg.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
dlg.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

6
OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
View file

@ -429,7 +429,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
group = (OsMoGroup) (o instanceof OsMoGroup ? o : null);
MenuItem mi = null;
if (device != null) {
mi = createMenuItem(menu, ON_OFF_ACTION_ID, R.string.default_buttons_ok, 0, 0,
mi = createMenuItem(menu, ON_OFF_ACTION_ID, R.string.shared_string_ok, 0, 0,
MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
}
if (device != null && device.getLastLocation() != null) {
@ -600,7 +600,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
tv.setMovementMethod(LinkMovementMethod.getInstance());
tv.setText(sb.toString());
bld.setView(sv);
bld.setPositiveButton(R.string.default_buttons_ok, null);
bld.setPositiveButton(R.string.shared_string_ok, null);
bld.setNegativeButton(R.string.osmo_invite, new OnClickListener() {
@Override
@ -865,7 +865,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
builder.setView(v);
builder.setNegativeButton(R.string.default_buttons_cancel, null);
builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if(!checkOperationIsNotRunning()) {

2
OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
View file

@ -403,7 +403,7 @@ public class OsMoService implements OsMoReactor {
protected void showRegisterAgain(OsMoGroupsActivity ga, String msg) {
Builder bld = new AlertDialog.Builder(ga);
bld.setMessage(msg);
bld.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
bld.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

2
OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
View file

@ -134,7 +134,7 @@ public class SettingsOsMoActivity extends SettingsBaseActivity {
tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 19);
tv.setMovementMethod(LinkMovementMethod.getInstance());
bld.setView(sv);
bld.setPositiveButton(R.string.default_buttons_ok, null);
bld.setPositiveButton(R.string.shared_string_ok, null);
bld.show();
return true;
} else if(preference == trackerId) {

4
OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
View file

@ -348,7 +348,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
timePicker.setCurrentHour(0);
timePicker.setCurrentMinute(0);
setTime.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
setTime.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
choose.dismiss();
@ -394,7 +394,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
Builder deleteEventWarning = new AlertDialog.Builder(activity);
deleteEventWarning.setTitle(activity.getString(R.string.osmand_parking_warning));
deleteEventWarning.setMessage(activity.getString(R.string.osmand_parking_warning_text));
deleteEventWarning.setNeutralButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
deleteEventWarning.setNeutralButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}

2
OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
View file

@ -293,7 +293,7 @@ public class RoutePointsActivity extends OsmandListActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
createMenuItem(menu, OK_ID, R.string.default_buttons_ok,
createMenuItem(menu, OK_ID, R.string.shared_string_ok,
R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark ,
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
createMenuItem(menu, NAVIGATE_DIALOG_ID, R.string.navigate_dialog,

4
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -354,7 +354,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
bld.setMessage(R.string.stage_is_completed);
}
bld.setTitle(getString(R.string.stage_is_completed_short))
.setPositiveButton(R.string.default_buttons_ok, null);
.setPositiveButton(R.string.shared_string_ok, null);
if (args != null && args.getBoolean(START_OVER)) {
String id = args.getString(TOUR_PARAM);
TourInformation tours = null;
@ -522,7 +522,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
ssf.onAttach(getActivity());
AlertDialog dlg = new AlertDialog.Builder(getActivity())
.setView(ssf.onCreateView(getActivity().getLayoutInflater(), null, savedInstanceState))
.setPositiveButton(R.string.default_buttons_ok, null)
.setPositiveButton(R.string.shared_string_ok, null)
.create();
return dlg;
}

2
OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
View file

@ -100,7 +100,7 @@ public class SherpafySelectToursFragment extends ListFragment {
}
});
builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String acCode = editText.getText().toString();

2
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -158,7 +158,7 @@ public class MapInfoWidgetsFactory {
});
}
dlg.setView(ll);
dlg.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
dlg.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
app.getSettings().SERVICE_OFF_INTERVAL.set(vs.value);