Commit 11042b9b authored by CLOUARD Regis's avatar CLOUARD Regis
Browse files

Merge branch 'release3.0.1' into 'master'

Release3.0.1

See merge request rclouard/vikazimut-flutter!54
parents ad15ad3b 5ca262d6
......@@ -8,13 +8,11 @@ variables:
stages:
- test
# - build
before_script:
- echo 'class Secret { static const String key = "123456"; static const String initializationVector = "123456";}'> lib/keys.dart
- flutter clean
- flutter pub get
- flutter --version
flutter_test:
only:
......@@ -26,15 +24,3 @@ flutter_test:
- genhtml coverage/lcov.info --output=coverage
tags:
- gitlab-runner-ensicaen
#flutter_build_android:
# only:
# - master
# stage: build
# script:
# - echo "systemProp.https.proxyHost=193.49.200.22" >> android/gradle.properties
# - echo "systemProp.https.proxyPort=3128" >> android/gradle.properties
# - echo "systemProp.https.nonProxyHosts=localhost|127.0.0.1|10.10.1.*" >> android/gradle.properties
# - flutter build apk
# tags:
# - gitlab-runner-ensicaen
......@@ -11,17 +11,15 @@ Ceci impose que les futurs développements se fassent aussi sous cette licence.
L'ensemble des codes sources de Vikazimut est accessible sur le [GitLab du projet](https://gitlab.ecole.ensicaen.fr/rclouard/vikazimut-flutter).
Toutefois, le fichier `/lib/keys.dart` contenant les clés de chiffrement des images de cartes
est volontairement absent. Ce fichier est à récupérer auprès du responsable de projet.
Toutefois, le fichier `/lib/keys.dart` contenant les clés de chiffrement des images de cartes est volontairement absent. Ce fichier est à récupérer auprès du responsable de projet.
## Édition des codes
Le projet a été initialement développé avec Android Studio.
Le fichier `android_studio_settings.zip` contient l'ensemble des règles d'écriture utilisées pour le projet.
Il doit être importé dans Android Studio pour le projet.
Il doit être importé dans Android Studio pour contribuer au projet.
Mais, tout autre IDE pouvant éditer du Flutter peut être utilisé. Dans ce cas, il est nécessaire de redéfinir
les règles d'écriture pour cet IDE.
Mais, tout autre IDE pouvant éditer du Flutter peut être utilisé. Dans ce cas, il est nécessaire de redéfinir les règles d'écriture pour cet IDE.
## Compiler la distribution
......@@ -38,12 +36,14 @@ Pour certaines bibliothèques, il faut en plus procéder à leur mise en place :
- La base de données : floor
L'installation se fait par la commande Shell :
```
flutter packages pub run build_runner build
```
- Le splashscreen : flutter_native_splash
L'installation se fait par la commande Shell :
```
flutter pub run flutter_native_splash:create
```
......@@ -33,6 +33,8 @@ sa localisation et un mode promenade où l’orienteur est positionné sur la ca
[Télécharger sur Google Play](https://play.google.com/store/apps/details?id=fr.ensicaen.vikazimut)
[Télécharger sur App Store](https://apps.apple.com/us/app/vikazimut/id1571112577)
## Traductions
* Français
......
......@@ -56,10 +56,6 @@ android {
buildTypes {
release {
// Use for debugging purpose on Google play
ndk {
debugSymbolLevel 'FULL'
}
signingConfig signingConfigs.release
// Enables code shrinking, obfuscation, and optimization for only
// your project's release build type.
......
......@@ -84,7 +84,7 @@
"missing_cp_error_title": "Action denied",
"validating_cp_error_title": "Force Validation Error",
"validating_cp_error_no_location": "Cannot locate your current position to get the control point to validate.",
"success_validating_control_point": "Successful validation of control point %s",
"success_validating_control_point": "Successfully validated control point %s",
"server_connection_error_use_memorized_map": "No network connection.\nUse maps in memory.",
"error_title": "Error",
"error_prefix": "Error:",
......
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
# Uncomment this line to define a global platform for your project
platform :ios, '9.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}
def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end
File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
end
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
flutter_ios_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end
post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end
end
PODS:
- audioplayers (0.0.1):
- Flutter
- disk_space (0.0.1):
- Flutter
- Flutter (1.0.0)
- flutter_compass (0.0.1):
- Flutter
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- geolocator (6.2.0):
- Flutter
- location (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
- nfc_manager (0.0.1):
- Flutter
- package_info (0.0.1):
- Flutter
- path_provider (0.0.1):
- Flutter
- qr_code_scanner (0.2.0):
- Flutter
- MTBBarcodeScanner
- shared_preferences (0.0.1):
- Flutter
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
- url_launcher (0.0.1):
- Flutter
- vibration (1.7.4-nullsafety.0):
- Flutter
- volume_controller (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
- webview_flutter (0.0.1):
- Flutter
DEPENDENCIES:
- audioplayers (from `.symlinks/plugins/audioplayers/ios`)
- disk_space (from `.symlinks/plugins/disk_space/ios`)
- Flutter (from `Flutter`)
- flutter_compass (from `.symlinks/plugins/flutter_compass/ios`)
- geolocator (from `.symlinks/plugins/geolocator/ios`)
- location (from `.symlinks/plugins/location/ios`)
- nfc_manager (from `.symlinks/plugins/nfc_manager/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- vibration (from `.symlinks/plugins/vibration/ios`)
- volume_controller (from `.symlinks/plugins/volume_controller/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
SPEC REPOS:
trunk:
- FMDB
- MTBBarcodeScanner
EXTERNAL SOURCES:
audioplayers:
:path: ".symlinks/plugins/audioplayers/ios"
disk_space:
:path: ".symlinks/plugins/disk_space/ios"
Flutter:
:path: Flutter
flutter_compass:
:path: ".symlinks/plugins/flutter_compass/ios"
geolocator:
:path: ".symlinks/plugins/geolocator/ios"
location:
:path: ".symlinks/plugins/location/ios"
nfc_manager:
:path: ".symlinks/plugins/nfc_manager/ios"
package_info:
:path: ".symlinks/plugins/package_info/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
qr_code_scanner:
:path: ".symlinks/plugins/qr_code_scanner/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
vibration:
:path: ".symlinks/plugins/vibration/ios"
volume_controller:
:path: ".symlinks/plugins/volume_controller/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter:
:path: ".symlinks/plugins/webview_flutter/ios"
SPEC CHECKSUMS:
audioplayers: 455322b54050b30ea4b1af7cd9e9d105f74efa8c
disk_space: e94d34bbdf77954adfb39e60bde9cc5c7233eda6
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
geolocator: f5e3de65e241caba7ce3e8a618803387bda73384
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
nfc_manager: 69e4cd9c15112206ab30246b1ce8d81a75729fdf
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
vibration: 1ec279c4a1a7a646627b54039d812334b3f1114a
volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 9f491a9b5a66f2573946a389b2677987b0ff8c0b
PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
COCOAPODS: 1.10.1
......@@ -342,7 +342,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
......@@ -377,7 +377,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = fr.ensicaen.vikazimut;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Vikazimut Provisioning Profile";
......@@ -436,7 +436,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
......@@ -486,7 +486,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
......@@ -523,7 +523,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = fr.ensicaen.vikazimut;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Vikazimut Provisioning Profile";
......@@ -561,7 +561,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = fr.ensicaen.vikazimut;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Vikazimut Provisioning Profile";
......
......@@ -2,6 +2,6 @@
<Workspace
version = "1.0">
<FileRef
location = "self:">
location = "group:Runner.xcodeproj">
</FileRef>
</Workspace>
......@@ -4,7 +4,4 @@
<FileRef
location = "group:Runner.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......@@ -27,7 +27,7 @@
<key>NFCReaderUsageDescription</key>
<string>The NFC reader is used to validate a checkpoint when the checkpoint is equipped</string>
<key>NSCameraUsageDescription</key>
<string>The camera is used to validate a checkpoint from QR Code when the checkpoint is equipped</string>
<string>This app needs camera access to scan QR codes</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Vikazimut needs access to location when in the background to continue controlling the correct sequence of checkpoint visits and recording the GPS track even during a phone call or use of another apps.</string>
<key>NSLocationUsageDescription</key>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment