Skip to content

Update SKIE app #2

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

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Update SKIE app #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 20 additions & 34 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
66CD08F82A6A5C0E00D66EFD /* FunctionWithDefaultArgumentsExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD08F72A6A5C0E00D66EFD /* FunctionWithDefaultArgumentsExample.swift */; };
66CD08FF2A71559000D66EFD /* JavaDocComments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD08FE2A71559000D66EFD /* JavaDocComments.swift */; };
66CD090A2A78109A00D66EFD /* DataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD09092A78109A00D66EFD /* DataClass.swift */; };
66CD090E2A79052C00D66EFD /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD090D2A79052C00D66EFD /* EnumClass.swift */; };
66CD09142A790FF300D66EFD /* SealedClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD09132A790FF300D66EFD /* SealedClass.swift */; };
66D4CCF32AD6EDA000552E0E /* SuspendFunction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66D4CCF22AD6EDA000552E0E /* SuspendFunction.swift */; };
66D4CD0A2AD919DF00552E0E /* ConstructorWithDefaultArgumentsExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66D4CD092AD919DF00552E0E /* ConstructorWithDefaultArgumentsExample.swift */; };
66D4CD462ADD754E00552E0E /* FlowExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66D4CD452ADD754E00552E0E /* FlowExample.swift */; };
66F10C7D2B19FD1300FFB2C8 /* InteropSamples.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F10C7C2B19FD1300FFB2C8 /* InteropSamples.swift */; };
66F10C7F2B19FD2E00FFB2C8 /* ResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F10C7E2B19FD2E00FFB2C8 /* ResultView.swift */; };
66F10C812B19FDA400FFB2C8 /* SealedInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F10C802B19FDA400FFB2C8 /* SealedInterface.swift */; };
7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
/* End PBXBuildFile section */

Expand All @@ -39,13 +39,13 @@
058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
66CD08F72A6A5C0E00D66EFD /* FunctionWithDefaultArgumentsExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FunctionWithDefaultArgumentsExample.swift; sourceTree = "<group>"; };
66CD08FE2A71559000D66EFD /* JavaDocComments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JavaDocComments.swift; sourceTree = "<group>"; };
66CD09092A78109A00D66EFD /* DataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataClass.swift; sourceTree = "<group>"; };
66CD090D2A79052C00D66EFD /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
66CD09132A790FF300D66EFD /* SealedClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SealedClass.swift; sourceTree = "<group>"; };
66D4CCF22AD6EDA000552E0E /* SuspendFunction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuspendFunction.swift; sourceTree = "<group>"; };
66D4CD092AD919DF00552E0E /* ConstructorWithDefaultArgumentsExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstructorWithDefaultArgumentsExample.swift; sourceTree = "<group>"; };
66D4CD452ADD754E00552E0E /* FlowExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowExample.swift; sourceTree = "<group>"; };
66F10C7C2B19FD1300FFB2C8 /* InteropSamples.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteropSamples.swift; sourceTree = "<group>"; };
66F10C7E2B19FD2E00FFB2C8 /* ResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultView.swift; sourceTree = "<group>"; };
66F10C802B19FDA400FFB2C8 /* SealedInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SealedInterface.swift; sourceTree = "<group>"; };
7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -70,38 +70,22 @@
path = "Preview Content";
sourceTree = "<group>";
};
66CD08FD2A71556800D66EFD /* Common */ = {
66CD09062A780AF800D66EFD /* ClassesAndInterfaces */ = {
isa = PBXGroup;
children = (
66CD08FE2A71559000D66EFD /* JavaDocComments.swift */,
);
path = Common;
sourceTree = "<group>";
};
66CD09002A715BA500D66EFD /* DataTypes */ = {
isa = PBXGroup;
children = (
);
path = DataTypes;
sourceTree = "<group>";
};
66CD09062A780AF800D66EFD /* Classes */ = {
isa = PBXGroup;
children = (
66CD09092A78109A00D66EFD /* DataClass.swift */,
66CD090D2A79052C00D66EFD /* EnumClass.swift */,
66CD09132A790FF300D66EFD /* SealedClass.swift */,
66F10C802B19FDA400FFB2C8 /* SealedInterface.swift */,
);
path = Classes;
path = ClassesAndInterfaces;
sourceTree = "<group>";
};
66CD090B2A78FD7800D66EFD /* UsualWorkflow */ = {
66CD090B2A78FD7800D66EFD /* MoreAboutFunctions */ = {
isa = PBXGroup;
children = (
66CD08F72A6A5C0E00D66EFD /* FunctionWithDefaultArgumentsExample.swift */,
66D4CD092AD919DF00552E0E /* ConstructorWithDefaultArgumentsExample.swift */,
);
path = UsualWorkflow;
path = MoreAboutFunctions;
sourceTree = "<group>";
};
66D4CD422ADD6EDE00552E0E /* Coroutines */ = {
Expand Down Expand Up @@ -134,15 +118,15 @@
isa = PBXGroup;
children = (
66D4CD422ADD6EDE00552E0E /* Coroutines */,
66CD090B2A78FD7800D66EFD /* UsualWorkflow */,
66CD09062A780AF800D66EFD /* Classes */,
66CD09002A715BA500D66EFD /* DataTypes */,
66CD08FD2A71556800D66EFD /* Common */,
66CD090B2A78FD7800D66EFD /* MoreAboutFunctions */,
66CD09062A780AF800D66EFD /* ClassesAndInterfaces */,
058557BA273AAA24004C7B11 /* Assets.xcassets */,
7555FF82242A565900829871 /* ContentView.swift */,
7555FF8C242A565B00829871 /* Info.plist */,
2152FB032600AC8F00CF470E /* iOSApp.swift */,
058557D7273AAEEB004C7B11 /* Preview Content */,
66F10C7C2B19FD1300FFB2C8 /* InteropSamples.swift */,
66F10C7E2B19FD2E00FFB2C8 /* ResultView.swift */,
);
path = iosApp;
sourceTree = "<group>";
Expand Down Expand Up @@ -249,13 +233,13 @@
66D4CCF32AD6EDA000552E0E /* SuspendFunction.swift in Sources */,
2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
66CD090E2A79052C00D66EFD /* EnumClass.swift in Sources */,
66CD090A2A78109A00D66EFD /* DataClass.swift in Sources */,
66F10C7D2B19FD1300FFB2C8 /* InteropSamples.swift in Sources */,
66F10C7F2B19FD2E00FFB2C8 /* ResultView.swift in Sources */,
66D4CD462ADD754E00552E0E /* FlowExample.swift in Sources */,
66CD08F82A6A5C0E00D66EFD /* FunctionWithDefaultArgumentsExample.swift in Sources */,
66CD09142A790FF300D66EFD /* SealedClass.swift in Sources */,
66D4CD0A2AD919DF00552E0E /* ConstructorWithDefaultArgumentsExample.swift in Sources */,
66CD08FF2A71559000D66EFD /* JavaDocComments.swift in Sources */,
7555FF83242A565900829871 /* ContentView.swift in Sources */,
66F10C812B19FDA400FFB2C8 /* SealedInterface.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -390,6 +374,7 @@
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
INFOPLIST_FILE = iosApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -418,6 +403,7 @@
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
INFOPLIST_FILE = iosApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
Binary file modified ...proj/project.xcworkspace/xcuserdata/pamelahill.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
23 changes: 0 additions & 23 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/Classes/DataClass.swift
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/Classes/EnumClass.swift
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/Classes/SealedClass.swift
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/ClassesAndInterfaces/EnumClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import Foundation
import shared


func useEnumClass() {
let e1 = EnumClass.entryOne
let _ = EnumClass.entryTwo

let _ = EnumClass.entryOne.name
let _ = EnumClass.entryOne.type

let _ = EnumClass.companion.findByType(type: "entry_two")
let _ = EnumClass.companion.findByType(type: "entry_two_trheee")

switchEnumClass(enumClassExample: e1)
}

private func switchEnumClass(enumClassExample: EnumClass) {
switch (enumClassExample) {
case .entryOne: print("entryOne")
case .entryTwo: print("entryTwo")
}
}

16 changes: 16 additions & 0 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/ClassesAndInterfaces/SealedClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import Foundation
import shared

func sealedClassExample(){
printSealedClassType(s: SealedClass.Object())
printSealedClassType(s: SealedClass.Simple(param1: "123"))
printSealedClassType(s: SealedClass.Data(param1: "123", param2: true))
}

private func printSealedClassType(s: SealedClass) {
switch onEnum(of: s) {
case .object: print("object")
case .simple(let simple): print("simple \(simple.param1)")
case .data(let data): print("data \(data.param1) \(data.param2)")
}
}
26 changes: 26 additions & 0 deletions ...n-swift-interopedia-samples-skie/iosApp/iosApp/ClassesAndInterfaces/SealedInterface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import Foundation
import shared

func sealedInterfaceExample(){
switchOnSealedInterfaces(sealedInterfaces: SealedInterfacesFirstImpl())
switchOnSealedInterfaces(sealedInterfaces: SealedInterfacesSecondImpl())
}

private func switchOnSealedInterfaces(sealedInterfaces: SealedInterfaces){
switch(onEnum(of: sealedInterfaces)){
case .first: print((sealedInterfaces as! any SealedInterfacesFirst as SealedInterfacesFirst).firstFunctionExample())
case .second: print((sealedInterfaces as! any SealedInterfacesSecond as SealedInterfacesSecond).secondFunctionExample())
}
}

class SealedInterfacesFirstImpl : SealedInterfacesFirst {
func firstFunctionExample() -> String {
return "first"
}
}

class SealedInterfacesSecondImpl : SealedInterfacesSecond {
func secondFunctionExample() -> String {
return "second"
}
}
9 changes: 0 additions & 9 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/Common/JavaDocComments.swift
View file
Open in desktop

This file was deleted.

73 changes: 23 additions & 50 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,32 @@ import SwiftUI
import shared

struct ContentView: View {
var body: some View {
VStack {
Text("Swift Interop Playground")
Button("Go", action: {
//testClasses()

//testCoroutines()

//testUsualWorkflow()
})
var body: some View {
let sections = sections()
NavigationView {
VStack {
List {
ForEach(sections) { section in
Section(section.title) {
ForEach(section.samples) { sample in
NavigationLink(destination: ResultView(sample: sample)) {
Text(sample.title)
}
}
}
}
}
.listStyle(.sidebar)
}
.navigationTitle("Kotlin/Swift Interop Playground (SKIE)")
.navigationBarTitleDisplayMode(.inline)
}
}

func testClasses(){
//Data classes
//If default argument interop is enabled, it's not necessary to specify all arguments.
//DataClassExample().copy()

//Enum classes
//SKIE creates real Swift enums, and automatically converts them from Kotlin enums. Enums are exhaustive.
//EnumClassExample().useEnumClass()

//SealedClassExample().example(s: SealedClass.Object())
//SealedClassExample().example(s: SealedClass.Simple(param1: "param1"))
//SealedClassExample().example(s: SealedClass.Data(param1: "param1", param2: true))
}

@MainActor func testCoroutines(){
//Suspend functions
//Translated into callback, experimentally - into async / await. Libraries like SKIE and KMP-NativeCoroutines can be used to improve the interop.
//SuspendFunctionExample().example()

//Flows
//Translated into callback, experimentally - into async / await. Generic type arguments are lost. Libraries like SKIE and KMP-NativeCoroutines can be used to improve the interop and provide cancellation support.
//FlowExample().example()

//SuspendFunctionExample().exampleWithCancellation()
//FlowExample().exampleWithCancellation()
}

func testUsualWorkflow(){
//Constructor with default arguments
//If default argument interop is enabled, it's notnecessary to specify all arguments.
//ConstructorWithDefaultArgumentsExample().example()

//Function with default arguments
//If annotated, it's not necessary to specify all the arguments.
//FunctionWithDefaultArgumentsExample().example()
}
}


struct ContentView_Previews: PreviewProvider {
static var previews: some View {
ContentView()
}
static var previews: some View {
ContentView()
}
}
27 changes: 14 additions & 13 deletions kotlin-swift-interopedia-samples-skie/iosApp/iosApp/Coroutines/FlowExample.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import Foundation
import shared



@MainActor
class FlowExample{
func example(){
Task {
for await it in NumberFlowRepository().getNumbers() {
print("Got number: \(it)")
}
func flowExample(){
Task {
for await it in NumberFlowRepository().getNumbers() {
print("Got number: \(it)")
}
}
}

func exampleWithCancellation(){
Task {
for await it in NumberFlowRepository().getNumbers() {
print("Got number: \(it)")
}
}.cancel()
}
func flowWithCancellationExample(){
Task {
for await it in NumberFlowRepository().getNumbers() {
print("Got number: \(it)")
}
}.cancel()
}

Loading