diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj index 4ca2553..1a2fa23 100644 --- a/Mongle/Mongle.xcodeproj/project.pbxproj +++ b/Mongle/Mongle.xcodeproj/project.pbxproj @@ -1237,7 +1237,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.5; + IPHONEOS_DEPLOYMENT_TARGET = 14.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1291,7 +1291,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.5; + IPHONEOS_DEPLOYMENT_TARGET = 14.2; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -1313,11 +1313,11 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.04; + MARKETING_VERSION = 1.08; PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -1333,11 +1333,11 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.04; + MARKETING_VERSION = 1.08; PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/Mongle/Mongle/AppDelegate.swift b/Mongle/Mongle/AppDelegate.swift index 2de468c..8ef2cc1 100644 --- a/Mongle/Mongle/AppDelegate.swift +++ b/Mongle/Mongle/AppDelegate.swift @@ -38,5 +38,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } + } diff --git a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/Contents.json index 805d77b..608c801 100644 --- a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/Contents.json +++ b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/Contents.json @@ -2,18 +2,18 @@ "images" : [ { "filename" : "onboarding1Bg.png", - "idiom" : "universal", - "scale" : "1x" + "scale" : "1x", + "idiom" : "universal" }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "onboarding1Bg@2x.png" + "filename" : "onboarding1Bg@2x.png", + "scale" : "2x" }, { - "idiom" : "universal", "filename" : "onboarding1Bg@3x.png", - "scale" : "3x" + "scale" : "3x", + "idiom" : "universal" } ], "info" : { diff --git a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg.png b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg.png index c7bfe55..a614616 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg.png and b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@2x.png index e454c99..f85640e 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@2x.png and b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@3x.png index 38709db..0e40496 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@3x.png and b/Mongle/Mongle/Resource/Assets.xcassets/onboarding1Bg.imageset/onboarding1Bg@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/Contents.json new file mode 100644 index 0000000..f8eea3c --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "idiom" : "universal", + "filename" : "writingSentenceBookBtnBookSearch.png" + }, + { + "idiom" : "universal", + "filename" : "writingSentenceBookBtnBookSearch@2x.png", + "scale" : "2x" + }, + { + "filename" : "writingSentenceBookBtnBookSearch@3x.png", + "scale" : "3x", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch.png b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch.png new file mode 100644 index 0000000..15f3afe Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch@2x.png new file mode 100644 index 0000000..816f688 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch@3x.png new file mode 100644 index 0000000..f7a9282 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookBtnBookSearch.imageset/writingSentenceBookBtnBookSearch@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/Contents.json new file mode 100644 index 0000000..c57708a --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "writingSentenceBookErrorBtnBookSearch.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "writingSentenceBookErrorBtnBookSearch@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "filename" : "writingSentenceBookErrorBtnBookSearch@3x.png", + "scale" : "3x", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch.png b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch.png new file mode 100644 index 0000000..1ac19ec Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch@2x.png new file mode 100644 index 0000000..6967c87 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch@3x.png new file mode 100644 index 0000000..5109ab8 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/writingSentenceBookErrorBtnBookSearch.imageset/writingSentenceBookErrorBtnBookSearch@3x.png differ diff --git a/Mongle/Mongle/Resource/Storyboard/CuratorTabInfo.storyboard b/Mongle/Mongle/Resource/Storyboard/CuratorTabInfo.storyboard index 2475265..620b555 100644 --- a/Mongle/Mongle/Resource/Storyboard/CuratorTabInfo.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/CuratorTabInfo.storyboard @@ -2,7 +2,6 @@ - @@ -241,16 +240,16 @@ - + - + - + - + @@ -420,7 +419,7 @@ - + diff --git a/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard b/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard index 9596bbb..021e618 100644 --- a/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard @@ -29,7 +29,6 @@ - diff --git a/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard b/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard index 2eb554b..e3a3e41 100644 --- a/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard @@ -2,7 +2,6 @@ - @@ -62,80 +61,77 @@ - + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + - - @@ -161,6 +157,7 @@ + diff --git a/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard b/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard index 863834a..1d45aea 100644 --- a/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard @@ -84,12 +84,12 @@