Version 1.5.3

ChoiysApple · Aug 4, 2021 · 167a0e3 · 167a0e3
2 parents 0c38af4 + ca04bea
commit 167a0e3
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 32 deletions.
diff --git a/Popcat.xcodeproj/project.pbxproj b/Popcat.xcodeproj/project.pbxproj
@@ -496,7 +496,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.choiysapple.MyPopcat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -521,7 +521,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.choiysapple.MyPopcat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Popcat/Contoller/SettingsViewController.swift b/Popcat/Contoller/SettingsViewController.swift
@@ -49,8 +49,9 @@ extension SettingsViewController: UITableViewDataSource {
         }
 
         switch section {
-        case .volume: return VolumeOption.allCases.count
+        case .Volume: return VolumeOption.allCases.count
         case .About: return AboutOption.allCases.count
+        case .Guide: return GuideOption.allCases.count
         }
     }
 
@@ -59,10 +60,12 @@ extension SettingsViewController: UITableViewDataSource {
         guard let section = SettingsSection(rawValue: indexPath.section) else { return UITableViewCell() }
 
         switch section {
-        case .volume:
+        case .Volume:
             return VolumeOption.volume.cell
         case .About:
             return AboutOption(rawValue: indexPath.row)?.cell ?? UITableViewCell()
+        case .Guide:
+            return GuideOption(rawValue: indexPath.row)?.cell ?? UITableViewCell()
         }
 
     }
@@ -118,6 +121,15 @@ extension SettingsViewController {
                 }
                 tableView.cellForRow(at: indexPath)?.isSelected = false
             }
+        } else if section == .Guide {
+            if GuideOption.init(rawValue: indexPath.row) == .main {
+                getOnboardingViewController(onboardingDataList: OnboardingData.mainView.onboardingDataList).presentFrom(self, animated: true)
+
+                tableView.cellForRow(at: indexPath)?.isSelected = false
+            } else if GuideOption.init(rawValue: indexPath.row) == .catTower {
+                getOnboardingViewController(onboardingDataList: OnboardingData.catTowerView.onboardingDataList).presentFrom(self, animated: true)
+                tableView.cellForRow(at: indexPath)?.isSelected = false
+            }
         }
     }
 

diff --git a/Popcat/Model/SettingsSection.swift b/Popcat/Model/SettingsSection.swift
@@ -9,18 +9,20 @@ import Foundation
 import UIKit
 
 enum SettingsSection: Int, CaseIterable {
-    case volume, About
+    case Volume,Guide, About
 
     var headerDescription: String {
         switch self {
-        case .volume: return "Volume".localized
+        case .Volume: return "Volume".localized
+        case .Guide: return "Tutorial".localized
         case .About: return "About".localized
         }
     }
 
     var footerDescription: String {
         switch self {
-        case .volume: return "Set pop sound Volume".localized
+        case .Volume: return "Set pop sound Volume".localized
+        case .Guide: return "Show tutorial again".localized
         case .About: return "Show participator information".localized
         }
     }
@@ -42,6 +44,30 @@ enum VolumeOption: Int, CaseIterable {
     }
 }
 
+enum GuideOption: Int, CaseIterable {
+    case main, catTower
+
+    var description: String {
+        switch self {
+        case .main: return "Open main screen tutorial".localized
+        case .catTower: return "Open Cat Tower tutorial".localized
+        }
+    }
+
+    var cell: UITableViewCell {
+        switch self {
+        case .main:
+            let cell = SettingsDiscolsureCell()
+            cell.textLabel?.text = self.description
+            return cell
+        case .catTower:
+            let cell = SettingsDiscolsureCell()
+            cell.textLabel?.text = self.description
+            return cell
+        }
+    }
+}
+
 enum AboutOption: Int, CaseIterable {
 
     case version, developer, artist

diff --git a/Popcat/en.lproj/Localizable.strings b/Popcat/en.lproj/Localizable.strings
@@ -7,6 +7,10 @@
 
 */
 
+//   +-------------+
+//   | Onboardings |
+//   +-------------+
+
 // Onboarding - Main
 "Tap Anywhere" = "Tap Anywhere";
 "Tap anywhere to get relexed" = "Cat will pop when you tap. Be relaxed and healed by tapping more!";
@@ -21,32 +25,54 @@
 
 "Next" = "Next";
 
-// Cat Tower
+//   +-----------------+
+//   | View Controller |
+//   +-----------------+
+
+
+// Main View Controller
+"Swipe up!" = "Swipe up!";
+
+// Cat Tower View Controller
 "Show Pop count" = "Show Pop count";
 "Done" = "Done";
 
-// developer Info
-"Visit GitHub page for more" = "Visit GitHub page for more";
-"Try next version in advanced" = "Try next version in advanced";
 
-// Setting section title
-"Volume" = "Volume";
-"About" = "About";
+//   +---------------+
+//   | Settings View |
+//   +---------------+
 
-// Setting - Description
+// Volume
+"Volume" = "Volume";
 "Set pop sound Volume" = "Set pop sound Volume";
 "Show participator information" = "Show participator information";
 
-// Setting - About
+// Tutorial
+"Tutorial" = "Tutorial";
+"Open main screen tutorial" = "Open main screen tutorial";
+"Open Cat Tower tutorial" = "Open Cat Tower tutorial";
+"Show tutorial again" = "Show tutorial again";
+
+
+// About
+"About" = "About";
+
 "Version" = "Version";
 "Developer Info" = "Developer Info";
 "Art of My Little Popcat" = "Art of My Little Popcat";
 
 "Cat Tower 🐈" = "Cat Tower 🐈";
 "Settings ⚙" = "Settings";
 
+// developer Info
+"Visit GitHub page for more" = "Visit GitHub page for more";
+"Try next version in advanced" = "Try next version in advanced";
+
+
+//   +-----------+
+//   | Cat Names |
+//   +-----------+
 
-// Cats
 "Pop Cat" = "Pop Cat";
 "Original Cat" = "Original Cat";
 "Hood Cat" = "Hood Cat";
@@ -72,5 +98,3 @@
 "Bubble Pop" = "Bubble Pop";
 "Pop Kitten" = "Pop Kitten";
 "Cosmic Red" = "Cosmic Cat";
-
-"Swipe up!" = "Swipe up!";
diff --git a/Popcat/ko.lproj/Localizable.strings b/Popcat/ko.lproj/Localizable.strings
@@ -7,13 +7,17 @@
 
 */
 
-// Onboarding - Main
+//   +-------------+
+//   | Onboardings |
+//   +-------------+
+
+// Main
 "Tap Anywhere" = "아무곳이나 탭하세요";
 "Tap anywhere to get relexed" = "화면 아무 곳이나 탭하면 고양이가 반응합니다! 많이 탭하고 귀여운 고양이 보면서 힐링하세요";
 "Swipe Up" = "위로 스와이프";
 "Swipe Up to Check more cats and settings" = "위로 스와이프하면 다른 고양이들을 만나볼 수 있습니다";
 
-// Onboarding - Cat Tower
+// Cat Tower
 "Welcome to Cat Tower" = "캣타워에 오신 걸 환영합니다!";
 "You can pick various cats here" = "이곳에서 수많은 고양이들을 만나볼 수 있습니다.";
 "More taps, More cats" = "많은 탭, 많은 고양이";
@@ -22,37 +26,52 @@
 "Next" = "다음";
 
 
+//   +-----------------+
+//   | View Controller |
+//   +-----------------+
 
+// Guide view on Main
 "Swipe up!" = "위로 스와이프!";
 
-
-
 // Cat Tower
 "Show Pop count" = "탭 횟수 표시";
 "Done" = "완료";
 
-// developer Info
-"Visit GitHub page for more" = "더 많은 정보는 GitHub 페이지를 방문하세요";
-"Try next version in advanced" = "다음 버전을 미리 만나보세요";
 
-// Setting section title
-"Volume" = "음량";
-"About" = "정보";
+//   +---------------+
+//   | Settings View |
+//   +---------------+
 
-// Setting - Description
+// Volume
+"Volume" = "음량";
 "Set pop sound Volume" = "팝 소리 크기를 설정합니다";
 "Show participator information" = "앱 개발에 참여자 정보를 표시합니다";
 
-// Setting - About
+// Tutorial
+"Tutorial" = "튜토리얼";
+"Open main screen tutorial" = "메인화면 튜토리얼 다시보기";
+"Open Cat Tower tutorial" = "캣타워 튜토리얼 다시보기";
+"Show tutorial again" = "앱 사용법을 다시 볼 수 있습니다";
+
+// About
+"About" = "정보";
+
 "Version" = "버전";
 "Developer Info" = "개발자 정보";
 "Art of My Little Popcat" = "고양이를 그려주신 작가분들";
 
 "Cat Tower 🐈" = "캣 타워 🐈";
 "Settings ⚙" = "설정";
 
+// developer Info
+"Visit GitHub page for more" = "더 많은 정보는 GitHub 페이지를 방문하세요";
+"Try next version in advanced" = "다음 버전을 미리 만나보세요";
+
+
+//   +-----------+
+//   | Cat Names |
+//   +-----------+
 
-//cats
 "Pop Cat" = "팝 캣";
 "Original Cat" = "오리지널 캣";
 "Hood Cat" = "후드 캣";