From dff2cf72dcc6accded81c90ca62f8a2b8fb2f0e8 Mon Sep 17 00:00:00 2001 From: Manos Chorianopoulos <manoschr05@gmail.com> Date: Fri, 4 Apr 2025 16:04:43 +0300 Subject: [PATCH] wallet color changes --- SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate | Bin 278015 -> 0 bytes SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/Contents.json | 23 +++++++++++++++++++++++ SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 1.png | Bin 0 -> 321 bytes SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 2.png | Bin 0 -> 321 bytes SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark.png | Bin 0 -> 321 bytes SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponCollectionViewCell.swift | 6 +++--- SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponsScrollTableViewCell.swift | 16 ++++++++-------- SwiftWarplyFramework/SwiftWarplyFramework/WalletQuestionnaireBannerTableViewCell.swift | 12 ++++++++---- SwiftWarplyFramework/SwiftWarplyFramework/WalletVouchersBannerTableViewCell.swift | 4 ++-- 9 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/Contents.json create mode 100644 SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 1.png create mode 100644 SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 2.png create mode 100644 SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark.png diff --git a/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate index 2923fcf..350ea43 100644 Binary files a/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/Contents.json b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/Contents.json new file mode 100644 index 0000000..c54f489 --- /dev/null +++ b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "wallet_plus_green_dark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "wallet_plus_green_dark 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "wallet_plus_green_dark 2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 1.png b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 1.png new file mode 100644 index 0000000..c10860b Binary files /dev/null and b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 1.png differ diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 2.png b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 2.png new file mode 100644 index 0000000..c10860b Binary files /dev/null and b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark 2.png differ diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark.png b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark.png new file mode 100644 index 0000000..c10860b Binary files /dev/null and b/SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/wallet_plus_green_dark.imageset/wallet_plus_green_dark.png differ diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponCollectionViewCell.swift b/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponCollectionViewCell.swift index 75ebb02..0dc962d 100644 --- a/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponCollectionViewCell.swift +++ b/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponCollectionViewCell.swift @@ -32,10 +32,10 @@ import UIKit badgeView.layer.cornerRadius = 16.0 badgeCountView.layer.cornerRadius = 4.0 - badgeCountView.backgroundColor = UIColor(red: 0.92, green: 0.75, blue: 0.41, alpha: 1.00) - // badgeCountView.backgroundColor = UIColor(rgb: 0xE20074) + // badgeCountView.backgroundColor = UIColor(red: 0.92, green: 0.75, blue: 0.41, alpha: 1.00) + badgeCountView.backgroundColor = UIColor(rgb: 0xE20074) - // badgeCountLabel.textColor = .white + badgeCountLabel.textColor = .white } func configureCell(badgeId: String, badgeCount: Int) { diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponsScrollTableViewCell.swift b/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponsScrollTableViewCell.swift index ea75276..6b626ca 100644 --- a/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponsScrollTableViewCell.swift +++ b/SwiftWarplyFramework/SwiftWarplyFramework/WalletActiveCouponsScrollTableViewCell.swift @@ -39,14 +39,14 @@ import SwiftEventBus dotLeftWidth.constant = 12 dotLeftHeight.constant = 12 dotLeft.layer.cornerRadius = 6 - dotLeft.backgroundColor = UIColor(rgb: 0x00A5E3) - // dotLeft.backgroundColor = UIColor(rgb: 0xE20074) + // dotLeft.backgroundColor = UIColor(rgb: 0x00A5E3) + dotLeft.backgroundColor = UIColor(rgb: 0xE20074) dotRightWidth.constant = 8 dotRightHeight.constant = 8 dotRight.layer.cornerRadius = 4 - dotRight.backgroundColor = UIColor(rgb: 0x00A5E3) - // dotRight.backgroundColor = UIColor(rgb: 0x767676) + // dotRight.backgroundColor = UIColor(rgb: 0x00A5E3) + dotRight.backgroundColor = UIColor(rgb: 0x767676) } @@ -117,23 +117,23 @@ extension WalletActiveCouponsScrollTableViewCell: UIScrollViewDelegate { dotLeftWidth.constant = 8 dotLeftHeight.constant = 8 dotLeft.layer.cornerRadius = 4 - // dotLeft.backgroundColor = UIColor(rgb: 0x767676) + dotLeft.backgroundColor = UIColor(rgb: 0x767676) dotRightWidth.constant = 12 dotRightHeight.constant = 12 dotRight.layer.cornerRadius = 6 - // dotRight.backgroundColor = UIColor(rgb: 0xE20074) + dotRight.backgroundColor = UIColor(rgb: 0xE20074) } else { dotLeftWidth.constant = 12 dotLeftHeight.constant = 12 dotLeft.layer.cornerRadius = 6 - // dotLeft.backgroundColor = UIColor(rgb: 0xE20074) + dotLeft.backgroundColor = UIColor(rgb: 0xE20074) dotRightWidth.constant = 8 dotRightHeight.constant = 8 dotRight.layer.cornerRadius = 4 - // dotRight.backgroundColor = UIColor(rgb: 0x767676) + dotRight.backgroundColor = UIColor(rgb: 0x767676) } } diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/WalletQuestionnaireBannerTableViewCell.swift b/SwiftWarplyFramework/SwiftWarplyFramework/WalletQuestionnaireBannerTableViewCell.swift index 6bb2715..ebe83fe 100644 --- a/SwiftWarplyFramework/SwiftWarplyFramework/WalletQuestionnaireBannerTableViewCell.swift +++ b/SwiftWarplyFramework/SwiftWarplyFramework/WalletQuestionnaireBannerTableViewCell.swift @@ -27,12 +27,14 @@ import UIKit bannerView.layer.cornerRadius = 12.0 bannerView.layer.borderWidth = 1 - bannerView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor + bannerView.layer.borderColor = UIColor(rgb: 0x0E8004).cgColor +// bannerView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor // bannerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor bannerCenteredView.layer.cornerRadius = 12.0 bannerCenteredView.layer.borderWidth = 1 - bannerCenteredView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor + bannerCenteredView.layer.borderColor = UIColor(rgb: 0x0E8004).cgColor +// bannerCenteredView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor // Add shadow // bannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor @@ -40,12 +42,14 @@ import UIKit // bannerView.layer.shadowOpacity = 1.0 // bannerView.layer.shadowRadius = 1.0 - bannerIconImage.image = UIImage(named: "wallet_plus", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) - bannerCenteredIconImage.image = UIImage(named: "wallet_plus", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) + bannerIconImage.image = UIImage(named: "wallet_plus_green_dark", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) + bannerCenteredIconImage.image = UIImage(named: "wallet_plus_green_dark", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) // bannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) bannerLabel.font = UIFont(name: "PeridotPE-Bold", size: 12) + bannerLabel.textColor = UIColor(rgb: 0x0E8004) bannerCenteredLabel.font = UIFont(name: "PeridotPE-Bold", size: 12) + bannerCenteredLabel.textColor = UIColor(rgb: 0x0E8004) } public override func setSelected(_ selected: Bool, animated: Bool) { diff --git a/SwiftWarplyFramework/SwiftWarplyFramework/WalletVouchersBannerTableViewCell.swift b/SwiftWarplyFramework/SwiftWarplyFramework/WalletVouchersBannerTableViewCell.swift index 4d434dd..e5e285e 100644 --- a/SwiftWarplyFramework/SwiftWarplyFramework/WalletVouchersBannerTableViewCell.swift +++ b/SwiftWarplyFramework/SwiftWarplyFramework/WalletVouchersBannerTableViewCell.swift @@ -41,8 +41,8 @@ import UIKit // voucherBannerLabel.text = "Ενημερώσου για το υπόλοιπο επιδότησης" voucherCountView.layer.cornerRadius = 4.0 - voucherCountView.backgroundColor = UIColor(red: 0.92, green: 0.75, blue: 0.41, alpha: 1.00) - // voucherCountView.backgroundColor = UIColor(rgb: 0xE20074) + // voucherCountView.backgroundColor = UIColor(red: 0.92, green: 0.75, blue: 0.41, alpha: 1.00) + voucherCountView.backgroundColor = UIColor(rgb: 0xE20074) } public override func setSelected(_ selected: Bool, animated: Bool) { -- libgit2 0.24.0