Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions NativeAppTemplate.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@
01D85A962E07C78400A95798 /* NumberTagsWebpageListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85A952E07C78400A95798 /* NumberTagsWebpageListViewModel.swift */; };
01D85A9A2E07C85900A95798 /* ShopBasicSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85A992E07C85900A95798 /* ShopBasicSettingsViewModel.swift */; };
01D85A9E2E07C9BD00A95798 /* ShopSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85A9D2E07C9BD00A95798 /* ShopSettingsViewModel.swift */; };
01D85AE72E07CD4400A95798 /* ItemTagDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AE62E07CD4400A95798 /* ItemTagDetailViewModel.swift */; };
01D85AEB2E07CF3600A95798 /* ItemTagEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AEA2E07CF3600A95798 /* ItemTagEditViewModel.swift */; };
01D85AEF2E07D20500A95798 /* ItemTagCreateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AEE2E07D20500A95798 /* ItemTagCreateViewModel.swift */; };
01D85AF32E07D37E00A95798 /* ItemTagListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AF22E07D37E00A95798 /* ItemTagListViewModel.swift */; };
01D8AE8B2AB453C1009AFFBA /* ShopBasicSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D8AE8A2AB453C1009AFFBA /* ShopBasicSettingsView.swift */; };
01DCE23F298FA3B300BA311D /* ShopListCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DCE23E298FA3B300BA311D /* ShopListCardView.swift */; };
01E0A59C25BD088600298D35 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A59125BD087E00298D35 /* SettingsView.swift */; };
Expand Down Expand Up @@ -296,6 +300,10 @@
01D85A952E07C78400A95798 /* NumberTagsWebpageListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberTagsWebpageListViewModel.swift; sourceTree = "<group>"; };
01D85A992E07C85900A95798 /* ShopBasicSettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopBasicSettingsViewModel.swift; sourceTree = "<group>"; };
01D85A9D2E07C9BD00A95798 /* ShopSettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopSettingsViewModel.swift; sourceTree = "<group>"; };
01D85AE62E07CD4400A95798 /* ItemTagDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagDetailViewModel.swift; sourceTree = "<group>"; };
01D85AEA2E07CF3600A95798 /* ItemTagEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagEditViewModel.swift; sourceTree = "<group>"; };
01D85AEE2E07D20500A95798 /* ItemTagCreateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagCreateViewModel.swift; sourceTree = "<group>"; };
01D85AF22E07D37E00A95798 /* ItemTagListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagListViewModel.swift; sourceTree = "<group>"; };
01D8AE8A2AB453C1009AFFBA /* ShopBasicSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopBasicSettingsView.swift; sourceTree = "<group>"; };
01DCE23E298FA3B300BA311D /* ShopListCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopListCardView.swift; sourceTree = "<group>"; };
01E0A59125BD087E00298D35 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -724,7 +732,9 @@
isa = PBXGroup;
children = (
017278932D7D99D100CE424F /* ItemTagDetailView.swift */,
01D85AE62E07CD4400A95798 /* ItemTagDetailViewModel.swift */,
017278942D7D99D100CE424F /* ItemTagEditView.swift */,
01D85AEA2E07CF3600A95798 /* ItemTagEditViewModel.swift */,
);
path = "ItemTag Detail";
sourceTree = "<group>";
Expand All @@ -733,8 +743,10 @@
isa = PBXGroup;
children = (
017278962D7D99D100CE424F /* ItemTagCreateView.swift */,
01D85AEE2E07D20500A95798 /* ItemTagCreateViewModel.swift */,
017278972D7D99D100CE424F /* ItemTagListCardView.swift */,
017278982D7D99D100CE424F /* ItemTagListView.swift */,
01D85AF22E07D37E00A95798 /* ItemTagListViewModel.swift */,
);
path = "ItemTag List";
sourceTree = "<group>";
Expand Down Expand Up @@ -932,6 +944,7 @@
"",
"",
"",
"",
);
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -962,6 +975,7 @@
01FC03E22B3329B700E6CD8E /* NeedAppUpdatesView.swift in Sources */,
0172033725A9642E008FD63B /* JSONAPIResource.swift in Sources */,
01B37C7629B0960700BF5B2D /* ForgotPasswordView.swift in Sources */,
01D85AEF2E07D20500A95798 /* ItemTagCreateViewModel.swift in Sources */,
01E0A5B725BD0FCD00298D35 /* OfflineView.swift in Sources */,
0110A15F2AC816F5003EDCBA /* SendConfirmation.swift in Sources */,
0199CD2A2E07512100109DC6 /* OnboardingRepositoryProtocol.swift in Sources */,
Expand Down Expand Up @@ -1039,6 +1053,7 @@
01482FA42B351E4100A56D43 /* AcceptPrivacyView.swift in Sources */,
0172046325AA82BF008FD63B /* OnboardingView.swift in Sources */,
013DE735284E99DF00528CC5 /* ShopCreateView.swift in Sources */,
01D85AE72E07CD4400A95798 /* ItemTagDetailViewModel.swift in Sources */,
017203B625A96FD6008FD63B /* View+Extensions.swift in Sources */,
0106414229A9F51700B46FED /* AccountPasswordRepository.swift in Sources */,
0172033A25A9642E008FD63B /* JSONAPIDocument.swift in Sources */,
Expand All @@ -1061,6 +1076,7 @@
0172789A2D7D99D100CE424F /* ItemTagListCardView.swift in Sources */,
0172789B2D7D99D100CE424F /* ItemTagListView.swift in Sources */,
0172789C2D7D99D100CE424F /* ItemTagDetailView.swift in Sources */,
01D85AEB2E07CF3600A95798 /* ItemTagEditViewModel.swift in Sources */,
0172789D2D7D99D100CE424F /* ItemTagCreateView.swift in Sources */,
0172789E2D7D99D100CE424F /* ItemTagEditView.swift in Sources */,
0172786F2D7D87D000CE424F /* String+Extensions.swift in Sources */,
Expand All @@ -1069,6 +1085,7 @@
01E0A59C25BD088600298D35 /* SettingsView.swift in Sources */,
0172052525AAFA43008FD63B /* Shopkeeper.swift in Sources */,
017278752D7D8FAC00CE424F /* ItemTagRepository.swift in Sources */,
01D85AF32E07D37E00A95798 /* ItemTagListViewModel.swift in Sources */,
0172047E25AA8343008FD63B /* Font+Extensions.swift in Sources */,
0172034825A9642E008FD63B /* Request.swift in Sources */,
0172048025AA8343008FD63B /* UIColor+Extensions.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,44 +11,21 @@ import CoreNFC

struct ItemTagDetailView: View {
@Environment(\.dismiss) private var dismiss
@Environment(MessageBus.self) private var messageBus
@Environment(\.sessionController) private var sessionController
private var itemTagRepository: ItemTagRepositoryProtocol
@StateObject private var nfcManager = appSingletons.nfcManager
@State private var isLocked = false
@State private var isShowingEditSheet = false
@State private var isShowingDeleteConfirmationDialog = false
@State private var isFetching = true
@State private var isGeneratingQrCode = false
@State private var isDeleting = false
@State private var customerTagQrCodeImage: UIImage?
private let qrCodeGenerator = QRCodeGenerator()
private let imageSaver = ImageSaver()
@State private var viewModel: ItemTagDetailViewModel

private var shop: Shop
private var itemTagId: String

private var itemTag: Binding<ItemTag> {
Binding {
itemTagRepository.findBy(id: itemTagId)
} set: { _ in
}
}

init(
itemTagRepository: ItemTagRepositoryProtocol,
shop: Shop,
itemTagId: String
) {
self.itemTagRepository = itemTagRepository
self.shop = shop
self.itemTagId = itemTagId
init(viewModel: ItemTagDetailViewModel) {
self._viewModel = State(wrappedValue: viewModel)
}

var body: some View {
contentView
.task {
reload()
viewModel.reload()
}
.onChange(of: viewModel.shouldDismiss) { _, shouldDismiss in
if shouldDismiss {
dismiss()
}
}
}
}
Expand All @@ -58,7 +35,7 @@ private extension ItemTagDetailView {
var contentView: some View {

@ViewBuilder var contentView: some View {
if isFetching || isDeleting || isGeneratingQrCode {
if viewModel.isBusy {
LoadingView()
} else {
itemTagDetailView
Expand All @@ -76,26 +53,28 @@ private extension ItemTagDetailView {
.font(.title2)
.padding(.top, 8)

Text(shop.name)
Text(viewModel.shop.name)
.font(.title3)
.padding(.top, 16)

Text(String(itemTag.wrappedValue.queueNumber))
.font(.largeTitle)
.bold()
.padding(.top, 8)
.foregroundStyle(.lightestAccent)
if let itemTag = viewModel.itemTag {
Text(String(itemTag.queueNumber))
.font(.largeTitle)
.bold()
.padding(.top, 8)
.foregroundStyle(.lightestAccent)
}
}

GroupBox(label: Label(String("Lock"), systemImage: "lock") ) {
Toggle(isOn: $isLocked) {
Toggle(isOn: $viewModel.isLocked) {
Text(verbatim: "Lock")
}
.dynamicTypeSize(...DynamicTypeSize.large)
.frame(width: 96)
.tint(.lockForeground)

if isLocked {
if viewModel.isLocked {
Text(String.youCannotUndoAfterLockingTag)
.font(.uiFootnote)
.foregroundStyle(.alarm)
Expand All @@ -106,22 +85,7 @@ private extension ItemTagDetailView {

GroupBox(label: Label(String("Server"), systemImage: "storefront") ) {
MainButtonView(title: String.writeServerTag, type: .server(withArrow: false)) {
guard NFCNDEFReaderSession.readingAvailable else {
messageBus.post(
message: Message(
level: .error,
message: String.thisDeviceDoesNotSupportTagScanning,
autoDismiss: false
)
)
return
}

let ndefMessage = createNdefMessage(itemTag: itemTag.wrappedValue, itemTagType: .server)

Task {
await nfcManager.startWriting(ndefMessage: ndefMessage, isLock: isLocked)
}
viewModel.writeServerTag()
}
.padding()
}
Expand All @@ -130,48 +94,17 @@ private extension ItemTagDetailView {

GroupBox(label: Label(String("Customer"), systemImage: "person.2") ) {
MainButtonView(title: String.writeCustomerTag, type: .customer(withArrow: false)) {
guard NFCNDEFReaderSession.readingAvailable else {
messageBus.post(
message: Message(
level: .error,
message: String.thisDeviceDoesNotSupportTagScanning,
autoDismiss: false
)
)
return
}

let ndefMessage = createNdefMessage(itemTag: itemTag.wrappedValue, itemTagType: .customer)

Task {
await nfcManager.startWriting(ndefMessage: ndefMessage, isLock: isLocked)
}
viewModel.writeCustomerTag()
}
.padding()

if let customerTagQrCodeImage = customerTagQrCodeImage {
if let customerTagQrCodeImage = viewModel.customerTagQrCodeImage {
Image(uiImage: customerTagQrCodeImage)
.resizable()
.frame(width: 96, height: 96)

Button {
getSaveToPhotoAlbumPermissionIfNeeded { granted in
guard granted else { return }

imageSaver.save(image: customerTagQrCodeImage) { error in
if let error {
messageBus.post(
message: Message(
level: .error,
message: "\(String.customerQrCodeImageSavedToPhotoAlbumError)(\(error))",
autoDismiss: false
)
)
} else {
messageBus.post(message: Message(level: .success, message: .customerQrCodeImageSavedToPhotoAlbum))
}
}
}
viewModel.saveImageToPhotoAlbum()
} label: {
Text(String.saveToPhotoAlbum)
}
Expand All @@ -185,123 +118,59 @@ private extension ItemTagDetailView {
}
}
.sheet(
isPresented: $isShowingEditSheet,
isPresented: $viewModel.isShowingEditSheet,
onDismiss: {
reload()
viewModel.reload()
},
content: {
ItemTagEditView(itemTagRepository: itemTagRepository, itemTagId: itemTagId)
ItemTagEditView(
viewModel: ItemTagEditViewModel(
itemTagRepository: viewModel.itemTagRepository,
messageBus: viewModel.messageBus,
sessionController: viewModel.sessionController,
itemTagId: viewModel.itemTagId
)
)
}
)
.confirmationDialog(
String.buttonDeleteTag,
isPresented: $isShowingDeleteConfirmationDialog
isPresented: $viewModel.isShowingDeleteConfirmationDialog
) {
Button(String.buttonDeleteTag, role: .destructive) {
destroyItemTag()
viewModel.destroyItemTag()
}
Button(String.cancel, role: .cancel) {
isShowingDeleteConfirmationDialog = false
viewModel.isShowingDeleteConfirmationDialog = false
}
} message: {
Text(String.areYouSure)
}
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Button {
isShowingEditSheet.toggle()
viewModel.isShowingEditSheet.toggle()
} label: {
Text(String.edit)
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button {
isShowingDeleteConfirmationDialog.toggle()
viewModel.isShowingDeleteConfirmationDialog.toggle()
} label: {
Image(systemName: "trash")
}
}
}
}

private func reload() {
fetchItemTagDetail()
}

private func reloadCustomerTagQrCodeImage() {
isGeneratingQrCode = true

let scanUrl = itemTag.wrappedValue.scanUrl(itemTagType: ItemTagType.customer)

customerTagQrCodeImage = qrCodeGenerator.generateWithCenterText(
inputText: scanUrl.absoluteString,
centerText: String(itemTag.wrappedValue.queueNumber)
)

isGeneratingQrCode = false
}

private func fetchItemTagDetail() {
Task { @MainActor in
do {
isFetching = true
_ = try await itemTagRepository.fetchDetail(id: itemTagId)
isFetching = false
} catch {
messageBus.post(message: Message(level: .error, message: error.localizedDescription, autoDismiss: false))
dismiss()
}
}
}

private var generateCustomerQrCodeView: some View {
VStack {
Button {
reloadCustomerTagQrCodeImage()
viewModel.generateCustomerQrCode()
} label: {
Text(String.generateCustomerQrCode)
}
}
}

private func destroyItemTag() {
Task { @MainActor in
isDeleting = true

do {
try await itemTagRepository.destroy(id: itemTag.id)
messageBus.post(message: Message(level: .success, message: .itemTagDeleted))
} catch {
messageBus.post(message: Message(level: .error, message: "\(String.itemTagDeletedError) \(error.localizedDescription)", autoDismiss: false))
}

dismiss()
}
}

private func createNdefMessage(itemTag: ItemTag, itemTagType: ItemTagType) -> NFCNDEFMessage {
let scanUrl = itemTag.scanUrl(itemTagType: itemTagType)
let urlPayload = NFCNDEFPayload.wellKnownTypeURIPayload(url: scanUrl)
let androidAarPayloadData = String.androidAar.data(using: .utf8)!
let androidAarPayload = NFCNDEFPayload(format: .nfcExternal, type: Data(String.androidAarNfcndefPayloadType.utf8), identifier: Data(), payload: androidAarPayloadData)

let ndefMessage = if itemTagType == ItemTagType.server {
NFCNDEFMessage(records: [urlPayload!, androidAarPayload])
} else {
NFCNDEFMessage(records: [urlPayload!])
}

return ndefMessage
}

private func getSaveToPhotoAlbumPermissionIfNeeded(completionHandler: @escaping (Bool) -> Void) {
guard PHPhotoLibrary.authorizationStatus(for: .addOnly) != .authorized else {
completionHandler(true)
return
}

PHPhotoLibrary.requestAuthorization(for: .addOnly) { status in
completionHandler(status == .authorized ? true : false)
}
}
}
Loading