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

use one string for "Actions"

Browse source
This commit is contained in:
veliymolfar 2020-04-30 16:24:43 +03:00
parent a8c05348b8
commit d1a1942907
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@
<string name="replace_point_descr">Replace another point with this</string> <string name="replace_point_descr">Replace another point with this</string>
<string name="developer_plugin">Developer Plugin</string> <string name="developer_plugin">Developer Plugin</string>
<string name="move_inside_category">You can move items only inside this category.</string> <string name="move_inside_category">You can move items only inside this category.</string>
<string name="additional_actions_descr">You can access these actions by tapping the “Actions” button.</string> <string name="additional_actions_descr">You can access these actions by tapping the “%1$s” button.</string>
<string name="main_actions">Main actions</string> <string name="main_actions">Main actions</string>
<string name="main_actions_descr">Main actions containt only 4 buttons.</string> <string name="main_actions_descr">Main actions containt only 4 buttons.</string>
<string name="reset_items_descr">Settings will be reset to the original state after hiding.</string> <string name="reset_items_descr">Settings will be reset to the original state after hiding.</string>

6
OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java
View file

@ -226,7 +226,11 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
h.title.setTypeface(FontCache.getFont(app, app.getString(R.string.font_roboto_medium))); h.title.setTypeface(FontCache.getFont(app, app.getString(R.string.font_roboto_medium)));
h.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, app.getResources().getDimension(R.dimen.default_list_text_size)); h.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, app.getResources().getDimension(R.dimen.default_list_text_size));
h.title.setText(header.titleRes); h.title.setText(header.titleRes);
h.description.setText(header.descrRes); if (header.descrRes == R.string.additional_actions_descr) {
h.description.setText(String.format(app.getString(header.descrRes), app.getString(R.string.shared_string_actions)));
} else {
h.description.setText(header.descrRes);
}
h.moveIcon.setVisibility(View.GONE); h.moveIcon.setVisibility(View.GONE);
h.movable = header.titleRes == R.string.additional_actions; h.movable = header.titleRes == R.string.additional_actions;
} else if (holder instanceof ButtonHolder) { } else if (holder instanceof ButtonHolder) {