From f9531a4cc86b6e58f296ea671673c821cf89c4c1 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Fri, 13 Oct 2023 13:21:56 +1100
Subject: [PATCH] polish the recovery password remider

---
 Session/Home/HomeVC.swift                   |  4 ++--
 Session/Onboarding/SeedReminderView.swift   | 19 ++++++++++++++++---
 Session/Onboarding/SeedVC.swift             |  2 +-
 SessionUIKit/Components/SessionButton.swift |  5 +++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift
index fd3473914..de75ac8b8 100644
--- a/Session/Home/HomeVC.swift
+++ b/Session/Home/HomeVC.swift
@@ -48,9 +48,9 @@ final class HomeVC: BaseVC, SessionUtilRespondingViewController, UITableViewData
     private var tableViewTopConstraint: NSLayoutConstraint!
     
     private lazy var seedReminderView: SeedReminderView = {
-        let result = SeedReminderView(hasContinueButton: true)
+        let result = SeedReminderView(hasContinueButton: true, hasSessionShieldIcon: true)
         result.accessibilityLabel = "Recovery phrase reminder"
-        let title = "onboarding_recovery_password_title".localized()
+        result.title = NSAttributedString(string: "onboarding_recovery_password_title".localized())
         result.subtitle = "onboarding_recovery_password_subtitle".localized()
         result.setProgress(1, animated: false)
         result.delegate = self
diff --git a/Session/Onboarding/SeedReminderView.swift b/Session/Onboarding/SeedReminderView.swift
index 5570cc578..eded9a1c6 100644
--- a/Session/Onboarding/SeedReminderView.swift
+++ b/Session/Onboarding/SeedReminderView.swift
@@ -8,6 +8,7 @@ final class SeedReminderView: UIView {
     private static let progressBarThickness: CGFloat = 2
     
     private let hasContinueButton: Bool
+    private let hasSessionShieldIcon: Bool
     
     var title = NSAttributedString(string: "") { didSet { titleLabel.attributedText = title } }
     var subtitle = "" { didSet { subtitleLabel.text = subtitle } }
@@ -46,8 +47,9 @@ final class SeedReminderView: UIView {
     
     // MARK: - Lifecycle
     
-    init(hasContinueButton: Bool) {
+    init(hasContinueButton: Bool, hasSessionShieldIcon: Bool) {
         self.hasContinueButton = hasContinueButton
+        self.hasSessionShieldIcon = hasSessionShieldIcon
         
         super.init(frame: CGRect.zero)
         
@@ -75,8 +77,19 @@ final class SeedReminderView: UIView {
         subtitleLabel.pin(.leading, to: .leading, of: subtitleContainerView)
         subtitleLabel.pin(.trailing, to: .trailing, of: subtitleContainerView)
         
+        let sessionShieldIcon: UIImageView = UIImageView(
+            image: UIImage(named: "SessionShieldFilled")?.withRenderingMode(.alwaysTemplate)
+        )
+        sessionShieldIcon.contentMode = .scaleAspectFill
+        sessionShieldIcon.set(.height, to: 16)
+        sessionShieldIcon.set(.width, to: 14)
+        sessionShieldIcon.isHidden = !hasSessionShieldIcon
+        let titleContainerView: UIStackView = UIStackView(arrangedSubviews: [titleLabel, sessionShieldIcon, UIView.hStretchingSpacer()])
+        titleContainerView.axis = .horizontal
+        titleContainerView.spacing = Values.verySmallSpacing
+        
         // Set up label stack view
-        let labelStackView = UIStackView(arrangedSubviews: [ titleLabel, subtitleContainerView ])
+        let labelStackView = UIStackView(arrangedSubviews: [ titleContainerView, subtitleContainerView ])
         labelStackView.axis = .vertical
         labelStackView.spacing = 4
         
@@ -86,7 +99,7 @@ final class SeedReminderView: UIView {
         button.accessibilityLabel = "Continue"
         button.isAccessibilityElement = true
         button.setTitle("continue_2".localized(), for: UIControl.State.normal)
-        button.set(.width, greaterThanOrEqualTo: 96)
+        button.set(.width, greaterThanOrEqualTo: 80)
         button.addTarget(self, action: #selector(handleContinueButtonTapped), for: UIControl.Event.touchUpInside)
         
         // Set up content stack view
diff --git a/Session/Onboarding/SeedVC.swift b/Session/Onboarding/SeedVC.swift
index f6ef5bdc8..b037f4671 100644
--- a/Session/Onboarding/SeedVC.swift
+++ b/Session/Onboarding/SeedVC.swift
@@ -59,7 +59,7 @@ final class SeedVC: BaseVC {
     // MARK: - Components
     
     private lazy var seedReminderView: SeedReminderView = {
-        let result = SeedReminderView(hasContinueButton: false)
+        let result = SeedReminderView(hasContinueButton: false, hasSessionShieldIcon: false)
         result.subtitle = "view_seed_reminder_subtitle_2".localized()
         result.setProgress(0.9, animated: false)
         
diff --git a/SessionUIKit/Components/SessionButton.swift b/SessionUIKit/Components/SessionButton.swift
index f30ca2ede..fcaa0836f 100644
--- a/SessionUIKit/Components/SessionButton.swift
+++ b/SessionUIKit/Components/SessionButton.swift
@@ -102,11 +102,12 @@ public final class SessionButton: UIButton {
     
     private func setup(size: Size) {
         clipsToBounds = true
+        let spacing: CGFloat = (size == .small ? Values.smallSpacing : Values.largeSpacing)
         contentEdgeInsets = UIEdgeInsets(
             top: 0,
-            left: Values.largeSpacing,
+            left: spacing,
             bottom: 0,
-            right: Values.largeSpacing
+            right: spacing
         )
         titleLabel?.font = .boldSystemFont(ofSize: (size == .small ?
             Values.smallFontSize :