-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into bug/appli-mobile
- Loading branch information
Showing
43 changed files
with
308 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" | ||
#include "Generated.xcconfig" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" | ||
#include "Generated.xcconfig" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Uncomment this line to define a global platform for your project | ||
# platform :ios, '12.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__)) | ||
target 'RunnerTests' do | ||
inherit! :search_paths | ||
end | ||
end | ||
|
||
post_install do |installer| | ||
installer.pods_project.targets.each do |target| | ||
flutter_additional_ios_build_settings(target) | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
PODS: | ||
- Flutter (1.0.0) | ||
- shared_preferences_foundation (0.0.1): | ||
- Flutter | ||
- FlutterMacOS | ||
|
||
DEPENDENCIES: | ||
- Flutter (from `Flutter`) | ||
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) | ||
|
||
EXTERNAL SOURCES: | ||
Flutter: | ||
:path: Flutter | ||
shared_preferences_foundation: | ||
:path: ".symlinks/plugins/shared_preferences_foundation/darwin" | ||
|
||
SPEC CHECKSUMS: | ||
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 | ||
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 | ||
|
||
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 | ||
|
||
COCOAPODS: 1.15.2 |
164 changes: 154 additions & 10 deletions
164
frontend/app_student/ios/Runner.xcodeproj/project.pbxproj
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
frontend/app_student/ios/Runner.xcworkspace/contents.xcworkspacedata
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
120 changes: 6 additions & 114 deletions
120
frontend/app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,122 +1,14 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"size" : "20x20", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "20x20", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
}, | ||
{ | ||
"size" : "29x29", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"size" : "29x29", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "29x29", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
}, | ||
{ | ||
"size" : "40x40", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "40x40", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
}, | ||
{ | ||
"size" : "60x60", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "60x60", | ||
"idiom" : "iphone", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
}, | ||
{ | ||
"size" : "20x20", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"size" : "20x20", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "29x29", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"size" : "29x29", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "40x40", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"size" : "40x40", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "76x76", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"size" : "76x76", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "83.5x83.5", | ||
"idiom" : "ipad", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"size" : "1024x1024", | ||
"idiom" : "ios-marketing", | ||
"filename" : "[email protected]", | ||
"scale" : "1x" | ||
"filename" : "Sans titre.jpg", | ||
"idiom" : "universal", | ||
"platform" : "ios", | ||
"size" : "1024x1024" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file removed
BIN
-177 KB
...student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-768 Bytes
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-1.86 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-3.27 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-1.18 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-3.1 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-5.3 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-1.86 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-4.76 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-7.82 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-2.58 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-6.28 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-3.09 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-7.37 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-7.82 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-13 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-4.18 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-9.86 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-4.42 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-10.5 KB
...app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file removed
BIN
-11.9 KB
...student/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file not shown.
Binary file added
BIN
+65.9 KB
frontend/app_student/ios/Runner/Assets.xcassets/AppIcon.appiconset/Sans titre.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions
10
frontend/app_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "splash screen-2 2.jpg", | ||
"idiom" : "universal", | ||
"filename" : "LaunchImage.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "splash screen-2.jpg", | ||
"idiom" : "universal", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "splash screen-2 1.jpg", | ||
"idiom" : "universal", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file removed
BIN
-68 Bytes
...end/app_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
Binary file not shown.
Binary file removed
BIN
-68 Bytes
.../app_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]
Binary file not shown.
Binary file removed
BIN
-68 Bytes
.../app_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]
Binary file not shown.
Binary file added
BIN
+25.7 KB
...p_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/splash screen-2 1.jpg
Oops, something went wrong.
Binary file added
BIN
+25.7 KB
...p_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/splash screen-2 2.jpg
Oops, something went wrong.
Binary file added
BIN
+25.7 KB
...app_student/ios/Runner/Assets.xcassets/LaunchImage.imageset/splash screen-2.jpg
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" | ||
#include "ephemeral/Flutter-Generated.xcconfig" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" | ||
#include "ephemeral/Flutter-Generated.xcconfig" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
platform :osx, '10.14' | ||
|
||
# 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', 'ephemeral', '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 Flutter-Generated.xcconfig, then run \"flutter pub get\"" | ||
end | ||
|
||
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) | ||
|
||
flutter_macos_podfile_setup | ||
|
||
target 'Runner' do | ||
use_frameworks! | ||
use_modular_headers! | ||
|
||
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) | ||
target 'RunnerTests' do | ||
inherit! :search_paths | ||
end | ||
end | ||
|
||
post_install do |installer| | ||
installer.pods_project.targets.each do |target| | ||
flutter_additional_macos_build_settings(target) | ||
end | ||
end |
Oops, something went wrong.