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

move context to first place

Browse source
This commit is contained in:
Chumva 2018-06-08 15:08:12 +03:00
parent 66dd86360f
commit 765402b4e8
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
View file

@ -139,7 +139,7 @@ public abstract class SwitchableAction<T> extends QuickAction {
public void onBindViewHolder(final Adapter.ItemHolder holder, final int position) { public void onBindViewHolder(final Adapter.ItemHolder holder, final int position) {
final T item = itemsList.get(position); final T item = itemsList.get(position);
holder.title.setText(getItemName(item, context)); holder.title.setText(getItemName(context, item));
holder.handleView.setOnTouchListener(new View.OnTouchListener() { holder.handleView.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
@ -278,7 +278,7 @@ public abstract class SwitchableAction<T> extends QuickAction {
protected abstract void saveListToParams(List<T> list); protected abstract void saveListToParams(List<T> list);
protected abstract String getItemName(T item, Context context); protected abstract String getItemName(Context context, T item);
protected abstract protected abstract
@StringRes @StringRes

2
OsmAnd/src/net/osmand/plus/quickaction/actions/MapOverlayAction.java
View file

@ -70,7 +70,7 @@ public class MapOverlayAction extends SwitchableAction<Pair<String, String>> {
} }
@Override @Override
protected String getItemName(Pair<String, String> item, Context context) { protected String getItemName(Context context, Pair<String, String> item) {
return item.second; return item.second;
} }

2
OsmAnd/src/net/osmand/plus/quickaction/actions/MapSourceAction.java
View file

@ -189,7 +189,7 @@ public class MapSourceAction extends SwitchableAction<Pair<String, String>> {
} }
@Override @Override
protected String getItemName(Pair<String, String> item, Context context) { protected String getItemName(Context context, Pair<String, String> item) {
return item.second; return item.second;
} }

2
OsmAnd/src/net/osmand/plus/quickaction/actions/MapStyleAction.java
View file

@ -201,7 +201,7 @@ public class MapStyleAction extends SwitchableAction<String> {
} }
@Override @Override
protected String getItemName(String item, Context context) { protected String getItemName(Context context, String item) {
if (context != null) { if (context != null) {
return getTranslatedItemName(context, item); return getTranslatedItemName(context, item);
} else { } else {

2
OsmAnd/src/net/osmand/plus/quickaction/actions/MapUnderlayAction.java
View file

@ -70,7 +70,7 @@ public class MapUnderlayAction extends SwitchableAction<Pair<String, String>> {
} }
@Override @Override
protected String getItemName(Pair<String, String> item, Context context) { protected String getItemName(Context context, Pair<String, String> item) {
return item.second; return item.second;
} }