Skip to content

Commit

Permalink
Merge pull request #131 from Sopt-Mongle/feature/#129
Browse files Browse the repository at this point in the history 
Feature/#129
  • Loading branch information
@Juhyeoklee
Juhyeoklee authored Nov 13, 2020
2 parents 971bcea + bfc506c commit cdf204c
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 34 deletions.
4 changes: 2 additions & 2 deletions Mongle/Mongle.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand All @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion Mongle/Mongle/Resource/APIService/ThemeService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct ThemeService {
static let shared = ThemeService()

func getThemeInfo(idx: Int, completion: @escaping ((NetworkResult<Any>)->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",
Expand Down
23 changes: 23 additions & 0 deletions Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "themeBtnBack.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/themeBtnBack.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Mongle/Mongle/Resource/Assets.xcassets/themeBtnBack.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions Mongle/Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "themeIcBackTouch.png",
"scale" : "1x"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added .../Mongle/Resource/Assets.xcassets/themeIcBackTouch.imageset/themeIcBackTouch.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ngle/Resource/Assets.xcassets/themeIcBackTouch.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ngle/Resource/Assets.xcassets/themeIcBackTouch.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<rect key="frame" x="0.0" y="0.0" width="350" height="344"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XTk-TW-Boh">
<rect key="frame" x="42" y="37.000000000000007" width="258" height="91.666666666666686"/>
<rect key="frame" x="42" y="37.000000000000007" width="258" height="116.66666666666669"/>
<string key="text">온 세상에
나만 깨어있는 것 같은
새벽감성에 읽기 좋은 문장</string>
Expand All @@ -76,15 +76,15 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9IE-gO-9rY" userLabel="bar">
<rect key="frame" x="42" y="154" width="64" height="1"/>
<rect key="frame" x="42" y="179" width="64" height="1"/>
<color key="backgroundColor" red="0.85098039215686272" green="0.85098039215686272" blue="0.85098039215686272" alpha="0.73999999999999999" colorSpace="custom" customColorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="89" id="3BS-fA-gk9"/>
<constraint firstAttribute="height" constant="1" id="M6p-CL-Y2v"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="문장 15개" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mSr-nK-5fu">
<rect key="frame" x="42" y="165" width="56" height="18.333333333333343"/>
<rect key="frame" x="42" y="190" width="60" height="18.333333333333343"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="15"/>
<color key="textColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -209,7 +209,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z6z-fN-ZSv">
<rect key="frame" x="41" y="85.666666666666671" width="38.333333333333343" height="21"/>
<rect key="frame" x="41" y="86" width="41.666666666666657" height="20"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="17"/>
<color key="textColor" red="0.73725490196078436" green="0.73725490196078436" blue="0.73725490196078436" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -291,13 +291,13 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wJ9-Ie-Gvf">
<rect key="frame" x="31.333333333333332" y="87" width="33.666666666666671" height="18.333333333333329"/>
<rect key="frame" x="29.666666666666671" y="87" width="37" height="18.333333333333329"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoM00" family="AppleSDGothicNeoM00" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3f-8z-erq">
<rect key="frame" x="33.333333333333336" y="108.33333333333333" width="29.333333333333336" height="16"/>
<rect key="frame" x="32" y="108.33333333333333" width="32" height="16"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="13"/>
<color key="textColor" red="0.73725490196078436" green="0.73725490196078436" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -364,7 +364,7 @@
<rect key="frame" x="0.0" y="0.0" width="159" height="159"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N9i-ko-rae">
<rect key="frame" x="18" y="18" width="109" height="22.333333333333329"/>
<rect key="frame" x="18" y="18" width="109" height="20"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoSB00" family="AppleSDGothicNeoSB00" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
Expand All @@ -376,15 +376,15 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mainIcBookmark1" translatesAutoresizingMaskIntoConstraints="NO" id="86a-ca-e7e">
<rect key="frame" x="107.33333333333333" y="125" width="10" height="10"/>
<rect key="frame" x="103.33333333333333" y="125" width="10" height="10"/>
<color key="backgroundColor" red="0.51372549020000002" green="0.51372549020000002" blue="0.51372549020000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="9ka-bW-MJx"/>
<constraint firstAttribute="height" constant="10" id="OcM-s1-IVR"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="172" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LoN-DH-lGU">
<rect key="frame" x="123" y="122" width="18" height="16"/>
<rect key="frame" x="119" y="122.33333333333333" width="22" height="15.333333333333329"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="13"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
Expand Down
Loading

0 comments on commit cdf204c

Please sign in to comment.