Merge branch 'develop'

Author: Thibault Deckers

.github/workflows/release.yml

@@ -43,12 +43,14 @@ jobs:
         # `KEY_JKS` should contain the result of:
         # gpg -c --armor keystore.jks
         # `KEY_JKS_PASSPHRASE` should contain the passphrase used for the command above
+        # The SkSL bundle must be produced with the same Flutter engine as the one used to build the artifact
+        # flutter build <subcommand> --bundle-sksl-path shaders.sksl.json
         run: |
           echo "${{ secrets.KEY_JKS }}" > release.keystore.asc
           gpg -d --passphrase "${{ secrets.KEY_JKS_PASSPHRASE }}" --batch release.keystore.asc > $AVES_STORE_FILE
           rm release.keystore.asc
-          flutter build apk --bundle-sksl-path shaders.sksl.json
-          flutter build appbundle --bundle-sksl-path shaders.sksl.json
+          flutter build apk
+          flutter build appbundle
           rm $AVES_STORE_FILE
         env:
           AVES_STORE_FILE: ${{ github.workspace }}/key.jks

lib/widgets/fullscreen/info/location_section.dart

@@ -6,7 +6,7 @@ import 'package:aves/utils/geo_utils.dart';
 import 'package:aves/widgets/common/aves_filter_chip.dart';
 import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/fullscreen/info/info_page.dart';
-import 'package:aves/widgets/fullscreen/info/maps/buttons.dart';
+import 'package:aves/widgets/fullscreen/info/maps/common.dart';
 import 'package:aves/widgets/fullscreen/info/maps/google_map.dart';
 import 'package:aves/widgets/fullscreen/info/maps/leaflet_map.dart';
 import 'package:flutter/material.dart';

lib/widgets/fullscreen/info/maps/buttons.dart renamed to lib/widgets/fullscreen/info/maps/common.dart

@@ -7,11 +7,36 @@ import 'package:aves/widgets/fullscreen/info/location_section.dart';
 import 'package:aves/widgets/fullscreen/overlay/common.dart';
 import 'package:flutter/material.dart';
 
+class MapDecorator extends StatelessWidget {
+  final Widget child;
+
+  static const BorderRadius mapBorderRadius = BorderRadius.all(Radius.circular(24)); // to match button circles
+
+  const MapDecorator({@required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onScaleStart: (details) {
+        // absorb scale gesture here to prevent scrolling
+        // and triggering by mistake a move to the image page above
+      },
+      child: ClipRRect(
+        borderRadius: mapBorderRadius,
+        child: Container(
+          color: Colors.white70,
+          height: 200,
+          child: child,
+        ),
+      ),
+    );
+  }
+}
+
 class MapButtonPanel extends StatelessWidget {
   final String geoUri;
   final void Function(double amount) zoomBy;
 
-  static const BorderRadius mapBorderRadius = BorderRadius.all(Radius.circular(24)); // to match button circles
   static const double padding = 4;
 
   const MapButtonPanel({

lib/widgets/fullscreen/info/maps/google_map.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/settings.dart';
-import 'package:aves/widgets/fullscreen/info/maps/buttons.dart';
+import 'package:aves/widgets/fullscreen/info/maps/common.dart';
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:tuple/tuple.dart';
@@ -45,57 +45,44 @@ class EntryGoogleMapState extends State<EntryGoogleMap> with AutomaticKeepAliveC
     super.build(context);
     return Stack(
       children: [
-        _buildMap(),
-        Positioned.fill(
-          child: Align(
-            alignment: AlignmentDirectional.centerEnd,
-            child: MapButtonPanel(
-              geoUri: widget.geoUri,
-              zoomBy: _zoomBy,
-            ),
-          ),
-        )
+        MapDecorator(
+          child: _buildMap(),
+        ),
+        MapButtonPanel(
+          geoUri: widget.geoUri,
+          zoomBy: _zoomBy,
+        ),
       ],
     );
   }
 
   Widget _buildMap() {
     final accentHue = HSVColor.fromColor(Theme.of(context).accentColor).hue;
-    return GestureDetector(
-      onScaleStart: (details) {
-        // absorb scale gesture here to prevent scrolling
-        // and triggering by mistake a move to the image page above
-      },
-      child: ClipRRect(
-        borderRadius: MapButtonPanel.mapBorderRadius,
-        child: Container(
-          color: Colors.white70,
-          height: 200,
-          child: GoogleMap(
-            // GoogleMap init perf issue: https://github.com/flutter/flutter/issues/28493
-            initialCameraPosition: CameraPosition(
-              target: widget.latLng,
-              zoom: widget.initialZoom,
-            ),
-            onMapCreated: (controller) => setState(() => _controller = controller),
-            rotateGesturesEnabled: false,
-            scrollGesturesEnabled: false,
-            zoomControlsEnabled: false,
-            zoomGesturesEnabled: false,
-            liteModeEnabled: false,
-            tiltGesturesEnabled: false,
-            myLocationEnabled: false,
-            myLocationButtonEnabled: false,
-            markers: {
-              Marker(
-                markerId: MarkerId(widget.markerId),
-                icon: BitmapDescriptor.defaultMarkerWithHue(accentHue),
-                position: widget.latLng,
-              )
-            },
-          ),
-        ),
+    return GoogleMap(
+      // GoogleMap init perf issue: https://github.com/flutter/flutter/issues/28493
+      initialCameraPosition: CameraPosition(
+        target: widget.latLng,
+        zoom: widget.initialZoom,
       ),
+      onMapCreated: (controller) => setState(() => _controller = controller),
+      compassEnabled: false,
+      mapToolbarEnabled: false,
+      rotateGesturesEnabled: false,
+      scrollGesturesEnabled: false,
+      zoomControlsEnabled: false,
+      zoomGesturesEnabled: false,
+      liteModeEnabled: false,
+      // no camera animation in lite mode
+      tiltGesturesEnabled: false,
+      myLocationEnabled: false,
+      myLocationButtonEnabled: false,
+      markers: {
+        Marker(
+          markerId: MarkerId(widget.markerId),
+          icon: BitmapDescriptor.defaultMarkerWithHue(accentHue),
+          position: widget.latLng,
+        )
+      },
     );
   }
 

lib/widgets/fullscreen/info/maps/leaflet_map.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/settings.dart';
-import 'package:aves/widgets/fullscreen/info/maps/buttons.dart';
+import 'package:aves/widgets/fullscreen/info/maps/common.dart';
 import 'package:aves/widgets/fullscreen/info/maps/scale_layer.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
@@ -50,7 +50,9 @@ class EntryLeafletMapState extends State<EntryLeafletMap> with AutomaticKeepAliv
       children: [
         Stack(
           children: [
-            _buildMap(),
+            MapDecorator(
+              child: _buildMap(),
+            ),
             MapButtonPanel(
               geoUri: widget.geoUri,
               zoomBy: _zoomBy,
@@ -63,51 +65,38 @@ class EntryLeafletMapState extends State<EntryLeafletMap> with AutomaticKeepAliv
   }
 
   Widget _buildMap() {
-    return GestureDetector(
-      onScaleStart: (details) {
-        // absorb scale gesture here to prevent scrolling
-        // and triggering by mistake a move to the image page above
-      },
-      child: ClipRRect(
-        borderRadius: MapButtonPanel.mapBorderRadius,
-        child: Container(
-          color: Colors.white70,
-          height: 200,
-          child: FlutterMap(
-            options: MapOptions(
-              center: widget.latLng,
-              zoom: widget.initialZoom,
-              interactive: false,
-            ),
-            children: [
-              _buildMapLayer(),
-              ScaleLayerWidget(
-                options: ScaleLayerOptions(),
-              ),
-              MarkerLayerWidget(
-                options: MarkerLayerOptions(
-                  markers: [
-                    Marker(
-                      width: markerSize,
-                      height: markerSize,
-                      point: widget.latLng,
-                      builder: (ctx) {
-                        return Icon(
-                          Icons.place,
-                          size: markerSize,
-                          color: Theme.of(context).accentColor,
-                        );
-                      },
-                      anchorPos: AnchorPos.align(AnchorAlign.top),
-                    ),
-                  ],
-                ),
+    return FlutterMap(
+      options: MapOptions(
+        center: widget.latLng,
+        zoom: widget.initialZoom,
+        interactive: false,
+      ),
+      children: [
+        _buildMapLayer(),
+        ScaleLayerWidget(
+          options: ScaleLayerOptions(),
+        ),
+        MarkerLayerWidget(
+          options: MarkerLayerOptions(
+            markers: [
+              Marker(
+                width: markerSize,
+                height: markerSize,
+                point: widget.latLng,
+                builder: (ctx) {
+                  return Icon(
+                    Icons.place,
+                    size: markerSize,
+                    color: Theme.of(context).accentColor,
+                  );
+                },
+                anchorPos: AnchorPos.align(AnchorAlign.top),
               ),
             ],
-            mapController: _mapController,
           ),
         ),
-      ),
+      ],
+      mapController: _mapController,
     );
   }
 

pubspec.yaml

@@ -11,7 +11,7 @@ description: A new Flutter application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.5+17
+version: 1.1.6+18
 
 # video_player (as of v0.10.8+2, backed by ExoPlayer):
 # - does not support content URIs (by default, but trivial by fork)