Skip to content

Commit

Permalink
Merge pull request #10 from matisiekpl/feat/intro-dialog
Browse files Browse the repository at this point in the history
feat: info dialog
  • Loading branch information
matisiekpl authored Apr 5, 2024
2 parents 37f7735 + 88b00a5 commit b59d7de
Show file tree
Hide file tree
Showing 15 changed files with 414 additions and 296 deletions.
2 changes: 1 addition & 1 deletion assets/aed_poland.geojson

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/world.geojson

Large diffs are not rendered by default.

172 changes: 88 additions & 84 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,45 @@ PODS:
- connectivity_plus (0.0.1):
- Flutter
- ReachabilitySwift
- Firebase/Analytics (10.18.0):
- Firebase/Analytics (10.22.0):
- Firebase/Core
- Firebase/Core (10.18.0):
- Firebase/Core (10.22.0):
- Firebase/CoreOnly
- FirebaseAnalytics (~> 10.18.0)
- Firebase/CoreOnly (10.18.0):
- FirebaseCore (= 10.18.0)
- firebase_analytics (10.8.0):
- Firebase/Analytics (= 10.18.0)
- FirebaseAnalytics (~> 10.22.0)
- Firebase/CoreOnly (10.22.0):
- FirebaseCore (= 10.22.0)
- firebase_analytics (10.8.9):
- Firebase/Analytics (= 10.22.0)
- firebase_core
- Flutter
- firebase_core (2.24.2):
- Firebase/CoreOnly (= 10.18.0)
- firebase_core (2.27.0):
- Firebase/CoreOnly (= 10.22.0)
- Flutter
- FirebaseAnalytics (10.18.0):
- FirebaseAnalytics/AdIdSupport (= 10.18.0)
- FirebaseAnalytics (10.22.0):
- FirebaseAnalytics/AdIdSupport (= 10.22.0)
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- FirebaseAnalytics/AdIdSupport (10.18.0):
- nanopb (< 2.30911.0, >= 2.30908.0)
- FirebaseAnalytics/AdIdSupport (10.22.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleAppMeasurement (= 10.18.0)
- GoogleAppMeasurement (= 10.22.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- FirebaseCore (10.18.0):
- nanopb (< 2.30911.0, >= 2.30908.0)
- FirebaseCore (10.22.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- FirebaseCoreInternal (10.20.0):
- FirebaseCoreInternal (10.23.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseInstallations (10.20.0):
- FirebaseInstallations (10.23.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
Expand All @@ -50,42 +50,39 @@ PODS:
- Flutter
- flutter_web_auth (0.5.0):
- Flutter
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- geolocator_apple (1.2.0):
- Flutter
- google_mlkit_commons (0.3.0):
- google_mlkit_commons (0.5.0):
- Flutter
- MLKitVision
- google_mlkit_image_labeling (0.6.0):
- google_mlkit_image_labeling (0.8.0):
- Flutter
- google_mlkit_commons
- GoogleMLKit/ImageLabeling (~> 4.0.0)
- GoogleMLKit/ImageLabelingCustom (~> 4.0.0)
- GoogleAppMeasurement (10.18.0):
- GoogleAppMeasurement/AdIdSupport (= 10.18.0)
- GoogleAppMeasurement (10.22.0):
- GoogleAppMeasurement/AdIdSupport (= 10.22.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/AdIdSupport (10.18.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.18.0)
- nanopb (< 2.30911.0, >= 2.30908.0)
- GoogleAppMeasurement/AdIdSupport (10.22.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.22.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/WithoutAdIdSupport (10.18.0):
- nanopb (< 2.30911.0, >= 2.30908.0)
- GoogleAppMeasurement/WithoutAdIdSupport (10.22.0):
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleDataTransport (9.3.0):
- nanopb (< 2.30911.0, >= 2.30908.0)
- GoogleDataTransport (9.4.1):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleMLKit/ImageLabeling (4.0.0):
- GoogleMLKit/MLKitCore
Expand All @@ -107,25 +104,34 @@ PODS:
- GoogleToolboxForMac/Defines (= 2.3.2)
- "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
- "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
- GoogleUtilities/AppDelegateSwizzler (7.12.0):
- GoogleUtilities/AppDelegateSwizzler (7.13.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.12.0):
- GoogleUtilities/Privacy
- GoogleUtilities/Environment (7.13.0):
- GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.12.0):
- GoogleUtilities/Logger (7.13.0):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (7.12.0):
- GoogleUtilities/Privacy
- GoogleUtilities/MethodSwizzler (7.13.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network (7.12.0):
- GoogleUtilities/Privacy
- GoogleUtilities/Network (7.13.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Privacy
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.12.0)"
- GoogleUtilities/Reachability (7.12.0):
- "GoogleUtilities/NSData+zlib (7.13.0)":
- GoogleUtilities/Privacy
- GoogleUtilities/Privacy (7.13.0)
- GoogleUtilities/Reachability (7.13.0):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.12.0):
- GoogleUtilities/Privacy
- GoogleUtilities/UserDefaults (7.13.0):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- GoogleUtilitiesComponents (1.1.0):
- GoogleUtilities/Logger
- GTMSessionFetcher/Core (2.3.0)
Expand Down Expand Up @@ -177,31 +183,31 @@ PODS:
- MLKitImageLabelingCommon (~> 5.0)
- MLKitObjectDetectionCommon (~> 5.0)
- MLKitVision (~> 5.0)
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
- nanopb/decode (2.30909.1)
- nanopb/encode (2.30909.1)
- nanopb (2.30910.0):
- nanopb/decode (= 2.30910.0)
- nanopb/encode (= 2.30910.0)
- nanopb/decode (2.30910.0)
- nanopb/encode (2.30910.0)
- package_info_plus (0.4.5):
- Flutter
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- PromisesObjC (2.3.1)
- ReachabilitySwift (5.0.0)
- Sentry/HybridSDK (8.19.0):
- SentryPrivate (= 8.19.0)
- PromisesObjC (2.4.0)
- ReachabilitySwift (5.2.1)
- Sentry/HybridSDK (8.21.0):
- SentryPrivate (= 8.21.0)
- sentry_flutter (0.0.1):
- Flutter
- FlutterMacOS
- Sentry/HybridSDK (= 8.19.0)
- SentryPrivate (8.19.0)
- Sentry/HybridSDK (= 8.21.0)
- SentryPrivate (8.21.0)
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- sqflite (0.0.2):
- sqflite (0.0.3):
- Flutter
- FMDB (>= 2.7.5)
- FlutterMacOS
- url_launcher_ios (0.0.1):
- Flutter

Expand All @@ -222,8 +228,8 @@ DEPENDENCIES:
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
Expand All @@ -233,7 +239,6 @@ SPEC REPOS:
- FirebaseCore
- FirebaseCoreInternal
- FirebaseInstallations
- FMDB
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleMLKit
Expand Down Expand Up @@ -290,36 +295,35 @@ EXTERNAL SOURCES:
sentry_flutter:
:path: ".symlinks/plugins/sentry_flutter/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
:path: ".symlinks/plugins/sqflite/darwin"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"

SPEC CHECKSUMS:
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06
firebase_analytics: b3d6dd14c61549a29abb10e9843446a4d8bb53eb
firebase_core: 0af4a2b24f62071f9bf283691c0ee41556dcb3f5
FirebaseAnalytics: 4d310b35c48eaa4a058ddc04bdca6bdb5dc0fe80
FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f
FirebaseCoreInternal: efeeb171ac02d623bdaefe121539939821e10811
FirebaseInstallations: 558b1da7d65afeb996fd5c814332f013234ece4e
Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71
firebase_analytics: b9ce200bfc2c54629076bb22d6a510f31c296ab8
firebase_core: 100945864b4aedce3cfef0c62ab864858bf013cf
FirebaseAnalytics: 8d0ff929c63b7f72260f332b86ccf569776b75d3
FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7
FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3
FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
flutter_web_auth: c25208760459cec375a3c39f6a8759165ca0fa4d
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
google_mlkit_commons: a4f893c1b9708fc697b2194728013a1ed0f50b6b
google_mlkit_image_labeling: 88b617654d4c113dbf5cfaea3ef8a279594bec77
GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e
GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
google_mlkit_commons: 9765447bd869c5d4f750dbd01475c8c42fd47aec
google_mlkit_image_labeling: 55d24cf5b52437d66ef52974a480f823f521c962
GoogleAppMeasurement: ccefe3eac9b0aa27f96066809fb1a7fe4b462626
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e
GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18
integration_test: 13825b8a9334a850581300559b8839134b124670
maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
Mixpanel-swift: e5dd85295923e6a875acf17ccbab8d2ecb10ea65
Expand All @@ -332,17 +336,17 @@ SPEC CHECKSUMS:
MLKitObjectDetectionCommon: 424e43365d7ef7dd7005a4799e5303eeb4287fec
MLKitVision: 8baa5f46ee3352614169b85250574fde38c36f49
MLKitVisionKit: 5b5472d40ffc143bda693ba20a3cff44fe627d41
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
nanopb: 438bc412db1928dac798aa6fd75726007be04262
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
Sentry: 1ebcaef678a27c8ac515f974cb5425dd1bbdec2f
sentry_flutter: ecdfbedee55337205561cfa782ee02d31ec83e1f
SentryPrivate: 765c9b4ebe9ac1a5fcdc067c5a1cfbf3f10e1677
shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
Sentry: ebc12276bd17613a114ab359074096b6b3725203
sentry_flutter: dff1df05dc39c83d04f9330b36360fc374574c5e
SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586

PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011

Expand Down
5 changes: 4 additions & 1 deletion lib/l10n/app_de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
"version": "Version",
"website": "Projektwebsite",
"author": "Autor",
"contact": "Kontakt"
"contact": "Kontakt",
"understand": "Ich verstehe",
"dataSource": "Datenquelle",
"dataSourceDescription": "Die Daten über die Standorte von Defibrillatoren stammen von OpenStreetMap. Ihre Qualität kann variieren. Der Autor übernimmt keine Verantwortung für die Richtigkeit der Daten. Wir ermutigen Sie, die Datenbank auf openstreetmap.org mitzugestalten"

}
5 changes: 4 additions & 1 deletion lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
"version": "Version",
"website": "Project website",
"author": "Author",
"contact": "Contact"
"contact": "Contact",
"understand": "I understand",
"dataSource": "Data source",
"dataSourceDescription": "The data about the location of defibrillators comes from OpenStreetMap. Their quality may vary. The author is not responsible for the correctness of the data. We encourage you to co-create the database on openstreetmap.org"

}
5 changes: 4 additions & 1 deletion lib/l10n/app_es.arb
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
"version": "Versión",
"website": "Sitio web del proyecto",
"author": "Autor",
"contact": "Contacto"
"contact": "Contacto",
"understand": "Entiendo",
"dataSource": "Fuente de datos",
"dataSourceDescription": "Los datos sobre la ubicación de los desfibriladores provienen de OpenStreetMap. Su calidad puede variar. El autor no es responsable de la exactitud de los datos. Te animamos a co-crear la base de datos en openstreetmap.org"

}
5 changes: 4 additions & 1 deletion lib/l10n/app_fr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
"version": "Version",
"website": "Site web du projet",
"author": "Auteur",
"contact": "Contact"
"contact": "Contact",
"understand": "Je comprends",
"dataSource": "Source de données",
"dataSourceDescription": "Les données sur l'emplacement des défibrillateurs proviennent d'OpenStreetMap. Leur qualité peut varier. L'auteur n'est pas responsable de l'exactitude des données. Nous vous encourageons à co-créer la base de données sur openstreetmap.org"

}
5 changes: 4 additions & 1 deletion lib/l10n/app_it.arb
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
"version": "Versione",
"website": "Sito web del progetto",
"author": "Autore",
"contact": "Contatto"
"contact": "Contatto",
"understand": "Capisco",
"dataSource": "Fonte dei dati",
"dataSourceDescription": "I dati sulla posizione dei defibrillatori provengono da OpenStreetMap. La loro qualità può variare. L'autore non è responsabile per la correttezza dei dati. Ti incoraggiamo a co-creare il database su openstreetmap.org"

}
5 changes: 4 additions & 1 deletion lib/l10n/app_pl.arb
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,8 @@
"version":"Wersja",
"website":"Strona projektu",
"author":"Autor",
"contact":"Kontakt"
"contact":"Kontakt",
"understand":"Rozumiem",
"dataSource": "Pochodzenie danych",
"dataSourceDescription": "Dane o lokalizacji defibrylatorów pochodzą z OpenStreetMap. Ich jakość może się różnić. Autor nie ponosi odpowiedzialności za poprawność danych. Zachęcamy do współtworzenia bazy na openstreetmap.org"
}
4 changes: 3 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ class _AppState extends State<App> {
return CupertinoApp(
debugShowCheckedModeBanner: false,
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
supportedLocales: List.from(AppLocalizations.supportedLocales)
..sort((a, b) =>
const Locale('en').languageCode.compareTo(a.languageCode)),
home: MultiBlocProvider(
providers: [
BlocProvider<PointsCubit>(
Expand Down
2 changes: 1 addition & 1 deletion lib/repositories/points_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PointsRepository {
SharedPreferences prefs = await SharedPreferences.getInstance();
try {
var response = await http.get(
Uri.parse('https://back.openaedmap.org/api/v1/countries/WORLD.geojson'
Uri.parse('https://openaedmap.org/api/v1/countries/WORLD.geojson'
// 'https://aed.openstreetmap.org.pl/aed_poland.geojson'
));
await prefs.setString(aedListKey, utf8.decode(response.bodyBytes));
Expand Down
Loading

0 comments on commit b59d7de

Please sign in to comment.