diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/Contents.json index 7f18add..99997af 100644 --- a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/Contents.json +++ b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/Contents.json @@ -1,19 +1,19 @@ { "images" : [ { - "idiom" : "universal", "filename" : "sentenceThemeOBtnBack.png", - "scale" : "1x" + "scale" : "1x", + "idiom" : "universal" }, { - "idiom" : "universal", + "filename" : "sentenceThemeOBtnBack@2x.png", "scale" : "2x", - "filename" : "sentenceThemeOBtnBack@2x.png" + "idiom" : "universal" }, { - "scale" : "3x", + "filename" : "sentenceThemeOBtnBack@3x.png", "idiom" : "universal", - "filename" : "sentenceThemeOBtnBack@3x.png" + "scale" : "3x" } ], "info" : { diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack.png index 9289405..843e0ce 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack.png and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@2x.png index 18041f0..1c4a51b 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@2x.png and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@3x.png index fe33c18..a83b54e 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@3x.png and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOBtnBack.imageset/sentenceThemeOBtnBack@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/Contents.json new file mode 100644 index 0000000..44c2381 --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "sentenceThemeOIcCompany.png" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "sentenceThemeOIcCompany@2x.png" + }, + { + "idiom" : "universal", + "filename" : "sentenceThemeOIcCompany@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany.png new file mode 100644 index 0000000..613560f Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany@2x.png new file mode 100644 index 0000000..ac97404 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany@3x.png new file mode 100644 index 0000000..40fd130 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcCompany.imageset/sentenceThemeOIcCompany@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/Contents.json new file mode 100644 index 0000000..7bea1b1 --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "idiom" : "universal", + "filename" : "sentenceThemeOIcSentenceBookmark1.png" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "sentenceThemeOIcSentenceBookmark1@2x.png" + }, + { + "idiom" : "universal", + "filename" : "sentenceThemeOIcSentenceBookmark1@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1.png new file mode 100644 index 0000000..1059ce7 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1@2x.png new file mode 100644 index 0000000..4b41781 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1@3x.png new file mode 100644 index 0000000..2c7ca48 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceBookmark1.imageset/sentenceThemeOIcSentenceBookmark1@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/Contents.json new file mode 100644 index 0000000..42bba3c --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "sentenceThemeOIcSentenceLike1.png" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "sentenceThemeOIcSentenceLike1@2x.png" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "sentenceThemeOIcSentenceLike1@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1.png new file mode 100644 index 0000000..edccbf6 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1@2x.png new file mode 100644 index 0000000..54819a1 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1@3x.png new file mode 100644 index 0000000..9cfd43f Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcSentenceLike1.imageset/sentenceThemeOIcSentenceLike1@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/Contents.json index 831a784..32ffdb5 100644 --- a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/Contents.json +++ b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/Contents.json @@ -1,19 +1,19 @@ { "images" : [ { + "scale" : "1x", "filename" : "sentenceThemeOIcWriter.png", - "idiom" : "universal", - "scale" : "1x" + "idiom" : "universal" }, { "scale" : "2x", - "filename" : "sentenceThemeOIcWriter@2x.png", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "sentenceThemeOIcWriter@2x.png" }, { - "idiom" : "universal", "filename" : "sentenceThemeOIcWriter@3x.png", - "scale" : "3x" + "scale" : "3x", + "idiom" : "universal" } ], "info" : { diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter.png index b9e0e24..1485b95 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter.png and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@2x.png index d0ab46b..944ff67 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@2x.png and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@3x.png index be8b146..d75af6a 100644 Binary files a/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@3x.png and b/Mongle/Mongle/Resource/Assets.xcassets/sentenceThemeOIcWriter.imageset/sentenceThemeOIcWriter@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/slateGreen.colorset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/slateGreen.colorset/Contents.json new file mode 100644 index 0000000..81c5062 --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/slateGreen.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "0.550", + "blue" : "105", + "green" : "145", + "red" : "90" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/Contents.json new file mode 100644 index 0000000..c9f942e --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "filename" : "themeSentenceThemeOBoxBlur.png", + "idiom" : "universal" + }, + { + "filename" : "themeSentenceThemeOBoxBlur@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "scale" : "3x", + "filename" : "themeSentenceThemeOBoxBlur@3x.png", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur.png new file mode 100644 index 0000000..d86e46b Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur@2x.png new file mode 100644 index 0000000..6ddb301 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur@3x.png new file mode 100644 index 0000000..9d17b67 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur.imageset/themeSentenceThemeOBoxBlur@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/Contents.json new file mode 100644 index 0000000..5090f7b --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "idiom" : "universal", + "filename" : "themeSentenceThemeOBoxBlur2.png" + }, + { + "filename" : "themeSentenceThemeOBoxBlur2@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "themeSentenceThemeOBoxBlur2@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2.png new file mode 100644 index 0000000..1972f97 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2@2x.png new file mode 100644 index 0000000..1ef712f Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2@3x.png new file mode 100644 index 0000000..d1a5b22 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxBlur2.imageset/themeSentenceThemeOBoxBlur2@3x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/Contents.json new file mode 100644 index 0000000..4f558d6 --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "idiom" : "universal", + "filename" : "themeSentenceThemeOBoxLike.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "themeSentenceThemeOBoxLike@2x.png" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "themeSentenceThemeOBoxLike@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike.png new file mode 100644 index 0000000..5719390 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike@2x.png new file mode 100644 index 0000000..149395c Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike@2x.png differ diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike@3x.png new file mode 100644 index 0000000..c4e4611 Binary files /dev/null and b/Mongle/Mongle/Resource/Assets.xcassets/themeSentenceThemeOBoxLike.imageset/themeSentenceThemeOBoxLike@3x.png differ diff --git a/Mongle/Mongle/Resource/Storyboard/SentenceInfo.storyboard b/Mongle/Mongle/Resource/Storyboard/SentenceInfo.storyboard index 0aaf354..aea4d17 100644 --- a/Mongle/Mongle/Resource/Storyboard/SentenceInfo.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/SentenceInfo.storyboard @@ -1,15 +1,21 @@ - + - + + + + AppleSDGothicNeoL00 + + AppleSDGothicNeoM00 + AppleSDGothicNeoR00 @@ -23,96 +29,98 @@ + + + + + + + + - - + + - + - + - + - - - - + + + @@ -198,7 +200,7 @@ - + @@ -230,7 +232,7 @@ - + @@ -248,7 +250,7 @@ - + @@ -291,111 +293,139 @@ - + - - - - - - - - - - - - - - - - + + + + + + - - + + - - - - - - - + + - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + - + + + + + + + + + + + + + - + + + + + + + + + + - - - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + + + + + - - + + + + + + + - + + + + + - @@ -407,22 +437,35 @@ + + - + + - + + + + - - + + + + + + + + + diff --git a/Mongle/Mongle/Source/VCs/SentenceInfoVC.swift b/Mongle/Mongle/Source/VCs/SentenceInfoVC.swift index e3ceb2e..6cfee25 100644 --- a/Mongle/Mongle/Source/VCs/SentenceInfoVC.swift +++ b/Mongle/Mongle/Source/VCs/SentenceInfoVC.swift @@ -24,6 +24,9 @@ class SentenceInfoVC: UIViewController { @IBOutlet var likeView: UIView! @IBOutlet var bookmarkView: UIView! + @IBOutlet var themeImageView: UIImageView! + @IBOutlet var themeNameLabel: UILabel! + //MARK:- UI Component lazy var popup = MonglePopupView(frame: CGRect(x: 0, y: 0, width: 304, height: 193)) lazy var blur = UIView().then { @@ -47,6 +50,7 @@ class SentenceInfoVC: UIViewController { override func viewDidLoad() { super.viewDidLoad() addGesture() + bindThemeInfo() layoutTableView.delegate = self layoutTableView.dataSource = self } @@ -75,6 +79,12 @@ class SentenceInfoVC: UIViewController { } } } + + func bindThemeInfo() { + themeImageView.image = themeImage + themeNameLabel.text = themeText + } + func getOtherSentece(){ SentenceService.shared.getSentence(idx: self.sentenceIdx ?? 0) { networkResult in switch networkResult { @@ -197,18 +207,15 @@ class SentenceInfoVC: UIViewController { func showPopUp(){ - popup.setPopUp(state: .delete, - yesHandler: { [weak self] in - print(#function) - self?.navigationController?.popViewController(animated: true) - - }, - noHandler: {[weak self] in - self?.blur.removeFromSuperview() - self?.popup.removeFromSuperview() - - }, - confirmHandler: nil) + popup.setPopUp(state: .delete, yesHandler: { [weak self] in + print(#function) + self?.navigationController?.popViewController(animated: true) + + }, noHandler: {[weak self] in + self?.blur.removeFromSuperview() + self?.popup.removeFromSuperview() + + },confirmHandler: nil) self.view.addSubview(blur) @@ -224,7 +231,7 @@ class SentenceInfoVC: UIViewController { } } - @objc func touchUpBackButton(){ + @IBAction func touchUpBackButton(){ self.navigationController?.popViewController(animated: true) } @@ -236,8 +243,6 @@ class SentenceInfoVC: UIViewController { self.navigationController?.pushViewController(dvc, animated: true) } - - } //MARK:- Extension @@ -259,12 +264,10 @@ extension SentenceInfoVC: UITableViewDelegate { } func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { - if section == 0 { - return 144 - } - else { + if section == 1 { return 95 } + return 43 } func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { @@ -279,54 +282,7 @@ extension SentenceInfoVC: UITableViewDelegate { func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { if section == 0 { - let view = UIView(frame: CGRect(x: 0, y: 0, width: 375, height: 144)) - - var imageView = UIImageView(image: self.themeImage) -// imageView.contentMode = .scaleAspectFill -// imageView. - - let backButton = UIButton().then { - $0.frame = CGRect(x: 0, y: 0, width: 48, height: 48) - $0.setImage(UIImage(named: "sentenceThemeOBtnBack"), for: .normal) - $0.addTarget(self, action: #selector(touchUpBackButton), for: .touchUpInside) - } - - let themeLabel = UILabel().then { - $0.text = themeText - $0.textColor = .white - $0.font = UIFont(name: "AppleSDGothicNeo-Medium", size: 18.0)! - $0.numberOfLines = 2 - $0.lineBreakMode = .byCharWrapping - } - - if !hasTheme { - self.tableViewBottomConstraint.constant = -likeAndBookmarkView.frame.height - themeLabel.text = "테마 없는 문장" - imageView = UIImageView(image: UIImage(named: "sentenceThemeXBgThemeX")) - backButton.setImage(UIImage(named: "sentenceThemeXBtnBack"), for: .normal) - likeAndBookmarkView.isHidden = true - } - - view.addSubview(imageView) - view.addSubview(backButton) - view.addSubview(themeLabel) - - imageView.snp.makeConstraints { - $0.top.leading.trailing.bottom.equalToSuperview() - } - backButton.snp.makeConstraints { - $0.top.equalToSuperview().offset(37) - $0.leading.equalToSuperview() - $0.height.width.equalTo(48) - } - - themeLabel.snp.makeConstraints { - $0.leading.equalToSuperview().offset(28) - $0.trailing.equalToSuperview().offset(-28) - $0.bottom.equalToSuperview().offset(-19) - } - view.backgroundColor = .brown - return view + return UIView() } else { let view = UIView(frame: CGRect(x: 0, y: 0, width: 375, height: 95)) @@ -339,8 +295,6 @@ extension SentenceInfoVC: UITableViewDelegate { $0.leading.equalToSuperview().offset(16) $0.bottom.equalToSuperview().offset(-22) } - - return view } }