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

Fix popup menu

Browse source
This commit is contained in:
Alexander Sytnyk 2017-11-10 15:32:34 +02:00
parent e71622b2e2
commit c95d234c8a
1 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
View file

@ -2,24 +2,25 @@ package net.osmand.plus.mapmarkers;
import android.app.Activity; import android.app.Activity;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.Paint;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.LayerDrawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.widget.CompoundButtonCompat; import android.support.v4.widget.CompoundButtonCompat;
import android.support.v7.widget.ListPopupWindow;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.TextView; import android.widget.TextView;
@ -27,6 +28,7 @@ import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks; import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.github.ksoichiro.android.observablescrollview.ScrollState; import com.github.ksoichiro.android.observablescrollview.ScrollState;
import net.osmand.AndroidUtils;
import net.osmand.plus.ApplicationMode; import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.MapMarkersMode; import net.osmand.plus.OsmandSettings.MapMarkersMode;
@ -109,26 +111,28 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
menuTv.setOnClickListener(new View.OnClickListener() { menuTv.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
int count = settings.DISPLAYED_MARKERS_WIDGETS_COUNT.get(); CharSequence[] titles = getMenuTitles();
PopupMenu popupMenu = new PopupMenu(getActivity(), menuTv); Paint paint = new Paint();
Menu menu = popupMenu.getMenu(); paint.setTextSize(getResources().getDimensionPixelSize(R.dimen.default_list_text_size));
popupMenu.getMenuInflater().inflate(R.menu.active_markers_menu, menu); float titleTextWidth = Math.max(paint.measureText(titles[0].toString()), paint.measureText(titles[1].toString()));
setupActiveMenuItem(menu.findItem(count == 1 ? R.id.action_one : R.id.action_two)); float itemWidth = titleTextWidth + AndroidUtils.dpToPx(getActivity(), 32);
popupMenu.setOnMenuItemClickListener(new OnMenuItemClickListener() { float minWidth = AndroidUtils.dpToPx(getActivity(), 100);
final ListPopupWindow listPopupWindow = new ListPopupWindow(getActivity());
listPopupWindow.setAnchorView(menuTv);
listPopupWindow.setContentWidth((int) (Math.max(itemWidth, minWidth)));
listPopupWindow.setDropDownGravity(Gravity.END | Gravity.TOP);
listPopupWindow.setHorizontalOffset(AndroidUtils.dpToPx(getActivity(), 8));
listPopupWindow.setVerticalOffset(-menuTv.getHeight());
listPopupWindow.setModal(true);
listPopupWindow.setAdapter(new ArrayAdapter<>(getActivity(), R.layout.popup_list_text_item, titles));
listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (item.getItemId()) { updateDisplayedMarkersCount(position == 0 ? 1 : 2);
case R.id.action_one: listPopupWindow.dismiss();
updateDisplayedMarkersCount(1);
return true;
case R.id.action_two:
updateDisplayedMarkersCount(2);
return true;
}
return false;
} }
}); });
popupMenu.show(); listPopupWindow.show();
} }
}); });
@ -194,6 +198,20 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
return null; return null;
} }
private CharSequence[] getMenuTitles() {
if (getSettings().DISPLAYED_MARKERS_WIDGETS_COUNT.get() == 1) {
return new CharSequence[]{getActiveString(R.string.shared_string_one), getString(R.string.shared_string_two)};
}
return new CharSequence[]{getString(R.string.shared_string_one), getActiveString(R.string.shared_string_two)};
}
private SpannableString getActiveString(int id) {
SpannableString res = new SpannableString(getString(id));
res.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), getSettings().isLightContent()
? R.color.dashboard_blue : R.color.osmand_orange)), 0, res.length(), 0);
return res;
}
private void updateHelpImage() { private void updateHelpImage() {
OsmandSettings settings = getSettings(); OsmandSettings settings = getSettings();
int count = settings.DISPLAYED_MARKERS_WIDGETS_COUNT.get(); int count = settings.DISPLAYED_MARKERS_WIDGETS_COUNT.get();
@ -273,14 +291,6 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
? R.drawable.img_help_markers_direction_device_day : R.drawable.img_help_markers_direction_device_night); ? R.drawable.img_help_markers_direction_device_day : R.drawable.img_help_markers_direction_device_night);
} }
private void setupActiveMenuItem(MenuItem item) {
int stringId = item.getItemId() == R.id.action_one ? R.string.shared_string_one : R.string.shared_string_two;
SpannableString title = new SpannableString(getString(stringId));
title.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), getSettings().isLightContent()
? R.color.dashboard_blue : R.color.osmand_orange)), 0, title.length(), 0);
item.setTitle(title);
}
private Drawable getIconBackground(boolean active) { private Drawable getIconBackground(boolean active) {
return active ? getIcon(R.drawable.ic_action_device_top, R.color.dashboard_blue) return active ? getIcon(R.drawable.ic_action_device_top, R.color.dashboard_blue)
: getContentIcon(R.drawable.ic_action_device_top); : getContentIcon(R.drawable.ic_action_device_top);