diff --git a/_img/collage.svg b/_img/collage.svg new file mode 100644 index 00000000..01d06a88 --- /dev/null +++ b/_img/collage.svg @@ -0,0 +1,429 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_img/collage_bw.svg b/_img/collage_bw.svg new file mode 100644 index 00000000..949524c8 --- /dev/null +++ b/_img/collage_bw.svg @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/johan/evmap/fragment/MapFragment.kt b/app/src/main/java/com/johan/evmap/fragment/MapFragment.kt index 0371e21a..5edaaae6 100644 --- a/app/src/main/java/com/johan/evmap/fragment/MapFragment.kt +++ b/app/src/main/java/com/johan/evmap/fragment/MapFragment.kt @@ -155,6 +155,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac vm.chargerSparse.observe(viewLifecycleOwner, Observer { if (it != null) { bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED + binding.fabDirections.show() } else { bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN } @@ -184,6 +185,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac binding.gallery.apply { adapter = GalleryAdapter(context, galleryClickListener) + itemAnimator = null layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) addItemDecoration( @@ -196,12 +198,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac binding.detailView.connectors.apply { adapter = ConnectorAdapter() + itemAnimator = null layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) } binding.detailView.details.apply { adapter = DetailAdapter() + itemAnimator = null layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) addItemDecoration( diff --git a/app/src/main/java/com/johan/evmap/ui/IconGenerators.kt b/app/src/main/java/com/johan/evmap/ui/IconGenerators.kt index e888bb4b..79c9a937 100644 --- a/app/src/main/java/com/johan/evmap/ui/IconGenerators.kt +++ b/app/src/main/java/com/johan/evmap/ui/IconGenerators.kt @@ -48,7 +48,7 @@ class ChargerIconGenerator(val context: Context) { return value.byteCount } } - val oversize = 1.5f + val oversize = 1f // increase to add padding for overshoot scale animation val icon = R.drawable.ic_map_marker_charging init { diff --git a/app/src/main/res/drawable/collage_bw.xml b/app/src/main/res/drawable/collage_bw.xml new file mode 100644 index 00000000..33935cfe --- /dev/null +++ b/app/src/main/res/drawable/collage_bw.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index d3f3585d..63a832a6 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -70,15 +70,27 @@ - + app:layout_behavior="@string/BackDropBottomSheetBehavior"> + + + + + + + tools:bottomsheetbehavior_defaultState="stateAnchorPoint">