Skip to content

[WIP] SwiftUI Support #94

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.

Sign up for GitHub

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

Open
kazuhiro4949 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[WIP] SwiftUI Support #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8cf0c82
make ContentViewController with SwiftUI
kazuhiro4949 Jun 4, 2019
fee3d5b
add coordinator
kazuhiro4949 Jun 6, 2019
8f2e169
Add SwiftUI sample
kazuhiro4949 Jun 22, 2019
7618572
make MenuView
kazuhiro4949 Jun 22, 2019
21273e0
update SwiftUI sample
kazuhiro4949 Jun 23, 2019
59a6077
add focusview
kazuhiro4949 Jun 23, 2019
c83a3a5
divide files
kazuhiro4949 Jun 23, 2019
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
5 changes: 5 additions & 0 deletions PagingKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
2B4F03471F8FAE5D0015FCC8 /* PagingMenuViewCellStub.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F03461F8FAE5D0015FCC8 /* PagingMenuViewCellStub.xib */; };
2B4F03491F8FB9950015FCC8 /* PagingContentViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B4F03481F8FB9950015FCC8 /* PagingContentViewControllerTests.swift */; };
2B668C5F1F1395BE008A0694 /* PagingMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B668C5E1F1395BE008A0694 /* PagingMenuView.swift */; };
2BA286A322A73AD500582ABA /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BA286A222A73AD500582ABA /* ContentViewController.swift */; };
2BC16A321FFE355F00CB884A /* UnderlineFocusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BC16A311FFE355F00CB884A /* UnderlineFocusView.swift */; };
2BC16A341FFE35AA00CB884A /* PagingKitProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BC16A331FFE35AA00CB884A /* PagingKitProxy.swift */; };
2BC16A361FFE3B3E00CB884A /* TitleLabelMenuViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BC16A351FFE3B3E00CB884A /* TitleLabelMenuViewCell.swift */; };
Expand Down Expand Up @@ -41,6 +42,7 @@
2B4F03461F8FAE5D0015FCC8 /* PagingMenuViewCellStub.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PagingMenuViewCellStub.xib; sourceTree = "<group>"; };
2B4F03481F8FB9950015FCC8 /* PagingContentViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagingContentViewControllerTests.swift; sourceTree = "<group>"; };
2B668C5E1F1395BE008A0694 /* PagingMenuView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PagingMenuView.swift; sourceTree = "<group>"; };
2BA286A222A73AD500582ABA /* ContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = "<group>"; };
2BC16A311FFE355F00CB884A /* UnderlineFocusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderlineFocusView.swift; sourceTree = "<group>"; };
2BC16A331FFE35AA00CB884A /* PagingKitProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagingKitProxy.swift; sourceTree = "<group>"; };
2BC16A351FFE3B3E00CB884A /* TitleLabelMenuViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLabelMenuViewCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -102,6 +104,7 @@
2BC16A311FFE355F00CB884A /* UnderlineFocusView.swift */,
2BC16A351FFE3B3E00CB884A /* TitleLabelMenuViewCell.swift */,
2BC16A331FFE35AA00CB884A /* PagingKitProxy.swift */,
2BA286A222A73AD500582ABA /* ContentViewController.swift */,
);
path = PagingKit;
sourceTree = "<group>";
Expand Down Expand Up @@ -196,6 +199,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -241,6 +245,7 @@
2B668C5F1F1395BE008A0694 /* PagingMenuView.swift in Sources */,
6EC140D71F09410F0054B514 /* PagingMenuViewController.swift in Sources */,
2B283F051FA8A2BD00DA2FE4 /* Array+NSLayoutConstraint.swift in Sources */,
2BA286A322A73AD500582ABA /* ContentViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
65 changes: 65 additions & 0 deletions PagingKit/ContentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
//
// ContentViewController.swift
// PagingKit
//
// Created by Kazuhiro Hayashi on 6/4/31 H.
// Copyright © 2019 Kazuhiro Hayashi. All rights reserved.
//

import SwiftUI
import UIKit

@available(iOS 13.0, *)
public struct Menu<Selection, Content> where Selection : SelectionManager, Content : View {

/// Creates an instance.
///
/// - Parameter selection: A selection manager that identifies the selected row(s).
///
/// - See Also: `View.selectionValue` which gives an identifier to the rows.
///
/// - Note: On iOS and tvOS, you must explicitly put the `List` into Edit
/// Mode for the selection to apply.
public init(selection: Binding<Selection>?, content: () -> Content) {

}

/// The type of view representing the body of this view.
///
/// When you create a custom view, Swift infers this type from your
/// implementation of the required `body` property.
public typealias Body = Never
}


struct ContentViewController: UIViewControllerRepresentable {
func makeCoordinator() -> ContentViewController.Coordinator {
Coordinator(self)
}

var controllers: [UIViewController]

func makeUIViewController(context: UIViewControllerRepresentableContext<ContentViewController>) -> PagingContentViewController {
return PagingContentViewController()
}

func updateUIViewController(_ uiViewController: PagingContentViewController, context: UIViewControllerRepresentableContext<ContentViewController>) {
uiViewController.reloadData()
}

class Coordinator: NSObject, PagingContentViewControllerDataSource {
func numberOfItemsForContentViewController(viewController: PagingContentViewController) -> Int {
return parent.controllers.count
}

func contentViewController(viewController: PagingContentViewController, viewControllerAt index: Int) -> UIViewController {
parent.controllers[index]
}

var parent: ContentViewController

init(_ contentViewController: ContentViewController) {
self.parent = contentViewController
}
}
}
37 changes: 37 additions & 0 deletions iOS Sample/iOS Sample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
2B11E7D622BF9FE900B54860 /* PagingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B11E7D522BF9FE900B54860 /* PagingMenu.swift */; };
2B11E7D822BFA01000B54860 /* PagingContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B11E7D722BFA01000B54860 /* PagingContent.swift */; };
2B140598218EB84C00474615 /* NavigationBarMenuCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2B140597218EB84C00474615 /* NavigationBarMenuCell.xib */; };
2B14059A218EB8A000474615 /* NavigationBarMenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B140599218EB8A000474615 /* NavigationBarMenuCell.swift */; };
2B14059C218EBAC200474615 /* NavigationBarFocusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B14059B218EBAC200474615 /* NavigationBarFocusView.swift */; };
Expand Down Expand Up @@ -55,6 +57,9 @@
2BC7828C2127EFCB009999F6 /* InitializingWithoutStoryboardViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2BC7828B2127EFCB009999F6 /* InitializingWithoutStoryboardViewController.storyboard */; };
2BE47F081FA41AF40057A786 /* FullscreenViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2BE47F071FA41AF40057A786 /* FullscreenViewController.storyboard */; };
2BE47F0A1FA41B090057A786 /* FullscreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BE47F091FA41B090057A786 /* FullscreenViewController.swift */; };
2BEDEC0422BE1270001B29D9 /* SimpleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BEDEC0322BE1270001B29D9 /* SimpleView.swift */; };
2BEDEC0A22BE16D1001B29D9 /* SwiftUIViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2BEDEC0922BE16D1001B29D9 /* SwiftUIViewController.storyboard */; };
2BEDEC0C22BE1747001B29D9 /* SwiftUIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BEDEC0B22BE1747001B29D9 /* SwiftUIViewController.swift */; };
2BFA4AC31F0CEC39001B9BCA /* ModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BFA4AC21F0CEC39001B9BCA /* ModalViewController.swift */; };
6E98277A1F0A91F400860828 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E9827791F0A91F400860828 /* AppDelegate.swift */; };
6E98277C1F0A91F400860828 /* SimpleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E98277B1F0A91F400860828 /* SimpleViewController.swift */; };
Expand Down Expand Up @@ -98,6 +103,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
2B11E7D522BF9FE900B54860 /* PagingMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagingMenu.swift; sourceTree = "<group>"; };
2B11E7D722BFA01000B54860 /* PagingContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagingContent.swift; sourceTree = "<group>"; };
2B140597218EB84C00474615 /* NavigationBarMenuCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NavigationBarMenuCell.xib; sourceTree = "<group>"; };
2B140599218EB8A000474615 /* NavigationBarMenuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarMenuCell.swift; sourceTree = "<group>"; };
2B14059B218EBAC200474615 /* NavigationBarFocusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarFocusView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -146,6 +153,9 @@
2BC7828B2127EFCB009999F6 /* InitializingWithoutStoryboardViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = InitializingWithoutStoryboardViewController.storyboard; sourceTree = "<group>"; };
2BE47F071FA41AF40057A786 /* FullscreenViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = FullscreenViewController.storyboard; sourceTree = "<group>"; };
2BE47F091FA41B090057A786 /* FullscreenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullscreenViewController.swift; sourceTree = "<group>"; };
2BEDEC0322BE1270001B29D9 /* SimpleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleView.swift; sourceTree = "<group>"; };
2BEDEC0922BE16D1001B29D9 /* SwiftUIViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SwiftUIViewController.storyboard; sourceTree = "<group>"; };
2BEDEC0B22BE1747001B29D9 /* SwiftUIViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIViewController.swift; sourceTree = "<group>"; };
2BFA4AC21F0CEC39001B9BCA /* ModalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
6E9827761F0A91F400860828 /* iOS Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; };
6E9827791F0A91F400860828 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -190,6 +200,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2B11E7D322BF9F9800B54860 /* Wrapper */ = {
isa = PBXGroup;
children = (
2B11E7D522BF9FE900B54860 /* PagingMenu.swift */,
2B11E7D722BFA01000B54860 /* PagingContent.swift */,
);
name = Wrapper;
sourceTree = "<group>";
};
2B14059F218EBD7200474615 /* NavigationBar */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -345,6 +364,17 @@
name = Fullscreen;
sourceTree = "<group>";
};
2BEDEC0122BE1240001B29D9 /* SwiftUI */ = {
isa = PBXGroup;
children = (
2B11E7D322BF9F9800B54860 /* Wrapper */,
2BEDEC0322BE1270001B29D9 /* SimpleView.swift */,
2BEDEC0922BE16D1001B29D9 /* SwiftUIViewController.storyboard */,
2BEDEC0B22BE1747001B29D9 /* SwiftUIViewController.swift */,
);
name = SwiftUI;
sourceTree = "<group>";
};
6E98276D1F0A91F400860828 = {
isa = PBXGroup;
children = (
Expand All @@ -370,6 +400,7 @@
6E9827781F0A91F400860828 /* iOS Sample */ = {
isa = PBXGroup;
children = (
2BEDEC0122BE1240001B29D9 /* SwiftUI */,
2B14059F218EBD7200474615 /* NavigationBar */,
2BC782882127ECEE009999F6 /* InitializingWithoutStoryboard */,
2B40528F20425C6C0017F90E /* DynamicWidth */,
Expand Down Expand Up @@ -514,6 +545,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -560,6 +592,7 @@
2B4F034C1F9052060015FCC8 /* ContentViewController.storyboard in Resources */,
6E98277F1F0A91F400860828 /* Main.storyboard in Resources */,
2B4541991FA48FFC00A9B253 /* IndicatorFocusMenuView.xib in Resources */,
2BEDEC0A22BE16D1001B29D9 /* SwiftUIViewController.storyboard in Resources */,
2B4541931FA48E7800A9B253 /* IndicatorViewController.storyboard in Resources */,
2BBB70EC1F92351200320900 /* SimpleViewController.storyboard in Resources */,
);
Expand Down Expand Up @@ -591,6 +624,7 @@
2BE47F0A1FA41B090057A786 /* FullscreenViewController.swift in Sources */,
2BFA4AC31F0CEC39001B9BCA /* ModalViewController.swift in Sources */,
2B4541951FA48E8D00A9B253 /* IndicatorViewController.swift in Sources */,
2BEDEC0C22BE1747001B29D9 /* SwiftUIViewController.swift in Sources */,
2B95EA05203157C70054F23E /* MenuReloadableViewController.swift in Sources */,
2B95EA0A203164BE0054F23E /* AlignmentViewController.swift in Sources */,
2B47E72F1F10957100D67C04 /* OverlayViewController.swift in Sources */,
Expand All @@ -605,9 +639,12 @@
2B45419D1FA490BE00A9B253 /* PhotoViewController.swift in Sources */,
2B47F87A1F5BF173001A7D2B /* DynamicSizeViewController.swift in Sources */,
2B7F2E65217EBF1400523F2E /* NavigationBarViewController.swift in Sources */,
2BEDEC0422BE1270001B29D9 /* SimpleView.swift in Sources */,
2B47E7341F109DE400D67C04 /* OverlayFocusView.swift in Sources */,
2BC1B4181F19F29800829D1A /* TagViewController.swift in Sources */,
2B11E7D822BFA01000B54860 /* PagingContent.swift in Sources */,
2B4F03501F90575B0015FCC8 /* ContentTableViewController.swift in Sources */,
2B11E7D622BF9FE900B54860 /* PagingMenu.swift in Sources */,
2B3C7CC51F8CEB0100A43223 /* TwoLineMenuViewController.swift in Sources */,
2BC1B41A1F19F4CB00829D1A /* TagMenuCell.swift in Sources */,
2B47E7361F10A15700D67C04 /* OverlayMenuCell.swift in Sources */,
Expand Down
Loading