mirror of
https://github.com/ev-map/EVMap.git
synced 2026-05-19 12:26:20 -04:00
committed by
Johan von Forstner
parent
af0fb6762d
commit
3151d74d1a
@@ -194,7 +194,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
|
||||
val density = resources.displayMetrics.density
|
||||
// status bar height + toolbar height + margin
|
||||
val margin =
|
||||
insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
|
||||
if (binding.toolbarContainer.layoutParams.width == ViewGroup.LayoutParams.MATCH_PARENT) {
|
||||
insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
|
||||
} else {
|
||||
insets.systemWindowInsetTop + (12 * density).toInt()
|
||||
}
|
||||
binding.fabLayers.updateLayoutParams<ViewGroup.MarginLayoutParams> {
|
||||
topMargin = margin
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/toolbar_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="@dimen/map_toolbar_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:fitsSystemWindows="true"
|
||||
app:layout_behavior="@string/ScrollingAppBarLayoutBehavior">
|
||||
@@ -231,7 +231,7 @@
|
||||
android:focusable="true"
|
||||
android:layout_gravity="top|end"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginTop="100dp"
|
||||
android:layout_marginTop="@dimen/layers_fab_top_padding"
|
||||
app:tint="?android:colorControlNormal"
|
||||
app:backgroundTint="?android:colorBackground"
|
||||
app:borderWidth="0dp"
|
||||
@@ -246,7 +246,7 @@
|
||||
android:layout_width="200dp"
|
||||
android:layout_gravity="top|end"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="100dp"
|
||||
android:layout_marginTop="@dimen/layers_fab_top_padding"
|
||||
android:visibility="gone"
|
||||
app:cardCornerRadius="16dp"
|
||||
tools:visibility="visible">
|
||||
|
||||
5
app/src/main/res/values-sw720dp/dimens.xml
Normal file
5
app/src/main/res/values-sw720dp/dimens.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="map_toolbar_width">500dp</dimen>
|
||||
<dimen name="layers_fab_top_padding">20dp</dimen>
|
||||
</resources>
|
||||
@@ -7,4 +7,8 @@
|
||||
<dimen name="detail_corner_radius_negative">-8dp</dimen>
|
||||
<dimen name="expand_toggle_padding_large">16dp</dimen>
|
||||
<dimen name="expand_toggle_padding_small">8dp</dimen>
|
||||
|
||||
<item name="match_parent" type="dimen">-1</item>
|
||||
<dimen name="map_toolbar_width">@dimen/match_parent</dimen>
|
||||
<dimen name="layers_fab_top_padding">100dp</dimen>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user