diff --git a/Popcat.xcodeproj/project.pbxproj b/Popcat.xcodeproj/project.pbxproj index 45114d4..e1e152e 100644 --- a/Popcat.xcodeproj/project.pbxproj +++ b/Popcat.xcodeproj/project.pbxproj @@ -488,7 +488,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ZW6466CHF4; INFOPLIST_FILE = Popcat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -496,7 +496,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; PRODUCT_BUNDLE_IDENTIFIER = com.choiysapple.MyPopcat; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -513,7 +513,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ZW6466CHF4; INFOPLIST_FILE = Popcat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -521,7 +521,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; PRODUCT_BUNDLE_IDENTIFIER = com.choiysapple.MyPopcat; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/Contents.json b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/Contents.json new file mode 100644 index 0000000..8fa6e54 --- /dev/null +++ b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "drag.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "drag-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "drag@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "drag-2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "drag@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "drag-2@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2.png b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2.png new file mode 100644 index 0000000..a0dae1b Binary files /dev/null and b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2.png differ diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2@2x.png b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2@2x.png new file mode 100644 index 0000000..3e69d4e Binary files /dev/null and b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2@2x.png differ diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2@3x.png b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2@3x.png new file mode 100644 index 0000000..deafe01 Binary files /dev/null and b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag-2@3x.png differ diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag.png b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag.png new file mode 100644 index 0000000..0140275 Binary files /dev/null and b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag.png differ diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag@2x.png b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag@2x.png new file mode 100644 index 0000000..3e2275e Binary files /dev/null and b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag@2x.png differ diff --git a/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag@3x.png b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag@3x.png new file mode 100644 index 0000000..714af81 Binary files /dev/null and b/Popcat/Assets.xcassets/guideImage/swipe_up_main.imageset/drag@3x.png differ diff --git a/Popcat/Base.lproj/Main.storyboard b/Popcat/Base.lproj/Main.storyboard index e947735..02b5735 100644 --- a/Popcat/Base.lproj/Main.storyboard +++ b/Popcat/Base.lproj/Main.storyboard @@ -44,11 +44,32 @@ + + + + + + + + + + + + + + + + @@ -57,12 +78,14 @@ + + @@ -103,6 +126,8 @@ + + @@ -114,7 +139,7 @@ - + @@ -493,6 +518,7 @@ + diff --git a/Popcat/Contoller/CatTowerVeiwController.swift b/Popcat/Contoller/CatTowerVeiwController.swift index b5ed34f..fafd897 100644 --- a/Popcat/Contoller/CatTowerVeiwController.swift +++ b/Popcat/Contoller/CatTowerVeiwController.swift @@ -49,8 +49,7 @@ class CatTowerVeiwController: UIViewController { if !dataManager.getIsNotInitialCatTower() { getOnboardingViewController(onboardingDataList: OnboardingData.catTowerView.onboardingDataList).presentFrom(self, animated: true) - dataManager.setIsNotInitialCatTower(isFirst: true) - dataManager.setIsNotInitialLaunch(isFirst: true) + dataManager.setIsNotInitialCatTower(isNotFirst: true) } diff --git a/Popcat/Contoller/MainViewController.swift b/Popcat/Contoller/MainViewController.swift index 2e45120..3ddc9af 100644 --- a/Popcat/Contoller/MainViewController.swift +++ b/Popcat/Contoller/MainViewController.swift @@ -14,6 +14,9 @@ class MainViewController: UIViewController { //MARK: IBOutlet @IBOutlet weak var popcatImage: UIImageView! @IBOutlet weak var countLabel: UILabel! + @IBOutlet weak var guideLabel: UILabel! + @IBOutlet weak var guideView: UIStackView! + //MARK: touchEventImage @@ -27,7 +30,6 @@ class MainViewController: UIViewController { // Timer related private let imageDelay = 0.08 private var timer = Timer() - private var isNotFirstLaunch = true override func viewDidLoad() { super.viewDidLoad() @@ -35,22 +37,28 @@ class MainViewController: UIViewController { self.navigationController?.setNavigationBarHidden(true, animated: false) - } override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - + + // Display onboarding if !dataManager.getIsNotInitialLaunch() { getOnboardingViewController(onboardingDataList: OnboardingData.mainView.onboardingDataList).presentFrom(self, animated: true) - dataManager.setIsNotInitialLaunch(isFirst: true) + dataManager.setIsNotInitialLaunch(isNotFirst: true) + } + + // Guide label settings + if dataManager.getIsNotInitialCatTower() { + guideView.isHidden = true + } else { + guideLabel.attributedText = NSAttributedString(string: "Swipe up!".localized) + guideView.isHidden = false } updateViewSettings() touchEvent.delegate = self - - - + } } @@ -121,20 +129,24 @@ extension MainViewController { // apply current settings func updateViewSettings() { + + // count label settings countLabel.isHidden = !dataManager.getPopVisibility() countLabel.text = String(dataManager.getPopCount()) + let catData = dataManager.getCatData() touchUpImageSource = UIImage(named: catData.closedImageName) touchDownImageSource = UIImage(named: catData.openedImageName) popcatImage.image = touchUpImageSource - + let popSoundVolume = dataManager.getPopSoundVolume() touchEvent = TouchEventManager(source: catData.audioSourceName, volume: popSoundVolume) timer.invalidate() + + } - } diff --git a/Popcat/Model/UserDataManager.swift b/Popcat/Model/UserDataManager.swift index 2ffb71c..e7ffc6c 100644 --- a/Popcat/Model/UserDataManager.swift +++ b/Popcat/Model/UserDataManager.swift @@ -29,12 +29,12 @@ class UserDataManager { userDefaults.set(popVisibility, forKey: UserDataKey.popCountVisibility) } - func setIsNotInitialLaunch(isFirst: Bool) { - userDefaults.set(isFirst, forKey: UserDataKey.isNotFirstLaunch) + func setIsNotInitialLaunch(isNotFirst: Bool) { + userDefaults.set(isNotFirst, forKey: UserDataKey.isNotFirstLaunch) } - func setIsNotInitialCatTower(isFirst: Bool) { - userDefaults.set(isFirst, forKey: UserDataKey.isNotFirstCatTower) + func setIsNotInitialCatTower(isNotFirst: Bool) { + userDefaults.set(isNotFirst, forKey: UserDataKey.isNotFirstCatTower) } func setPopSoundVolume(volume: Float){ @@ -89,7 +89,7 @@ class UserDataManager { if isKeyPresentInUserDefaults(key: UserDataKey.isNotFirstLaunch){ return userDefaults.bool(forKey: UserDataKey.isNotFirstLaunch) } else { - setIsNotInitialLaunch(isFirst: false) + setIsNotInitialLaunch(isNotFirst: false) return false } } @@ -99,7 +99,7 @@ class UserDataManager { if isKeyPresentInUserDefaults(key: UserDataKey.isNotFirstCatTower){ return userDefaults.bool(forKey: UserDataKey.isNotFirstCatTower) } else { - setIsNotInitialLaunch(isFirst: false) + setIsNotInitialCatTower(isNotFirst: false) return false } } diff --git a/Popcat/View/CatTowerCell.swift b/Popcat/View/CatTowerCell.swift index b04bee4..f411b11 100644 --- a/Popcat/View/CatTowerCell.swift +++ b/Popcat/View/CatTowerCell.swift @@ -34,8 +34,8 @@ class CatTowerCell: UICollectionViewCell { self.cellView.backgroundColor = UIColor(named: "BgColor") // Make border of CollectionView Cell for selected Cell - if currentCatName == catData.catName.localized { - self.cellView.layer.borderWidth = 2.0 + if currentCatName.localized == catData.catName.localized { + self.cellView.layer.borderWidth = 2.5 } else { self.cellView.layer.borderWidth = 0.75 } diff --git a/Popcat/en.lproj/Localizable.strings b/Popcat/en.lproj/Localizable.strings index 78b9e02..39ce8d6 100644 --- a/Popcat/en.lproj/Localizable.strings +++ b/Popcat/en.lproj/Localizable.strings @@ -72,3 +72,5 @@ "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 index 0c98262..7068797 100644 --- a/Popcat/ko.lproj/Localizable.strings +++ b/Popcat/ko.lproj/Localizable.strings @@ -22,6 +22,11 @@ "Next" = "다음"; + +"Swipe up!" = "위로 스와이프!"; + + + // Cat Tower "Show Pop count" = "탭 횟수 표시"; "Done" = "완료"; @@ -73,3 +78,4 @@ "Bubble Pop" = "풍선껌 고앵"; "Pop Kitten" = "팝 아깽이"; "Cosmic Red" = "우주적 고양이"; +