Browse Source

refer view icon changed

v0.17
yajan 2 years ago
parent
commit
3f7e0433dc
  1. 27
      GME Remit/AppDelegate.swift
  2. 30
      GME Remit/Modules/InviteUser/User Interface/View/InviteUser.storyboard
  3. 2
      GME Remit/Modules/InviteUser/User Interface/View/InviteView.swift
  4. 2
      GME Remit/Modules/NotificationList/User Interface/View/NotificationList.storyboard
  5. 1
      GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift
  6. 2
      GME Remit/Modules/NotificationList/User Interface/View/cell/NotificationListCell.swift
  7. 2
      GME Remit/MultiLanguages/en.lproj/Localizable.strings

27
GME Remit/AppDelegate.swift

@ -269,7 +269,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
case .howToDeposit:
HowToDepositWireframe().open(on: baseVC)
case .redirect:
// openURL(link: <#T##String#>)
openURL(userInfo: userInfo)
break
default:
break
@ -300,18 +300,19 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
}
func openURL(userInfo: [String : AnyObject]?) {
// guard
// let aps = userInfo?["aps"] as? [String: AnyObject],
// let destination = aps["category"] as? String,
// let destinationType = PushNotificationAction.getAction(target: destination)
// guard let webController = UIStoryboard(name: "Storyboard", bundle: nil)
// .instantiateViewController(withIdentifier: "WebLinksViewController") as? WebLinksViewController
// else { return }
//
//// webController.titleString = item.title ?? "Notification"
// webController.url = link
// let nav = UINavigationController.init(rootViewController: webController)
// NotificationHistoryWireframe().open(on: nav)
guard
let aps = userInfo?["aps"] as? [String: AnyObject],
let destination = aps["category"] as? String else {
return
}
guard let webController = UIStoryboard(name: "Storyboard", bundle: nil)
.instantiateViewController(withIdentifier: "WebLinksViewController") as? WebLinksViewController
else { return }
// webController.titleString = item.title ?? "Notification"
webController.url = destination
let nav = UINavigationController.init(rootViewController: webController)
NotificationHistoryWireframe().open(on: nav)
}
extension AppDelegate {

30
GME Remit/Modules/InviteUser/User Interface/View/InviteUser.storyboard

@ -23,33 +23,33 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jOn-0D-dtz">
<rect key="frame" x="10" y="8" width="355" height="220"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="refer_earn" translatesAutoresizingMaskIntoConstraints="NO" id="Ilh-q9-hBr">
<rect key="frame" x="20" y="20" width="125" height="125"/>
<constraints>
<constraint firstAttribute="width" constant="125" id="fvC-z3-hHl"/>
<constraint firstAttribute="width" secondItem="Ilh-q9-hBr" secondAttribute="height" multiplier="1:1" id="r6i-YX-Y7f"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="eu9-HM-scH">
<rect key="frame" x="58.5" y="72.5" width="238" height="75"/>
<rect key="frame" x="165" y="57" width="153" height="51"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="refer_earn" translatesAutoresizingMaskIntoConstraints="NO" id="Ilh-q9-hBr">
<rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
<constraints>
<constraint firstAttribute="width" constant="75" id="fvC-z3-hHl"/>
<constraint firstAttribute="width" secondItem="Ilh-q9-hBr" secondAttribute="height" multiplier="1:1" id="r6i-YX-Y7f"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="ugh-d9-EZv">
<rect key="frame" x="85" y="0.0" width="153" height="75"/>
<rect key="frame" x="0.0" y="0.0" width="153" height="51"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Reward Points Available" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CZ9-bC-qoP">
<rect key="frame" x="0.0" y="0.0" width="153" height="41"/>
<rect key="frame" x="0.0" y="0.0" width="153" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" name="ThemeSubBackground"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5100" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eVX-cq-6O9">
<rect key="frame" x="0.0" y="41" width="153" height="24"/>
<rect key="frame" x="0.0" y="17" width="153" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" name="ThemeWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VxT-bh-SOK">
<rect key="frame" x="0.0" y="65" width="153" height="10"/>
<rect key="frame" x="0.0" y="41" width="153" height="10"/>
<constraints>
<constraint firstAttribute="height" constant="10" id="cJK-iL-WjM"/>
</constraints>
@ -64,9 +64,11 @@
</subviews>
<color key="backgroundColor" name="ThemeMixedRed"/>
<constraints>
<constraint firstItem="Ilh-q9-hBr" firstAttribute="top" secondItem="jOn-0D-dtz" secondAttribute="top" constant="20" id="7wR-aP-qsj"/>
<constraint firstAttribute="height" constant="220" id="BSS-YV-GyU"/>
<constraint firstItem="eu9-HM-scH" firstAttribute="centerY" secondItem="jOn-0D-dtz" secondAttribute="centerY" id="FZq-uV-ivV"/>
<constraint firstItem="eu9-HM-scH" firstAttribute="centerX" secondItem="jOn-0D-dtz" secondAttribute="centerX" id="V64-yg-wsa"/>
<constraint firstItem="eu9-HM-scH" firstAttribute="leading" secondItem="Ilh-q9-hBr" secondAttribute="trailing" constant="20" id="OWS-bV-Ros"/>
<constraint firstItem="Ilh-q9-hBr" firstAttribute="leading" secondItem="jOn-0D-dtz" secondAttribute="leading" constant="20" id="Wjo-5x-6Xe"/>
<constraint firstItem="eu9-HM-scH" firstAttribute="centerY" secondItem="Ilh-q9-hBr" secondAttribute="centerY" id="wMi-rE-qSK"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kRU-ZJ-Bxs">

2
GME Remit/Modules/InviteUser/User Interface/View/InviteView.swift

@ -28,7 +28,7 @@ class InviteView: UIView {
lazy var referNowTitleLabel: UILabel = {
let label = UILabel()
label.text = "your_referral_code_text".localized()
label.text = "refer_now_text".localized()
label.font = .sanfrancisco(.bold, size: 16)
label.textColor = .themeBlack
label.translatesAutoresizingMaskIntoConstraints = false

2
GME Remit/Modules/NotificationList/User Interface/View/NotificationList.storyboard

@ -48,7 +48,7 @@
<color key="textColor" white="0.0" alpha="0.65000000000000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tran ID: 10317685 was successfully cancelled" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="87j-YI-wdX">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tran ID: 10317685 was successfully cancelled" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="87j-YI-wdX">
<rect key="frame" x="65" y="35.5" width="254" height="36"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
<color key="textColor" name="ThemeText"/>

1
GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift

@ -71,6 +71,7 @@ extension NotificationListViewController: UITableViewDelegate, UITableViewDataSo
let item = tableData[indexPath.row]
cell.setupView()
cell.renderData(data: item)
print(item.isRead)
return cell
}

2
GME Remit/Modules/NotificationList/User Interface/View/cell/NotificationListCell.swift

@ -28,7 +28,7 @@ class NotificationListCell: UITableViewCell {
statusLabel.text = data.title
statusDate.text = data.createDate
statusDescription.text = data.body
if data.isRead == "1" {
if data.isRead == "0" {
statusImageView.image = UIImage(named: data.category == "SUCCESS" ? "notify" : data.category == "INFO" ? "info" : "error")
} else {
statusImageView.image = UIImage(named: data.category == "SUCCESS" ? "notify-Success-grey" : data.category == "INFO" ? "notify-Info-grey" : "notify-error-grey")

2
GME Remit/MultiLanguages/en.lproj/Localizable.strings

@ -968,7 +968,7 @@
"current_id_expiry_text" = "Current ID Expiry Date";
"current_id_expiry_status_text" = "ID Expiry Status";
"refer_and_earn_text" = "Refer & Earn";
"refer_now_text" = "Refer";
"refer_now_text" = "Refer Now";
"your_referral_code_text" = "Your Referral Code";
"rewards_points_available_text" = "Rewards Points Available";
"title_referral_text" = "Referrals";

Loading…
Cancel
Save