From 4aa78747502aea4987c6d7417dfb75cd98b9a6e8 Mon Sep 17 00:00:00 2001 From: nazar-kutz Date: Sun, 4 Apr 2021 10:15:23 +0300 Subject: [PATCH] Fix dark theme --- OsmAnd/res/layout/route_line_appearance.xml | 1 - .../settings/fragments/RouteLineAppearanceFragment.java | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/layout/route_line_appearance.xml b/OsmAnd/res/layout/route_line_appearance.xml index ca822afb37..e5410cdd2f 100644 --- a/OsmAnd/res/layout/route_line_appearance.xml +++ b/OsmAnd/res/layout/route_line_appearance.xml @@ -88,7 +88,6 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/card_and_list_background_basic" android:minHeight="@dimen/toolbar_height" android:padding="0dp" osmand:contentInsetEnd="0dp" diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteLineAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteLineAppearanceFragment.java index 2975815bb4..254e1e3d3d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteLineAppearanceFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteLineAppearanceFragment.java @@ -15,6 +15,7 @@ import android.widget.ScrollView; import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; @@ -32,7 +33,6 @@ import net.osmand.plus.routing.cards.RouteLineColorCard; import net.osmand.plus.routing.cards.RouteLineColorCard.OnMapThemeUpdateListener; import net.osmand.plus.routing.cards.RouteLineColorCard.OnSelectedColorChangeListener; import net.osmand.plus.routing.cards.RouteLineWidthCard; -import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.track.CustomColorBottomSheet.ColorPickerListener; import net.osmand.plus.track.TrackAppearanceFragment.OnNeedScrollListener; @@ -203,6 +203,8 @@ public class RouteLineAppearanceFragment extends ContextMenuScrollFragment imple } }); closeButton.setImageResource(AndroidUtils.getNavigationIconResId(toolbarContainer.getContext())); + int bgColorId = isNightMode() ? R.color.app_bar_color_dark : R.color.list_background_color_light; + toolbarContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), bgColorId)); updateToolbarVisibility(toolbarContainer); } @@ -212,7 +214,7 @@ public class RouteLineAppearanceFragment extends ContextMenuScrollFragment imple if (Build.VERSION.SDK_INT >= 23 && !isNightMode() && view != null) { view.setSystemUiVisibility(view.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); } - return isNightMode() ? R.color.divider_color_dark : R.color.divider_color_light; + return isNightMode() ? R.color.status_bar_color_dark : R.color.divider_color_light; } @Override