diff --git a/19AW/makeup_01_19aw.png b/19AW/makeup_01_19aw.png new file mode 100644 index 0000000..ca8d606 Binary files /dev/null and b/19AW/makeup_01_19aw.png differ diff --git a/19AW/makeup_02_19aw.png b/19AW/makeup_02_19aw.png new file mode 100644 index 0000000..8232784 Binary files /dev/null and b/19AW/makeup_02_19aw.png differ diff --git a/19AW/makeup_03_19aw.png b/19AW/makeup_03_19aw.png new file mode 100644 index 0000000..990016d Binary files /dev/null and b/19AW/makeup_03_19aw.png differ diff --git a/19AW/makeup_04_19aw.png b/19AW/makeup_04_19aw.png new file mode 100644 index 0000000..1020123 Binary files /dev/null and b/19AW/makeup_04_19aw.png differ diff --git a/19AW/makeup_05_19aw.png b/19AW/makeup_05_19aw.png new file mode 100644 index 0000000..4734de9 Binary files /dev/null and b/19AW/makeup_05_19aw.png differ diff --git a/19AW/makeup_06_19aw.png b/19AW/makeup_06_19aw.png new file mode 100644 index 0000000..29381b1 Binary files /dev/null and b/19AW/makeup_06_19aw.png differ diff --git a/19AW/makeup_07_19aw.png b/19AW/makeup_07_19aw.png new file mode 100644 index 0000000..f6476d4 Binary files /dev/null and b/19AW/makeup_07_19aw.png differ diff --git a/19AW/one_line.png b/19AW/one_line.png new file mode 100644 index 0000000..594393c Binary files /dev/null and b/19AW/one_line.png differ diff --git a/Share Beauty App.xcodeproj/project.pbxproj b/Share Beauty App.xcodeproj/project.pbxproj index f0ecb13..8f02dcf 100644 --- a/Share Beauty App.xcodeproj/project.pbxproj +++ b/Share Beauty App.xcodeproj/project.pbxproj @@ -147,6 +147,7 @@ 443E1EEA22702D6900674B3A /* page1_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 443E1EE922702D6900674B3A /* page1_logo.png */; }; 443E1EEC22702D7C00674B3A /* p2_complexion.png in Resources */ = {isa = PBXBuildFile; fileRef = 443E1EEB22702D7C00674B3A /* p2_complexion.png */; }; 443E1EEE22702D8E00674B3A /* p2_makeup.png in Resources */ = {isa = PBXBuildFile; fileRef = 443E1EED22702D8D00674B3A /* p2_makeup.png */; }; + 445DA9BE22840B4F00C80EC1 /* one_line.png in Resources */ = {isa = PBXBuildFile; fileRef = 445DA9BD22840B4F00C80EC1 /* one_line.png */; }; 44B34E1F224CA2A10097A6D1 /* 03_back_07.png in Resources */ = {isa = PBXBuildFile; fileRef = 44B34E1E224CA2A10097A6D1 /* 03_back_07.png */; }; 44B34E21224CA2A90097A6D1 /* 03_back_08.png in Resources */ = {isa = PBXBuildFile; fileRef = 44B34E20224CA2A90097A6D1 /* 03_back_08.png */; }; 44B34E25224CC21E0097A6D1 /* SMBK19AWTextureViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44B34E24224CC21E0097A6D1 /* SMBK19AWTextureViewController.swift */; }; @@ -181,7 +182,16 @@ 44D7BC0E2283DDFC0073D506 /* p9_01.png in Resources */ = {isa = PBXBuildFile; fileRef = 44D7BBF42283DDFC0073D506 /* p9_01.png */; }; 44D7BC0F2283DDFC0073D506 /* p11_02.png in Resources */ = {isa = PBXBuildFile; fileRef = 44D7BBF52283DDFC0073D506 /* p11_02.png */; }; 44D7BC102283DDFC0073D506 /* p10_04.png in Resources */ = {isa = PBXBuildFile; fileRef = 44D7BBF62283DDFC0073D506 /* p10_04.png */; }; + 44D7BC122283EBA60073D506 /* MakeUp19AWView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44D7BC112283EBA60073D506 /* MakeUp19AWView.swift */; }; + 44D7BC142283EBBA0073D506 /* MakeUp19AWView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 44D7BC132283EBBA0073D506 /* MakeUp19AWView.xib */; }; 4F00CD4122840E890092F7B4 /* UTM_Edited33.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD4022840E890092F7B4 /* UTM_Edited33.mp4 */; }; + 4F00CD49228522D80092F7B4 /* makeup_03_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD42228522D70092F7B4 /* makeup_03_19aw.png */; }; + 4F00CD4A228522D80092F7B4 /* makeup_02_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD43228522D70092F7B4 /* makeup_02_19aw.png */; }; + 4F00CD4B228522D80092F7B4 /* makeup_01_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD44228522D70092F7B4 /* makeup_01_19aw.png */; }; + 4F00CD4C228522D80092F7B4 /* makeup_06_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD45228522D70092F7B4 /* makeup_06_19aw.png */; }; + 4F00CD4D228522D80092F7B4 /* makeup_04_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD46228522D80092F7B4 /* makeup_04_19aw.png */; }; + 4F00CD4E228522D80092F7B4 /* makeup_05_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD47228522D80092F7B4 /* makeup_05_19aw.png */; }; + 4F00CD4F228522D80092F7B4 /* makeup_07_19aw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F00CD48228522D80092F7B4 /* makeup_07_19aw.png */; }; 4F1DB747227ED1450062F4CA /* BNF618FirstTechView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1DB745227ED1450062F4CA /* BNF618FirstTechView.xib */; }; 4F1DB748227ED1450062F4CA /* BNF618FirstTechView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F1DB746227ED1450062F4CA /* BNF618FirstTechView.swift */; }; 4F1DB74A227ED1B20062F4CA /* BNFTech1.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F1DB749227ED1B20062F4CA /* BNFTech1.png */; }; @@ -1074,6 +1084,7 @@ 443E1EE922702D6900674B3A /* page1_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page1_logo.png; sourceTree = ""; }; 443E1EEB22702D7C00674B3A /* p2_complexion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = p2_complexion.png; sourceTree = ""; }; 443E1EED22702D8D00674B3A /* p2_makeup.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = p2_makeup.png; sourceTree = ""; }; + 445DA9BD22840B4F00C80EC1 /* one_line.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = one_line.png; sourceTree = ""; }; 44B34E1E224CA2A10097A6D1 /* 03_back_07.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 03_back_07.png; sourceTree = ""; }; 44B34E20224CA2A90097A6D1 /* 03_back_08.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 03_back_08.png; sourceTree = ""; }; 44B34E24224CC21E0097A6D1 /* SMBK19AWTextureViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SMBK19AWTextureViewController.swift; sourceTree = ""; }; @@ -1108,7 +1119,16 @@ 44D7BBF42283DDFC0073D506 /* p9_01.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = p9_01.png; sourceTree = ""; }; 44D7BBF52283DDFC0073D506 /* p11_02.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = p11_02.png; sourceTree = ""; }; 44D7BBF62283DDFC0073D506 /* p10_04.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = p10_04.png; sourceTree = ""; }; + 44D7BC112283EBA60073D506 /* MakeUp19AWView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakeUp19AWView.swift; sourceTree = ""; }; + 44D7BC132283EBBA0073D506 /* MakeUp19AWView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MakeUp19AWView.xib; sourceTree = ""; }; 4F00CD4022840E890092F7B4 /* UTM_Edited33.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = UTM_Edited33.mp4; sourceTree = ""; }; + 4F00CD42228522D70092F7B4 /* makeup_03_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_03_19aw.png; sourceTree = ""; }; + 4F00CD43228522D70092F7B4 /* makeup_02_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_02_19aw.png; sourceTree = ""; }; + 4F00CD44228522D70092F7B4 /* makeup_01_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_01_19aw.png; sourceTree = ""; }; + 4F00CD45228522D70092F7B4 /* makeup_06_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_06_19aw.png; sourceTree = ""; }; + 4F00CD46228522D80092F7B4 /* makeup_04_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_04_19aw.png; sourceTree = ""; }; + 4F00CD47228522D80092F7B4 /* makeup_05_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_05_19aw.png; sourceTree = ""; }; + 4F00CD48228522D80092F7B4 /* makeup_07_19aw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeup_07_19aw.png; sourceTree = ""; }; 4F1DB745227ED1450062F4CA /* BNF618FirstTechView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BNF618FirstTechView.xib; sourceTree = ""; }; 4F1DB746227ED1450062F4CA /* BNF618FirstTechView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BNF618FirstTechView.swift; sourceTree = ""; }; 4F1DB749227ED1B20062F4CA /* BNFTech1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BNFTech1.png; sourceTree = ""; }; @@ -2819,6 +2839,8 @@ C023C2161E14EBA7002FBB1B /* LineStepLowerCollectionViewCell.xib */, C023C2191E14FC0E002FBB1B /* LineStepUpperCollectionViewCell.swift */, C023C21A1E14FC0E002FBB1B /* LineStepUpperCollectionViewCell.xib */, + 44D7BC112283EBA60073D506 /* MakeUp19AWView.swift */, + 44D7BC132283EBBA0073D506 /* MakeUp19AWView.xib */, C02818AB1E6D449300D4DADA /* MakeupUsageView.swift */, C02818AD1E6D44CA00D4DADA /* MakeupUsageView.xib */, C0665AC71D6ACA0300B3D8E5 /* NavigationView.swift */, @@ -2935,6 +2957,13 @@ children = ( 4F00CD4022840E890092F7B4 /* UTM_Edited33.mp4 */, 4F3B4E8C22806E4D008FAB09 /* BNF619Efficacy2.png */, + 4F00CD44228522D70092F7B4 /* makeup_01_19aw.png */, + 4F00CD43228522D70092F7B4 /* makeup_02_19aw.png */, + 4F00CD42228522D70092F7B4 /* makeup_03_19aw.png */, + 4F00CD46228522D80092F7B4 /* makeup_04_19aw.png */, + 4F00CD47228522D80092F7B4 /* makeup_05_19aw.png */, + 4F00CD45228522D70092F7B4 /* makeup_06_19aw.png */, + 4F00CD48228522D80092F7B4 /* makeup_07_19aw.png */, 4F3B4E7E22805F57008FAB09 /* BNF619Tech3.png */, 4F3B4E782280592C008FAB09 /* BNF619Tech1.png */, 4F3B4E7222805337008FAB09 /* BNFEfficacy3.png */, @@ -2948,6 +2977,7 @@ 4FCDAF66225C7D5300F7BBF2 /* graph_anim_623.png */, 4FCDAF6E225C904800F7BBF2 /* graph_anim_624.png */, 4FCDAF60225C703300F7BBF2 /* waso_tech_623_bg.png */, + 445DA9BD22840B4F00C80EC1 /* one_line.png */, DE673F20221698EB0081064E /* 03_back_06.png */, 44B34E1E224CA2A10097A6D1 /* 03_back_07.png */, 44B34E20224CA2A90097A6D1 /* 03_back_08.png */, @@ -3737,6 +3767,7 @@ DE06F7131F16450200EF2FE2 /* body.png in Resources */, DE2C90A11E9C66E600B5FC4A /* LXYutakaTreatmentView.xib in Resources */, 44B34E2B224CC3F10097A6D1 /* SMBK19AWTextureViewController.storyboard in Resources */, + 44D7BC142283EBBA0073D506 /* MakeUp19AWView.xib in Resources */, C050C90B1E82619F0009679D /* ss_ibuki_bg.png in Resources */, C050C9971E8267450009679D /* t_btn_white.png in Resources */, 6E4ABB3120AA6CAF000355D2 /* complexion_40.png in Resources */, @@ -3832,6 +3863,7 @@ C050C91D1E82619F0009679D /* orange_C.png in Resources */, 419484802153A27A00680A26 /* cleanser_scent_03.png in Resources */, 4F3B4E8D22806E4E008FAB09 /* BNF619Efficacy2.png in Resources */, + 4F00CD49228522D80092F7B4 /* makeup_03_19aw.png in Resources */, DE06F7201F16450200EF2FE2 /* desc_4.png in Resources */, DE2C300920737ADE00548627 /* eee_item01_after.png in Resources */, DE325B11207741BF00B660C9 /* lx_img_tmp.png in Resources */, @@ -3845,6 +3877,7 @@ DA80CB34225458E40017694A /* p2_graph_flower.png in Resources */, 6E4ABB4220AA6CAF000355D2 /* 02_02.png in Resources */, DE2C300F20737B3D00548627 /* eee_technology2_item01.png in Resources */, + 4F00CD4B228522D80092F7B4 /* makeup_01_19aw.png in Resources */, DE2C300C20737ADE00548627 /* eee_item01_before.png in Resources */, E5E0D3EE1DF3D04C0053373F /* IdealSecondSelectViewController.storyboard in Resources */, C050C96C1E8267450009679D /* d_2.png in Resources */, @@ -3894,8 +3927,10 @@ 26AD5D7420230A1F002A2076 /* KozGoPr6N-Regular.otf in Resources */, C050C91E1E82619F0009679D /* orange_L.png in Resources */, DE80C66C20726D4E00CD326A /* 18aw_85.png in Resources */, + 4F00CD4F228522D80092F7B4 /* makeup_07_19aw.png in Resources */, 44D7BC0E2283DDFC0073D506 /* p9_01.png in Resources */, 44D7BC092283DDFC0073D506 /* p9_02.png in Resources */, + 4F00CD4E228522D80092F7B4 /* makeup_05_19aw.png in Resources */, DE325B1C2077469000B660C9 /* lx_b02.png in Resources */, DE80C67B20726DCC00CD326A /* 18aw_98.png in Resources */, 4F3B4E7322805337008FAB09 /* BNFEfficacy3.png in Resources */, @@ -3946,6 +3981,7 @@ DE2C8F501E9B9F5800B5FC4A /* ACaslonPro-Regular.otf in Resources */, 8045C1E81EEE862700284CF9 /* LifeStyleFirstProductView.xib in Resources */, C02818B21E6D4A5E00D4DADA /* StepUsageView.xib in Resources */, + 4F00CD4C228522D80092F7B4 /* makeup_06_19aw.png in Resources */, DEED708B20A54E85001027EB /* SMBKTextureViewController.storyboard in Resources */, 4FCDAF6B225C87EF00F7BBF2 /* Waso624EfficacyView.xib in Resources */, DE078948220CA5F600D6CBAF /* LXLegendaryEnmeiComplexView.xib in Resources */, @@ -4035,11 +4071,13 @@ 4194846D21539EE300680A26 /* WasoCleanserEfficacyView.xib in Resources */, 2680EC212037E4FA005257B1 /* makeup_8.png in Resources */, 260E34AE2019CF7B0006109B /* UTM-play-button.png in Resources */, + 445DA9BE22840B4F00C80EC1 /* one_line.png in Resources */, C050C97A1E8267450009679D /* efficacy_face2_01.png in Resources */, C050C98C1E8267450009679D /* f_effect_3.png in Resources */, DA0D5F1F22004470006703D5 /* LuxuryLegendaryEnmeiViewController.storyboard in Resources */, 2680EC10203404D0005257B1 /* before_03.png in Resources */, C050C90C1E82619F0009679D /* ss_ibuki_hoshi.png in Resources */, + 4F00CD4A228522D80092F7B4 /* makeup_02_19aw.png in Resources */, C050C9A31E8267450009679D /* utm_bg_02.png in Resources */, C050C9711E8267450009679D /* d_block_2s.png in Resources */, C050C9121E82619F0009679D /* wab01_before.png in Resources */, @@ -4058,6 +4096,7 @@ 6E4ABB3F20AA6CAF000355D2 /* 02_04.png in Resources */, 419D8DF721006A4100106B49 /* UtmMaskEfficacyView.xib in Resources */, 4FCDAF67225C7D5400F7BBF2 /* graph_anim_623.png in Resources */, + 4F00CD4D228522D80092F7B4 /* makeup_04_19aw.png in Resources */, C050C9101E82619F0009679D /* ss_purple_5.png in Resources */, DA80CB31225458DA0017694A /* p2_bar_red.png in Resources */, C02818A21E6BCE7C00D4DADA /* WasoFeatureView.xib in Resources */, @@ -4337,7 +4376,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Share Beauty App/Pods-Share Beauty App-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-Share Beauty App/Pods-Share Beauty App-frameworks.sh", "${BUILT_PRODUCTS_DIR}/AImage/AImage.framework", "${BUILT_PRODUCTS_DIR}/APNGKit/APNGKit.framework", "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", @@ -4360,7 +4399,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Share Beauty App/Pods-Share Beauty App-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Share Beauty App/Pods-Share Beauty App-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -4425,6 +4464,7 @@ DEC751F52073BCC300A9FC1C /* WASOPeelHowToUseResultView.swift in Sources */, C058183A1D6DBA9B00C8FB55 /* UIView+FQExtention.swift in Sources */, DE38CC571F25C47E001656E5 /* GscThumnailCollectionViewCell.swift in Sources */, + 44D7BC122283EBA60073D506 /* MakeUp19AWView.swift in Sources */, DE2C90861E9C66E600B5FC4A /* LXHeaderView.swift in Sources */, C0DA9AF31DB8CC7E00692058 /* DropDownCell.swift in Sources */, EB73659C1D8312A700D223BA /* TroubleTranslateTable.swift in Sources */, diff --git a/Share Beauty App/Controllers/ProductDetailViewController.swift b/Share Beauty App/Controllers/ProductDetailViewController.swift index ae4f8d4..a2ae752 100644 --- a/Share Beauty App/Controllers/ProductDetailViewController.swift +++ b/Share Beauty App/Controllers/ProductDetailViewController.swift @@ -1221,6 +1221,8 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat // 19AW BNF mCategoryButtonTechnologies.enabled = true mCategoryButtonEfficacy.enabled = true + } else if productId == 584 { + mCategoryButtonDefend.enabled = true } else if [625,626,627,628,629,630,631,632].contains(productId) { mCategoryButtonHowToUse.enabled = true } @@ -1741,6 +1743,11 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat mVContent.isHidden = true mVCurrentSelect?.removeFromSuperview() mVCurrentSelect = nil + } else if productId == 584 { + print("country:\(LanguageConfigure.countryId)") + let makeUpV: MakeUp19AWView = UINib(nibName: "MakeUp19AWView", bundle: nil).instantiate(withOwner: self, options: nil)[0] as! MakeUp19AWView + makeUpV.setMakeUp19AW(countryId: LanguageConfigure.countryId) + self.mVContent.addSubview(makeUpV) } default: diff --git a/Share Beauty App/Controllers/SMBK/SMBKTopViewController.swift b/Share Beauty App/Controllers/SMBK/SMBKTopViewController.swift index 58e5357..f849c4c 100644 --- a/Share Beauty App/Controllers/SMBK/SMBKTopViewController.swift +++ b/Share Beauty App/Controllers/SMBK/SMBKTopViewController.swift @@ -92,7 +92,6 @@ class SMBKTopViewController: UIViewController, NavigationControllerAnnotation { mForthComplexionBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -110, 0, 0) mForthTitleLbl.text = AppItemTable.getNameByItemId(itemId: 8539) mForthVText.text = AppItemTable.getNameByItemId(itemId: 8540) - print("test:\(mForthVText.text!)") } diff --git a/Share Beauty App/Views/MakeUp19AWView.swift b/Share Beauty App/Views/MakeUp19AWView.swift new file mode 100644 index 0000000..7a4e1e5 --- /dev/null +++ b/Share Beauty App/Views/MakeUp19AWView.swift @@ -0,0 +1,383 @@ +// +// MakeUp19AWView.swift +// Share Beauty App +// +// Created by 大倉 瑠維 on 2019/05/09. +// Copyright © 2019年 AQUA Co., Ltd. All rights reserved. +// + +import Foundation +import UIKit + +class MakeUp19AWView: UIView, UIScrollViewDelegate { + + @IBOutlet weak var mScrollV: UIScrollView! + + func setMakeUp19AW(countryId: Int) { + mScrollV.isPagingEnabled = true + mScrollV.delegate = self + let mVContent = UIView() + mVContent.frame = CGRect(x: 0, y: 0, width: self.size.width, height: self.size.height) + + var descriptItemIds: [Int] = [] + var descriptTexts: [String] = [] + + // image + for i in 0..<3 { + let image = UIImage(named: "makeup_0\(i+1)_19aw.png")! + let faceImageV = UIImageView(image:image) + faceImageV.contentMode = .scaleAspectFit + faceImageV.clipsToBounds = true + faceImageV.backgroundColor = UIColor.clear + faceImageV.frame = CGRect(x: 40, y: 20+(Int(self.mScrollV.frame.height))*i, width: 500, height: 500) + self.mScrollV.addSubview(faceImageV) + } + + //title + for i in 0..<3 { + let title = UILabel() + title.textColor = UIColor.black + title.font = UIFont(name: "Reader-Bold", size: 18) + if i == 0 { + title.text = AppItemTable.getNameByItemId(itemId: 8472) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 180+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 1 { + title.text = AppItemTable.getNameByItemId(itemId: 8482) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 220+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 2 { + title.text = AppItemTable.getNameByItemId(itemId: 8490) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 120+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } + self.mScrollV.addSubview(title) + } + + //subtitle + for i in 0..<3 { + let subTitle = UILabel() + subTitle.textColor = UIColor.black + subTitle.font = UIFont(name: "Reader-Bold", size: 24) + if i == 0 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8473) // "502 Whisper" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 210+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 1 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8483) // "509 Flame" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 250+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 2 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8491) // "518 Selfie" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 150+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } + self.mScrollV.addSubview(subTitle) + + } + + //description + for i in 0..<3 { + if i == 0 { + descriptItemIds = [8474,8475,8476,8477,8478,8479,8480,8481] + for j in 0..<8 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: Int(self.size.height)/2-50+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: Int(self.size.height)/2-30+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: Int(self.size.height)/2-30+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + } else if i == 1 { + descriptItemIds = [8484,8485,8486,8487,8488,8489] + for j in 0..<6 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-10+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+10+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+10+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + } else if i == 2 { + descriptItemIds = [8492,8493,8494,8495,8496,8497,8498,8499,8500,8501] + for j in 0..<10 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-110+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-90+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-90+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + + } + } + + if [5,6,7,8,9,10,11,12,13,15,16,17,18,19,20,21,22,23,24,25,26,27].contains(countryId) { + self.mScrollV.contentSize = CGSize(width: self.size.width, height: self.size.height*5) + // image + for i in 3..<5 { + let image = UIImage(named: "makeup_0\(i+1)_19aw.png")! + let faceImageV = UIImageView(image:image) + faceImageV.contentMode = .scaleAspectFit + faceImageV.clipsToBounds = true + faceImageV.backgroundColor = UIColor.clear + faceImageV.frame = CGRect(x: 40, y: 20+(Int(self.mScrollV.frame.height))*i, width: 500, height: 500) + self.mScrollV.addSubview(faceImageV) + } + + //title + for i in 3..<5 { + let title = UILabel() + title.textColor = UIColor.black + title.font = UIFont(name: "Reader-Bold", size: 18) + if i == 3 { + title.text = AppItemTable.getNameByItemId(itemId: 8502) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 220+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 4 { + title.text = AppItemTable.getNameByItemId(itemId: 8510) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 180+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } + self.mScrollV.addSubview(title) + } + + //subtitle + for i in 3..<5 { + let subTitle = UILabel() + subTitle.textColor = UIColor.black + subTitle.font = UIFont(name: "Reader-Bold", size: 24) + if i == 3 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8503) // "Elemental Rose" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 250+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 4 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8511) // "Lipstick Red Force" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 210+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } + self.mScrollV.addSubview(subTitle) + + } + + //description + for i in 3..<5 { + if i == 3 { + descriptItemIds = [8504,8505,8506,8507,8508,8509] + for j in 0..<6 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-10+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+10+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+10+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + } else if i == 4 { + descriptItemIds = [8512,8513,8514,8515,8516,8517,8518,8519] + for j in 0..<8 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-50+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-30+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-30+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + } + } + } else if countryId == 14 { + self.mScrollV.contentSize = CGSize(width: self.size.width, height: self.size.height*5) + // image + for i in 3..<5 { + let image = UIImage(named: "makeup_0\(i+3)_19aw.png")! + let faceImageV = UIImageView(image:image) + faceImageV.contentMode = .scaleAspectFit + faceImageV.clipsToBounds = true + faceImageV.backgroundColor = UIColor.clear + faceImageV.frame = CGRect(x: 40, y: 20+(Int(self.mScrollV.frame.height))*i, width: 500, height: 500) + self.mScrollV.addSubview(faceImageV) + } + + //title + for i in 3..<5 { + let title = UILabel() + title.textColor = UIColor.black + title.font = UIFont(name: "Reader-Bold", size: 18) + if i == 3 { + title.text = AppItemTable.getNameByItemId(itemId: 8520) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 270+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 4 { + title.text = AppItemTable.getNameByItemId(itemId: 8526) // "ModernMatte Powder Lipstick" + title.frame = CGRect(x: Int(self.size.width/2 + 40), y: 220+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } + self.mScrollV.addSubview(title) + } + + //subtitle + for i in 3..<5 { + let subTitle = UILabel() + subTitle.textColor = UIColor.black + subTitle.font = UIFont(name: "Reader-Bold", size: 24) + if i == 3 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8521) // "517 Rose Hip" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 300+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } else if i == 4 { + subTitle.text = AppItemTable.getNameByItemId(itemId: 8527) // "515 Mellow Drama" + subTitle.frame = CGRect(x: Int(self.size.width/2 + 40), y: 250+(Int(self.mScrollV.frame.height))*i, width: 700, height: 40) + } + self.mScrollV.addSubview(subTitle) + + } + + //description + for i in 3..<5 { + if i == 3 { + descriptItemIds = [8522,8523,8524,8525] + for j in 0..<4 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+50+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+70+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+70+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + } else if i == 4 { + descriptItemIds = [8528,8529,8530,8531,8532,8533] + for j in 0..<6 { + let image = UIImage(named: "one_line.png")! + let lineV = UIImageView(image:image) + lineV.contentMode = .scaleAspectFit + lineV.clipsToBounds = true + lineV.backgroundColor = UIColor.clear + lineV.frame = CGRect(x: Int(self.size.width/2 + 40)-10, y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2-10+(30*j), width: 300, height: 20) + + if let text = AppItemTable.getNameByItemId(itemId: descriptItemIds[j]) { + descriptTexts.append(text) + } else { + descriptTexts.append("") + } + let descriptLabel: UILabel = UILabel() + descriptLabel.numberOfLines = 0 + descriptLabel.lineBreakMode = NSLineBreakMode.byWordWrapping + descriptLabel.text = descriptTexts[j] + if j % 2 == 0 { + descriptLabel.font = UIFont(name: "Reader-regular", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+10+(30*j), width: 500, height: 20) + self.mScrollV.addSubview(lineV) + } else { + descriptLabel.font = UIFont(name: "Reader-Bold", size: 18) + descriptLabel.frame = CGRect(x: Int(self.size.width/2 + 40), y: (Int(self.mScrollV.frame.height))*i+Int(self.size.height)/2+10+(30*(j-1))+20, width: 500, height: 20) + } + self.mScrollV.addSubview(descriptLabel) + } + } + } + + } else { + self.mScrollV.contentSize = CGSize(width: self.size.width, height: self.size.height*3) + } + } +} diff --git a/Share Beauty App/Views/MakeUp19AWView.xib b/Share Beauty App/Views/MakeUp19AWView.xib new file mode 100644 index 0000000..6bf6770 --- /dev/null +++ b/Share Beauty App/Views/MakeUp19AWView.xib @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +