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

Merge pull request #11338 from osmandapp/RouteLineFixes

Browse source 
Route Line UI Review fixes
This commit is contained in:
Vitaliy 2021-04-04 12:10:44 +03:00 committed by GitHub
commit accb726fcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/route_line_appearance.xml
View file

@ -88,7 +88,6 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/card_and_list_background_basic"
android:minHeight="@dimen/toolbar_height" android:minHeight="@dimen/toolbar_height"
android:padding="0dp" android:padding="0dp"
osmand:contentInsetEnd="0dp" osmand:contentInsetEnd="0dp"

2
OsmAnd/src/net/osmand/plus/routing/cards/RouteLineWidthCard.java
View file

@ -36,7 +36,7 @@ import java.util.List;
public class RouteLineWidthCard extends BaseCard { public class RouteLineWidthCard extends BaseCard {
private final static int CUSTOM_WIDTH_MIN = 1; private final static int CUSTOM_WIDTH_MIN = 1;
private final static int CUSTOM_WIDTH_MAX = 24; private final static int CUSTOM_WIDTH_MAX = 36;
private RouteLineDrawInfo routeLineDrawInfo; private RouteLineDrawInfo routeLineDrawInfo;
private OnNeedScrollListener onNeedScrollListener; private OnNeedScrollListener onNeedScrollListener;

6
OsmAnd/src/net/osmand/plus/settings/fragments/RouteLineAppearanceFragment.java
View file

@ -15,6 +15,7 @@ import android.widget.ScrollView;
import androidx.activity.OnBackPressedCallback; import androidx.activity.OnBackPressedCallback;
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.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; 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.OnMapThemeUpdateListener;
import net.osmand.plus.routing.cards.RouteLineColorCard.OnSelectedColorChangeListener; import net.osmand.plus.routing.cards.RouteLineColorCard.OnSelectedColorChangeListener;
import net.osmand.plus.routing.cards.RouteLineWidthCard; 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.CustomColorBottomSheet.ColorPickerListener;
import net.osmand.plus.track.TrackAppearanceFragment.OnNeedScrollListener; import net.osmand.plus.track.TrackAppearanceFragment.OnNeedScrollListener;
@ -203,6 +203,8 @@ public class RouteLineAppearanceFragment extends ContextMenuScrollFragment imple
} }
}); });
closeButton.setImageResource(AndroidUtils.getNavigationIconResId(toolbarContainer.getContext())); 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); updateToolbarVisibility(toolbarContainer);
} }
@ -212,7 +214,7 @@ public class RouteLineAppearanceFragment extends ContextMenuScrollFragment imple
if (Build.VERSION.SDK_INT >= 23 && !isNightMode() && view != null) { if (Build.VERSION.SDK_INT >= 23 && !isNightMode() && view != null) {
view.setSystemUiVisibility(view.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); 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 @Override