Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Upgrade flutter_map and use built-in tile cache

Neeraj Gupta515a113ba6c3
diff --git a/mobile/apps/photos/lib/ui/map/tile/cache.dart b/mobile/apps/photos/lib/ui/map/tile/cache.dart
deleted file mode 100644
index acaa2f756e..0000000000
--- a/mobile/apps/photos/lib/ui/map/tile/cache.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import "package:cached_network_image/cached_network_image.dart";
-import "package:flutter/widgets.dart";
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import "package:flutter_map/flutter_map.dart";
-
-class TilesCacheManager extends CacheManager with ImageCacheManager {
- static const key = 'tiles-cached-image-data';
-
- static final TilesCacheManager _instance = TilesCacheManager._();
- factory TilesCacheManager() {
- return _instance;
- }
-
- TilesCacheManager._() : super(Config(key));
-}
-
-class CachedNetworkTileProvider extends TileProvider {
- CachedNetworkTileProvider({super.headers});
-
- @override
- ImageProvider<Object> getImage(
- TileCoordinates coordinates,
- TileLayer options,
- ) {
- return CachedNetworkImageProvider(
- getTileUrl(coordinates, options),
- cacheManager: TilesCacheManager(),
- headers: headers,
- );
- }
-}
diff --git a/mobile/apps/photos/lib/ui/map/tile/layers.dart b/mobile/apps/photos/lib/ui/map/tile/layers.dart
index 0a2c9c16a2..9253e070ce 100644
--- a/mobile/apps/photos/lib/ui/map/tile/layers.dart
+++ b/mobile/apps/photos/lib/ui/map/tile/layers.dart
@@ -4,10 +4,18 @@ import "package:flutter_map/flutter_map.dart";
import "package:photos/service_locator.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/map/tile/attribution/map_attribution.dart";
-import "package:photos/ui/map/tile/cache.dart";
import "package:url_launcher/url_launcher.dart";
import "package:url_launcher/url_launcher_string.dart";
+const _tileCacheSizeBytes = 200 * 1024 * 1024;
+
+NetworkTileProvider get _tileProvider => NetworkTileProvider(
+ headers: {'User-Agent': _userAgent},
+ cachingProvider: BuiltInMapCachingProvider.getOrCreateInstance(
+ maxCacheSize: _tileCacheSizeBytes,
+ ),
+);
+
String get _userAgent {
try {
final version = ServiceLocator.instance.packageInfo.version;
@@ -36,8 +44,7 @@ class OSMTileLayer extends StatelessWidget {
Widget build(BuildContext context) {
return TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
- userAgentPackageName: _userAgent,
- tileProvider: CachedNetworkTileProvider(),
+ tileProvider: _tileProvider,
);
}
}
@@ -51,8 +58,7 @@ class OSMFranceTileLayer extends StatelessWidget {
urlTemplate: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
fallbackUrl: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
subdomains: const ['a', 'b', 'c'],
- tileProvider: CachedNetworkTileProvider(),
- userAgentPackageName: _userAgent,
+ tileProvider: _tileProvider,
panBuffer: 1,
);
}
@@ -139,8 +145,7 @@ class MapBoxTilesLayer extends StatelessWidget {
"https://api.mapbox.com/styles/v1/{mb_user}/{mb_style_id}/tiles/{z}/{x}/{y}?access_token={mb_token}",
fallbackUrl: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
subdomains: const ['a', 'b', 'c'],
- userAgentPackageName: _userAgent,
- tileProvider: CachedNetworkTileProvider(),
+ tileProvider: _tileProvider,
additionalOptions: const {
"mb_token": String.fromEnvironment("mb_token"),
"mb_style_id": String.fromEnvironment("mb_style_id"),
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index 9ad2a54ca4..e0458f9052 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -17,7 +17,6 @@ dependencies:
backup_exclusion:
path: ../../packages/backup_exclusion
bip39: 1.0.6
- cached_network_image: 3.4.1
camera: 0.11.2+1
chewie: 1.13.0
collection: 1.19.1
@@ -107,7 +106,7 @@ dependencies:
flutter_local_notifications: 19.3.0
flutter_localizations:
sdk: flutter
- flutter_map: 7.0.2
+ flutter_map: 8.3.1
flutter_rust_bridge: 2.12.0
# Version 9.2.4 leaves lock-screen keys behind after an app reinstall.
# Upgrade only after this is fixed or with a migration.
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 48d1d49fab..b55ed4c2e0 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -233,30 +233,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "8.12.6"
- cached_network_image:
- dependency: transitive
- description:
- name: cached_network_image
- sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
- url: "https://pub.dev"
- source: hosted
- version: "3.4.1"
- cached_network_image_platform_interface:
- dependency: transitive
- description:
- name: cached_network_image_platform_interface
- sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
- url: "https://pub.dev"
- source: hosted
- version: "4.1.1"
- cached_network_image_web:
- dependency: transitive
- description:
- name: cached_network_image_web
- sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
- url: "https://pub.dev"
- source: hosted
- version: "1.3.1"
camera:
dependency: transitive
description:
@@ -490,6 +466,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.0"
+ dart_polylabel2:
+ dependency: transitive
+ description:
+ name: dart_polylabel2
+ sha256: "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.0"
dart_style:
dependency: transitive
description:
@@ -1024,10 +1008,10 @@ packages:
dependency: transitive
description:
name: flutter_map
- sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
+ sha256: ce1debbb29cade61964334b2a19c7c76e5bb2ef7dacf126c6424ee44036232f8
url: "https://pub.dev"
source: hosted
- version: "7.0.2"
+ version: "8.3.1"
flutter_native_splash:
dependency: transitive
description:
@@ -1585,14 +1569,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.1"
- logger:
- dependency: transitive
- description:
- name: logger
- sha256: "25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c"
- url: "https://pub.dev"
- source: hosted
- version: "2.7.0"
logging:
dependency: transitive
description:
@@ -1861,14 +1837,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "9.4.1"
- octo_image:
- dependency: transitive
- description:
- name: octo_image
- sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.0"
open_file:
dependency: transitive
description:
@@ -2157,14 +2125,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.9.1"
- polylabel:
- dependency: transitive
- description:
- name: polylabel
- sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.1"
pool:
dependency: transitive
description: