IGListKit/Examples/Examples-iOS/IGListKitExamples/ViewControllers/ObjcGeneratedModelDemoViewController.m

81 lines
3.7 KiB
Mathematica
Raw Normal View History

/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#import "ObjcGeneratedModelDemoViewController.h"
Improve SwiftPM support (#1546) Summary: This diff imports and refines the PR made by cntrump on GitHub. The PR introduces the following: * Sample apps now use SPM instead of CocoaPods to import IGListKit. * Adds Mac Catalyst as an example target. * Adds C++ flags to the CocoaPods specs. * Fixes a script issue that was discovered when regenerating the symlinks. The PR originally aimed to remove the need for symlinked references to the IGListKit and IGListDiffKit source files, but in testing, I couldn't get it working. It's possible SPM being too strict [on where the headers can be placed to be discovered](https://forums.swift.org/t/how-do-i-specify-the-headers-directory-for-a-objc-target-in-swift-package-managers-package-swift/58531/3). Additionally, another issue was that the original PR changed all of the `#import` statements to the the modular `import` statements, which is fine for the sample apps, but ended up breaking compatibility for any apps that had modules disabled. ## Changes in this pull request Improve SwiftPM support: Build module `IGListDiffKit` and `IGListKit` as Objective-C++. module `IGListDiffKit`: - Source/IGListDiffKit - module defined in `Source/IGListDiffKit/modulemap/module.modulemap` - requires `-fmodules` and `-fcxx-modules` module `IGListKit`: - depend on `IGListDiffKit`, use `import IGListDiffKit;` - Source/IGListKit - module defined in `Source/IGListKit/modulemap/module.modulemap` - requires `-fmodules` and `-fcxx-modules` module `IGListSwiftKit`: - depend on `IGListKit`, use `import IGListKit` - Source/IGListSwiftKit Deleted `spm/` and `scripts/generate_spm_sources_layout.sh`, it is unnecessary. Updated `.podspec`, add `'OTHER_CFLAGS' => '-fmodules'` and `'OTHER_CPLUSPLUSFLAGS' => '-fcxx-modules'`. Add missing swift files for `IGListSwiftKit` in `IGListKit.xcodeproj` ### How to use Replace `#import <IGListDiffKit/IGListDiffKit.h>` with `import IGListDiffKit;`, because `IGListDiffKit.h` isn't exist in `modulemap/`, Or create a symbol link by `ln -sf ../IGListDiffKit.h` for support it ? ### Examples Use SwiftPM for building examples. ### Checklist - [x] All tests pass. Demo project builds and runs. - [x] I added tests, an experiment, or detailed why my change isn't tested. - [ ] I added an entry to the `CHANGELOG.md` for any breaking changes, enhancements, or bug fixes. - [x] I have reviewed the [contributing guide](https://github.com/Instagram/IGListKit/blob/master/.github/CONTRIBUTING.md) Pull Request resolved: https://github.com/Instagram/IGListKit/pull/1546 Test Plan: Test PR showing running tests: https://github.com/TimOliver/IGListKit/actions/runs/4339956050/jobs/7578047058 Reviewed By: lorixx Differential Revision: D33592395 Pulled By: TimOliver fbshipit-source-id: 8f7b1873f2b1c6a80908bb55b123e31bea13bb0c
2023-03-07 07:29:41 +00:00
@import IGListKit;
#import "PersonModel.h"
#import "PersonSectionController.h"
@interface ObjcGeneratedModelDemoViewController () <IGListAdapterDataSource>
@property (nonatomic, strong) UICollectionView *collectionView;
@property (nonatomic, strong) IGListAdapter *adapter;
@property (nonatomic, copy) NSArray<PersonModel *> *persons;
@end
@implementation ObjcGeneratedModelDemoViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.persons = @[[[PersonModel alloc] initWithFirstName:@"Ryan" lastName:@"Nystrom" uniqueId:@"1"],
[[PersonModel alloc] initWithFirstName:@"Jesse" lastName:@"Squires" uniqueId:@"2"],
[[PersonModel alloc] initWithFirstName:@"Markus" lastName:@"Emrich" uniqueId:@"3"],
[[PersonModel alloc] initWithFirstName:@"James" lastName:@"Sherlock" uniqueId:@"4"],
[[PersonModel alloc] initWithFirstName:@"Bofei" lastName:@"Zhu" uniqueId:@"5"],
[[PersonModel alloc] initWithFirstName:@"Valeriy" lastName:@"Van" uniqueId:@"6"],
[[PersonModel alloc] initWithFirstName:@"Hesham" lastName:@"Salman" uniqueId:@"7"],
[[PersonModel alloc] initWithFirstName:@"Bas" lastName:@"Broek" uniqueId:@"8"],
[[PersonModel alloc] initWithFirstName:@"Andrew" lastName:@"Monshizadeh" uniqueId:@"9"],
[[PersonModel alloc] initWithFirstName:@"Adlai" lastName:@"Holler" uniqueId:@"10"],
[[PersonModel alloc] initWithFirstName:@"Ben" lastName:@"Asher" uniqueId:@"11"],
[[PersonModel alloc] initWithFirstName:@"Jake" lastName:@"Lin" uniqueId:@"12"],
[[PersonModel alloc] initWithFirstName:@"Jeff" lastName:@"Bailey" uniqueId:@"13"],
[[PersonModel alloc] initWithFirstName:@"Daniel" lastName:@"Alamo" uniqueId:@"14"],
[[PersonModel alloc] initWithFirstName:@"Viktor" lastName:@"Gardart" uniqueId:@"15"],
[[PersonModel alloc] initWithFirstName:@"Anton" lastName:@"Sotkov" uniqueId:@"16"],
[[PersonModel alloc] initWithFirstName:@"Guilherme" lastName:@"Rambo" uniqueId:@"17"],
[[PersonModel alloc] initWithFirstName:@"Rizwan" lastName:@"Ibrahim" uniqueId:@"18"],
[[PersonModel alloc] initWithFirstName:@"Ayush" lastName:@"Saraswat" uniqueId:@"19"],
[[PersonModel alloc] initWithFirstName:@"Dustin" lastName:@"Shahidehpour" uniqueId:@"20"],
];
self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero
collectionViewLayout:[UICollectionViewFlowLayout new]];
[self.view addSubview:self.collectionView];
self.adapter = [[IGListAdapter alloc] initWithUpdater:[[IGListAdapterUpdater alloc] init]
viewController:self];
self.adapter.collectionView = self.collectionView;
self.adapter.dataSource = self;
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
self.collectionView.frame = self.view.bounds;
}
#pragma mark - IGListAdapterDataSource
- (NSArray<id<IGListDiffable>> *)objectsForListAdapter:(IGListAdapter *)listAdapter {
return self.persons;
}
- (IGListSectionController *)listAdapter:(IGListAdapter *)listAdapter sectionControllerForObject:(id)object {
return [PersonSectionController new];
}
- (UIView *)emptyViewForListAdapter:(IGListAdapter *)listAdapter {
return nil;
}
@end