[Merge] Pull Develop (#141)

zanzanbari · Sep 8, 2023 · a72beca · a72beca
2 parents 589a1cb + 8e68617
commit a72beca
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/WAL/WAL/Screen/Setting/Controller/SettingViewController.swift b/WAL/WAL/Screen/Setting/Controller/SettingViewController.swift
@@ -112,6 +112,10 @@ extension SettingViewController: UITableViewDelegate {
                 let viewController = SettingCategoryViewController()
                 transition(viewController)
             }
+        case 2:
+            print("여기 주석 처리 해제해주세요~ SettingVC 116번 줄")
+//            let viewController = WalCreatorViewController()
+//            transition(viewController)
         default:
             if indexPath.row == 0 {
                 let viewController = ZanzanbariViewController()
@@ -139,7 +143,7 @@ extension SettingViewController: UITableViewDataSource {
 
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         switch section {
-        case 1, 2: return 10
+        case 1, 2, 3: return 10
         default: return 0
         }
     }
@@ -149,14 +153,15 @@ extension SettingViewController: UITableViewDataSource {
     }
 
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 3
+        return 4
     }
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch section {
         case 0: return 1
-        case 1: return setting.getSettingCount(setting.firstRowData)
-        case 2: return setting.getSettingCount(setting.secondRowData)
+        case 1: return setting.getSettingCount(setting.settingRowData)
+        case 2: return setting.getSettingCount(setting.creatorRowData)
+        case 3: return setting.getSettingCount(setting.infoRowData)
         default: return 0
         }
     }
@@ -169,13 +174,13 @@ extension SettingViewController: UITableViewDataSource {
             cell.nicknameLabel.text = nickname
             cell.selectionStyle = .none
             return cell
-        case 1:
+        case 1, 2:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: SettingTableViewCell.identifier, for: indexPath) as? SettingTableViewCell
             else { return UITableViewCell() }
-            cell.menuLabel.text = setting.getMenuLabel(setting.firstRowData, indexPath.row)
+            cell.menuLabel.text = setting.getMenuLabel(indexPath.section == 1 ? setting.settingRowData : setting.creatorRowData, indexPath.row)
             configureCellBackgroundColor(cell)
             return cell
-        case 2:
+        case 3:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: SettingTableViewCell.identifier, for: indexPath) as? SettingTableViewCell
             else { return UITableViewCell() }
             cell.setupData(index: indexPath.row)

diff --git a/WAL/WAL/Screen/Setting/Model/Setting.swift b/WAL/WAL/Screen/Setting/Model/Setting.swift
@@ -50,12 +50,16 @@ struct ResignSetting {
 }
 
 struct SettingData {
-    var firstRowData = [
+    var settingRowData = [
         Setting(menu: "알림"),
         Setting(menu: "왈소리 유형")
     ]
 
-    var secondRowData: [Setting]
+    var creatorRowData = [
+        Setting(menu: "왈소리 크리에이터")
+    ]
+
+    var infoRowData: [Setting]
 
     var resignRowData = [
         ResignSetting(menu: Reason.DO_NOT_LIKE, select: false),
@@ -72,14 +76,14 @@ struct SettingData {
     init() {
         if let info = Bundle.main.infoDictionary,
            let currentVersion = info["CFBundleShortVersionString"] as? String {
-            self.secondRowData = [
+            self.infoRowData = [
                 Setting(menu: "왈이 궁금해요"),
                 Setting(menu: "공지사항"),
                 Setting(menu: "서비스 이용 약관"),
                 Setting(menu: "버전 정보", subMenu: currentVersion)
             ]
         } else {
-            self.secondRowData = [
+            self.infoRowData = [
                 Setting(menu: "왈이 궁금해요"),
                 Setting(menu: "공지사항"),
                 Setting(menu: "서비스 이용 약관"),

diff --git a/WAL/WAL/Screen/Setting/View/SettingTableViewCell.swift b/WAL/WAL/Screen/Setting/View/SettingTableViewCell.swift
@@ -59,7 +59,7 @@ final class SettingTableViewCell: BaseTableViewCell {
     // MARK: - Custom Method
 
     func setupData(index: Int) {
-        menuLabel.text = setting.getMenuLabel(setting.secondRowData, index)
-        subMenuLabel.text = setting.getSubMenuLabel(setting.secondRowData, index)
+        menuLabel.text = setting.getMenuLabel(setting.infoRowData, index)
+        subMenuLabel.text = setting.getSubMenuLabel(setting.infoRowData, index)
     }
 }