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

Review

Browse source
This commit is contained in:
androiddevkotlin 2021-03-29 20:43:41 +03:00
parent 896ae11878
commit 5e1a5e8d3e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
View file

@ -72,8 +72,6 @@ public class QuickActionListFragment extends BaseOsmAndFragment
private static final int ITEMS_IN_GROUP = 6; private static final int ITEMS_IN_GROUP = 6;
public static final int GROUP_POI_ID = 5;
private RecyclerView rv; private RecyclerView rv;
private FloatingActionButton fab; private FloatingActionButton fab;
private View bottomPanel; private View bottomPanel;
@ -595,12 +593,12 @@ public class QuickActionListFragment extends BaseOsmAndFragment
List<QuickAction> actions = getQuickActions(); List<QuickAction> actions = getQuickActions();
int actionGlobalPosition = actions.indexOf(action); int actionGlobalPosition = actions.indexOf(action);
int actionPosition = actionGlobalPosition % ITEMS_IN_GROUP + 1; int actionPosition = actionGlobalPosition % ITEMS_IN_GROUP + 1;
int actionType = action.getType(); String name = action.getName(app);
if (actionType == GROUP_POI_ID) { if (action.getActionNameRes() != 0 && !name.contains(getString(action.getActionNameRes()))) {
String prefAction = getString(R.string.quick_action_show_hide_title); String prefAction = getString(action.getActionNameRes());
h.title.setText(getString(R.string.ltr_or_rtl_combine_via_dash, prefAction, action.getName(app))); h.title.setText(getString(R.string.ltr_or_rtl_combine_via_dash, prefAction, action.getName(app)));
} else { } else {
h.title.setText(action.getName(app)); h.title.setText(name);
} }
h.subTitle.setText(getResources().getString(R.string.quick_action_item_action, actionPosition)); h.subTitle.setText(getResources().getString(R.string.quick_action_item_action, actionPosition));
h.icon.setImageDrawable(getContentIcon(action.getIconRes(app))); h.icon.setImageDrawable(getContentIcon(action.getIconRes(app)));