Merge branch 'feature/private_beta_feedback' into develop

kukai-wallet · Feb 14, 2024 · e114ab2 · e114ab2
2 parents 09981c6 + e264c03
commit e114ab2
Show file tree

Hide file tree

Showing 10 changed files with 654 additions and 443 deletions.
diff --git a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -69,7 +69,7 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "50642c483fcc185a2bf55f3fc2334154f703b79d"
+        "revision" : "137b92329aa18883efd2c73a0002f61ea9e4ee53"
       }
     },
     {

diff --git a/Kukai Mobile/Controls/AutoScrollView.swift b/Kukai Mobile/Controls/AutoScrollView.swift
@@ -23,7 +23,9 @@ class AutoScrollView: UIScrollView {
 	func refocus() {
 		guard let parentView = parentView, let viewToFocusOn = viewToFocusOn else { return }
 
-		let whereKeyboardWillGoToo = ((self.frame.height + parentView.safeAreaInsets.bottom) - previousKeyboardHeight)
+		let toolbar = (viewToFocusOn as? UITextField)?.inputAccessoryView
+		let toolbarAddition = toolbar != nil ? toolbar?.frame.height ?? 0 : 0
+		let whereKeyboardWillGoToo = (((self.frame.height + parentView.safeAreaInsets.bottom) - toolbarAddition) - previousKeyboardHeight)
 		let whereNeedsToBeDisplayed = (viewToFocusOn.convert(CGPoint(x: 0, y: 0), to: self).y + viewToFocusOn.frame.height + 8).rounded(.up)
 
 		if whereKeyboardWillGoToo < whereNeedsToBeDisplayed {

diff --git a/Kukai Mobile/Controls/ScanViewController.swift b/Kukai Mobile/Controls/ScanViewController.swift
@@ -20,6 +20,7 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 	var captureSession: AVCaptureSession!
 	var previewLayer: AVCaptureVideoPreviewLayer! = AVCaptureVideoPreviewLayer()
 
+	let scrollView = AutoScrollView()
 	let titleLabel = UILabel()
 	let previewContainerView = UIView()
 	let blurEffectView = UIVisualEffectView()
@@ -66,6 +67,34 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 			}.store(in: &bag)
 	}
 
+	override func viewWillAppear(_ animated: Bool) {
+		super.viewWillAppear(animated)
+
+		textfield.text = nil
+
+		if (captureSession?.isRunning == false) {
+			// Xcode warning, should be run on a background thread in order to avoid hanging UI thread
+			DispatchQueue.global(qos: .background).async { [weak self] in
+				self?.captureSession.startRunning()
+			}
+		}
+
+		scrollView.setupAutoScroll(focusView: textfield, parentView: self.view)
+		scrollView.autoScrollDelegate = self
+	}
+
+	override func viewWillDisappear(_ animated: Bool) {
+		super.viewWillDisappear(animated)
+
+		scrollView.stopAutoScroll()
+
+		if (captureSession?.isRunning == true) {
+			DispatchQueue.global(qos: .background).async { [weak self] in
+				self?.captureSession.stopRunning()
+			}
+		}
+	}
+
 	@objc func back() {
 		self.dismiss(animated: true, completion: nil)
 	}
@@ -92,6 +121,9 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 		modalBackButton.addTarget(self, action: #selector(back), for: .touchUpInside)
 		self.view.addSubview(modalBackButton)
 
+		scrollView.translatesAutoresizingMaskIntoConstraints = false
+		self.view.addSubview(scrollView)
+
 		NSLayoutConstraint.activate([
 			titleLabel.topAnchor.constraint(equalTo: self.view.topAnchor, constant: 24),
 			titleLabel.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 16),
@@ -101,13 +133,18 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 			modalBackButton.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -24),
 			modalBackButton.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
 			modalBackButton.heightAnchor.constraint(equalToConstant: 44),
-			modalBackButton.widthAnchor.constraint(equalToConstant: 44)
+			modalBackButton.widthAnchor.constraint(equalToConstant: 44),
+
+			scrollView.topAnchor.constraint(equalTo: self.titleLabel.bottomAnchor, constant: 16),
+			scrollView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 0),
+			scrollView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: 0),
+			scrollView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)
 		])
 	}
 
 	func setupPreviewView() {
 		previewContainerView.translatesAutoresizingMaskIntoConstraints = false
-		self.view.addSubview(previewContainerView)
+		scrollView.addSubview(previewContainerView)
 
 		blurEffectView.translatesAutoresizingMaskIntoConstraints = false
 		blurEffectView.frame = previewContainerView.bounds
@@ -116,7 +153,9 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 		previewContainerView.addSubview(blurEffectView)
 
 		NSLayoutConstraint.activate([
-			previewContainerView.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 50),
+			previewContainerView.topAnchor.constraint(equalTo: scrollView.topAnchor, constant: 50),
+			previewContainerView.leadingAnchor.constraint(equalTo: scrollView.leadingAnchor),
+			previewContainerView.trailingAnchor.constraint(equalTo: scrollView.trailingAnchor),
 			previewContainerView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
 			previewContainerView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
 			previewContainerView.heightAnchor.constraint(equalTo: previewContainerView.widthAnchor),
@@ -147,7 +186,7 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 			textfield.leftView = paddingView
 			textfield.font = .custom(ofType: .bold, andSize: 14)
 			textfield.textColor = .colorNamed("Txt2")
-			self.view.addSubview(textfield)
+			scrollView.addSubview(textfield)
 
 			pasteButton.translatesAutoresizingMaskIntoConstraints = false
 			pasteButton.accessibilityIdentifier = "paste-button"
@@ -179,15 +218,15 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 				}
 			}), for: .touchUpInside)
 
-			self.view.addSubview(pasteButton)
+			scrollView.addSubview(pasteButton)
 
 			NSLayoutConstraint.activate([
-				textfield.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 16),
+				textfield.leadingAnchor.constraint(equalTo: scrollView.leadingAnchor, constant: 16),
 				textfield.trailingAnchor.constraint(equalTo: self.pasteButton.leadingAnchor, constant: -16),
 				textfield.topAnchor.constraint(equalTo: self.previewContainerView.bottomAnchor, constant: 24),
 				textfield.heightAnchor.constraint(equalToConstant: 36),
 
-				pasteButton.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -16),
+				pasteButton.trailingAnchor.constraint(equalTo: scrollView.trailingAnchor, constant: -16),
 				pasteButton.centerYAnchor.constraint(equalTo: self.textfield.centerYAnchor, constant: 0),
 				pasteButton.widthAnchor.constraint(equalToConstant: 36),
 				pasteButton.heightAnchor.constraint(equalToConstant: 36),
@@ -308,29 +347,6 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 		captureSession = nil
 	}
 
-	override func viewWillAppear(_ animated: Bool) {
-		super.viewWillAppear(animated)
-
-		textfield.text = nil
-
-		if (captureSession?.isRunning == false) {
-			// Xcode warning, should be run on a background thread in order to avoid hanging UI thread
-			DispatchQueue.global(qos: .background).async { [weak self] in
-				self?.captureSession.startRunning()
-			}
-		}
-	}
-
-	override func viewWillDisappear(_ animated: Bool) {
-		super.viewWillDisappear(animated)
-
-		if (captureSession?.isRunning == true) {
-			DispatchQueue.global(qos: .background).async { [weak self] in
-				self?.captureSession.stopRunning()
-			}
-		}
-	}
-
 	func metadataOutput(_ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
 
 		if let metadataObject = metadataObjects.first {
@@ -376,3 +392,16 @@ class ScanViewController: UIViewController, AVCaptureMetadataOutputObjectsDelega
 		return .portrait
 	}
 }
+
+extension ScanViewController: AutoScrollViewDelegate {
+
+	func keyboardWillShow() {
+		//self.topSectionContainer.alpha = 0.2
+		//self.topSectionContainer.isUserInteractionEnabled = false
+	}
+
+	func keyboardWillHide() {
+		//self.topSectionContainer.alpha = 1
+		//self.topSectionContainer.isUserInteractionEnabled = true
+	}
+}
diff --git a/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard b/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard
@@ -114,6 +114,7 @@
                         <segue destination="70q-lL-8WM" kind="presentation" identifier="app-update-required" modalPresentationStyle="overFullScreen" modalTransitionStyle="crossDissolve" id="2kJ-tl-bHi"/>
                         <segue destination="wXr-c8-sbt" kind="show" identifier="side-menu-show-onramp" id="yB4-OA-Mg2"/>
                         <segue destination="5kq-lD-FPQ" kind="custom" identifier="wallet-connect-generic" customClass="BottomSheetCustomSegue" customModule="Kukai_Mobile" customModuleProvider="target" id="bWZ-eJ-9bp"/>
+                        <segue destination="SuN-lc-s6p" kind="custom" identifier="wallet-connect-delegate" customClass="BottomSheetCustomSegue" customModule="Kukai_Mobile" customModuleProvider="target" id="xUf-Hg-Wxw"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="C8m-X9-tpS" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -550,7 +551,7 @@
                 <viewControllerPlaceholder storyboardName="Send" referencedIdentifier="confirm-batch" id="2yu-Z9-dT9" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="QBe-QO-cvT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-115" y="-2504"/>
+            <point key="canvasLocation" x="-132" y="-2527"/>
         </scene>
         <!--Discover-->
         <scene sceneID="iYF-dS-aIN">
@@ -1372,7 +1373,15 @@
                 <viewControllerPlaceholder storyboardName="Send" referencedIdentifier="confirm-generic" id="5kq-lD-FPQ" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="QY1-LC-Yeq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-115" y="-2458"/>
+            <point key="canvasLocation" x="-124" y="-2472"/>
+        </scene>
+        <!--confirm-stake-->
+        <scene sceneID="f6P-Cx-nlY">
+            <objects>
+                <viewControllerPlaceholder storyboardName="Stake" referencedIdentifier="confirm-stake" id="SuN-lc-s6p" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="d1g-SF-82o" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-132" y="-2498"/>
         </scene>
     </scenes>
     <designables>

diff --git a/Kukai Mobile/Modules/Home/HomeTabBarController.swift b/Kukai Mobile/Modules/Home/HomeTabBarController.swift
@@ -538,6 +538,9 @@ extension HomeTabBarController: WalletConnectServiceDelegate {
 				case .batch:
 					self.performSegue(withIdentifier: "wallet-connect-batch", sender: nil)
 
+				case .delegate:
+					self.performSegue(withIdentifier: "wallet-connect-delegate", sender: nil)
+
 				case .generic:
 					self.performSegue(withIdentifier: "wallet-connect-generic", sender: nil)
 			}