Skip to content

Commit 97d51c4

Browse files
Ben-GBen-G
authored
Merge pull request ReSwift#7 from ReSwift/dev
Many minor improvements & cleanup efforts
2 parents 1a3dbd5 + 8667b4d commit 97d51c4

14 files changed

+227
-94
lines changed

‎SwiftFlowGitHubBrowser.xcodeproj/project.pbxproj‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
251A75DC1C94F92900EBEB32 /* BookmarkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 251A75DB1C94F92900EBEB32 /* BookmarkViewController.swift */; };
1111
2532E8F61C8F8BFB003F5392 /* BookmarkActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2532E8F51C8F8BFB003F5392 /* BookmarkActions.swift */; };
12-
2532E92B1C8F8C49003F5392 /* BookmarksReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2532E92A1C8F8C49003F5392 /* BookmarksReducer.swift */; };
1312
254B3B951D3ABBFF00B1E4F0 /* OctoKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B881D3ABBCE00B1E4F0 /* OctoKit.framework */; };
1413
254B3B961D3ABBFF00B1E4F0 /* OctoKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B881D3ABBCE00B1E4F0 /* OctoKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
254B3B991D3ABC0400B1E4F0 /* RequestKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B701D3ABBC400B1E4F0 /* RequestKit.framework */; };
@@ -20,6 +19,14 @@
2019
254B3BA21D3ABC1300B1E4F0 /* ReSwiftRouter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B401D3ABBAB00B1E4F0 /* ReSwiftRouter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2120
254B3BA51D3ABC1E00B1E4F0 /* SSKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B251D3ABB9400B1E4F0 /* SSKeychain.framework */; };
2221
254B3BA61D3ABC1E00B1E4F0 /* SSKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 254B3B251D3ABB9400B1E4F0 /* SSKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
22+
2574204D1D4421410002D020 /* BookmarkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2574204C1D4421410002D020 /* BookmarkService.swift */; };
23+
257420841D442A7C0002D020 /* RepositoryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420831D442A7C0002D020 /* RepositoryTableViewCell.swift */; };
24+
257420861D442E020002D020 /* BookmarkTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420851D442E020002D020 /* BookmarkTableViewCell.swift */; };
25+
257420891D44304C0002D020 /* NavigationController+CompletionBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420881D44304C0002D020 /* NavigationController+CompletionBlock.swift */; };
26+
257420E21D443D990002D020 /* AppReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420DE1D443D990002D020 /* AppReducer.swift */; };
27+
257420E31D443D990002D020 /* AuthenticationReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420DF1D443D990002D020 /* AuthenticationReducer.swift */; };
28+
257420E41D443D990002D020 /* BookmarksReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420E01D443D990002D020 /* BookmarksReducer.swift */; };
29+
257420E51D443D990002D020 /* GitHubAPIReducers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 257420E11D443D990002D020 /* GitHubAPIReducers.swift */; };
2330
258184351C3CC710008E200A /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 258184341C3CC710008E200A /* State.swift */; };
2431
2581843A1C3CC912008E200A /* Routes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 258184391C3CC912008E200A /* Routes.swift */; };
2532
25BB76211C3CB8CB008EA13B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25BB76201C3CB8CB008EA13B /* AppDelegate.swift */; };
@@ -29,9 +36,6 @@
2936
25BE03E11C7C07E6005EBB09 /* AuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25BE03E01C7C07E6005EBB09 /* AuthenticationService.swift */; };
3037
25C00E991C3CD8E50074655A /* AuthenticationActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C00E981C3CD8E50074655A /* AuthenticationActions.swift */; };
3138
25C00E9C1C3CDAAC0074655A /* AuthenticationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C00E9B1C3CDAAC0074655A /* AuthenticationState.swift */; };
32-
25C00E9E1C3CDB5D0074655A /* AppReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C00E9D1C3CDB5D0074655A /* AppReducer.swift */; };
33-
25C00EA01C3CDCA70074655A /* AuthenticationReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C00E9F1C3CDCA70074655A /* AuthenticationReducer.swift */; };
34-
25C00EA21C3CDD1F0074655A /* GitHubAPIReducers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C00EA11C3CDD1F0074655A /* GitHubAPIReducers.swift */; };
3539
6296CA0E1C4D777800A60ECD /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6296CA0D1C4D777800A60ECD /* Credentials.swift */; };
3640
62C935481C8CD17F00887A23 /* GitHubRepositories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C935471C8CD17F00887A23 /* GitHubRepositories.swift */; };
3741
62C9354A1C8CD2CC00887A23 /* GitHubRepositoriesActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C935491C8CD2CC00887A23 /* GitHubRepositoriesActions.swift */; };
@@ -497,12 +501,19 @@
497501
/* Begin PBXFileReference section */
498502
251A75DB1C94F92900EBEB32 /* BookmarkViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkViewController.swift; sourceTree = "<group>"; };
499503
2532E8F51C8F8BFB003F5392 /* BookmarkActions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkActions.swift; sourceTree = "<group>"; };
500-
2532E92A1C8F8C49003F5392 /* BookmarksReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksReducer.swift; sourceTree = "<group>"; };
501504
254B3B1A1D3ABB9400B1E4F0 /* SSKeychain.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SSKeychain.xcodeproj; path = Carthage/Checkouts/SSKeychain/SSKeychain.xcodeproj; sourceTree = SOURCE_ROOT; };
502505
254B3B321D3ABBAB00B1E4F0 /* ReSwiftRouter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReSwiftRouter.xcodeproj; path = Carthage/Checkouts/ReSwiftRouter/ReSwiftRouter.xcodeproj; sourceTree = SOURCE_ROOT; };
503506
254B3B4D1D3ABBB400B1E4F0 /* ReSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReSwift.xcodeproj; path = Carthage/Checkouts/ReSwift/ReSwift.xcodeproj; sourceTree = SOURCE_ROOT; };
504507
254B3B651D3ABBC400B1E4F0 /* RequestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RequestKit.xcodeproj; path = Carthage/Checkouts/RequestKit/RequestKit.xcodeproj; sourceTree = SOURCE_ROOT; };
505508
254B3B7D1D3ABBCE00B1E4F0 /* OctoKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OctoKit.xcodeproj; path = Carthage/Checkouts/octokit.swift/OctoKit.xcodeproj; sourceTree = SOURCE_ROOT; };
509+
2574204C1D4421410002D020 /* BookmarkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkService.swift; sourceTree = "<group>"; };
510+
257420831D442A7C0002D020 /* RepositoryTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepositoryTableViewCell.swift; sourceTree = "<group>"; };
511+
257420851D442E020002D020 /* BookmarkTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkTableViewCell.swift; sourceTree = "<group>"; };
512+
257420881D44304C0002D020 /* NavigationController+CompletionBlock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NavigationController+CompletionBlock.swift"; path = "UIKitExtensions/NavigationController+CompletionBlock.swift"; sourceTree = "<group>"; };
513+
257420DE1D443D990002D020 /* AppReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppReducer.swift; path = Reducers/AppReducer.swift; sourceTree = "<group>"; };
514+
257420DF1D443D990002D020 /* AuthenticationReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AuthenticationReducer.swift; path = Reducers/AuthenticationReducer.swift; sourceTree = "<group>"; };
515+
257420E01D443D990002D020 /* BookmarksReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BookmarksReducer.swift; path = Reducers/BookmarksReducer.swift; sourceTree = "<group>"; };
516+
257420E11D443D990002D020 /* GitHubAPIReducers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GitHubAPIReducers.swift; path = Reducers/GitHubAPIReducers.swift; sourceTree = "<group>"; };
506517
258184341C3CC710008E200A /* State.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = State.swift; sourceTree = "<group>"; };
507518
258184391C3CC912008E200A /* Routes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Routes.swift; sourceTree = "<group>"; };
508519
25BB761D1C3CB8CB008EA13B /* SwiftFlowGitHubBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftFlowGitHubBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -514,9 +525,6 @@
514525
25BE03E01C7C07E6005EBB09 /* AuthenticationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationService.swift; sourceTree = "<group>"; };
515526
25C00E981C3CD8E50074655A /* AuthenticationActions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationActions.swift; sourceTree = "<group>"; };
516527
25C00E9B1C3CDAAC0074655A /* AuthenticationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationState.swift; sourceTree = "<group>"; };
517-
25C00E9D1C3CDB5D0074655A /* AppReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppReducer.swift; sourceTree = "<group>"; };
518-
25C00E9F1C3CDCA70074655A /* AuthenticationReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationReducer.swift; sourceTree = "<group>"; };
519-
25C00EA11C3CDD1F0074655A /* GitHubAPIReducers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitHubAPIReducers.swift; sourceTree = "<group>"; };
520528
6296CA0D1C4D777800A60ECD /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
521529
62C935471C8CD17F00887A23 /* GitHubRepositories.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitHubRepositories.swift; sourceTree = "<group>"; };
522530
62C935491C8CD2CC00887A23 /* GitHubRepositoriesActions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitHubRepositoriesActions.swift; sourceTree = "<group>"; };
@@ -627,6 +635,23 @@
627635
name = Products;
628636
sourceTree = "<group>";
629637
};
638+
257420821D442A700002D020 /* Views */ = {
639+
isa = PBXGroup;
640+
children = (
641+
257420831D442A7C0002D020 /* RepositoryTableViewCell.swift */,
642+
257420851D442E020002D020 /* BookmarkTableViewCell.swift */,
643+
);
644+
path = Views;
645+
sourceTree = "<group>";
646+
};
647+
257420871D4430330002D020 /* UIKitExtensions */ = {
648+
isa = PBXGroup;
649+
children = (
650+
257420881D44304C0002D020 /* NavigationController+CompletionBlock.swift */,
651+
);
652+
name = UIKitExtensions;
653+
sourceTree = "<group>";
654+
};
630655
258184331C3CC6F2008E200A /* State */ = {
631656
isa = PBXGroup;
632657
children = (
@@ -665,8 +690,9 @@
665690
25BB761F1C3CB8CB008EA13B /* SwiftFlowGitHubBrowser */ = {
666691
isa = PBXGroup;
667692
children = (
693+
257420871D4430330002D020 /* UIKitExtensions */,
694+
257420821D442A700002D020 /* Views */,
668695
62C935461C8CD14F00887A23 /* APIRequests */,
669-
62C9351E1C8CCF8800887A23 /* Models */,
670696
25BE03BA1C7C079B005EBB09 /* Services */,
671697
62EF0A6C1C700ABB00D13711 /* ViewControllers */,
672698
25C00EA41C3CEDBB0074655A /* GitHubAuth */,
@@ -701,6 +727,7 @@
701727
isa = PBXGroup;
702728
children = (
703729
25BE03E01C7C07E6005EBB09 /* AuthenticationService.swift */,
730+
2574204C1D4421410002D020 /* BookmarkService.swift */,
704731
);
705732
path = Services;
706733
sourceTree = "<group>";
@@ -718,10 +745,10 @@
718745
25C00E9A1C3CDA340074655A /* Reducers */ = {
719746
isa = PBXGroup;
720747
children = (
721-
25C00E9D1C3CDB5D0074655A /* AppReducer.swift */,
722-
25C00E9F1C3CDCA70074655A /* AuthenticationReducer.swift */,
723-
25C00EA11C3CDD1F0074655A /* GitHubAPIReducers.swift */,
724-
2532E92A1C8F8C49003F5392 /* BookmarksReducer.swift */,
748+
257420DE1D443D990002D020 /* AppReducer.swift */,
749+
257420DF1D443D990002D020 /* AuthenticationReducer.swift */,
750+
257420E01D443D990002D020 /* BookmarksReducer.swift */,
751+
257420E11D443D990002D020 /* GitHubAPIReducers.swift */,
725752
);
726753
name = Reducers;
727754
sourceTree = "<group>";
@@ -734,13 +761,6 @@
734761
path = GitHubAuth;
735762
sourceTree = "<group>";
736763
};
737-
62C9351E1C8CCF8800887A23 /* Models */ = {
738-
isa = PBXGroup;
739-
children = (
740-
);
741-
path = Models;
742-
sourceTree = "<group>";
743-
};
744764
62C935461C8CD14F00887A23 /* APIRequests */ = {
745765
isa = PBXGroup;
746766
children = (
@@ -1358,23 +1378,27 @@
13581378
isa = PBXSourcesBuildPhase;
13591379
buildActionMask = 2147483647;
13601380
files = (
1361-
25C00EA01C3CDCA70074655A /* AuthenticationReducer.swift in Sources */,
13621381
62EF0A701C700AD500D13711 /* MainViewController.swift in Sources */,
13631382
6296CA0E1C4D777800A60ECD /* Credentials.swift in Sources */,
13641383
25BE03E11C7C07E6005EBB09 /* AuthenticationService.swift in Sources */,
1384+
2574204D1D4421410002D020 /* BookmarkService.swift in Sources */,
1385+
257420891D44304C0002D020 /* NavigationController+CompletionBlock.swift in Sources */,
13651386
62C9357B1C8CDBDE00887A23 /* RepositoryDetailViewController.swift in Sources */,
1387+
257420E51D443D990002D020 /* GitHubAPIReducers.swift in Sources */,
13661388
25C00E9C1C3CDAAC0074655A /* AuthenticationState.swift in Sources */,
1367-
25C00E9E1C3CDB5D0074655A /* AppReducer.swift in Sources */,
1389+
257420E41D443D990002D020 /* BookmarksReducer.swift in Sources */,
1390+
257420841D442A7C0002D020 /* RepositoryTableViewCell.swift in Sources */,
1391+
257420E31D443D990002D020 /* AuthenticationReducer.swift in Sources */,
13681392
2532E8F61C8F8BFB003F5392 /* BookmarkActions.swift in Sources */,
13691393
62C9354A1C8CD2CC00887A23 /* GitHubRepositoriesActions.swift in Sources */,
1394+
257420861D442E020002D020 /* BookmarkTableViewCell.swift in Sources */,
13701395
25C00E991C3CD8E50074655A /* AuthenticationActions.swift in Sources */,
13711396
2581843A1C3CC912008E200A /* Routes.swift in Sources */,
13721397
62C935481C8CD17F00887A23 /* GitHubRepositories.swift in Sources */,
1373-
2532E92B1C8F8C49003F5392 /* BookmarksReducer.swift in Sources */,
1374-
25C00EA21C3CDD1F0074655A /* GitHubAPIReducers.swift in Sources */,
13751398
25BB76211C3CB8CB008EA13B /* AppDelegate.swift in Sources */,
13761399
62EF0A6E1C700ABB00D13711 /* LoginViewController.swift in Sources */,
13771400
251A75DC1C94F92900EBEB32 /* BookmarkViewController.swift in Sources */,
1401+
257420E21D443D990002D020 /* AppReducer.swift in Sources */,
13781402
258184351C3CC710008E200A /* State.swift in Sources */,
13791403
);
13801404
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)