Skip to content

Commit d5ffd7e

Browse files
GabrielSousa02GabrielSousa02
authored
[refactor] fix-screen-layout (#3)
* refactor: add `SafeArea` widget to wrap components and improve UI/UX * chore: update `.gitignore` * refactor: remove deprecated `synthetic-package` * feat: add ios compiling files * build: update pubspec.lock file * refactor: update language selection menu style
1 parent 8cfc1ff commit d5ffd7e

22 files changed

Lines changed: 575 additions & 364 deletions

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ test/full_coverage_test.dart
1010
*.swp
1111
.DS_Store
1212
.atom/
13+
.build/
1314
.buildlog/
1415
.history
1516
.svn/
17+
.swiftpm/
1618
migrate_working_dir/
1719

1820
# IntelliJ related
@@ -47,3 +49,6 @@ app.*.map.json
4749
/android/app/debug
4850
/android/app/profile
4951
/android/app/release
52+
53+
# FVM Version Cache
54+
.fvm/

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎ios/Flutter/Debug.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Generated.xcconfig"

‎ios/Flutter/Release.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Generated.xcconfig"

‎ios/Podfile‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Uncomment this line to define a global platform for your project
2+
platform :ios, '14.0'
3+
4+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
5+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
6+
7+
project 'Runner', {
8+
'Debug' => :debug,
9+
'Profile' => :release,
10+
'Release' => :release,
11+
}
12+
13+
def flutter_root
14+
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
15+
unless File.exist?(generated_xcode_build_settings_path)
16+
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
17+
end
18+
19+
File.foreach(generated_xcode_build_settings_path) do |line|
20+
matches = line.match(/FLUTTER_ROOT\=(.*)/)
21+
return matches[1].strip if matches
22+
end
23+
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
24+
end
25+
26+
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
27+
28+
flutter_ios_podfile_setup
29+
30+
target 'Runner' do
31+
use_frameworks!
32+
33+
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
34+
# target 'RunnerTests' do
35+
# inherit! :search_paths
36+
# end
37+
end
38+
39+
post_install do |installer|
40+
installer.pods_project.targets.each do |target|
41+
flutter_additional_ios_build_settings(target)
42+
end
43+
end

‎ios/Podfile.lock‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
PODS:
2+
- Flutter (1.0.0)
3+
- integration_test (0.0.1):
4+
- Flutter
5+
- open_filex (0.0.2):
6+
- Flutter
7+
- package_info_plus (0.4.5):
8+
- Flutter
9+
- path_provider_foundation (0.0.1):
10+
- Flutter
11+
- FlutterMacOS
12+
- share_plus (0.0.1):
13+
- Flutter
14+
- shared_preferences_foundation (0.0.1):
15+
- Flutter
16+
- FlutterMacOS
17+
- url_launcher_ios (0.0.1):
18+
- Flutter
19+
- workmanager (0.0.1):
20+
- Flutter
21+
22+
DEPENDENCIES:
23+
- Flutter (from `Flutter`)
24+
- integration_test (from `.symlinks/plugins/integration_test/ios`)
25+
- open_filex (from `.symlinks/plugins/open_filex/ios`)
26+
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
27+
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
28+
- share_plus (from `.symlinks/plugins/share_plus/ios`)
29+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
30+
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
31+
- workmanager (from `.symlinks/plugins/workmanager/ios`)
32+
33+
EXTERNAL SOURCES:
34+
Flutter:
35+
:path: Flutter
36+
integration_test:
37+
:path: ".symlinks/plugins/integration_test/ios"
38+
open_filex:
39+
:path: ".symlinks/plugins/open_filex/ios"
40+
package_info_plus:
41+
:path: ".symlinks/plugins/package_info_plus/ios"
42+
path_provider_foundation:
43+
:path: ".symlinks/plugins/path_provider_foundation/darwin"
44+
share_plus:
45+
:path: ".symlinks/plugins/share_plus/ios"
46+
shared_preferences_foundation:
47+
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
48+
url_launcher_ios:
49+
:path: ".symlinks/plugins/url_launcher_ios/ios"
50+
workmanager:
51+
:path: ".symlinks/plugins/workmanager/ios"
52+
53+
SPEC CHECKSUMS:
54+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
55+
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
56+
open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
57+
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
58+
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
59+
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
60+
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
61+
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
62+
workmanager: b89e4e4445d8b57ee2fdbf1c3925696ebe5b8990
63+
64+
PODFILE CHECKSUM: ec1ad48fafee7989ae02b93f14e4d03d1f0e05bb
65+
66+
COCOAPODS: 1.16.2

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 76 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -13,6 +13,7 @@
1313
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1414
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1515
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16+
D0190EC4023141C93A5318E8 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AE0C893C30B85278F5DF6A2 /* Pods_Runner.framework */; };
1617
/* End PBXBuildFile section */
1718

1819
/* Begin PBXCopyFilesBuildPhase section */
@@ -32,6 +33,8 @@
3233
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3334
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3435
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
36+
4C17CDF240BC5AE58F5C0AAE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
37+
4CC19D185F571E45AC7BB4FF /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3538
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3639
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3740
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -42,19 +45,41 @@
4245
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4346
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4447
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48+
9AE0C893C30B85278F5DF6A2 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
49+
F47B29FE948DC5ED2705681A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4550
/* End PBXFileReference section */
4651

4752
/* Begin PBXFrameworksBuildPhase section */
4853
97C146EB1CF9000F007C117D /* Frameworks */ = {
4954
isa = PBXFrameworksBuildPhase;
5055
buildActionMask = 2147483647;
5156
files = (
57+
D0190EC4023141C93A5318E8 /* Pods_Runner.framework in Frameworks */,
5258
);
5359
runOnlyForDeploymentPostprocessing = 0;
5460
};
5561
/* End PBXFrameworksBuildPhase section */
5662

5763
/* Begin PBXGroup section */
64+
5E3355700D4D226D390B38C6 /* Frameworks */ = {
65+
isa = PBXGroup;
66+
children = (
67+
9AE0C893C30B85278F5DF6A2 /* Pods_Runner.framework */,
68+
);
69+
name = Frameworks;
70+
sourceTree = "<group>";
71+
};
72+
89E5EBCBCE76D5370988611D /* Pods */ = {
73+
isa = PBXGroup;
74+
children = (
75+
4CC19D185F571E45AC7BB4FF /* Pods-Runner.debug.xcconfig */,
76+
F47B29FE948DC5ED2705681A /* Pods-Runner.release.xcconfig */,
77+
4C17CDF240BC5AE58F5C0AAE /* Pods-Runner.profile.xcconfig */,
78+
);
79+
name = Pods;
80+
path = Pods;
81+
sourceTree = "<group>";
82+
};
5883
9740EEB11CF90186004384FC /* Flutter */ = {
5984
isa = PBXGroup;
6085
children = (
@@ -72,6 +97,8 @@
7297
9740EEB11CF90186004384FC /* Flutter */,
7398
97C146F01CF9000F007C117D /* Runner */,
7499
97C146EF1CF9000F007C117D /* Products */,
100+
89E5EBCBCE76D5370988611D /* Pods */,
101+
5E3355700D4D226D390B38C6 /* Frameworks */,
75102
);
76103
sourceTree = "<group>";
77104
};
@@ -105,12 +132,14 @@
105132
isa = PBXNativeTarget;
106133
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
107134
buildPhases = (
135+
EB5CECB911C6292CB96F300E /* [CP] Check Pods Manifest.lock */,
108136
9740EEB61CF901F6004384FC /* Run Script */,
109137
97C146EA1CF9000F007C117D /* Sources */,
110138
97C146EB1CF9000F007C117D /* Frameworks */,
111139
97C146EC1CF9000F007C117D /* Resources */,
112140
9705A1C41CF9048500538489 /* Embed Frameworks */,
113141
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
142+
0BBD8B8AB681E2B94AB9A6ED /* [CP] Embed Pods Frameworks */,
114143
);
115144
buildRules = (
116145
);
@@ -127,7 +156,7 @@
127156
97C146E61CF9000F007C117D /* Project object */ = {
128157
isa = PBXProject;
129158
attributes = {
130-
LastUpgradeCheck = 1300;
159+
LastUpgradeCheck = 1510;
131160
ORGANIZATIONNAME = "";
132161
TargetAttributes = {
133162
97C146ED1CF9000F007C117D = {
@@ -169,12 +198,31 @@
169198
/* End PBXResourcesBuildPhase section */
170199

171200
/* Begin PBXShellScriptBuildPhase section */
201+
0BBD8B8AB681E2B94AB9A6ED /* [CP] Embed Pods Frameworks */ = {
202+
isa = PBXShellScriptBuildPhase;
203+
buildActionMask = 2147483647;
204+
files = (
205+
);
206+
inputFileListPaths = (
207+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
208+
);
209+
name = "[CP] Embed Pods Frameworks";
210+
outputFileListPaths = (
211+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
212+
);
213+
runOnlyForDeploymentPostprocessing = 0;
214+
shellPath = /bin/sh;
215+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
216+
showEnvVarsInLog = 0;
217+
};
172218
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
173219
isa = PBXShellScriptBuildPhase;
220+
alwaysOutOfDate = 1;
174221
buildActionMask = 2147483647;
175222
files = (
176223
);
177224
inputPaths = (
225+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
178226
);
179227
name = "Thin Binary";
180228
outputPaths = (
@@ -185,6 +233,7 @@
185233
};
186234
9740EEB61CF901F6004384FC /* Run Script */ = {
187235
isa = PBXShellScriptBuildPhase;
236+
alwaysOutOfDate = 1;
188237
buildActionMask = 2147483647;
189238
files = (
190239
);
@@ -197,6 +246,28 @@
197246
shellPath = /bin/sh;
198247
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
199248
};
249+
EB5CECB911C6292CB96F300E /* [CP] Check Pods Manifest.lock */ = {
250+
isa = PBXShellScriptBuildPhase;
251+
buildActionMask = 2147483647;
252+
files = (
253+
);
254+
inputFileListPaths = (
255+
);
256+
inputPaths = (
257+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
258+
"${PODS_ROOT}/Manifest.lock",
259+
);
260+
name = "[CP] Check Pods Manifest.lock";
261+
outputFileListPaths = (
262+
);
263+
outputPaths = (
264+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
265+
);
266+
runOnlyForDeploymentPostprocessing = 0;
267+
shellPath = /bin/sh;
268+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
269+
showEnvVarsInLog = 0;
270+
};
200271
/* End PBXShellScriptBuildPhase section */
201272

202273
/* Begin PBXSourcesBuildPhase section */
@@ -272,7 +343,7 @@
272343
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
273344
GCC_WARN_UNUSED_FUNCTION = YES;
274345
GCC_WARN_UNUSED_VARIABLE = YES;
275-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
346+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
276347
MTL_ENABLE_DEBUG_INFO = NO;
277348
SDKROOT = iphoneos;
278349
SUPPORTED_PLATFORMS = iphoneos;
@@ -349,7 +420,7 @@
349420
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
350421
GCC_WARN_UNUSED_FUNCTION = YES;
351422
GCC_WARN_UNUSED_VARIABLE = YES;
352-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
423+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
353424
MTL_ENABLE_DEBUG_INFO = YES;
354425
ONLY_ACTIVE_ARCH = YES;
355426
SDKROOT = iphoneos;
@@ -398,7 +469,7 @@
398469
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
399470
GCC_WARN_UNUSED_FUNCTION = YES;
400471
GCC_WARN_UNUSED_VARIABLE = YES;
401-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
472+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
402473
MTL_ENABLE_DEBUG_INFO = NO;
403474
SDKROOT = iphoneos;
404475
SUPPORTED_PLATFORMS = iphoneos;

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,11 +44,13 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
5052
debugServiceExtension = "internal"
53+
enableGPUValidationMode = "1"
5154
allowLocationSimulation = "YES">
5255
<BuildableProductRunnable
5356
runnableDebuggingMode = "0">

‎ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/Runner/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

0 commit comments

Comments
 (0)