From b6acee20d5cc5d0e48431fe18a89827979796758 Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Tue, 17 Dec 2019 15:31:37 +0900 Subject: [PATCH] changed home ui --- .../HomeRemainingLimitTableViewCell.swift | 29 ++- .../Home/User Interface/View/Home.storyboard | 189 ++++++++---------- 2 files changed, 95 insertions(+), 123 deletions(-) diff --git a/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift b/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift index 47c05cac..ae062bec 100644 --- a/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift +++ b/GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift @@ -25,7 +25,7 @@ class HomeRemainingLimitTableViewCell: UITableViewCell { @IBOutlet weak var rewardTapGesture: UITapGestureRecognizer! - @IBOutlet weak var withdrawButton: UIButton! +// @IBOutlet weak var withdrawButton: UIButton! @IBOutlet weak var walletNumberTitleLabel: UILabel! @IBOutlet weak var walletNumberLabel: UILabel! @IBOutlet weak var walletBankCodeLabel: UILabel! @@ -67,8 +67,7 @@ class HomeRemainingLimitTableViewCell: UITableViewCell { walletNumberLabel.text = GMEDB.shared.user.string(.walletNumber) walletBankCodeLabel.text = GMEDB.shared.user.string(.primaryBankName) - - withdrawButtonInit() + //withdrawButtonInit() } @objc @@ -81,7 +80,7 @@ class HomeRemainingLimitTableViewCell: UITableViewCell { } private func configureText() { - self.balaceTitleLabel.text = "available_balance_text".localized() +// self.balaceTitleLabel.text = "available_balance_text".localized() pointTitleLabel.text = "reward_points_text".localized() } @@ -96,17 +95,17 @@ class HomeRemainingLimitTableViewCell: UITableViewCell { } private func withdrawButtonInit() { - withdrawButton.setTitle("withdraw_text".localized(), for: UIControl.State.normal) - let shouldShowWithdrawButton = Utility.pennyTestVerified() && Utility.isVerifiedUser() - - withdrawButton.isHidden = !shouldShowWithdrawButton - withdrawButton.titleLabel?.adjustsFontSizeToFitWidth(true, scale: 0.5) - withdrawButton.layer.shadowColor = UIColor.darkGray.cgColor - withdrawButton.layer.shadowOpacity = 0.5 - withdrawButton.layer.shadowRadius = 2 - - let offset = CGSize(width: 1, height: 1) - withdrawButton.layer.shadowOffset = offset +// withdrawButton.setTitle("withdraw_text".localized(), for: UIControl.State.normal) +// let shouldShowWithdrawButton = Utility.pennyTestVerified() && Utility.isVerifiedUser() +// +// withdrawButton.isHidden = !shouldShowWithdrawButton +// withdrawButton.titleLabel?.adjustsFontSizeToFitWidth(true, scale: 0.5) +// withdrawButton.layer.shadowColor = UIColor.darkGray.cgColor +// withdrawButton.layer.shadowOpacity = 0.5 +// withdrawButton.layer.shadowRadius = 2 +// +// let offset = CGSize(width: 1, height: 1) +// withdrawButton.layer.shadowOffset = offset } @IBAction func touchWithdraw(_ sender: UIButton) { diff --git a/GME Remit/Modules/Home/User Interface/View/Home.storyboard b/GME Remit/Modules/Home/User Interface/View/Home.storyboard index f866f74e..cbd512f9 100644 --- a/GME Remit/Modules/Home/User Interface/View/Home.storyboard +++ b/GME Remit/Modules/Home/User Interface/View/Home.storyboard @@ -1,6 +1,6 @@ - + @@ -28,11 +28,11 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -85,102 +85,30 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + + - @@ -231,21 +159,67 @@ + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -332,8 +306,8 @@ - - + + @@ -358,21 +332,20 @@ - - + - + - + - + @@ -382,7 +355,7 @@ - + @@ -544,7 +517,7 @@ - +