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

Merge pull request #9251 from osmandapp/street_lightning_option_fix

Browse source 
Street lightning option fix
This commit is contained in:
vshcherb 2020-06-16 12:00:40 +02:00 committed by GitHub
commit 9a36a79982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java
View file

@ -3,11 +3,16 @@ package net.osmand.plus.dialogs;
import android.app.Activity; import android.app.Activity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
@ -15,12 +20,12 @@ import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton; import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton.OnBottomBtnClickListener; import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton.OnBottomBtnClickListener;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton; import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem; import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem; import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet; import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
import net.osmand.render.RenderingRuleProperty; import net.osmand.render.RenderingRuleProperty;
@ -46,6 +51,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
private ArrayAdapter<?> arrayAdapter; private ArrayAdapter<?> arrayAdapter;
private ContextMenuAdapter adapter; private ContextMenuAdapter adapter;
private int position; private int position;
private int padding;
private int paddingSmall;
private int paddingHalf;
public static void showInstance(@NonNull FragmentManager fm, public static void showInstance(@NonNull FragmentManager fm,
List<RenderingRuleProperty> properties, List<RenderingRuleProperty> properties,
@ -67,6 +75,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
padding = (int) getResources().getDimension(R.dimen.content_padding);
paddingSmall = (int) getResources().getDimension(R.dimen.content_padding_small);
paddingHalf = (int) getResources().getDimension(R.dimen.content_padding_half);
app = requiredMyApplication(); app = requiredMyApplication();
if (properties == null || preferences == null) { if (properties == null || preferences == null) {
properties = new ArrayList<>(); properties = new ArrayList<>();
@ -87,10 +98,27 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
@Override @Override
public void createMenuItems(Bundle savedInstanceState) { public void createMenuItems(Bundle savedInstanceState) {
int selectedProfileColorRes = app.getSettings().APPLICATION_MODE.get().getIconColorInfo().getColor(nightMode); int selectedProfileColorRes = app.getSettings().APPLICATION_MODE.get().getIconColorInfo().getColor(nightMode);
TitleItem titleItem = new TitleItem(getString(R.string.rendering_category_details)); float spacing = getResources().getDimension(R.dimen.line_spacing_extra_description);
items.add(titleItem); LinearLayout linearLayout = new LinearLayout(app);
ShortDescriptionItem descriptionItem = new ShortDescriptionItem(getString(R.string.details_dialog_decr)); linearLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
items.add(descriptionItem); linearLayout.setOrientation(LinearLayout.VERTICAL);
TextView title = new TextView(app);
title.setPadding(padding, paddingHalf, padding, 0);
title.setTypeface(FontCache.getRobotoMedium(app));
title.setText(R.string.rendering_category_details);
title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen.default_list_text_size));
title.setTextColor(nightMode ? ContextCompat.getColor(app, R.color.text_color_primary_dark) : ContextCompat.getColor(app, R.color.text_color_primary_light));
TextView description = new TextView(app);
description.setLineSpacing(spacing, 1.0f);
description.setPadding(padding, 0, padding, paddingSmall);
description.setText(R.string.details_dialog_decr);
description.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen.default_desc_text_size));
description.setTextColor(nightMode ? ContextCompat.getColor(app, R.color.text_color_secondary_dark) : ContextCompat.getColor(app, R.color.text_color_secondary_light));
linearLayout.addView(title);
linearLayout.addView(description);
items.add(new BaseBottomSheetItem.Builder().setCustomView(linearLayout).create());
if (preferences != null && properties != null) { if (preferences != null && properties != null) {
RenderingRuleProperty streetLightNightProp = getStreetLightNightProp(); RenderingRuleProperty streetLightNightProp = getStreetLightNightProp();
for (int i = 0; i < properties.size(); i++) { for (int i = 0; i < properties.size(); i++) {
@ -122,6 +150,7 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
streetLightsNightPref.set(false); streetLightsNightPref.set(false);
item[0].setChecked(checked); item[0].setChecked(checked);
item[0].setIsLeftBtnSelected(true); item[0].setIsLeftBtnSelected(true);
setupHeightAndBackground(getView());
} }
}) })
.create(); .create();
@ -148,7 +177,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
String attrName = property.getAttrName(); String attrName = property.getAttrName();
if (MORE_DETAILED.equals(attrName) || SHOW_SURFACE_GRADE.equals(attrName) if (MORE_DETAILED.equals(attrName) || SHOW_SURFACE_GRADE.equals(attrName)
|| COLORED_BUILDINGS.equals(attrName) || STREET_LIGHTING.equals(attrName)) { || COLORED_BUILDINGS.equals(attrName) || STREET_LIGHTING.equals(attrName)) {
items.add(new DividerItem(app)); DividerItem divider = new DividerItem(app);
divider.setMargins(padding, 0, 0, 0);
items.add(divider);
} }
} }
} }