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

Develop #17

Merged
merged 40 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
00bb1cc
Add new router
aromanov91 Apr 28, 2024
bad3524
Add routing draft
aromanov91 May 16, 2024
394e34a
Add router
aromanov91 May 17, 2024
a1ffaf0
Upd CI push develop
aromanov91 May 17, 2024
754506e
Test fix
aromanov91 May 17, 2024
502b879
Fix tvOS errors
aromanov91 May 18, 2024
da6e9b6
Fix tvOS support
aromanov91 May 19, 2024
63d766b
Fix tvOS
aromanov91 May 19, 2024
e24bf4d
Add wathOS example
aromanov91 May 19, 2024
80f9a7f
Fix ci
aromanov91 May 19, 2024
aaaaabe
Up
aromanov91 May 19, 2024
72798b3
Upd
aromanov91 May 19, 2024
df5be13
Remove build macOS
aromanov91 May 19, 2024
bcf6b0a
Fix support iPad
aromanov91 May 19, 2024
15d1f25
Up router
aromanov91 May 19, 2024
f871cff
Fix iPhone 15 version
aromanov91 May 19, 2024
3876c2b
Add iPhone 14 Pro build
aromanov91 May 19, 2024
c1acbb1
Add macOS build
aromanov91 May 19, 2024
71161bf
Fix ci
aromanov91 May 19, 2024
cfc4250
Delete macOS build
aromanov91 May 19, 2024
6ffd82a
Update routing, onboarding and up to Swift6
aromanov91 Nov 10, 2024
a945779
Fix #major
aromanov91 Nov 10, 2024
2c217ae
Fix ci
aromanov91 Nov 10, 2024
0ba8011
Update CI
aromanov91 Nov 11, 2024
05a5d83
Fix EventKit and Contacts
aromanov91 Nov 11, 2024
93712c8
Format code
aromanov91 Nov 11, 2024
f14ba91
Fix example
aromanov91 Nov 11, 2024
2ab21da
Fix macOS
aromanov91 Nov 11, 2024
da4a180
Update CI
aromanov91 Nov 11, 2024
341ec1e
Format and small refactor
aromanov91 Dec 25, 2024
8a512a9
Add new router
aromanov91 Apr 28, 2024
669ba3f
Add routing draft
aromanov91 May 16, 2024
7757dd2
Add router
aromanov91 May 17, 2024
3eb5a6e
Add wathOS example
aromanov91 May 19, 2024
ae19beb
Update routing, onboarding and up to Swift6
aromanov91 Nov 10, 2024
b2648c4
Fix example
aromanov91 Nov 11, 2024
93e668e
Format and small refactor
aromanov91 Dec 25, 2024
12f1b11
Merge branch 'develop' of https://github.com/oversizedev/OversizeKit …
aromanov91 Dec 25, 2024
a4d36d8
Fix
aromanov91 Dec 25, 2024
d4c40e3
Fix tvOS
aromanov91 Dec 25, 2024
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: 3 additions & 2 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--swiftversion 5.8
--disable preferKeyPath
--swiftversion 6.0
--disable preferKeyPath
--ifdef no-indent
12 changes: 6 additions & 6 deletions AppExample/Example/Router/Alerts.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ enum RootAlert: Identifiable {
var id: String {
switch self {
case .dismiss:
return "dismiss"
"dismiss"
case .delete:
return "delete"
"delete"
case .appError:
return "appError"
"appError"
}
}

var alert: Alert {
switch self {
case let .dismiss(action):
return Alert(
Alert(
title: Text("Are you sure you want to dismiss?"),
primaryButton: .destructive(Text("Dismiss"), action: action),
secondaryButton: .cancel()
)
case let .delete(action):
return Alert(
Alert(
title: Text("Are you sure you want to delete?"),
primaryButton: .destructive(Text("\(L10n.Button.delete)"), action: action),
secondaryButton: .cancel()
)
case let .appError(error: error):
return Alert(
Alert(
title: Text(error.title),
message: Text(error.subtitle.valueOrEmpty),
dismissButton: .cancel()
Expand Down
4 changes: 2 additions & 2 deletions AppExample/Example/Router/Router.swift
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ extension Router {
extension Screen: Hashable, Equatable {
static func == (lhs: Screen, rhs: Screen) -> Bool {
if lhs.id == rhs.id {
return true
true
} else {
return false
false
}
}

Expand Down
4 changes: 2 additions & 2 deletions AppExample/Example/Router/Screens.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ extension Screen: Identifiable {
var id: String {
switch self {
case .settings:
return "settings"
"settings"
case .premium:
return "premium"
"premium"
}
}
}
Expand Down
30 changes: 15 additions & 15 deletions AppExample/Example/Router/Tabs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,45 @@ public enum RootTab: String {
var id: String {
switch self {
case .main:
return "home"
"home"
case .secondary:
return "secondary"
"secondary"
case .tertiary:
return "tertiary"
"tertiary"
case .quaternary:
return "quaternary"
"quaternary"
case .settings:
return "settings"
"settings"
}
}

var title: String {
switch self {
case .main:
return "Home"
"Home"
case .secondary:
return "Secondary"
"Secondary"
case .tertiary:
return "Tertiary"
"Tertiary"
case .quaternary:
return "Quaternary"
"Quaternary"
case .settings:
return "Settings"
"Settings"
}
}

var image: Image {
switch self {
case .main:
return Image(systemName: "")
Image(systemName: "")
case .secondary:
return Image(systemName: "")
Image(systemName: "")
case .tertiary:
return Image(systemName: "")
Image(systemName: "")
case .quaternary:
return Image(systemName: "")
Image(systemName: "")
case .settings:
return Image(systemName: "")
Image(systemName: "")
}
}
}
Loading