Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change ios part - migration to Objective-c #213

Draft
wants to merge 26 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c7f3594
Merge pull request #191 from builttoroam/develop
bhl09 Mar 20, 2020
f1b19d5
Removed a redundant block (#194)
bhl09 Mar 20, 2020
4a796fa
Merge pull request #198 from builttoroam/develop
bhl09 Mar 24, 2020
0a05bdb
Merge pull request #200 from builttoroam/develop
bhl09 Mar 24, 2020
7e267b4
Merge pull request #203 from builttoroam/develop
bhl09 Mar 24, 2020
8f67a45
Merge pull request #204 from builttoroam/release
bhl09 Mar 25, 2020
9e66469
Merge pull request #207 from builttoroam/develop
bhl09 Mar 25, 2020
9ec999a
Merge pull request #208 from builttoroam/release
bhl09 Mar 25, 2020
21dca84
change ios part - migration to Objective-c
andreychernikovich Mar 31, 2020
73a3399
fix isAllDay is always true even when it is sent as false in dart
andreychernikovich Apr 6, 2020
8ec13d7
fix comments
andreychernikovich Apr 16, 2020
309405c
remove dev acc
andreychernikovich Apr 16, 2020
13c6800
fix attendees
andreychernikovich May 26, 2020
c784757
change ios developer team
andreychernikovich May 28, 2020
14d9429
Merge branch 'release' of https://github.com/andreychernikovich/flutt…
andreychernikovich Jun 8, 2020
310173b
Merge branch 'master' of https://github.com/andreychernikovich/flutte…
andreychernikovich Jun 8, 2020
d376caa
change ios part - migration to Objective-c
andreychernikovich Mar 31, 2020
0a88657
fix isAllDay is always true even when it is sent as false in dart
andreychernikovich Apr 6, 2020
addc505
fix comments
andreychernikovich Apr 16, 2020
2d6f6d9
remove dev acc
andreychernikovich Apr 16, 2020
dba28b1
fix attendees
andreychernikovich May 26, 2020
c717288
change ios developer team
andreychernikovich May 28, 2020
e8e4133
Merge branch 'migration_to_objective-c' of https://github.com/andreyc…
andreychernikovich Jul 5, 2020
81099e9
merge with latest dev branch
andreychernikovich Jul 5, 2020
8524df8
refactoring code
andreychernikovich Jul 5, 2020
2ba59d7
refactoring code
andreychernikovich Jul 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ target 'Runner' do
}

# Plugin Pods
pod 'JSONModel'
plugin_pods = parse_KV_file('../.flutter-plugins')
plugin_pods.map { |p|
symlink = File.join('Pods', '.symlinks', 'plugins', p[:name])
Expand Down
14 changes: 11 additions & 3 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
PODS:
- device_calendar (0.0.1):
- Flutter
- JSONModel
- Flutter (1.0.0)
- JSONModel (1.8.0)

DEPENDENCIES:
- device_calendar (from `Pods/.symlinks/plugins/device_calendar/ios`)
- Flutter (from `Pods/.symlinks/flutter/ios`)
- JSONModel

SPEC REPOS:
trunk:
- JSONModel

EXTERNAL SOURCES:
device_calendar:
Expand All @@ -14,9 +21,10 @@ EXTERNAL SOURCES:
:path: Pods/.symlinks/flutter/ios

SPEC CHECKSUMS:
device_calendar: 23b28a5f1ab3bf77e34542fb1167e1b8b29a98f5
device_calendar: fb103d17cdd72b294a9c464b811e903566f04e67
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
JSONModel: 02ab723958366a3fd27da57ea2af2113658762e9

PODFILE CHECKSUM: ea0518673586564c605fb6593d385c0e3708ff8d
PODFILE CHECKSUM: d833004bd9a416c1f9c3fb12831e1203a373fbfb

COCOAPODS: 1.8.4
COCOAPODS: 1.9.3
34 changes: 13 additions & 21 deletions example/ios/Runner.xcodeproj/project.pbxproj
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
0904E8AC2433323B00DFD5BE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0904E8AB2433323B00DFD5BE /* AppDelegate.m */; };
0904E8AF2433360500DFD5BE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0904E8AE2433360500DFD5BE /* main.m */; };
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
763C5C3662C48FEF7F2B0120 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E098C60D243A71853922C094 /* Pods_Runner.framework */; };
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
Expand All @@ -27,26 +24,23 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0904E8AB2433323B00DFD5BE /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
0904E8AD2433325300DFD5BE /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
0904E8AE2433360500DFD5BE /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
2AD784C0989B63BAA46EFDFD /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -61,8 +55,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
763C5C3662C48FEF7F2B0120 /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -90,9 +82,7 @@
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
3B80C3931E831B6300D905FE /* App.framework */,
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
9740EEB31CF90195004384FC /* Generated.xcconfig */,
Expand Down Expand Up @@ -129,8 +119,9 @@
97C146F11CF9000F007C117D /* Supporting Files */,
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
0904E8AB2433323B00DFD5BE /* AppDelegate.m */,
0904E8AD2433325300DFD5BE /* AppDelegate.h */,
0904E8AE2433360500DFD5BE /* main.m */,
);
path = Runner;
sourceTree = "<group>";
Expand Down Expand Up @@ -224,11 +215,13 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
"${BUILT_PRODUCTS_DIR}/JSONModel/JSONModel.framework",
"${BUILT_PRODUCTS_DIR}/device_calendar/device_calendar.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSONModel.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_calendar.framework",
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -248,7 +241,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -289,8 +282,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
0904E8AF2433360500DFD5BE /* main.m in Sources */,
0904E8AC2433323B00DFD5BE /* AppDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -318,7 +312,6 @@
/* Begin XCBuildConfiguration section */
97C147031CF9000F007C117D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -374,7 +367,6 @@
};
97C147041CF9000F007C117D /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down

This file was deleted.

6 changes: 6 additions & 0 deletions example/ios/Runner/AppDelegate.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#import <Flutter/Flutter.h>
#import <UIKit/UIKit.h>

@interface AppDelegate : FlutterAppDelegate

@end
13 changes: 13 additions & 0 deletions example/ios/Runner/AppDelegate.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#import "AppDelegate.h"
#import "GeneratedPluginRegistrant.h"

@implementation AppDelegate

- (BOOL)application:(UIApplication *)application
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[GeneratedPluginRegistrant registerWithRegistry:self];
// Override point for customization after application launch.
return [super application:application didFinishLaunchingWithOptions:launchOptions];
}

@end
13 changes: 0 additions & 13 deletions example/ios/Runner/AppDelegate.swift

This file was deleted.

1 change: 0 additions & 1 deletion example/ios/Runner/Runner-Bridging-Header.h

This file was deleted.

9 changes: 9 additions & 0 deletions example/ios/Runner/main.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#import <Flutter/Flutter.h>
#import <UIKit/UIKit.h>
#import "AppDelegate.h"

int main(int argc, char* argv[]) {
@autoreleasepool {
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
}
}
11 changes: 11 additions & 0 deletions ios/Classes/Date+Utilities.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#import <Foundation/Foundation.h>

NS_ASSUME_NONNULL_BEGIN

@interface NSDate (Utilities)

@property (readonly) float millisecondsSinceEpoch;

@end

NS_ASSUME_NONNULL_END
10 changes: 10 additions & 0 deletions ios/Classes/Date+Utilities.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#import "Date+Utilities.h"

@implementation NSDate (Utilities)

- (float) millisecondsSinceEpoch
{
return [self timeIntervalSince1970] * 1000.0;
}

@end
4 changes: 4 additions & 0 deletions ios/Classes/DeviceCalendarExtendedPlugin.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#import <Flutter/Flutter.h>

@interface DeviceCalendarExtendedPlugin : NSObject<FlutterPlugin>
@end
8 changes: 8 additions & 0 deletions ios/Classes/DeviceCalendarExtendedPlugin.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#import "DeviceCalendarExtendedPlugin.h"
#import "DeviceCalendarPlugin.h"

@implementation DeviceCalendarExtendedPlugin
+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
[DeviceCalendarPlugin registerWithRegistrar:registrar];
}
@end
5 changes: 4 additions & 1 deletion ios/Classes/DeviceCalendarPlugin.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#import <Flutter/Flutter.h>
#import <EventKit/EventKit.h>

@interface DeviceCalendarPlugin : NSObject<FlutterPlugin>
@interface DeviceCalendarPlugin: NSObject<FlutterPlugin>
@end


Loading