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

Fix color. Add replace and delete.

Browse source
This commit is contained in:
Dima-1 2020-03-17 09:03:37 +02:00
parent 663af18f67
commit 0ff96f333b
7 changed files with 118 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/point_editor_button.xml
View file

@ -14,7 +14,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="invisible"
app:srcCompat="@drawable/circle_contour_bg_light" />
app:srcCompat="@drawable/bg_point_circle_contour" />
<ImageView
android:id="@+id/background"

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

@ -11,6 +11,9 @@
Thx - Hardy
-->
<string name="shared_string_square">Square</string>
<string name="shared_string_rhomb">Rhomb</string>
<string name="shared_string_circle">Circle</string>
<string name="select_shape">Select shape</string>
<string name="select_group">Select group</string>
<string name="add_description">Add description</string>

15
OsmAnd/src/net/osmand/data/FavouritePoint.java
View file

@ -299,19 +299,26 @@ public class FavouritePoint implements Serializable, LocationPoint {
}
public enum BackgroundType {
CIRCLE("circle", R.drawable.bg_point_circle),
RHOMB("rhomb", R.drawable.bg_point_rhomb),
SQUARE("square", R.drawable.bg_point_square);
CIRCLE("circle", R.string.shared_string_circle, R.drawable.bg_point_circle),
RHOMB("rhomb", R.string.shared_string_rhomb, R.drawable.bg_point_rhomb),
SQUARE("square", R.string.shared_string_square, R.drawable.bg_point_square);
private String typeName;
@StringRes
private int nameId;
@DrawableRes
private int iconId;
BackgroundType(@NonNull String typeName, @DrawableRes int iconId) {
BackgroundType(@NonNull String typeName, @StringRes int nameId, @DrawableRes int iconId) {
this.typeName = typeName;
this.nameId = nameId;
this.iconId = iconId;
}
public int getNameId() {
return nameId;
}
public int getIconId() {
return iconId;
}

8
OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java
View file

@ -63,9 +63,9 @@ public class FavoriteImageDrawable extends Drawable {
int uiBackgroundIconId = point != null ? point.getBackgroundType().getIconId() : R.drawable.bg_point_circle;
uiBackgroundIcon = ((OsmandApplication) ctx.getApplicationContext()).getUIUtilities()
.getPaintedIcon(uiBackgroundIconId, col);
int mapBackgroundIconIdTop = getMapBackIconId(ctx, point, "top");
int mapBackgroundIconIdCenter = getMapBackIconId(ctx, point, "center");
int mapBackgroundIconIdBottom = getMapBackIconId(ctx, point, "bottom");
int mapBackgroundIconIdTop = getMapBackgroundIconId(ctx, point, "top");
int mapBackgroundIconIdCenter = getMapBackgroundIconId(ctx, point, "center");
int mapBackgroundIconIdBottom = getMapBackgroundIconId(ctx, point, "bottom");
favBackgroundTop = BitmapFactory.decodeResource(res, mapBackgroundIconIdTop);
favBackgroundCenter = BitmapFactory.decodeResource(res, mapBackgroundIconIdCenter);
favBackgroundBottom = BitmapFactory.decodeResource(res, mapBackgroundIconIdBottom);
@ -83,7 +83,7 @@ public class FavoriteImageDrawable extends Drawable {
.replaceFirst("mx_", "mm_"), "drawable", ctx.getPackageName());
}
private int getMapBackIconId(Context ctx, FavouritePoint point, String layer) {
private int getMapBackgroundIconId(Context ctx, FavouritePoint point, String layer) {
if (point != null) {
int iconId = point.getBackgroundType().getIconId();
String iconName = ctx.getResources().getResourceEntryName(iconId);

13
OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
View file

@ -15,6 +15,8 @@ import android.widget.ArrayAdapter;
import android.widget.Spinner;
import android.widget.TextView;
import androidx.annotation.ColorRes;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
@ -243,6 +245,17 @@ public class ColorDialogs {
return d;
}
public static int getColorName(@ColorRes int color) {
int colorName = R.string.rendering_value_darkyellow_name;
for (int i = 0; i < ColorDialogs.pallette.length; i++) {
if (ColorDialogs.pallette[i] == color) {
colorName = ColorDialogs.paletteColors[i];
break;
}
}
return colorName;
}
private static int dpToPx(final Activity activity, float dp) {
Resources r = activity.getResources();
return (int) TypedValue.applyDimension(

28
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java
View file

@ -8,7 +8,7 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -78,13 +78,29 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = super.onCreateView(inflater, container, savedInstanceState);
FavoritePointEditor editor = getFavoritePointEditor();
if (view != null && editor != null && editor.isNew()) {
Button replaceButton = (Button) view.findViewById(R.id.replace_button);
replaceButton.setTextColor(getResources().getColor(!editor.isLight() ? R.color.osmand_orange : R.color.map_widget_blue));
if (view != null) {
View replaceButton = view.findViewById(R.id.button_replace_container);
replaceButton.setVisibility(View.VISIBLE);
replaceButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
replacePressed();
}
});
if (editor != null && editor.isNew()) {
ImageView toolbarAction = (ImageView) view.findViewById(R.id.toolbar_action);
toolbarAction.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
replacePressed();
}
});
}
}
return view;
}
private void replacePressed() {
Bundle args = new Bundle();
args.putSerializable(FavoriteDialogs.KEY_FAVORITE, getFavorite());
FragmentActivity activity = getActivity();
@ -92,10 +108,6 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
FavoriteDialogs.createReplaceFavouriteDialog(activity, args);
}
}
});
}
return view;
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

116
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
View file

@ -18,9 +18,9 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.appcompat.widget.Toolbar;
@ -69,6 +69,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
private boolean cancelled;
private boolean nightMode;
private String selectedIcon;
@ColorInt
private int selectedColor;
private FavouritePoint.BackgroundType selectedShape = FavouritePoint.BackgroundType.CIRCLE;
private ImageView nameIcon;
@ -108,20 +109,16 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
int activeColorResId = !editor.isLight() ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
ImageView toolbarAction = (ImageView) view.findViewById(R.id.toolbar_action);
ImageView groupListIcon = (ImageView) view.findViewById(R.id.group_list_button_icon);
groupListIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_group_select_all, activeColorResId));
ImageView replaceIcon = (ImageView) view.findViewById(R.id.replace_action_icon);
replaceIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_replace, activeColorResId));
ImageView deleteIcon = (ImageView) view.findViewById(R.id.delete_action_icon);
deleteIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_delete_dark, activeColorResId));
// ((TextView)view.findViewById(R.id.replace_action_title)).setTextColor(ContextCompat.getColor(app,activeColorResId));
// ((TextView)view.findViewById(R.id.replace_action_description)).setTextColor(ContextCompat.getColor(app,activeColorResId));
// ((TextView)view.findViewById(R.id.delete_action_title)).setTextColor(ContextCompat.getColor(app,activeColorResId));
View groupList = view.findViewById(R.id.group_list_button);
groupList.setOnClickListener(new View.OnClickListener() {
@Override
@ -151,15 +148,6 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
}
});
// Button deleteButton = (Button) view.findViewById(R.id.delete_button);
// deleteButton.setTextColor(getResources().getColor(activeColorResId));
// deleteButton.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// deletePressed();
// }
// });
UiUtilities.setupDialogButton(nightMode, cancelButton, UiUtilities.DialogButtonType.SECONDARY, R.string.shared_string_cancel);
UiUtilities.setupDialogButton(nightMode, saveButton, UiUtilities.DialogButtonType.PRIMARY, R.string.shared_string_save);
@ -199,13 +187,20 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
});
nameIcon.setImageDrawable(getNameIcon());
if (app.accessibilityEnabled()) {
nameCaption.setFocusable(true);
nameEdit.setHint(R.string.access_hint_enter_name);
descriptionEdit.setHint(R.string.access_hint_enter_description);
}
LinearLayout deleteButton = (LinearLayout) view.findViewById(R.id.button_delete_container);
View deleteButton = view.findViewById(R.id.button_delete_container);
deleteButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
deletePressed();
}
});
if (editor.isNew()) {
toolbarAction.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_replace, activeColorResId));
deleteButton.setVisibility(View.GONE);
@ -224,11 +219,21 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
}
}
toolbarAction.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (!editor.isNew) {
deletePressed();
}
}
});
createGroupSelector(app);
createIconSelector();
createColorSelector();
createShapeSelector();
updateColorSelector(selectedColor, view);
updateShapeSelector(selectedShape, view);
return view;
}
@ -265,12 +270,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
ImageView backgroundCircle = colorItemView.findViewById(R.id.background);
AndroidUtils.setBackground(backgroundCircle,
UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle), color));
GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.circle_contour_bg_light);
if (rectContourDrawable != null) {
rectContourDrawable.setStroke(AndroidUtils.dpToPx(app, 2), ContextCompat.getColor(app, R.color.divider_color_light));
ImageView outline = colorItemView.findViewById(R.id.outline);
outline.setImageDrawable(rectContourDrawable);
}
backgroundCircle.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -289,22 +289,19 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
icon.setImageDrawable(UiUtilities.tintDrawable(icon.getDrawable(), R.color.icon_color_default_light));
}
rootView.findViewWithTag(color).findViewById(R.id.outline).setVisibility(View.VISIBLE);
int colorName = R.string.rendering_value_darkyellow_name;
for (int i = 0; i < ColorDialogs.pallette.length; i++) {
if (ColorDialogs.pallette[i] == color) {
colorName = ColorDialogs.paletteColors[i];
break;
}
}
ImageView icon = view.findViewById(R.id.icon);
icon.setImageDrawable(UiUtilities.tintDrawable(icon.getDrawable(), R.color.white_50_transparent));
((TextView) view.findViewById(R.id.color_name)).setText(colorName);
View icon = rootView.findViewWithTag(selectedIcon);
if (icon != null) {
ImageView iconImage = icon.findViewById(R.id.icon);
iconImage.setImageDrawable(UiUtilities.tintDrawable(iconImage.getDrawable(), R.color.white_50_transparent));
ImageView backgroundCircle = view.findViewById(R.id.background);
AndroidUtils.setBackground(backgroundCircle,
UiUtilities.tintDrawable(ContextCompat.getDrawable(view.getContext(), selectedShape.getIconId()), color));
}
((TextView) view.findViewById(R.id.color_name)).setText(ColorDialogs.getColorName(color));
selectedColor = color;
setColor(color);
updateNameIcon();
updateShapeSelector();
}
private void createShapeSelector() {
@ -318,23 +315,51 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
OsmandApplication app = requireMyApplication();
FrameLayout shapeItemView = (FrameLayout) UiUtilities.getInflater(getContext(), nightMode)
.inflate(R.layout.point_editor_button, rootView, false);
ImageView backgroundCircle = shapeItemView.findViewById(R.id.background);
AndroidUtils.setBackground(backgroundCircle,
ImageView background = shapeItemView.findViewById(R.id.background);
AndroidUtils.setBackground(background,
UiUtilities.tintDrawable(ContextCompat.getDrawable(app, backgroundType.getIconId()),
ContextCompat.getColor(app, R.color.divider_color_light)));
ImageView outline = shapeItemView.findViewById(R.id.outline);
outline.setImageDrawable(getOutlineDrawable(backgroundType.getIconId()));
ImageView icon = shapeItemView.findViewById(R.id.icon);
backgroundCircle.setOnClickListener(new View.OnClickListener() {
background.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
updateShapeSelector(backgroundType, rootView);
updateShapeSelector(backgroundType, view);
}
});
shapeItemView.setTag(backgroundType);
return shapeItemView;
}
private void updateShapeSelector(FavouritePoint.BackgroundType backgroundType, FlowLayout rootView) {
private Drawable getOutlineDrawable(int iconId) {
OsmandApplication app = requireMyApplication();
String iconName = app.getResources().getResourceName(iconId);
int iconRes = app.getResources().getIdentifier(iconName + "_contour", "drawable", app.getPackageName());
return app.getUIUtilities().getIcon(iconRes, R.color.divider_color_light);
}
private void updateShapeSelector() {
updateShapeSelector(selectedShape, view);
}
private void updateShapeSelector(FavouritePoint.BackgroundType backgroundType, View rootView) {
View oldShape = rootView.findViewWithTag(selectedShape);
if (oldShape != null) {
oldShape.findViewById(R.id.outline).setVisibility(View.INVISIBLE);
ImageView background = oldShape.findViewById(R.id.background);
AndroidUtils.setBackground(background,
UiUtilities.tintDrawable(ContextCompat.getDrawable(requireMyApplication(), selectedShape.getIconId()),
ContextCompat.getColor(requireMyApplication(), R.color.divider_color_light)));
}
rootView.findViewWithTag(backgroundType).findViewById(R.id.outline).setVisibility(View.VISIBLE);
((TextView) rootView.findViewById(R.id.shape_name)).setText(backgroundType.getNameId());
ImageView background = rootView.findViewWithTag(backgroundType).findViewById(R.id.background);
AndroidUtils.setBackground(background,
UiUtilities.tintDrawable(ContextCompat.getDrawable(requireMyApplication(), backgroundType.getIconId()),
selectedColor));
selectedShape = backgroundType;
}
private void createIconSelector() {
@ -385,12 +410,6 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
AndroidUtils.setBackground(backgroundCircle,
UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle),
ContextCompat.getColor(app, R.color.divider_color_light)));
GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.circle_contour_bg_light);
if (rectContourDrawable != null) {
rectContourDrawable.setStroke(AndroidUtils.dpToPx(app, 2), ContextCompat.getColor(app, R.color.divider_color_light));
ImageView outline = iconItemView.findViewById(R.id.outline);
outline.setImageDrawable(rectContourDrawable);
}
ImageView icon = iconItemView.findViewById(R.id.icon);
icon.setVisibility(View.VISIBLE);
final int iconRes = app.getResources().getIdentifier("mx_" + iconName, "drawable", app.getPackageName());
@ -422,15 +441,8 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
}
private void updateNameIcon() {
ImageView nameImage = (ImageView) view.findViewById(R.id.name_icon);
if (nameIcon != null) {
nameIcon.setImageDrawable(getNameIcon());
// AndroidUtils.setBackground(nameIcon, UiUtilities.tintDrawable(ContextCompat.getDrawable(requireContext(),
// R.drawable.circle_background_light), selectedColor));
// ImageView profileIcon = view.findViewById(R.id.profile_icon);
// if (profileIcon != null) {
// profileIcon.setImageDrawable(getPaintedIcon(changedProfile.iconRes, iconColor));
// }
}
}
@ -464,12 +476,6 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
}
}
public Drawable getRowIcon(int iconId) {
PointEditor editor = getEditor();
boolean light = editor == null || editor.isLight();
return getIcon(iconId, light ? R.color.icon_color_default_light : R.color.icon_color_default_dark);
}
@Override
public void onStart() {
super.onStart();