From 62a1dfbd3dbce44abc20849a06f63790930165a2 Mon Sep 17 00:00:00 2001 From: hehehaha Date: Mon, 12 Sep 2022 18:15:21 +0545 Subject: [PATCH] notification bug fixed --- .DS_Store | Bin 12292 -> 12292 bytes GME Remit.xcodeproj/project.pbxproj | 8 ++-- GME Remit/AppDelegate.swift | 15 +++++--- GME Remit/GME RemitRelease.entitlements | 12 ++++++ .../View/NotificationListViewController.swift | 7 +++- GME Remit/Supported Files/Info.plist | 36 ++++++++++++------ 6 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 GME Remit/GME RemitRelease.entitlements diff --git a/.DS_Store b/.DS_Store index 25bcfa5c8961d947b6e68031098c370b8c7d991d..e9e375e86f8279292520b8b33f908398665f37ee 100644 GIT binary patch delta 489 zcmZokXi1ph&*(leAZv1uIuA!j$qFaU^dpXw)f6ljmq@U0X6InxVAPttK;4{~;{wCP z31%z|3=E=^KMDy?))y3?Y$XuEW?FzOB$1o%;*yk;p9B=-NNwY_Q~?@?rXU5M0#&vI zpmKyAn_C1AGI697C+8&P=jUuz5HVz&d`^vzk6}Fn10&ymFkoPqoG7X>IZ)JvBkb&- zW@V5M5=FHp_o;Is3usI}rOrEzjGx#hD=_kHX6InxU{z&cU=W?0C@egAzM%Nz zRRR%gjcmw561n*E0jB*Mcu zd5t>nWP34lw&TH;N*A;z*NB-Rm|By~1o$R@5Sz1kp?DSt(7oRnr6-#xR8MYE65MQ{ z*vZDsek5Yz1f9t_Vq6?EOtpaq9C4gD!3>G5#b1zN7@VA+TL5wZ1N(!?=Owf^vuJ!} M**sBIgNaN7055}RC;$Ke diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 3692da4e..55175ae8 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -792,6 +792,7 @@ 281EF5FD28ACCC4D0092E5E6 /* HowToDepositViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HowToDepositViewInterface.swift; sourceTree = ""; }; 281EF5FE28ACCC4D0092E5E6 /* HowToDeposit.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = HowToDeposit.storyboard; sourceTree = ""; }; 281EF5FF28ACCC4D0092E5E6 /* HowToDepositViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HowToDepositViewController.swift; sourceTree = ""; }; + 2877368628CF53130094F850 /* GME RemitRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "GME RemitRelease.entitlements"; sourceTree = ""; }; 382D802DD74FA232C60815F2 /* Pods-GME Remit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GME Remit.release.xcconfig"; path = "Target Support Files/Pods-GME Remit/Pods-GME Remit.release.xcconfig"; sourceTree = ""; }; 3DC711495F701A2990ED1DD7 /* Pods-GMERemittanceTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMERemittanceTests.release.xcconfig"; path = "Target Support Files/Pods-GMERemittanceTests/Pods-GMERemittanceTests.release.xcconfig"; sourceTree = ""; }; 40218EE424D2B1940047FBF5 /* UserRegistrationModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRegistrationModuleInterface.swift; sourceTree = ""; }; @@ -5207,6 +5208,7 @@ 9FD260F61FD00458007A511D /* GME Remit */ = { isa = PBXGroup; children = ( + 2877368628CF53130094F850 /* GME RemitRelease.entitlements */, 9FD260F71FD00458007A511D /* AppDelegate.swift */, 7E364CE824A44531007D6E02 /* Shared */, D96848CA212D3F1200EF12B1 /* APIs */, @@ -8032,7 +8034,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 7; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; @@ -8070,10 +8072,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; + CODE_SIGN_ENTITLEMENTS = "GME Remit/GME RemitRelease.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 7; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; diff --git a/GME Remit/AppDelegate.swift b/GME Remit/AppDelegate.swift index 86c6ce9e..26adda59 100644 --- a/GME Remit/AppDelegate.swift +++ b/GME Remit/AppDelegate.swift @@ -269,7 +269,8 @@ extension AppDelegate: UNUserNotificationCenterDelegate { case .howToDeposit: HowToDepositWireframe().open(on: baseVC) case .redirect: - openURL(userInfo: userInfo as? [String: AnyObject]) + break +// openURL(userInfo: userInfo as? [String: AnyObject]) } } } @@ -298,8 +299,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate { func openURL(userInfo: [String : AnyObject]?) { guard - let aps = userInfo?["aps"] as? [String: AnyObject], - let destination = aps["category"] as? String else { + let url = userInfo?["url"] as? String else { return } guard let webController = UIStoryboard(name: "Storyboard", bundle: nil) @@ -307,9 +307,14 @@ func openURL(userInfo: [String : AnyObject]?) { else { return } // webController.titleString = item.title ?? "Notification" - webController.url = destination + webController.url = url let nav = UINavigationController.init(rootViewController: webController) - NotificationHistoryWireframe().open(on: nav) + + let window = UIWindow() + + let rootViewController = window.rootViewController as! UINavigationController + rootViewController.pushViewController(nav, animated: true) +// NotificationHistoryWireframe().open(on: nav) } extension AppDelegate { diff --git a/GME Remit/GME RemitRelease.entitlements b/GME Remit/GME RemitRelease.entitlements new file mode 100644 index 00000000..4ba03c5a --- /dev/null +++ b/GME Remit/GME RemitRelease.entitlements @@ -0,0 +1,12 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:jmeremit.page.link + + + diff --git a/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift b/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift index d325953e..ab678ffe 100644 --- a/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift +++ b/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift @@ -11,6 +11,7 @@ import UIKit class NotificationListViewController: UIViewController { var tableData = [NotificationList]() + var selectedNotificationRow = Int() // MARK: Properties @@ -57,7 +58,8 @@ extension NotificationListViewController: NotificationListViewInterface { } func notificationUpdated() { - presenter?.fetchNotification(isRefresh: false) + tableData[selectedNotificationRow].isRead = "1" + tableView.reloadData() } } @@ -71,7 +73,6 @@ extension NotificationListViewController: UITableViewDelegate, UITableViewDataSo let item = tableData[indexPath.row] cell.setupView() cell.renderData(data: item) - print(item.isRead) return cell } @@ -82,6 +83,8 @@ extension NotificationListViewController: UITableViewDelegate, UITableViewDataSo func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let item = tableData[indexPath.row] + selectedNotificationRow = indexPath.row + presenter?.updateNotification(rowId: item.rowID!) if item.isClickable == "Y" { guard let webController = UIStoryboard(name: "Storyboard", bundle: nil) diff --git a/GME Remit/Supported Files/Info.plist b/GME Remit/Supported Files/Info.plist index 2fea8695..a2a1c32c 100644 --- a/GME Remit/Supported Files/Info.plist +++ b/GME Remit/Supported Files/Info.plist @@ -23,6 +23,14 @@ $(MARKETING_VERSION) CFBundleURLTypes + + CFBundleURLName + com.japan.jmeremit + CFBundleURLSchemes + + com.japan.jmeremit + + CFBundleTypeRole Editor @@ -67,26 +75,26 @@ NSCameraUsageDescription - Allow "JME Remittance" to use your camera to capture Identification documents, Deposit slips + Allow "JME Remittance" to use your camera to capture Identification documents, Deposit slips NSContactsUsageDescription - Allow "JME Remittance" to use your contacts to get users contact + Allow "JME Remittance" to use your contacts to get users contact NSFaceIDUsageDescription - Allow "JME Remittance" to use your biometrics to simplify and secure your app usage + Allow "JME Remittance" to use your biometrics to simplify and secure your app usage NSLocationAlwaysAndWhenInUseUsageDescription - Allow "JME Remittance" to use your location? -Turning on location service allows us to show you nearby JME's branches. + Allow "JME Remittance" to use your location? +Turning on location service allows us to show you nearby JME's branches. NSLocationAlwaysUsageDescription - Allow "JME Remittance" to use your location? -Turning on location service allows us to show you nearby JME's branches. + Allow "JME Remittance" to use your location? +Turning on location service allows us to show you nearby JME's branches. NSLocationWhenInUseUsageDescription - Allow "JME Remittance" to use your location? -Turning on location service allows us to show you nearby JME's branches. + Allow "JME Remittance" to use your location? +Turning on location service allows us to show you nearby JME's branches. NSMicrophoneUsageDescription - Allow "JME Remittance" to use your microphone for access to your recorded voice + Allow "JME Remittance" to use your microphone for access to your recorded voice NSPhotoLibraryAddUsageDescription - Allow "JME Remittance" to use your gallery to use images of documents and depositslips + Allow "JME Remittance" to use your gallery to use images of documents and depositslips NSPhotoLibraryUsageDescription - Allow "JME Remittance" to use your gallery to use images of documents and depositslips + Allow "JME Remittance" to use your gallery to use images of documents and depositslips UIAppFonts SanFranciscoDisplay-Heavy.otf @@ -121,5 +129,9 @@ Turning on location service allows us to show you nearby JME's branches. UIViewControllerBasedStatusBarAppearance + FirebaseDeepLinkPasteboardRetrievalEnabled + + NSHumanReadableCopyright +