release (#636)

* README: Fix logo, add links to YeneGuzo, adapt copyright year (#606) * Fix Typos in constants / classes: Leaflet Map (#603) * Feat/map provider service (#608) * [Feature] remove GoogleMaps * [Fix] resolved initHiveForFlutter * [Feature] update pubspec.lock autogenerate files * [Feature] update ext.kotlin_version lastest * [Feature] update ios autogenerate files * [Feat] param trufiMapProvider in default values * [Fix] expanded ui map * [Cleanup] ignore: deprecated_member_use for lunch * [Feat] add versions to readme in Example (#625) * Feat/Trufi-Core 3.2.0 stable (#629) * [Fixed] CertificatedLetsencrypt android <= 7.1.1 * [feature] unusing certified ssl in web * [Feature] config uni-link * [Feature] share route button * [Feature] share itinerary * [Feature] use correct route * [Feature] add google_maps_flutter ^2.1.4 package * [Faeture] support widget marker in googleMaps * [Feature] support other maps providers * [Refactor] remove double cacheTileProvider * [Feature] implement google and leaflet map route * [Feature] implement leaflet=google map transport * [Feat] implement leaflet=google map chooseLocation * [Feature] use MapProviders in TrufiCore * [Cleanup] remove un used files * [Feature] using TrufiLatLng in all code * [Refactor] move map buttons * [feature] move marker configuration * [Feature] update package to version: 3.1.0 * [Feature] correct size yourlocation in google map * [Feature] add method to trufiLatLng * [Feature] update version * [Feature] update name Microbus * [Feature] improve ui * [Feature] create abstracts class for maps * [Feature] hide share buttons * [Fixed] use correct server * [Feature] onReady map in leaflet * [FIxed] clean lint * [Feature] use minSdkVersion default * [Feat] update feedbackTitle * [Feat] add whatsappIcon * [Feat] add bottomPaddingButtons in leaftle map * [Feature] autogenerate files * [Feat] update maps * [Feature] remove google map * [Feature] clean value * [Feature] comment ios 9.0 * [Feature] refactor code * [Cleanup] fix linter * [Feature] add CertificatedLetsencryptAndroid * [Feature] parameterize share base uri * [Feature] configure shareBaseUri for example * [Feature] update version to trufi-core _v3.2.0 * [Feature] configure url_launcher ios * [Fixed] resolve error in package device_info_plus * [Feat] parameterize RequestPlanService in blocProviders * [Fix] use correct routeColor * [Fix] remove duplication MapRouteCubit * [Fix] error code color * [Fix] correct color leaftlet map route * [Fix] resolve overFlowed when per > 1 * [Feat] Create AppUniqueId for session * [Feat] Add UniqueAppId in Requests and Queries * [Cleanup] Remove unused code * #604 Ensure Compatibility with Flutter v3 (TrufiMenuItem, Bump share_plus) (#627) * menu_item.dart was renamed to trufi_menu_item.dart as well as the contained class (MenuItem->TrufiMenuItem). * import last recent version of share_plus to fix build errors The example now builds with Flutter 3 * Feat/migration flutter 3.3.2 (#634) * feat(trufi-core)!: Migrated flutter files to v3.3.2 * [Feat] updated packages to lastest version * [Refactor] Updated sintaxis waring for Flutter v3.3.2 * [Refactor] Updated sintaxis for FlutterMap_v3.0.0 * [Refactor] updated configure dependencies * adding migration (#635) Co-authored-by: Gustavo T <tgustavoch@gmail.com> * fix flutter version (#637) Co-authored-by: Gustavo T <tgustavoch@gmail.com> * Fix/analyze issue (#638) * fix flutter version * adding fix Co-authored-by: Gustavo T <tgustavoch@gmail.com> Co-authored-by: Alexander Menk <alex@addismap.com> Co-authored-by: Gustavo T <tgustavoch@gmail.com>
trufi-association · Oct 1, 2022 · d2fd72c · d2fd72c
1 parent 43918d5
commit d2fd72c
Show file tree

Hide file tree

Showing 103 changed files with 898 additions and 2,275 deletions.
diff --git a/.github/workflows/flutter_test.yml b/.github/workflows/flutter_test.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Flutter Actions
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.8.1'
+          flutter-version: '3.3.3'
       - name: Flutter get Dependencies
         run: flutter pub get
       - name: Run Flutter Analyze

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -27,3 +28,5 @@
 .dart_tool/
 .packages
 build/
+.flutter-plugins
+.flutter-plugins-dependencies
diff --git a/.metadata b/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: b1395592de68cc8ac4522094ae59956dd21a91db
+  revision: 18a827f3933c19f51862dde3fa472197683249d6
   channel: stable
 
 project_type: package
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 A cross-plattform multi-modal public transport app based on open data.
 Built in [Flutter](https://flutter.dev/) by the [Trufi Association](https://www.trufi-association.org/), a social startup.
 
-[<img alt="Trufi Logo" src="trufi.svg" width="120" />](https://www.trufi-association.org/)
+[<img alt="Trufi Logo" src="assets/images/trufi-logo.png" width="120" />](https://www.trufi-association.org/)
 
 <img src="https://www.trufi.app/wp-content/uploads/2019/02/device_pixel-497x1024.png" width="200" hspace="20"/><img src="https://www.trufi.app/wp-content/uploads/2019/02/device_iphone-507x1024.png" width="200" hspace="20" />
 
@@ -19,9 +19,9 @@ The mobile application is currently available for the following cities:
 
 * Cochabamba, Bolivia - [Website](https://www.trufi.app), [Google Play](https://play.google.com/store/apps/details?id=app.trufi.navigator), [App Store](https://apps.apple.com/bo/app/trufi/id1471411924)
 * Accra, Ghana - [Website](https://www.trotro.app/), [Google Play](https://play.google.com/store/apps/details?id=com.trotro.trotro), [App Store](https://apps.apple.com/bo/app/trotro/id1478620071)
-* Addis Abeba, Ethiopia
+* Addis Ababa, Ethiopia - [Website](https://yeneguzo.app/), [Google Play](https://play.google.com/store/apps/details?id=app.yeneguzo.navigator), [App Store](https://apps.apple.com/app/yeneguzo/id1493441355)
 
-Please contact the [Trufi Association](https://www.trufi-association.org/contact/) to get one for your city, too. But if you prefer to do it yourself then see below
+Please contact the [Trufi Association](https://www.trufi-association.org/contact/) to get one for your city, too. But if you prefer to do it yourself then see below:
 
 ### Getting started
 
@@ -85,7 +85,7 @@ If you need to overwrite translations of the Host app checkout the following art
 
 ## Free Software
 
-Copyright 2020 - [Trufi Association](https://www.trufi-association.org/)
+Copyright 2020-present - [Trufi Association](https://www.trufi-association.org/)
 
 This program is free software: you can redistribute it and/or modify it under the terms of the [GNU General Public License version 3](./LICENSE) as published by the Free Software Foundation.
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

diff --git a/example/.gitignore b/example/.gitignore
@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -31,9 +32,6 @@
 .pub/
 /build/
 
-# Web related
-lib/generated_plugin_registrant.dart
-
 # Symbolication related
 app.*.symbols
 

diff --git a/example/.metadata b/example/.metadata
@@ -1,10 +1,10 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: cf4400006550b70f28e4b4af815151d1e74846c6
+  revision: 18a827f3933c19f51862dde3fa472197683249d6
   channel: stable
 
 project_type: app
diff --git a/example/README.md b/example/README.md
@@ -2,6 +2,10 @@
 
 This implementation demonstrates how to use the trufi_core Flutter plugin to build your own public transport app. You can use this folder as a skeleton to start your own app. We assume you have a working [Flutter environment](https://flutter.dev/docs/get-started/install).
 
+## Versions
+
+The example was tested against Flutter 2.8.1 and might cause [problems with Flutter 3](https://github.com/trufi-association/trufi-core/issues/604).
+
 ## Set up the backend
 
 The app needs to connect to a backend running on a server to be able to recommend routes. The app does not work without internet connection. But once it fetched the route it can operate without internet connection except for the map background tiles. So you can fetch your route at home and take your ride offline. But anyway you need a backend for the map background tiles and the routing at least. We build the backend called [trufi-server](https://github.com/trufi-association/trufi-server) which you can use. That backend just serves pre-generated data and that needs to be created. This is what we use [trufi-server-resources](https://github.com/trufi-association/trufi-server-resources) for.

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -26,7 +26,8 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -44,7 +45,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.trufi_app"
-        // For Google Maps is required minSdkVersion >= 20
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.trufi_app">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -45,6 +45,13 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <!-- App Links -->
+            <intent-filter android:autoVerify="true">
+              <action android:name="android.intent.action.VIEW" />
+              <category android:name="android.intent.category.DEFAULT" />
+              <category android:name="android.intent.category.BROWSABLE" />
+              <data android:scheme="https" android:host="trufi.example" android:pathPrefix="/app" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

diff --git a/example/android/app/src/main/res/values-night/styles.xml b/example/android/app/src/main/res/values-night/styles.xml
@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.trufi_app">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -4,16 +4,22 @@ PODS:
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
   - geolocator_apple (1.2.0):
     - Flutter
-  - package_info (0.0.1):
-    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_ios (0.0.1):
     - Flutter
   - share_plus (0.0.1):
     - Flutter
+  - sqflite (0.0.2):
+    - Flutter
+    - FMDB (>= 2.7.5)
+  - uni_links (0.0.1):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
 
@@ -22,12 +28,17 @@ DEPENDENCIES:
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
-  - package_info (from `.symlinks/plugins/package_info/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
+SPEC REPOS:
+  trunk:
+    - FMDB
+
 EXTERNAL SOURCES:
   app_review:
     :path: ".symlinks/plugins/app_review/ios"
@@ -37,28 +48,32 @@ EXTERNAL SOURCES:
     :path: Flutter
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/ios"
-  package_info:
-    :path: ".symlinks/plugins/package_info/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_ios:
     :path: ".symlinks/plugins/path_provider_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/ios"
+  uni_links:
+    :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   app_review: 6f51001269c59a2f4a5b5ae68b7d106401152764
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  geolocator_apple: b741765c55dc21950e3e106e8b3584e55cf81ce5
-  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af
+  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.3