Added logic to profiling. Clean localisations.

Author: ivanvorobei

Package.swift

@@ -16,7 +16,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ivanvorobei/SPAlert", .upToNextMajor(from: "4.2.0")),
-        .package(url: "https://github.com/ivanvorobei/NativeUIKit", .upToNextMajor(from: "1.4.4")),
+        .package(url: "https://github.com/ivanvorobei/NativeUIKit", .upToNextMajor(from: "1.4.5")),
         .package(url: "https://github.com/ivanvorobei/SPFirebase", .upToNextMajor(from: "1.0.8")),
         .package(url: "https://github.com/sparrowcode/SPSafeSymbols", .upToNextMajor(from: "1.0.5")),
         .package(url: "https://github.com/kean/Nuke", .upToNextMajor(from: "10.7.1"))

Sources/SPProfiling/Data/Texts.swift

@@ -66,8 +66,13 @@ enum Texts {
 
     enum Profile {
 
+        static var name_title: String { NSLocalizedString("profile name title", bundle: .module, comment: "") }
+        static var email_title: String { NSLocalizedString("profile email title", bundle: .module, comment: "") }
         static var placeholder_name: String { NSLocalizedString("profile placeholder name", bundle: .module, comment: "") }
 
+        static var public_data_header: String { NSLocalizedString("profile public data header", bundle: .module, comment: "") }
+        static var public_data_footer: String { NSLocalizedString("profile public data footer", bundle: .module, comment: "") }
+        
         enum Devices {
 
             static var title: String { NSLocalizedString("profile devices title", bundle: .module, comment: "") }
@@ -84,18 +89,6 @@ enum Texts {
 
         enum Actions {
 
-            static var email_copied: String { NSLocalizedString("profile actions email copied", bundle: .module, comment: "") }
-            
-            enum Rename {
-                
-                static var title: String { NSLocalizedString("profile actions rename title", bundle: .module, comment: "") }
-                static var description: String { NSLocalizedString("profile actions rename description", bundle: .module, comment: "") }
-                
-                static var alert_title: String { NSLocalizedString("profile rename alert title", bundle: .module, comment: "") }
-                static var alert_description: String { NSLocalizedString("profile rename alert description", bundle: .module, comment: "") }
-                static var alert_placeholder: String { NSLocalizedString("profile rename alert placeholder", bundle: .module, comment: "") }
-            }
-            
             enum SignOut {
 
                 static var title: String { NSLocalizedString("profile actions sign out title", bundle: .module, comment: "") }

Sources/SPProfiling/Interface/Devices/DeviceTableCell.swift

@@ -37,7 +37,7 @@ class DeviceTableCell: SPTableViewCell {
 
     override func commonInit() {
         super.commonInit()
-        textLabel?.font = UIFont.preferredFont(forTextStyle: .title3, weight: .medium)
+        textLabel?.font = UIFont.preferredFont(forTextStyle: .body, weight: .medium)
         textLabel?.textColor = .label
         textLabel?.numberOfLines = .zero
         detailTextLabel?.font = UIFont.preferredFont(forTextStyle: .footnote)
@@ -66,4 +66,11 @@ class DeviceTableCell: SPTableViewCell {
 
         imageView?.tintColor = .tint
     }
+    
+    // MARK: - Layout
+    
+    open override func sizeThatFits(_ size: CGSize) -> CGSize {
+        let superSize = super.sizeThatFits(size)
+        return .init(width: superSize.width, height: superSize.height + 2)
+    }
 }

Sources/SPProfiling/Interface/Profile/ProfileController+Actions.swift

@@ -0,0 +1,57 @@
+// The MIT License (MIT)
+// Copyright © 2022 Ivan Vorobei ([email protected])
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import UIKit
+import NativeUIKit
+import SparrowKit
+import SPDiffable
+import SPSafeSymbols
+import SPAlert
+
+extension ProfileController: UITextFieldDelegate {
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        
+        let nameTextField: UITextField? = {
+            guard let indexPath = diffableDataSource?.getIndexPath(id: Item.name.id) else { return nil }
+            guard let cell = tableView.cellForRow(at: indexPath) as? SPDiffableTextFieldTitleTableViewCell else { return nil }
+            return cell.textField
+        }()
+        
+        switch textField {
+        case nameTextField:
+            let text = textField.text ?? .empty
+            self.profileModel.setName(text, completion: { error in
+                if let error = error {
+                    SPAlert.present(message: error.localizedDescription, haptic: .error)
+                }
+                nameTextField?.text = self.profileModel.name
+            })
+        default:
+            break
+        }
+    }
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        textField.resignFirstResponder()
+        return true
+    }
+}

Sources/SPProfiling/Interface/Profile/ProfileController+UITextFieldDelegate.swift

@@ -77,62 +77,72 @@ class ProfileController: NativeProfileController {
             guard let self = self else { return }
             if let profileModel = ProfileModel.currentProfile {
                 self.profileModel = profileModel
-                self.configureHeader()
-                self.diffableDataSource?.updateLayout(animated: true)
+                self.diffableDataSource?.set(self.content, animated: true)
             }
         }
 
         configureHeader()
+        dismissKeyboardWhenTappedAround()
     }
 
     // MARK: - Diffable
 
-    internal enum Item: String, CaseIterable {
+    internal enum Section: String, CaseIterable {
 
-        case change_name
+        case pulibc_info
         case devices
         case sign_out
         case delete_account
 
-        var section_id: String { rawValue + "_section" }
-        var item_id: String { rawValue + "_row" }
+        var id: String { rawValue }
+    }
+    
+    internal enum Item: String, CaseIterable {
+        
+        case name
+        case email
+        case sign_out
+        case delete_account
+        
+        var id: String { rawValue }
     }
 
     private var content: [SPDiffableSection] {
         return [
             .init(
-                id: Item.change_name.section_id,
-                header: nil,
-                footer: SPDiffableTextHeaderFooter(text: Texts.Profile.Actions.Rename.description),
+                id: Section.pulibc_info.id,
+                header: SPDiffableTextHeaderFooter(text: Texts.Profile.public_data_header),
+                footer: SPDiffableTextHeaderFooter(text: Texts.Profile.public_data_footer),
                 items: [
                     SPDiffableTableRowTextFieldTitle(
-                        id: Item.change_name.item_id,
+                        id: Item.name.id,
                         icon: nil,
-                        title: "Name",
+                        title: Texts.Profile.name_title,
                         text: profileModel.name,
-                        placeholder: "Your name",
+                        placeholder: Texts.Profile.placeholder_name,
                         autocorrectionType: .no,
                         keyboardType: .default,
                         autocapitalizationType: .words,
                         clearButtonMode: .never,
-                        delegate: nil
+                        delegate: self
                     ),
                     SPDiffableTableRowTextFieldTitle(
-                        id: Item.change_name.item_id + "email",
+                        id: Item.email.id,
                         icon: nil,
-                        title: "Email",
+                        title: Texts.Profile.email_title,
                         text: profileModel.email,
-                        placeholder: "Your email",
+                        placeholder: .empty,
                         autocorrectionType: .no,
                         keyboardType: .emailAddress,
                         autocapitalizationType: .words,
                         clearButtonMode: .never,
-                        delegate: nil
+                        delegate: nil,
+                        editable: false
                     )
                 ]
             ),
             .init(
-                id: Item.devices.section_id,
+                id: Section.devices.id,
                 header: SPDiffableTextHeaderFooter(text: Texts.Profile.Devices.header),
                 footer: SPDiffableTextHeaderFooter(text: Texts.Profile.Devices.footer),
                 items: profileModel.devices.prefix(3).map({ SPDiffableWrapperItem(id: $0.id, model: $0) }) + [
@@ -151,12 +161,12 @@ class ProfileController: NativeProfileController {
                 ]
             ),
             .init(
-                id: Item.sign_out.section_id,
-                header: nil,
+                id: Section.sign_out.id,
+                header: SPDiffableTextHeaderFooter(text: Texts.Profile.Actions.SignOut.title),
                 footer: SPDiffableTextHeaderFooter(text: Texts.Profile.Actions.SignOut.description),
                 items: [
                     NativeDiffableLeftButton(
-                        id: Item.sign_out.item_id,
+                        id: Item.sign_out.id,
                         text: Texts.Profile.Actions.SignOut.title,
                         icon: .init(.xmark.squareFill),
                         action: { [weak self] _, indexPath in
@@ -194,12 +204,12 @@ class ProfileController: NativeProfileController {
                 ]
             ),
             .init(
-                id: Item.delete_account.section_id,
+                id: Section.delete_account.id,
                 header: SPDiffableTextHeaderFooter(text: Texts.Profile.Actions.Delete.header),
                 footer: SPDiffableTextHeaderFooter(text: Texts.Profile.Actions.Delete.description),
                 items: [
                     NativeDiffableLeftButton(
-                        id: Item.delete_account.item_id,
+                        id: Item.delete_account.id,
                         text: Texts.Profile.Actions.Delete.title,
                         textColor: .destructiveColor,
                         icon: .init(.trash.fill).withTintColor(.destructiveColor, renderingMode: .alwaysOriginal),

Sources/SPProfiling/Interface/Profile/ProfileController.swift

@@ -104,7 +104,7 @@
 "profile devices footer" = "You can disable access to a profile by deleting it.";
 
 /* No comment provided by engineer. */
-"profile devices header" = "Connected Devices";
+"profile devices header" = "Devices";
 
 /* No comment provided by engineer. */
 "profile devices manage devices" = "Manage Devices";

Sources/SPProfiling/Resources/Localization/en.lproj/Localizable.strings

@@ -104,7 +104,7 @@
 "profile devices footer" = "Вы можете запретить доступ к профилю, удалив его.";
 
 /* No comment provided by engineer. */
-"profile devices header" = "Подключенные устройства";
+"profile devices header" = "Устройства";
 
 /* No comment provided by engineer. */
 "profile devices manage devices" = "Управление устройствами";