beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix minor UI issues

Browse source
This commit is contained in:
ashilkn 2023-06-22 11:20:03 +05:30
parent 9c284aa004
commit 8275d5921d
2 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/ui/map/map_screen.dart
View file

@ -190,22 +190,28 @@ class _MapScreenState extends State<MapScreen> {
child: Scaffold(
body: Stack(
children: [
SizedBox(
height: MediaQuery.of(context).size.height * 0.78 -
bottomSheetDraggableAreaHeight,
child: MapView(
key: ValueKey(
'image-marker-count-${imageMarkers.length}',
),
controller: mapController,
imageMarkers: imageMarkers,
updateVisibleImages: calculateVisibleMarkers,
center: center,
initialZoom: initialZoom,
minZoom: minZoom,
maxZoom: maxZoom,
debounceDuration: debounceDuration,
),
LayoutBuilder(
builder: (context, constrains) {
return SizedBox(
height: constrains.maxHeight * 0.75 +
bottomSheetDraggableAreaHeight,
child: MapView(
key: ValueKey(
'image-marker-count-${imageMarkers.length}',
),
controller: mapController,
imageMarkers: imageMarkers,
updateVisibleImages: calculateVisibleMarkers,
center: center,
initialZoom: initialZoom,
minZoom: minZoom,
maxZoom: maxZoom,
debounceDuration: debounceDuration,
bottomSheetDraggableAreaHeight:
bottomSheetDraggableAreaHeight,
),
);
},
),
isLoading
? EnteLoadingWidget(

12
lib/ui/map/map_view.dart
View file

@ -20,6 +20,7 @@ class MapView extends StatefulWidget {
final double maxZoom;
final double initialZoom;
final int debounceDuration;
final double bottomSheetDraggableAreaHeight;
const MapView({
Key? key,
@ -31,6 +32,7 @@ class MapView extends StatefulWidget {
required this.maxZoom,
required this.initialZoom,
required this.debounceDuration,
required this.bottomSheetDraggableAreaHeight,
}) : super(key: key);
@override
@ -91,10 +93,12 @@ class _MapViewState extends State<MapView> {
}
},
),
nonRotatedChildren: const [
nonRotatedChildren: [
Padding(
padding: EdgeInsets.only(bottom: 16),
child: OSMFranceTileAttributes(),
padding: EdgeInsets.only(
bottom: widget.bottomSheetDraggableAreaHeight,
),
child: const OSMFranceTileAttributes(),
)
],
children: [
@ -152,7 +156,7 @@ class _MapViewState extends State<MapView> {
),
),
Positioned(
bottom: 30,
bottom: widget.bottomSheetDraggableAreaHeight + 10,
right: 10,
child: Column(
children: [