Skip to content

Commit ae7cdbe

Browse files
authored
[Release] v1.2.0
2 parents a8b27b7 + 4aeb10d commit ae7cdbe

File tree

8 files changed

+13
-7
lines changed

8 files changed

+13
-7
lines changed

Neki-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Neki-iOS/APP/Sources/Application/AppCoordinator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ struct AppCoordinator {
112112
}
113113

114114
case let .onOpenURL(url):
115-
guard url.scheme == "neki" && url.host == "shareExtension" else { return .none }
115+
guard (url.scheme == "neki" || url.scheme == "neki-dev") && url.host == "shareExtension" else { return .none }
116116
guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
117117
let appGroupID = components.queryItems?.first(where: { $0.name == "appGroupID" })?.value
118118
else { return .none }

Neki-iOS/APP/Sources/Application/Neki_iOSApp.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct Neki_iOSApp: App {
2727
}
2828

2929
private func handleIncomingURL(_ url: URL) {
30-
if url.scheme == "neki" {
30+
if url.scheme == "neki" || url.scheme == "neki-dev" {
3131
store.send(.onOpenURL(url))
3232
return
3333
}

Neki-iOS/Features/Archive/Sources/Data/Sources/DTO/RegisterPhotoDTO.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ public enum RegisterPhotoDTO {
2222
public struct RegisterPhotoData: Encodable {
2323
let mediaID: Int
2424
let memo: String?
25+
let uploadMethod: String
2526

2627
enum CodingKeys: String, CodingKey {
2728
case mediaID = "mediaId"
2829
case memo
30+
case uploadMethod
2931
}
3032
}
3133

Neki-iOS/Features/Archive/Sources/Data/Sources/DefaultArchiveRepository.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ final actor DefaultArchiveRepository: ArchiveRepository {
4242

4343
extension DefaultArchiveRepository {
4444
func registerPhoto(folderID: Int?, uploads: [(mediaID: Int, memo: String?)], favorite: Bool? = false) async throws {
45-
let uploadData = uploads.map { RegisterPhotoDTO.RegisterPhotoData(mediaID: $0.mediaID, memo: $0.memo) }
45+
let uploadData = uploads.map { RegisterPhotoDTO.RegisterPhotoData(mediaID: $0.mediaID, memo: $0.memo, uploadMethod: "QR") }
4646
let request = RegisterPhotoDTO.Request(folderID: folderID, uploads: uploadData, favorite: favorite)
4747
let endpoint = ArchiveEndpoint.registerPhoto(request: request)
4848
let _ = try await networkProvider.request(endpoint: endpoint)

Neki-iOS/Features/Archive/Sources/Presentation/Sources/View/ArchivePhotoDetailView.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ struct ArchivePhotoDetailView: View {
6464
left: { NekiToolBar.back { store.send(.onTapBackButton) } },
6565
center: { NekiToolBar.textCenter(store.formattedDate) },
6666
right: {
67+
#if DEBUG
6768
NekiToolBar.icon(UIImage(systemName: "wand.and.stars")!,
6869
action: { store.send(.onTapTransform) })
70+
#endif
6971
}
7072
)
7173
.nekiAlert(

Neki-iOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<key>CFBundleTypeRole</key>
2121
<string>Editor</string>
2222
<key>CFBundleURLName</key>
23-
<string>com.OneTen.Neki-iOS</string>
23+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
2424
<key>CFBundleURLSchemes</key>
2525
<array>
26-
<string>neki</string>
26+
<string>$(APP_URL_SCHEME)</string>
2727
</array>
2828
</dict>
2929
</array>

NekiShareExtension/Sources/Domain/Sources/Entities/ShareExtensionConfiguration.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ struct ShareExtensionConfiguration {
1818
init(bundle: Bundle = .main) {
1919
#if DEBUG
2020
self.appGroupID = "group.com.Neki-dev.Share-Extension"
21+
let scheme = "neki-dev"
2122
#else
2223
self.appGroupID = "group.com.OneTen.Neki-iOS.Share-Extension"
24+
let scheme = "neki"
2325
#endif
2426

25-
var components = URLComponents(string: "neki://shareExtension")
27+
var components = URLComponents(string: "\(scheme)://shareExtension")
2628
components?.queryItems = [URLQueryItem(name: "appGroupID", value: appGroupID)]
2729
self.deepLinkURL = components?.url
2830
}

0 commit comments

Comments
 (0)