diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj index 698a62b..265cbc5 100644 --- a/Mongle/Mongle.xcodeproj/project.pbxproj +++ b/Mongle/Mongle.xcodeproj/project.pbxproj @@ -1313,7 +1313,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; + PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12; + PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1332,7 +1333,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; + PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12; + PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json index bb127f9..82a485d 100644 --- a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,85 +1,85 @@ { "images" : [ { - "filename" : "Icon-40.png", + "filename" : "Icon-40 (1)-1.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "Icon-60.png", + "filename" : "Icon-60 (1).png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "Icon-58.png", + "filename" : "Icon-58 (1).png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "Icon-87.png", + "filename" : "Icon-87 (1).png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "Icon-80.png", + "filename" : "Icon-80 (1).png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "Icon-120.png", + "filename" : "Icon-120 (1)-1.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "Icon-121.png", + "filename" : "Icon-120 (1).png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "Icon-180.png", + "filename" : "Icon-180 (1).png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "Icon-20.png", + "filename" : "Icon-20 (1).png", "idiom" : "ipad", "scale" : "1x", "size" : "20x20" }, { - "filename" : "Icon-41.png", + "filename" : "Icon-40 (1).png", "idiom" : "ipad", "scale" : "2x", "size" : "20x20" }, { - "filename" : "Icon-29.png", + "filename" : "Icon-29 (1).png", "idiom" : "ipad", "scale" : "1x", "size" : "29x29" }, { - "filename" : "Icon-59.png", + "filename" : "Icon-58 (1)-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "29x29" }, { - "filename" : "Icon-42.png", + "filename" : "Icon-40 (1)-2.png", "idiom" : "ipad", "scale" : "1x", "size" : "40x40" }, { - "filename" : "Icon-81.png", + "filename" : "Icon-80 (1)-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "40x40" @@ -103,7 +103,7 @@ "size" : "83.5x83.5" }, { - "filename" : "Icon-1024.png", + "filename" : "appstore.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-1024.png deleted file mode 100644 index c3be790..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-1024.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120 (1)-1.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120 (1)-1.png new file mode 100644 index 0000000..8026b48 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120 (1)-1.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120 (1).png new file mode 100644 index 0000000..8026b48 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120.png deleted file mode 100644 index b554288..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-120.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-121.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-121.png deleted file mode 100644 index b554288..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-121.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-152.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-152.png index b35794d..eb0508c 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-152.png and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-152.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-167.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-167.png index 2edaa4f..f92c74b 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-167.png and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-167.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-180 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-180 (1).png new file mode 100644 index 0000000..389ea48 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-180 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-180.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-180.png deleted file mode 100644 index 909502a..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-180.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-20 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-20 (1).png new file mode 100644 index 0000000..d0d0ee0 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-20 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-20.png deleted file mode 100644 index e253a52..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-20.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-29 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-29 (1).png new file mode 100644 index 0000000..d6e16ab Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-29 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-29.png deleted file mode 100644 index fd41f6c..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-29.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1)-1.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1)-1.png new file mode 100644 index 0000000..c6cb708 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1)-1.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1)-2.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1)-2.png new file mode 100644 index 0000000..c6cb708 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1)-2.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1).png new file mode 100644 index 0000000..c6cb708 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40.png deleted file mode 100644 index 90e1421..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-40.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-41.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-41.png deleted file mode 100644 index 90e1421..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-41.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-42.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-42.png deleted file mode 100644 index 90e1421..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-42.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58 (1)-1.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58 (1)-1.png new file mode 100644 index 0000000..b5db7f6 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58 (1)-1.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58 (1).png new file mode 100644 index 0000000..b5db7f6 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58.png deleted file mode 100644 index e4218ed..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-58.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-59.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-59.png deleted file mode 100644 index e4218ed..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-59.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-60 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-60 (1).png new file mode 100644 index 0000000..fb8c086 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-60 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-60.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-60.png deleted file mode 100644 index e402d2c..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-60.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-76.png index 165ec1e..98ca559 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-76.png and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80 (1)-1.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80 (1)-1.png new file mode 100644 index 0000000..367134f Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80 (1)-1.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80 (1).png new file mode 100644 index 0000000..367134f Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80.png deleted file mode 100644 index c24d8d6..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-80.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-81.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-81.png deleted file mode 100644 index c24d8d6..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-81.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-87 (1).png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-87 (1).png new file mode 100644 index 0000000..f195ffe Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-87 (1).png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-87.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-87.png deleted file mode 100644 index a0ce2eb..0000000 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/Icon-87.png and /dev/null differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/appstore.png b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/appstore.png new file mode 100644 index 0000000..6b48cbc Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/AppIcon.appiconset/appstore.png differ diff --git a/Mongle/Mongle/SceneDelegate.swift b/Mongle/Mongle/SceneDelegate.swift index 0dca86b..c3c34ee 100644 --- a/Mongle/Mongle/SceneDelegate.swift +++ b/Mongle/Mongle/SceneDelegate.swift @@ -113,18 +113,19 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func sceneWillEnterForeground(_ scene: UIScene) { // Called as the scene transitions from the background to the foreground. // Use this method to undo the changes made on entering the background. - - let date = Date() - let formatter = DateFormatter() - formatter.dateFormat = "yyyy-MM-dd HH:mm:ss" - let originDate = UserDefaults.standard.string(forKey: "tokenTime")! - let ogD = formatter.date(from: originDate) - let calendar = Calendar.current - let diff = calendar.dateComponents([.minute], from: ogD!, to: date) - - if diff.minute! > 210 { - let defaults = UserDefaults.standard - if let token = defaults.string(forKey: "token"){ + let defaults = UserDefaults.standard + if let token = defaults.string(forKey: "token"){ + let date = Date() + let formatter = DateFormatter() + formatter.dateFormat = "yyyy-MM-dd HH:mm:ss" + let originDate = UserDefaults.standard.string(forKey: "tokenTime")! + let ogD = formatter.date(from: originDate) + let calendar = Calendar.current + let diff = calendar.dateComponents([.minute], from: ogD!, to: date) + + if diff.minute! > 210 { + + // 둘러보기 if token == "guest" || token == "1"{