diff --git a/OsmAnd/res/drawable/marker_circle_background_dark_n.xml b/OsmAnd/res/drawable/marker_circle_background_dark_n.xml new file mode 100644 index 0000000000..b7f47f5b54 --- /dev/null +++ b/OsmAnd/res/drawable/marker_circle_background_dark_n.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml new file mode 100644 index 0000000000..ad071dcc25 --- /dev/null +++ b/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/marker_circle_background_dark_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_dark_with_inset.xml new file mode 100644 index 0000000000..84a47130c9 --- /dev/null +++ b/OsmAnd/res/drawable/marker_circle_background_dark_with_inset.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml index d5fd81800e..b79b8a2e42 100644 --- a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml +++ b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml @@ -97,7 +97,7 @@ android:layout_gravity="center_vertical|end" android:maxLines="1" android:textAppearance="@style/TextAppearance.ListItemTitle" - android:textColor="@color/map_widget_blue_pressed" + tools:textColor="@color/map_widget_blue_pressed" tools:text="Top bar"/> diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml index d0decc4895..362aca621d 100644 --- a/OsmAnd/res/layout/map_marker_item_new.xml +++ b/OsmAnd/res/layout/map_marker_item_new.xml @@ -125,7 +125,7 @@ android:id="@+id/map_marker_options_button" android:layout_width="56dp" android:layout_height="56dp" - android:background="@drawable/marker_circle_background_light_with_inset" + tools:background="@drawable/marker_circle_background_dark_with_inset" android:focusableInTouchMode="true" tools:src="@drawable/ic_action_marker_passed"/> @@ -137,7 +137,7 @@ android:layout_height="1dp" android:layout_marginLeft="56dp" android:layout_marginStart="56dp" - android:background="?attr/dashboard_divider"/> + tools:background="?attr/dashboard_divider"/> diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index 27bd83e435..ddca75eb3b 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -262,4 +262,6 @@ #17828a #f2f4ff + #525e66 + \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java index 3e26135a91..2d04bf57c5 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java @@ -5,6 +5,7 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +19,7 @@ import android.widget.TextView; import net.osmand.AndroidUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.BottomSheetDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; @@ -35,8 +37,9 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment @Nullable @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + MapActivity mapActivity = (MapActivity) getActivity(); portrait = AndroidUiHelper.isOrientationPortrait(getActivity()); - boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls(); + boolean nightMode = !getMyApplication().getSettings().isLightContent(); final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme; final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_options_bottom_sheet_dialog, container); @@ -68,6 +71,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment ((ImageView) mainView.findViewById(R.id.move_all_to_history_icon)) .setImageDrawable(getContentIcon(R.drawable.ic_action_history2)); + ((TextView) mainView.findViewById(R.id.show_direction_text_view)).setTextColor(ContextCompat.getColor(mapActivity, nightMode ? R.color.color_dialog_buttons_dark : R.color.map_widget_blue_pressed)); ((TextView) mainView.findViewById(R.id.show_direction_text_view)).setText(getMyApplication().getSettings().MAP_MARKERS_MODE.get().toHumanString(getActivity())); mainView.findViewById(R.id.sort_by_row).setOnClickListener(new View.OnClickListener() { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java index dc9cea8c21..ac6bd6ad96 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java @@ -207,7 +207,7 @@ public class ShowDirectionBottomSheetDialogFragment extends BottomSheetDialogFra private void highlightSelectedItem(OsmandSettings.MapMarkersMode mode, boolean check) { int iconBgColor = check ? R.color.dashboard_blue : R.color.on_map_icon_color; int iconColor = check ? R.color.color_dialog_buttons_dark : R.color.dashboard_blue; - int textColor = ContextCompat.getColor(getContext(), check ? R.color.dashboard_blue : night ? R.color.color_white : R.color.color_black); + int textColor = ContextCompat.getColor(getContext(), check ? (night ? R.color.color_dialog_buttons_dark : R.color.dashboard_blue) : night ? R.color.color_white : R.color.color_black); switch (mode) { case TOOLBAR: ((RadioButton) mainView.findViewById(R.id.top_bar_radio_button)).setChecked(check); diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java index 49f697c609..529c16f7da 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java @@ -114,8 +114,8 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter items = new ArrayList<>(); private MapMarkersHistoryAdapterListener listener; private Snackbar snackbar; + private boolean night; public MapMarkersHistoryAdapter(OsmandApplication app) { this.app = app; + night = !app.getSettings().isLightContent(); createHeaders(); } @@ -125,6 +127,7 @@ public class MapMarkersHistoryAdapter extends RecyclerView.Adapter position + 1 && getItemViewType(position + 1) == HEADER_TYPE) || lastItem) { itemViewHolder.divider.setVisibility(View.GONE); } else { + itemViewHolder.divider.setBackgroundColor(ContextCompat.getColor(app, night ? R.color.actionbar_dark_color : R.color.dashboard_divider_light)); itemViewHolder.divider.setVisibility(View.VISIBLE); } itemViewHolder.bottomShadow.setVisibility(lastItem ? View.VISIBLE : View.GONE);