🧑‍💻🐳 chore: 调整 android iOS 风格 保持一致

wangxiang · wangxiang · commit c959bf7eeb1e · 2023-02-14T20:46:36.000+08:00
diff --git a/Dolphin.xcodeproj/project.pbxproj b/Dolphin.xcodeproj/project.pbxproj
diff --git a/Dolphin/Modules/Main/HomeTabBarViewController.swift b/Dolphin/Modules/Main/HomeTabBarViewController.swift
@@ -14,7 +14,7 @@ import WhatsNewKit
 enum HomeTabBarItem: Int, CaseIterable {
     
     // 导航栏包含(首页,工作台,消息,设置)
-    case home, workbench, message, settings
+    case home, workbench, message, user
 
     private func controller(with viewModel: ViewModel) -> UIViewController {
         switch self {
@@ -27,8 +27,8 @@ enum HomeTabBarItem: Int, CaseIterable {
         case .message:
             let vc = MessageViewController(viewModel: viewModel)
             return NavigationController(rootViewController: vc)
-        case .settings:
-            let vc = SettingsViewController(viewModel: viewModel)
+        case .user:
+            let vc = UserViewController(viewModel: viewModel)
             return NavigationController(rootViewController: vc)
         }
     }
@@ -39,7 +39,7 @@ enum HomeTabBarItem: Int, CaseIterable {
         case .home: return R.image.icon_tabbar_home()
         case .workbench: return R.image.icon_tabbar_workbench()
         case .message: return R.image.icon_tabbar_activity()
-        case .settings: return R.image.icon_tabbar_settings()
+        case .user: return R.image.icon_tabbar_settings()
         }
     }
 
@@ -49,7 +49,7 @@ enum HomeTabBarItem: Int, CaseIterable {
         case .home: return R.string.localizable.homeTabBarHomeTitle.key.localized()
         case .workbench: return R.string.localizable.homeTabBarWorkbenchTitle.key.localized()
         case .message: return R.string.localizable.homeTabBarMessageTitle.key.localized()
-        case .settings: return R.string.localizable.homeTabBarSettingsTitle.key.localized()
+        case .user: return R.string.localizable.homeTabBarUserTitle.key.localized()
         }
     }
 
@@ -59,7 +59,7 @@ enum HomeTabBarItem: Int, CaseIterable {
         case .home: animation = RAMBounceAnimation()
         case .workbench: animation = RAMBounceAnimation()
         case .message: animation = RAMBounceAnimation()
-        case .settings: animation = RAMRightRotationAnimation()
+        case .user: animation = RAMRightRotationAnimation()
         }
         animation.theme.iconSelectedColor = themeService.attribute { $0.secondary }
         animation.theme.textSelectedColor = themeService.attribute { $0.secondary }
diff --git a/Dolphin/Modules/Main/HomeTabBarViewModel.swift b/Dolphin/Modules/Main/HomeTabBarViewModel.swift
@@ -44,8 +44,8 @@ class HomeTabBarViewModel: ViewModel, ViewModelType {
         case .message:
             let viewModel = MessageViewModel()
             return viewModel
-        case .settings:
-            let viewModel = SettingsViewModel()
+        case .user:
+            let viewModel = UserViewModel()
             return viewModel
         }
     }
diff --git a/Dolphin/Modules/Setting/Cells/UserCell.swift b/Dolphin/Modules/Setting/Cells/UserCell.swift
@@ -5,7 +5,7 @@
 //
 
 import SwiftUI
-class SettingCell: DefaultTableViewCell {
+class UserCell: DefaultTableViewCell {
 
     override func makeUI() {
         super.makeUI()
diff --git a/Dolphin/Modules/Setting/Cells/UserCell.xib b/Dolphin/Modules/Setting/Cells/UserCell.xib
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingCell" id="KGk-i7-Jjw" customClass="SettingCell" customModule="康来呼叫器" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="UserCell" id="KGk-i7-Jjw" userLabel="UserCell" customClass="UserCell" customModule="海豚生态" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <point key="canvasLocation" x="41" y="21"/>
         </tableViewCell>
     </objects>
 </document>
diff --git a/Dolphin/Modules/Setting/Cells/UserCellViewModel.swift b/Dolphin/Modules/Setting/Cells/UserCellViewModel.swift
@@ -8,7 +8,7 @@ import Foundation
 import RxSwift
 import RxCocoa
 
-class SettingCellViewModel: DefaultTableViewCellViewModel {
+class UserCellViewModel: DefaultTableViewCellViewModel {
 
     init(with title: String, detail: String?, image: UIImage?, hidesDisclosure: Bool) {
         super.init()
diff --git a/Dolphin/Modules/Setting/Cells/UserSwitchCell.swift b/Dolphin/Modules/Setting/Cells/UserSwitchCell.swift
@@ -6,7 +6,7 @@
 
 import SwiftUI
 
-class SettingSwitchCell: DefaultTableViewCell {
+class UserSwitchCell: DefaultTableViewCell {
 
     lazy var switchView: Switch = {
         let view = Switch()
@@ -26,7 +26,7 @@ class SettingSwitchCell: DefaultTableViewCell {
 
     override func bind(to viewModel: TableViewCellViewModel) {
         super.bind(to: viewModel)
-        guard let viewModel = viewModel as? SettingSwitchCellViewModel else { return }
+        guard let viewModel = viewModel as? UserSwitchCellViewModel else { return }
         viewModel.isEnabled.asDriver().drive(switchView.rx.isOn).disposed(by: rx.disposeBag)
         switchView.rx.isOn.bind(to: viewModel.switchChanged).disposed(by: rx.disposeBag)
     }
diff --git a/Dolphin/Modules/Setting/Cells/UserSwitchCell.xib b/Dolphin/Modules/Setting/Cells/UserSwitchCell.xib
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingSwitchCell" id="KGk-i7-Jjw" customClass="SettingSwitchCell" customModule="康来呼叫器" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="UserSwitchCell" id="KGk-i7-Jjw" userLabel="UserSwitchCell" customClass="UserSwitchCell" customModule="海豚生态" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <point key="canvasLocation" x="106" y="21"/>
         </tableViewCell>
     </objects>
 </document>
diff --git a/Dolphin/Modules/Setting/Cells/UserSwitchCellViewModel.swift b/Dolphin/Modules/Setting/Cells/UserSwitchCellViewModel.swift
@@ -8,7 +8,7 @@ import Foundation
 import RxSwift
 import RxCocoa
 
-class SettingSwitchCellViewModel: DefaultTableViewCellViewModel {
+class UserSwitchCellViewModel: DefaultTableViewCellViewModel {
 
     let isEnabled = BehaviorRelay<Bool>(value: false)
 
diff --git a/Dolphin/Modules/Setting/UserSection.swift b/Dolphin/Modules/Setting/UserSection.swift
@@ -7,32 +7,32 @@
 import Foundation
 import RxDataSources
 
-enum SettingsSection {
-    case setting(title: String, items: [SettingsSectionItem])
+enum UserSection {
+    case setting(title: String, items: [UserSectionItem])
 }
 
-enum SettingsSectionItem {
+enum UserSectionItem {
 
     // 夜间模式
-    case nightModeItem(viewModel: SettingSwitchCellViewModel)
+    case nightModeItem(viewModel: UserSwitchCellViewModel)
     
     // 切换主题颜色
-    case themeItem(viewModel: SettingCellViewModel)
+    case themeItem(viewModel: UserCellViewModel)
     
     // 切换国际化语言
-    case languageItem(viewModel: SettingCellViewModel)
+    case languageItem(viewModel: UserCellViewModel)
     
     // 清除图片缓存
-    case removeCacheItem(viewModel: SettingCellViewModel)
+    case removeCacheItem(viewModel: UserCellViewModel)
     
     // 新特性
-    case whatsNewItem(viewModel: SettingCellViewModel)
+    case whatsNewItem(viewModel: UserCellViewModel)
     
     // 登出
-    case logoutItem(viewModel: SettingCellViewModel)
+    case logoutItem(viewModel: UserCellViewModel)
 }
 
-extension SettingsSectionItem: IdentifiableType {
+extension UserSectionItem: IdentifiableType {
     typealias Identity = String
     var identity: Identity {
         switch self {
@@ -46,14 +46,14 @@ extension SettingsSectionItem: IdentifiableType {
     }
 }
 
-extension SettingsSectionItem: Equatable {
-    static func == (lhs: SettingsSectionItem, rhs: SettingsSectionItem) -> Bool {
+extension UserSectionItem: Equatable {
+    static func == (lhs: UserSectionItem, rhs: UserSectionItem) -> Bool {
         return lhs.identity == rhs.identity
     }
 }
 
-extension SettingsSection: AnimatableSectionModelType, IdentifiableType {
-    typealias Item = SettingsSectionItem
+extension UserSection: AnimatableSectionModelType, IdentifiableType {
+    typealias Item = UserSectionItem
 
     typealias Identity = String
     var identity: Identity { return title }
@@ -64,13 +64,13 @@ extension SettingsSection: AnimatableSectionModelType, IdentifiableType {
         }
     }
 
-    var items: [SettingsSectionItem] {
+    var items: [UserSectionItem] {
         switch  self {
         case .setting(_, let items): return items.map {$0}
         }
     }
 
-    init(original: SettingsSection, items: [Item]) {
+    init(original: UserSection, items: [Item]) {
         switch original {
         case .setting(let title, let items): self = .setting(title: title, items: items)
         }
diff --git a/Dolphin/Modules/Setting/UserViewController.swift b/Dolphin/Modules/Setting/UserViewController.swift
@@ -11,52 +11,52 @@ import RxDataSources
 import WhatsNewKit
 import Toast_Swift
 
-private let switchReuseIdentifier = R.reuseIdentifier.settingSwitchCell.identifier
-private let reuseIdentifier = R.reuseIdentifier.settingCell.identifier
-class SettingsViewController: TableViewController {
+private let switchReuseIdentifier = R.reuseIdentifier.userSwitchCell.identifier
+private let reuseIdentifier = R.reuseIdentifier.userCell.identifier
+class UserViewController: TableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
     }
    
     // 懒加载顶部头视图
-    private lazy var headerView: SettingsHeaderView = {
-        let view = SettingsHeaderView()
+    private lazy var headerView: UserHeaderView = {
+        let view = UserHeaderView()
         view.delegate = self
         return view
     }()
     
     override func makeUI() {
         super.makeUI()
         languageChanged.subscribe(onNext: { [weak self] () in
-            self?.navigationTitle = R.string.localizable.homeTabBarSettingsTitle.key.localized()
+            self?.navigationTitle = R.string.localizable.homeTabBarUserTitle.key.localized()
         }).disposed(by: rx.disposeBag)
         stackView.insertArrangedSubview(headerView, at: 0)
-        tableView.register(R.nib.settingCell)
-        tableView.register(R.nib.settingSwitchCell)
+        tableView.register(R.nib.userCell)
+        tableView.register(R.nib.userSwitchCell)
         tableView.headRefreshControl = nil
         tableView.footRefreshControl = nil
     }
     
     override func bindViewModel() {
         super.bindViewModel()
-        guard let viewModel = viewModel as? SettingsViewModel else { return }
+        guard let viewModel = viewModel as? UserViewModel else { return }
         let refresh = Observable.of(rx.viewWillAppear.mapToVoid(), languageChanged.asObservable()).merge()
-        let input = SettingsViewModel.Input(trigger: refresh, selection: tableView.rx.modelSelected(SettingsSectionItem.self).asDriver())
+        let input = UserViewModel.Input(trigger: refresh, selection: tableView.rx.modelSelected(UserSectionItem.self).asDriver())
         let output = viewModel.transform(input: input)
         
-        let dataSource = RxTableViewSectionedReloadDataSource<SettingsSection>(configureCell: { dataSource, tableView, indexPath, item in
+        let dataSource = RxTableViewSectionedReloadDataSource<UserSection>(configureCell: { dataSource, tableView, indexPath, item in
             switch item {
             case .nightModeItem(let viewModel):
-                let cell = (tableView.dequeueReusableCell(withIdentifier: switchReuseIdentifier, for: indexPath) as? SettingSwitchCell)!
+                let cell = (tableView.dequeueReusableCell(withIdentifier: switchReuseIdentifier, for: indexPath) as? UserSwitchCell)!
                 cell.bind(to: viewModel)
                 return cell
             case .themeItem(let viewModel),
                  .languageItem(let viewModel),
                  .removeCacheItem(let viewModel),
                  .whatsNewItem(let viewModel),
                  .logoutItem(let viewModel):
-                let cell = (tableView.dequeueReusableCell(withIdentifier: reuseIdentifier, for: indexPath) as? SettingCell)!
+                let cell = (tableView.dequeueReusableCell(withIdentifier: reuseIdentifier, for: indexPath) as? UserCell)!
                 cell.bind(to: viewModel)
                 return cell
             }
@@ -112,9 +112,9 @@ class SettingsViewController: TableViewController {
     }
     
     func logoutAction() {
-        let alertController = UIAlertController(title: "温馨提示", message: R.string.localizable.settingsLogoutAlertMessage.key.localized(), preferredStyle: UIAlertController.Style.alert)
+        let alertController = UIAlertController(title: "温馨提示", message: R.string.localizable.userLogoutAlertMessage.key.localized(), preferredStyle: UIAlertController.Style.alert)
       
-        let logoutAction = UIAlertAction(title: R.string.localizable.settingsLogoutAlertConfirmButtonTitle.key.localized(), style: .destructive) { [weak self] (result: UIAlertAction) in
+        let logoutAction = UIAlertAction(title: R.string.localizable.userLogoutAlertConfirmButtonTitle.key.localized(), style: .destructive) { [weak self] (result: UIAlertAction) in
             PermissionUtil.logout()
         }
 
@@ -127,7 +127,7 @@ class SettingsViewController: TableViewController {
 
 }
 
-extension SettingsViewController: SettingsHeaderViewDelegate {
+extension UserViewController: UserHeaderViewDelegate {
     
     // 图片点击
     func imgViewClick(imgView: UIImageView) {
diff --git a/Dolphin/Modules/Setting/UserViewModel.swift b/Dolphin/Modules/Setting/UserViewModel.swift
diff --git a/Dolphin/Modules/Setting/View/UserHeaderView.swift b/Dolphin/Modules/Setting/View/UserHeaderView.swift
diff --git a/Dolphin/Resources/en.lproj/Localizable.strings b/Dolphin/Resources/en.lproj/Localizable.strings
diff --git a/Dolphin/Resources/zh-Hans.lproj/Localizable.strings b/Dolphin/Resources/zh-Hans.lproj/Localizable.strings

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import WhatsNewKit`
`14`	`14`	`enum HomeTabBarItem: Int, CaseIterable {`
`15`	`15`
`16`	`16`	`// 导航栏包含(首页,工作台,消息,设置)`
`17`		`- case home, workbench, message, settings`
	`17`	`+ case home, workbench, message, user`
`18`	`18`
`19`	`19`	`private func controller(with viewModel: ViewModel) -> UIViewController {`
`20`	`20`	`switch self {`
`@@ -27,8 +27,8 @@ enum HomeTabBarItem: Int, CaseIterable {`
`27`	`27`	`case .message:`
`28`	`28`	`let vc = MessageViewController(viewModel: viewModel)`
`29`	`29`	`return NavigationController(rootViewController: vc)`
`30`		`- case .settings:`
`31`		`- let vc = SettingsViewController(viewModel: viewModel)`
	`30`	`+ case .user:`
	`31`	`+ let vc = UserViewController(viewModel: viewModel)`
`32`	`32`	`return NavigationController(rootViewController: vc)`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -39,7 +39,7 @@ enum HomeTabBarItem: Int, CaseIterable {`
`39`	`39`	`case .home: return R.image.icon_tabbar_home()`
`40`	`40`	`case .workbench: return R.image.icon_tabbar_workbench()`
`41`	`41`	`case .message: return R.image.icon_tabbar_activity()`
`42`		`- case .settings: return R.image.icon_tabbar_settings()`
	`42`	`+ case .user: return R.image.icon_tabbar_settings()`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -49,7 +49,7 @@ enum HomeTabBarItem: Int, CaseIterable {`
`49`	`49`	`case .home: return R.string.localizable.homeTabBarHomeTitle.key.localized()`
`50`	`50`	`case .workbench: return R.string.localizable.homeTabBarWorkbenchTitle.key.localized()`
`51`	`51`	`case .message: return R.string.localizable.homeTabBarMessageTitle.key.localized()`
`52`		`- case .settings: return R.string.localizable.homeTabBarSettingsTitle.key.localized()`
	`52`	`+ case .user: return R.string.localizable.homeTabBarUserTitle.key.localized()`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`@@ -59,7 +59,7 @@ enum HomeTabBarItem: Int, CaseIterable {`
`59`	`59`	`case .home: animation = RAMBounceAnimation()`
`60`	`60`	`case .workbench: animation = RAMBounceAnimation()`
`61`	`61`	`case .message: animation = RAMBounceAnimation()`
`62`		`- case .settings: animation = RAMRightRotationAnimation()`
	`62`	`+ case .user: animation = RAMRightRotationAnimation()`
`63`	`63`	`}`
`64`	`64`	`animation.theme.iconSelectedColor = themeService.attribute { $0.secondary }`
`65`	`65`	`animation.theme.textSelectedColor = themeService.attribute { $0.secondary }`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ class HomeTabBarViewModel: ViewModel, ViewModelType {`
`44`	`44`	`case .message:`
`45`	`45`	`let viewModel = MessageViewModel()`
`46`	`46`	`return viewModel`
`47`		`- case .settings:`
`48`		`- let viewModel = SettingsViewModel()`
	`47`	`+ case .user:`
	`48`	`+ let viewModel = UserViewModel()`
`49`	`49`	`return viewModel`
`50`	`50`	`}`
`51`	`51`	`}`