From 2a6fc516d9fe0cbf586822056b27cdb46b186c01 Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Tue, 27 Aug 2019 15:42:57 +0900 Subject: [PATCH] add haptic, change secure keypad license --- .../View/RecipientsViewController.swift | 8 +++++++- .../View/SetupRecipient.storyboard | 16 ++++++++-------- GME Remit/ThirdParty/.DS_Store | Bin 0 -> 6148 bytes .../ThirdParty/virtualKeyboard/.DS_Store | Bin 6148 -> 6148 bytes .../MTransKeyRes/license_mtranskey.rsl | 2 +- .../GMEAlert/GMEAlertViewController.swift | 4 +++- 6 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 GME Remit/ThirdParty/.DS_Store diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift index ebfc1284..869d9bed 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift @@ -26,7 +26,7 @@ class RecipientsViewController: UIViewController { private lazy var editTrigger = PublishSubject() private lazy var deleteTrigger = PublishSubject() - + private let impact = UISelectionFeedbackGenerator() // MARK: Computed Properties // MARK: IBOutlets @@ -107,6 +107,12 @@ extension RecipientsViewController { needEditTrigger: needEditTrigger.asDriverOnErrorJustComplete() ) + addRecipientTapGestureRecognizer.rx.event.mapToVoid().asDriverOnErrorJustComplete() + .drive(onNext: { + self.impact.selectionChanged() + }) + .disposed(by: disposeBag) + let output = viewModel.transform(input: input) output diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard index 012e2ab1..41a74cad 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard @@ -106,7 +106,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -197,7 +197,7 @@ - + diff --git a/GME Remit/ThirdParty/.DS_Store b/GME Remit/ThirdParty/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ca9592658e15e9223b11c60871fc0a7ce38cdf96 GIT binary patch literal 6148 zcmeHK%Sr=55Ukc50v?j1$N2^SU5lmHFg1VfKC!FH7?I91j(EZj4|u`Hr22BgxeJ`|h92)D z{xc3dt;hDX>G!+C{xxs8e2lVEKnh3!DIf);z%Lc>-bCCsP>k5a&q{C|Xu)5i5Lb14= z=eH<_b%}~nKnjc%xX$g;`~N-thxva@(oPCUfq$id&DNXsimz0?b@FoFYa9KM?lot+ r8`nW$h;~ejcFc{p?+S;+pfewIqJ9Qk7nv0JYX!alGxryo literal 0 HcmV?d00001 diff --git a/GME Remit/ThirdParty/virtualKeyboard/.DS_Store b/GME Remit/ThirdParty/virtualKeyboard/.DS_Store index 4a70e8a965c15a63b5de6ca01df54871e7decc32..a8f5cfe4f909e5f6c814e7812aa12059d7387fe8 100644 GIT binary patch delta 20 bcmZoMXffCz#>Q@Gp`&1IWV~6H?YSTTIb8)` delta 20 bcmZoMXffCz#>Q@Ls-s|HX1ZCH?YSTTIaCE< diff --git a/GME Remit/ThirdParty/virtualKeyboard/MTransKeyRes/license_mtranskey.rsl b/GME Remit/ThirdParty/virtualKeyboard/MTransKeyRes/license_mtranskey.rsl index b27a8212..8da38ef9 100644 --- a/GME Remit/ThirdParty/virtualKeyboard/MTransKeyRes/license_mtranskey.rsl +++ b/GME Remit/ThirdParty/virtualKeyboard/MTransKeyRes/license_mtranskey.rsl @@ -1 +1 @@ -AdCizOfQ3Gswwz7dSYA1BcKaDN2TeyJMSUNFTlNFIjp7IkxJQ0VOU0VfSU5GTyI6eyJQUk9EVUNUX05BTUUiOiJUb3VjaEVuIG1UcmFuc2tleSBDUyIsIlBST0RVQ1RfVkVSU0lPTiI6IjQuNi4wLjQxIiwiU0lURV9OQU1FIjoi6riA66Gc67KM66i464uI7J217Iqk7ZSE66CI7IqkIiwiU0lURV9DT0RFIjoic2l0ZTkyIiwiTElDRU5TRV9DT0RFIjoiUmFvbkxJQzUzNyIsIklTU1VFUiI6ImFkbWluIiwiSVNTVUVEX0RBVEUiOiIyMDE5MDUzMSIsIkVYUElSRV9EQVRFIjoiMjA5OTA2MDEiLCJMSUNFTlNFX1RZUEUiOiJTVEFOREFSRCJ9LCJMSUNFTlNFX1NDSEVNQSI6eyJOT0RFX0xPQ0tFRCI6eyJNQUMiOlsiLiJdLCJJUCI6WyIuIl0sIkRPTUFJTiI6WyIuIl0sIk9TIjpbIkFORFJPSUQiLCJJT1MiXSwiSE9TVF9JRCI6WyIuIl0sIkNQVV9DT1JFX0NPVU5UIjoiOTk5IiwiV0FTX0lOU1RBTkNFX0NPVU5UIjoiOTk5In0sIkZMT0FUSU5HIjp7IlVTRVJfQ09VTlQiOiI5OTk5OTkiLCJERVZJQ0VfQ09VTlQiOiI5OTk5OTkiLCJCUk9XU0VSIjpbIklFIiwiRURHRSIsIkNIUk9NRSIsIlNBRkFSSSIsIkZJUkVGT1giLCJPUEVSIl0sIkFQUF9JRCI6WyJjb20uZ21lLmdtZXJlbWl0IiwiY29tLmdtZXJlbWl0Lm9ubGluZS5nbWVyZW1pdHRhbmNlX25hdGl2ZSJdLCJPUFRJT05TIjoiIn19LCJGRUFUVVJFIjpbXX19 \ No newline at end of file +AR1HBDviFGvBNq+BXSnQF3xKodfLeyJMSUNFTlNFIjp7IkxJQ0VOU0VfVkVSU0lPTiI6IjEuMCIsIkxJQ0VOU0VfSU5GTyI6eyJQUk9EVUNUX05BTUUiOiJUb3VjaEVuIG1UcmFuc2tleSIsIlBST0RVQ1RfVkVSU0lPTiI6IjQuNi4wLjQxIiwiU0lURV9OQU1FIjoi6riA66Gc67KM66i464uI7J217Iqk7ZSE66CI7IqkIiwiU0lURV9DT0RFIjoiQTEyMTI3QzIyM0VCNzNGMDEyOTMiLCJMSUNFTlNFX0NPREUiOiI4Qzg2NzExMDcwMUFCRDU1MjI1NSIsIklTU1VFUiI6ImNoamVvbkByYW9uc2VjdXJlLmNvbSIsIklTU1VFRF9EQVRFIjoiMjAxOTA4MTQxNjQ3MzYiLCJFWFBJUkVfREFURSI6Ijk5OTkxMjMwIiwiTElDRU5TRV9UWVBFIjoiU1RBTkRBUkQifSwiTElDRU5TRV9TQ0hFTUEiOnsiTk9ERV9MT0NLRUQiOnsiQ1BVX0NPUkVfQ09VTlQiOiI5OTk5IiwiV0FTX0lOU1RBTkNFX0NPVU5UIjoiOTk5OSIsIk1BQyI6WyIqIl0sIklQIjpbIiouKi4qLioiXSwiRE9NQUlOIjpbXSwiT1MiOlsiQU5EUk9JRCIsIklPUyJdLCJIT1NUX0lEIjpbXX0sIkZMT0FUSU5HIjp7Ik9QVElPTlMiOiIiLCJVU0VSX0NPVU5UIjoiOTk5OSIsIkRFVklDRV9DT1VOVCI6Ijk5OTkiLCJCUk9XU0VSIjpbXSwiQVBQX0lEIjpbImNvbS5nbWUuZ21lcmVtaXQiLCJjb20uZ21lcmVtaXQub25saW5lLmdtZXJlbWl0dGFuY2VfbmF0aXZlIl19fSwiRVhURU5TSU9OIjp7fSwiRkVBVFVSRSI6W119fQ== \ No newline at end of file diff --git a/GME Remit/Utilities/GMEAlert/GMEAlertViewController.swift b/GME Remit/Utilities/GMEAlert/GMEAlertViewController.swift index e09548b2..664e66fa 100644 --- a/GME Remit/Utilities/GMEAlert/GMEAlertViewController.swift +++ b/GME Remit/Utilities/GMEAlert/GMEAlertViewController.swift @@ -27,6 +27,8 @@ class GMEAlertViewController: UIViewController { private var type: AlertType = .normal + private let impact = UIImpactFeedbackGenerator() + override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil) } @@ -79,7 +81,7 @@ class GMEAlertViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - + impact.impactOccurred() mainView.popUpBouncy() }