Skip to content

Commit e73043b

Browse files
zmtzawqlpzmtzawqlp
committed
refactor code structure
1 parent cc74665 commit e73043b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3556
-2738
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 5.0.0
2+
3+
* refactor code structure
4+
15
## 4.2.0
26

37
* Migrate to Flutter 3.27

‎example/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ app.*.symbols
3939

4040
# Obfuscation related
4141
app.*.map.json
42+
.metadata

‎example/.metadata

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎example/ios/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Flutter/flutter_assets/
2626
Flutter/flutter_export_environment.sh
2727
ServiceDefinitions.json
2828
Runner/GeneratedPluginRegistrant.*
29-
Podfile.lock
3029

3130
# Exceptions to above rules.
3231
!default.mode1v3

‎example/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>12.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Podfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11-
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1413
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1514
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1615
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16+
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1717
/* End PBXBuildFile section */
1818

1919
/* Begin PBXContainerItemProxy section */
@@ -42,8 +42,6 @@
4242
/* Begin PBXFileReference section */
4343
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4444
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
45-
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
46-
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4745
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4846
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4947
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -55,6 +53,8 @@
5553
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5654
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5755
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56+
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
57+
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5858
/* End PBXFileReference section */
5959

6060
/* Begin PBXFrameworksBuildPhase section */
@@ -68,14 +68,6 @@
6868
/* End PBXFrameworksBuildPhase section */
6969

7070
/* Begin PBXGroup section */
71-
331C8082294A63A400263BE5 /* RunnerTests */ = {
72-
isa = PBXGroup;
73-
children = (
74-
331C807B294A618700263BE5 /* RunnerTests.swift */,
75-
);
76-
path = RunnerTests;
77-
sourceTree = "<group>";
78-
};
7971
9740EEB11CF90186004384FC /* Flutter */ = {
8072
isa = PBXGroup;
8173
children = (
@@ -87,6 +79,14 @@
8779
name = Flutter;
8880
sourceTree = "<group>";
8981
};
82+
331C8082294A63A400263BE5 /* RunnerTests */ = {
83+
isa = PBXGroup;
84+
children = (
85+
331C807B294A618700263BE5 /* RunnerTests.swift */,
86+
);
87+
path = RunnerTests;
88+
sourceTree = "<group>";
89+
};
9090
97C146E51CF9000F007C117D = {
9191
isa = PBXGroup;
9292
children = (
@@ -129,6 +129,7 @@
129129
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130130
buildPhases = (
131131
331C807D294A63A400263BE5 /* Sources */,
132+
331C807E294A63A400263BE5 /* Frameworks */,
132133
331C807F294A63A400263BE5 /* Resources */,
133134
);
134135
buildRules = (
@@ -167,8 +168,7 @@
167168
97C146E61CF9000F007C117D /* Project object */ = {
168169
isa = PBXProject;
169170
attributes = {
170-
BuildIndependentTargetsInParallel = YES;
171-
LastUpgradeCheck = 1510;
171+
LastUpgradeCheck = 1300;
172172
ORGANIZATIONNAME = "";
173173
TargetAttributes = {
174174
331C8080294A63A400263BE5 = {
@@ -307,7 +307,6 @@
307307
isa = XCBuildConfiguration;
308308
buildSettings = {
309309
ALWAYS_SEARCH_USER_PATHS = NO;
310-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
311310
CLANG_ANALYZER_NONNULL = YES;
312311
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
313312
CLANG_CXX_LIBRARY = "libc++";
@@ -337,7 +336,6 @@
337336
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
338337
ENABLE_NS_ASSERTIONS = NO;
339338
ENABLE_STRICT_OBJC_MSGSEND = YES;
340-
ENABLE_USER_SCRIPT_SANDBOXING = NO;
341339
GCC_C_LANGUAGE_STANDARD = gnu99;
342340
GCC_NO_COMMON_BLOCKS = YES;
343341
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -346,7 +344,7 @@
346344
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
347345
GCC_WARN_UNUSED_FUNCTION = YES;
348346
GCC_WARN_UNUSED_VARIABLE = YES;
349-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
347+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
350348
MTL_ENABLE_DEBUG_INFO = NO;
351349
SDKROOT = iphoneos;
352350
SUPPORTED_PLATFORMS = iphoneos;
@@ -362,13 +360,14 @@
362360
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
363361
CLANG_ENABLE_MODULES = YES;
364362
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
363+
DEVELOPMENT_TEAM = 3CJ9HMC222;
365364
ENABLE_BITCODE = NO;
366365
INFOPLIST_FILE = Runner/Info.plist;
367366
LD_RUNPATH_SEARCH_PATHS = (
368367
"$(inherited)",
369368
"@executable_path/Frameworks",
370369
);
371-
PRODUCT_BUNDLE_IDENTIFIER = com.example.extendedTabsExample;
370+
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
372371
PRODUCT_NAME = "$(TARGET_NAME)";
373372
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
374373
SWIFT_VERSION = 5.0;
@@ -378,13 +377,14 @@
378377
};
379378
331C8088294A63A400263BE5 /* Debug */ = {
380379
isa = XCBuildConfiguration;
380+
baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */;
381381
buildSettings = {
382382
BUNDLE_LOADER = "$(TEST_HOST)";
383383
CODE_SIGN_STYLE = Automatic;
384384
CURRENT_PROJECT_VERSION = 1;
385385
GENERATE_INFOPLIST_FILE = YES;
386386
MARKETING_VERSION = 1.0;
387-
PRODUCT_BUNDLE_IDENTIFIER = com.example.extendedTabsExample.RunnerTests;
387+
PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
388388
PRODUCT_NAME = "$(TARGET_NAME)";
389389
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
390390
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -395,13 +395,14 @@
395395
};
396396
331C8089294A63A400263BE5 /* Release */ = {
397397
isa = XCBuildConfiguration;
398+
baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */;
398399
buildSettings = {
399400
BUNDLE_LOADER = "$(TEST_HOST)";
400401
CODE_SIGN_STYLE = Automatic;
401402
CURRENT_PROJECT_VERSION = 1;
402403
GENERATE_INFOPLIST_FILE = YES;
403404
MARKETING_VERSION = 1.0;
404-
PRODUCT_BUNDLE_IDENTIFIER = com.example.extendedTabsExample.RunnerTests;
405+
PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
405406
PRODUCT_NAME = "$(TARGET_NAME)";
406407
SWIFT_VERSION = 5.0;
407408
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -410,13 +411,14 @@
410411
};
411412
331C808A294A63A400263BE5 /* Profile */ = {
412413
isa = XCBuildConfiguration;
414+
baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */;
413415
buildSettings = {
414416
BUNDLE_LOADER = "$(TEST_HOST)";
415417
CODE_SIGN_STYLE = Automatic;
416418
CURRENT_PROJECT_VERSION = 1;
417419
GENERATE_INFOPLIST_FILE = YES;
418420
MARKETING_VERSION = 1.0;
419-
PRODUCT_BUNDLE_IDENTIFIER = com.example.extendedTabsExample.RunnerTests;
421+
PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
420422
PRODUCT_NAME = "$(TARGET_NAME)";
421423
SWIFT_VERSION = 5.0;
422424
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -427,7 +429,6 @@
427429
isa = XCBuildConfiguration;
428430
buildSettings = {
429431
ALWAYS_SEARCH_USER_PATHS = NO;
430-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
431432
CLANG_ANALYZER_NONNULL = YES;
432433
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
433434
CLANG_CXX_LIBRARY = "libc++";
@@ -457,7 +458,6 @@
457458
DEBUG_INFORMATION_FORMAT = dwarf;
458459
ENABLE_STRICT_OBJC_MSGSEND = YES;
459460
ENABLE_TESTABILITY = YES;
460-
ENABLE_USER_SCRIPT_SANDBOXING = NO;
461461
GCC_C_LANGUAGE_STANDARD = gnu99;
462462
GCC_DYNAMIC_NO_PIC = NO;
463463
GCC_NO_COMMON_BLOCKS = YES;
@@ -472,7 +472,7 @@
472472
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
473473
GCC_WARN_UNUSED_FUNCTION = YES;
474474
GCC_WARN_UNUSED_VARIABLE = YES;
475-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
475+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
476476
MTL_ENABLE_DEBUG_INFO = YES;
477477
ONLY_ACTIVE_ARCH = YES;
478478
SDKROOT = iphoneos;
@@ -484,7 +484,6 @@
484484
isa = XCBuildConfiguration;
485485
buildSettings = {
486486
ALWAYS_SEARCH_USER_PATHS = NO;
487-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
488487
CLANG_ANALYZER_NONNULL = YES;
489488
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
490489
CLANG_CXX_LIBRARY = "libc++";
@@ -514,7 +513,6 @@
514513
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
515514
ENABLE_NS_ASSERTIONS = NO;
516515
ENABLE_STRICT_OBJC_MSGSEND = YES;
517-
ENABLE_USER_SCRIPT_SANDBOXING = NO;
518516
GCC_C_LANGUAGE_STANDARD = gnu99;
519517
GCC_NO_COMMON_BLOCKS = YES;
520518
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -523,7 +521,7 @@
523521
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
524522
GCC_WARN_UNUSED_FUNCTION = YES;
525523
GCC_WARN_UNUSED_VARIABLE = YES;
526-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
524+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
527525
MTL_ENABLE_DEBUG_INFO = NO;
528526
SDKROOT = iphoneos;
529527
SUPPORTED_PLATFORMS = iphoneos;
@@ -541,13 +539,14 @@
541539
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
542540
CLANG_ENABLE_MODULES = YES;
543541
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
542+
DEVELOPMENT_TEAM = 3CJ9HMC222;
544543
ENABLE_BITCODE = NO;
545544
INFOPLIST_FILE = Runner/Info.plist;
546545
LD_RUNPATH_SEARCH_PATHS = (
547546
"$(inherited)",
548547
"@executable_path/Frameworks",
549548
);
550-
PRODUCT_BUNDLE_IDENTIFIER = com.example.extendedTabsExample;
549+
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
551550
PRODUCT_NAME = "$(TARGET_NAME)";
552551
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
553552
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -563,13 +562,14 @@
563562
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
564563
CLANG_ENABLE_MODULES = YES;
565564
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
565+
DEVELOPMENT_TEAM = 3CJ9HMC222;
566566
ENABLE_BITCODE = NO;
567567
INFOPLIST_FILE = Runner/Info.plist;
568568
LD_RUNPATH_SEARCH_PATHS = (
569569
"$(inherited)",
570570
"@executable_path/Frameworks",
571571
);
572-
PRODUCT_BUNDLE_IDENTIFIER = com.example.extendedTabsExample;
572+
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
573573
PRODUCT_NAME = "$(TARGET_NAME)";
574574
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
575575
SWIFT_VERSION = 5.0;

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

Lines changed: 1 addition & 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 = "1510"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎example/ios/Runner/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Flutter
21
import UIKit
2+
import Flutter
33

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

0 commit comments

Comments
 (0)