From cf731bba1d972662ddef745749aee6c39206218a Mon Sep 17 00:00:00 2001 From: Juhyeoklee Date: Sat, 14 Nov 2020 02:26:05 +0900 Subject: [PATCH 1/3] [fix] theme info view --- Mongle/Mongle.xcodeproj/project.pbxproj | 4 +- .../Resource/APIService/ThemeService.swift | 2 +- .../themeBtnBack.imageset/Contents.json | 23 +++++++++ .../themeBtnBack.imageset/themeBtnBack.png | Bin 0 -> 221 bytes .../themeBtnBack.imageset/themeBtnBack@2x.png | Bin 0 -> 310 bytes .../themeBtnBack.imageset/themeBtnBack@3x.png | Bin 0 -> 435 bytes .../themeIcBackTouch.imageset/Contents.json | 23 +++++++++ .../themeIcBackTouch.png | Bin 0 -> 201 bytes .../themeIcBackTouch@2x.png | Bin 0 -> 323 bytes .../themeIcBackTouch@3x.png | Bin 0 -> 524 bytes .../Storyboard/MainTabMain.storyboard | 18 +++---- .../Resource/Storyboard/ThemeInfo.storyboard | 48 +++++++++++------- Mongle/Mongle/Source/VCs/ThemeInfoVC.swift | 27 ++++++++-- 13 files changed, 111 insertions(+), 34 deletions(-) create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/Contents.json create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack@2x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack@3x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/Contents.json create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch@2x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch@3x.png diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj index c55ae5b..0d4c960 100644 --- a/Mongle/Mongle.xcodeproj/project.pbxproj +++ b/Mongle/Mongle.xcodeproj/project.pbxproj @@ -1259,7 +1259,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6ZTQ76LJPZ; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Mongle/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1278,7 +1278,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6ZTQ76LJPZ; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Mongle/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/Mongle/Mongle/Resource/APIService/ThemeService.swift b/Mongle/Mongle/Resource/APIService/ThemeService.swift index 94607a0..ca3d854 100644 --- a/Mongle/Mongle/Resource/APIService/ThemeService.swift +++ b/Mongle/Mongle/Resource/APIService/ThemeService.swift @@ -15,7 +15,7 @@ struct ThemeService { static let shared = ThemeService() func getThemeInfo(idx: Int, completion: @escaping ((NetworkResult)->Void)) { - let token = UserDefaults.standard.string(forKey: UserDefaultKeys.token.rawValue)! + let token: String = UserDefaults.standard.string(forKey: UserDefaultKeys.token.rawValue) ?? "guest" let header: HTTPHeaders = [ "Content-Type":"application/json", diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/Contents.json new file mode 100644 index 0000000..7ebe5cb --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "themeBtnBack.png", + "scale" : "1x", + "idiom" : "universal" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "themeBtnBack@2x.png" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "themeBtnBack@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack.png b/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack.png new file mode 100644 index 0000000000000000000000000000000000000000..aa1563fe5dceefb758490d38ad0ce357d54e71cd GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^+(0bM!3HGVG{0W}QjEnx?oJHr&dIz4ax79KJkxxA z8MJ_G4hF{dOa>N^5+IfWVg?4L1x#=e?gh+nwlGNY)3YV@Kq}bN#W6%fG&wgTe~DWM4fTDCOl literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c632d6556f761b21f145b41748c9bca616252978 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^qCl+1!3HF?e_oghq!^2X+?^QKos)S94s!k&4JZpV?QYvBiA|a#+cjws!7G_60Uf2E6-y%bOj& z8u{+9)-o?jyK#a4L8Fy_IHMC|`l3YVaHoxrmMl<{`sd~ROS0agOaJ{g&R0Gi=_f94 zSknAVrh3Wu)~XMg(Z)Kl46_>cDk!<;@Jw`C(!q6P$tBV3IY&JA9gqpz_KY=W6XzXA hhW8y$V)flh`Na=}mTg!*PoEj&eot3Fmvv4FO#n}zVPXIP literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a83b54e1b944dd03f3aa7c781935554f8722dec2 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bh!3HG57i%sDQjEnx?oJHr&dIz4ax79KJkxxA z8MJ_G4hF{dOa>N^5+IfWVg?4L1x#=eg$2xTwk1gN(Y~!#K*gG#E{-7)oNpr?xegf! z3`1MKso*y#$bqDn;R@G0aJHW5;gG2rS`x3t;%&xPR-O6K~dtj65%9%HBaz;#2 z`EPJ)(;bC%p=;b%OE&Orbl=mr){;}9?SSn}>!d6%CWf8vS(4nwOboq^;`dqXn-i=o z7;|o2D=u?-a9B(K=F2q>(;lYmNEEpc$Sq^&_j(0yvdKH8!xtkP|1`IK-s`?~x5Lpn z+g9#LvtcrQDy(L_FMFc;L|^@LJENb>tvkKq!;O%tT)p@00zXX~o^jlNzAe#DiM6Vy z<^PG2iB)#-$DS#DoZ|0w!8ORqD}XVr5}ADDtD5tk+iFYll;2G}F1P-@xOG?j$}K^q z#PWEDf@iB_S&fb}@*A(~pT@Y$NynY}4c8Zj-ARJE7uwBvK!NA!>gTe~DWM4fpM#zK literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/Contents.json new file mode 100644 index 0000000..d9cbaec --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "themeIcBackTouch.png", + "scale" : "1x" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "themeIcBackTouch@2x.png" + }, + { + "idiom" : "universal", + "filename" : "themeIcBackTouch@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch.png b/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch.png new file mode 100644 index 0000000000000000000000000000000000000000..947120fd1e4cdb9d26487e72b995e21a308a3efb GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}7O4@QX}-P; zT0k}j17mw80}DtA5K93u0|V0nCb)>f0%imoB>CgNpBa#{_jGX#$zXkZp%El_c)`zL r`6sObi3b`Onb~+G3=;4$4xB!~pklzl*f(RH7)ZCLtDnm{r-UW|2J9)x literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..763e8f35a8cf3691fb5c404c97c9260235caa45b GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|EK(yp(|mmy zw18|52FCVG1{RPKAeI7R1_q`DOmLBe1FMGaQo;E4f+0xXp#@+4 sb2;KW91;&SFfz08NEjpxPR1T)<_QT5jAsv=eh%`Cr>mdKI;Vst04P*NssI20 literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..af62648b11610f26aedbaedef91b5abb9e3e46a9 GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>cF%}28J29*~C-V}>u}F>ZO!M_+ z&;qhK7#Q0#8CXC{fLIEM85o!rFu_G8EMP{kL6S1xH8ueiH+i}^hEy=Vyga^#bF7p`}dpBJ84T=>{S3j3^P6 - + @@ -84,7 +84,7 @@