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

Harmonize using "On/Off" vs. partial "Enabled/Disabled"

Browse source
This commit is contained in:
sonora 2020-01-05 09:28:19 +01:00
parent 6dea7dde6b
commit 50f510f1d1
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/dash_plugin_item.xml
View file

@ -67,8 +67,8 @@
android:paddingRight="9.5dp" android:paddingRight="9.5dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:textColor="?attr/switch_ex_text_color" android:textColor="?attr/switch_ex_text_color"
android:textOff="@string/shared_string_disabled" android:textOff="@string/shared_string_off"
android:textOn="@string/shared_string_enabled" android:textOn="@string/shared_string_on"
android:textSize="@dimen/default_sub_text_size" android:textSize="@dimen/default_sub_text_size"
android:lines="1" android:lines="1"
android:maxLines="1" android:maxLines="1"

4
OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
View file

@ -70,8 +70,8 @@ public class RasterMapMenu {
} }
final boolean selected = mapTypeDescr != null; final boolean selected = mapTypeDescr != null;
final int toggleActionStringId = selected ? R.string.shared_string_enabled final int toggleActionStringId = selected ? R.string.shared_string_on
: R.string.shared_string_disabled; : R.string.shared_string_off;
final OnMapSelectedCallback onMapSelectedCallback = final OnMapSelectedCallback onMapSelectedCallback =
new OnMapSelectedCallback() { new OnMapSelectedCallback() {

2
OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
View file

@ -69,7 +69,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
final View toggleRow = view.findViewById(R.id.toggle_row); final View toggleRow = view.findViewById(R.id.toggle_row);
final boolean selected = settings.SHOW_MAPILLARY.get(); final boolean selected = settings.SHOW_MAPILLARY.get();
final int toggleActionStringId = selected ? R.string.shared_string_enabled : R.string.shared_string_disabled; final int toggleActionStringId = selected ? R.string.shared_string_on : R.string.shared_string_off;
int toggleIconColorId; int toggleIconColorId;
int toggleIconId; int toggleIconId;
if (selected) { if (selected) {

2
OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
View file

@ -34,7 +34,7 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
BaseBottomSheetItem snapToRoadItem = new BottomSheetItemWithCompoundButton.Builder() BaseBottomSheetItem snapToRoadItem = new BottomSheetItemWithCompoundButton.Builder()
.setChecked(snapToRoadEnabled) .setChecked(snapToRoadEnabled)
.setDescription(getString(snapToRoadEnabled ? R.string.shared_string_enabled : R.string.shared_string_disabled)) .setDescription(getString(snapToRoadEnabled ? R.string.shared_string_on : R.string.shared_string_off))
.setIcon(snapToRoadEnabled .setIcon(snapToRoadEnabled
? getActiveIcon(R.drawable.ic_action_snap_to_road) ? getActiveIcon(R.drawable.ic_action_snap_to_road)
: getContentIcon(R.drawable.ic_action_snap_to_road)) : getContentIcon(R.drawable.ic_action_snap_to_road))

2
OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java
View file

@ -86,7 +86,7 @@ public class ContourLinesMenu {
final OsmandSettings.CommonPreference<String> colorPref = settings.getCustomRenderProperty(colorSchemeProp.getAttrName()); final OsmandSettings.CommonPreference<String> colorPref = settings.getCustomRenderProperty(colorSchemeProp.getAttrName());
final boolean selected = !pref.get().equals(CONTOUR_LINES_DISABLED_VALUE); final boolean selected = !pref.get().equals(CONTOUR_LINES_DISABLED_VALUE);
final int toggleActionStringId = selected ? R.string.shared_string_enabled : R.string.shared_string_disabled; final int toggleActionStringId = selected ? R.string.shared_string_on : R.string.shared_string_off;
final int showZoomLevelStringId = R.string.show_from_zoom_level; final int showZoomLevelStringId = R.string.show_from_zoom_level;
final int colorSchemeStringId = R.string.srtm_color_scheme; final int colorSchemeStringId = R.string.srtm_color_scheme;

2
OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeMenu.java
View file

@ -52,7 +52,7 @@ public class HillshadeMenu {
} }
final boolean selected = plugin.isHillShadeLayerEnabled(); final boolean selected = plugin.isHillShadeLayerEnabled();
final int toggleActionStringId = selected ? R.string.shared_string_enabled : R.string.shared_string_disabled; final int toggleActionStringId = selected ? R.string.shared_string_on : R.string.shared_string_off;
ContextMenuAdapter.OnRowItemClick l = new ContextMenuAdapter.OnRowItemClick() { ContextMenuAdapter.OnRowItemClick l = new ContextMenuAdapter.OnRowItemClick() {
@Override @Override