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

Updated behavior of all modes button

Browse source
This commit is contained in:
Denis 2014-10-30 14:32:56 +02:00
parent 6ee5040f01
commit ed10b3aa14
4 changed files with 99 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -18,6 +18,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton.OnCheckedChangeListener;
import net.osmand.plus.activities.actions.AppModeDialog;
import net.osmand.plus.dialogs.ConfigureMapMenu;
public class ContextMenuAdapter {
@ -41,6 +42,13 @@ public class ContextMenuAdapter {
}
}
}
public class BooleanResult {
private boolean result = false;
public void setResult(boolean value) { result = value; }
public boolean getResult() { return result; }
}
private final Context ctx;
private View anchor;
@ -57,7 +65,13 @@ public class ContextMenuAdapter {
final TIntArrayList iconListLight = new TIntArrayList();
final ArrayList<String> itemDescription = new ArrayList<String>();
private List<ApplicationMode> visibleModes = new ArrayList<ApplicationMode>();
private View.OnClickListener changeAppModeListener = null;
private ConfigureMapMenu.OnClickListener changeAppModeListener = null;
private BooleanResult allModes = new BooleanResult();
public ContextMenuAdapter(Context ctx, boolean allModes) {
this.ctx = ctx;
this.allModes.setResult(allModes);
}
public ContextMenuAdapter(Context ctx) {
this.ctx = ctx;
@ -256,7 +270,7 @@ public class ContextMenuAdapter {
public void setChangeAppModeListener(View.OnClickListener changeAppModeListener) {
public void setChangeAppModeListener(ConfigureMapMenu.OnClickListener changeAppModeListener) {
this.changeAppModeListener = changeAppModeListener;
}
@ -272,36 +286,17 @@ public class ContextMenuAdapter {
Integer lid = getLayoutId(position);
if (lid == R.layout.mode_toggles){
final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>();
return AppModeDialog.prepareAppModeDrawerView(activity, visibleModes, selected, new View.OnClickListener() {
return AppModeDialog.prepareAppModeDrawerView(activity, visibleModes, selected, allModes, new View.OnClickListener() {
@Override
public void onClick(View view) {
if (selected.size() > 0) {
((OsmandApplication) activity.getApplication()).getSettings().APPLICATION_MODE.set(selected.iterator().next());
notifyDataSetChanged();
}
if(changeAppModeListener != null) {
changeAppModeListener.onClick(view);
if (changeAppModeListener != null) {
changeAppModeListener.onClick(allModes.getResult());
}
}
}, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
//if user selects modes and none of them is set to current
// - need to set one of them as current
OsmandSettings settings = ((OsmandApplication) activity.getApplication()).getSettings();
ApplicationMode currentMode = settings.APPLICATION_MODE.get();
boolean selected = false;
for (ApplicationMode mode : visibleModes) {
if (mode.equals(currentMode)){
selected = true;
break;
}
}
if (!selected) {
settings.APPLICATION_MODE.set(visibleModes.get(0));
}
notifyDataSetChanged();
}
});
}
if (v == null || (v.getTag() != lid)) {

131
OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
View file

@ -1,16 +1,10 @@
package net.osmand.plus.activities.actions;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import android.app.AlertDialog;
import android.content.DialogInterface;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.*;
import android.app.Activity;
import android.content.Context;
import android.util.TypedValue;
@ -38,28 +32,31 @@ public class AppModeDialog {
}
//special method for drawer menu
// needed because if there's more than 4 items - the don't fit in drawer
public static View prepareAppModeDrawerView(Activity a, List<ApplicationMode> visible, final Set<ApplicationMode> selected,
final View.OnClickListener onClickListener, DialogInterface.OnClickListener onDialogOk) {
//needed because if there's more than 4 items - the don't fit in drawer
public static View prepareAppModeDrawerView(Activity a, List<ApplicationMode> visible, final Set<ApplicationMode> selected, ContextMenuAdapter.BooleanResult allModes,
final View.OnClickListener onClickListener) {
OsmandSettings settings = ((OsmandApplication) a.getApplication()).getSettings();
final List<ApplicationMode> values = new ArrayList<ApplicationMode>(ApplicationMode.values(settings));
selected.add(settings.getApplicationMode());
if (values.size() > 4) {
return prepareAppModeDrawerView(a, visible, values, selected, onClickListener, onDialogOk);
return createDrawerView(a, visible, values, selected, allModes, onClickListener);
} else {
return prepareAppModeView(a, values, selected, null, true, onClickListener);
}
}
private static View prepareAppModeDrawerView(Activity a,final List<ApplicationMode> visible, final List<ApplicationMode> values,
final Set<ApplicationMode> selected,
final View.OnClickListener onClickListener,
DialogInterface.OnClickListener onDialogOk){
getVisibleModes(values, selected, visible);
private static View createDrawerView(Activity a, final List<ApplicationMode> visible, final List<ApplicationMode> allModes,
final Set<ApplicationMode> selected, ContextMenuAdapter.BooleanResult allModesVisible,
final View.OnClickListener onClickListener) {
getVisibleModes(allModes, selected, visible);
LinearLayout ll = (LinearLayout) a.getLayoutInflater().inflate(R.layout.mode_toggles, null);
final ToggleButton[] buttons = createDrawerToggles(visible, values, a, ll, onDialogOk);
for (int i = 0; i < buttons.length - 1; i++) {
setButtonListener(visible, selected, onClickListener, buttons, i, true);
if (allModesVisible.getResult()) {
createAllToggleButtons(allModes, selected, onClickListener, a, ll);
} else {
final ToggleButton[] buttons = createDrawerToggles(visible, allModes, selected, a, ll, allModesVisible, onClickListener);
for (int i = 0; i < buttons.length - 1; i++) {
setButtonListener(visible, selected, onClickListener, buttons, i, true);
}
}
return ll;
}
@ -93,11 +90,12 @@ public class AppModeDialog {
}
}
private static ToggleButton[] createDrawerToggles(final List<ApplicationMode> visible, final List<ApplicationMode> modes,
final Activity a, LinearLayout ll, final DialogInterface.OnClickListener onDialogOk) {
private static ToggleButton[] createDrawerToggles(final List<ApplicationMode> visible,final List<ApplicationMode> modes,
final Set<ApplicationMode> selected,
final Activity a, final LinearLayout ll, final ContextMenuAdapter.BooleanResult allModes, final View.OnClickListener onClickListener) {
ToggleButton[] buttons = createToggles(visible, ll, a);
ToggleButton[] newButtons = new ToggleButton[buttons.length + 1];
for (int i = 0; i< buttons.length; i++){
for (int i = 0; i < buttons.length; i++) {
newButtons[i] = buttons[i];
}
ToggleButton tb = new ToggleButton(a);
@ -113,42 +111,43 @@ public class AppModeDialog {
tb.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
CompoundButton compoundButton = (CompoundButton) view;
compoundButton.setChecked(false);
final AlertDialog.Builder builder = new AlertDialog.Builder(a);
final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>(visible);
builder.setTitle(R.string.profile_settings);
builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
visible.clear();
visible.addAll(selected);
if(onDialogOk != null){
onDialogOk.onClick(dialogInterface, i);
}
}
});
final AlertDialog dialog = builder.create();
View v = AppModeDialog.prepareAppModeView(a, modes, selected, null, false,
new View.OnClickListener() {
@Override
public void onClick(View v) {
if (selected.size() == 3){
dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(true);
} else {
dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
}
}
});
dialog.setView(v);
dialog.show();
allModes.setResult(true);
createAllToggleButtons(modes, selected, onClickListener, a, ll);
}
});
ll.addView(tb, lp);
return newButtons;
}
private static void createAllToggleButtons(List<ApplicationMode> allModes,
Set<ApplicationMode> selected,
View.OnClickListener onClickListener,
Activity a, LinearLayout ll) {
if (ll.getChildCount() > 0) {
ll.removeAllViews();
}
ToggleButton[] buttons;
ll.setOrientation(LinearLayout.VERTICAL);
buttons = new ToggleButton[allModes.size()];
LinearLayout container = new LinearLayout(a);
container.setOrientation(LinearLayout.HORIZONTAL);
LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
container.setLayoutParams(params);
ll.addView(container);
for (int i =0; i<allModes.size(); i++){
if (i != 0 && i % 4 == 0) {
container = new LinearLayout(a);
container.setOrientation(LinearLayout.HORIZONTAL);
container.setLayoutParams(params);
ll.addView(container);
}
buttons[i] = createToggle(a, container, allModes.get(i));
}
for (int i = 0; i < buttons.length; i++) {
setButtonListener(allModes, selected, onClickListener, buttons, i, true);
}
}
private static void getVisibleModes(List<ApplicationMode> values, Set<ApplicationMode> selected, List<ApplicationMode> visible) {
if (visible.size() == 3) {
for (ApplicationMode mode : selected){
@ -170,7 +169,7 @@ public class AppModeDialog {
if (positions.size() == 1) {
int pos = positions.get(0);
if (pos < values.size() - 2 && pos > 0){
if (pos < values.size() - 1 && pos > 0){
visible.add(values.get(pos - 1));
visible.add(values.get(pos));
visible.add(values.get(pos + 1));
@ -269,19 +268,23 @@ public class AppModeDialog {
scroll.addView(ll);
int k = 0;
int left = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, ctx.getResources().getDisplayMetrics());
int metrics = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, ctx.getResources().getDisplayMetrics());
for(ApplicationMode ma : values) {
ToggleButton tb = new ToggleButton(ctx);
buttons[k++] = tb;
tb.setTextOn("");
tb.setTextOff("");
tb.setContentDescription(ma.toHumanString(ctx));
tb.setButtonDrawable(ma.getIconId());
LayoutParams lp = new LinearLayout.LayoutParams(metrics, metrics);
lp.setMargins(left, 0, 0, 0);
ll.addView(tb, lp);
buttons[k++] = createToggle(ctx, ll, ma);
}
return buttons;
}
static private ToggleButton createToggle(Context ctx, LinearLayout layout, ApplicationMode mode){
int left = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, ctx.getResources().getDisplayMetrics());
int metrics = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, ctx.getResources().getDisplayMetrics());
ToggleButton tb = new ToggleButton(ctx);
tb.setTextOn("");
tb.setTextOff("");
tb.setContentDescription(mode.toHumanString(ctx));
tb.setButtonDrawable(mode.getIconId());
LayoutParams lp = new LinearLayout.LayoutParams(metrics, metrics);
lp.setMargins(left, 0, 0, 0);
layout.addView(tb, lp);
return tb;
}
}

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

@ -30,8 +30,14 @@ import android.widget.Toast;
public class ConfigureMapMenu {
public interface OnClickListener{
public void onClick(boolean result);
};
private boolean allModes = false;
public ContextMenuAdapter createListAdapter(final MapActivity ma) {
ContextMenuAdapter adapter = new ContextMenuAdapter(ma);
ContextMenuAdapter adapter = new ContextMenuAdapter(ma, allModes);
adapter.setDefaultLayoutId(R.layout.drawer_list_item);
adapter.item(R.string.configure_map).icons(R.drawable.ic_back_drawer_dark, R.drawable.ic_back_drawer_white)
.listen(new OnContextMenuClick() {
@ -44,10 +50,10 @@ public class ConfigureMapMenu {
}).reg();
adapter.item(R.string.app_modes_choose).layout(R.layout.mode_toggles).reg();
adapter.setChangeAppModeListener(new OnClickListener() {
@Override
public void onClick(View v) {
ma.getMapActions().prepareOptionsMenu(createListAdapter(ma));
public void onClick(boolean result) {
allModes = true;
ma.getMapActions().prepareOptionsMenu(createListAdapter(ma));
}
});

6
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -12,6 +12,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.mapwidgets.AppearanceWidgetsFactory;
import net.osmand.plus.views.mapwidgets.BaseMapWidget;
@ -35,7 +36,6 @@ import android.graphics.drawable.Drawable;
import android.view.Gravity;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.View.OnClickListener;
import android.widget.ArrayAdapter;
import android.widget.FrameLayout;
import android.widget.ImageView;
@ -303,10 +303,10 @@ public class MapInfoLayer extends OsmandMapLayer {
}
}).reg();
cm.item(R.string.app_modes_choose).layout(R.layout.mode_toggles).reg();
cm.setChangeAppModeListener(new OnClickListener() {
cm.setChangeAppModeListener(new ConfigureMapMenu.OnClickListener() {
@Override
public void onClick(View v) {
public void onClick(boolean allModes) {
map.getMapActions().prepareOptionsMenu(getViewConfigureMenuAdapter());
}
});