open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
8d898133 1 parent 7ef01dbf

redesign GFY

Inline Side-by-side
Showing 7 changed files with 39 additions and 34 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -69,24 +69,24 @@ import SwiftEventBus ...@@ -69,24 +69,24 @@ import SwiftEventBus
69 // mainView.clipsToBounds = true 69 // mainView.clipsToBounds = true
70 // mainView.layer.cornerRadius = 30 70 // mainView.layer.cornerRadius = 30
71 // mainView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius 71 // mainView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius
72 - mainView.backgroundColor = UIColor(red: 0.22, green: 0.32, blue: 0.40, alpha: 1.00) 72 + mainView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00)
73 73
74 - let image = UIImage(named: "top_border_shadow", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)! 74 +// let image = UIImage(named: "top_border_shadow", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)!
75 - var aspectR: CGFloat = 0.0 75 +// var aspectR: CGFloat = 0.0
76 - 76 +//
77 - aspectR = image.size.width/image.size.height 77 +// aspectR = image.size.width/image.size.height
78 - 78 +//
79 - topBorderShadow.translatesAutoresizingMaskIntoConstraints = false 79 +// topBorderShadow.translatesAutoresizingMaskIntoConstraints = false
80 - topBorderShadow.image = image 80 +// topBorderShadow.image = image
81 - topBorderShadow.contentMode = .scaleAspectFill 81 +// topBorderShadow.contentMode = .scaleAspectFill
82 - 82 +//
83 - NSLayoutConstraint.activate([ 83 +// NSLayoutConstraint.activate([
84 - topBorderShadow.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0), 84 +// topBorderShadow.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0),
85 - topBorderShadow.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0), 85 +// topBorderShadow.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0),
86 - topBorderShadow.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0), 86 +// topBorderShadow.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0),
87 - topBorderShadow.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width), 87 +// topBorderShadow.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width),
88 - topBorderShadow.heightAnchor.constraint(equalTo: topBorderShadow.widthAnchor, multiplier: 1/aspectR) 88 +// topBorderShadow.heightAnchor.constraint(equalTo: topBorderShadow.widthAnchor, multiplier: 1/aspectR)
89 - ]) 89 +// ])
90 90
91 } 91 }
92 92
......
...@@ -34,7 +34,7 @@ import UIKit ...@@ -34,7 +34,7 @@ import UIKit
34 public override func awakeFromNib() { 34 public override func awakeFromNib() {
35 super.awakeFromNib() 35 super.awakeFromNib()
36 36
37 - inboxView.layer.cornerRadius = 5.0 37 + inboxView.layer.cornerRadius = 16.0
38 inboxView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor 38 inboxView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
39 inboxView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) 39 inboxView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
40 inboxView.layer.shadowOpacity = 1.0 40 inboxView.layer.shadowOpacity = 1.0
......
...@@ -2281,22 +2281,22 @@ ...@@ -2281,22 +2281,22 @@
2281 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2281 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2282 <prototypes> 2282 <prototypes>
2283 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="InboxTableViewCellId" id="5x6-NG-BBQ" customClass="InboxTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> 2283 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="InboxTableViewCellId" id="5x6-NG-BBQ" customClass="InboxTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target">
2284 - <rect key="frame" x="0.0" y="50" width="414" height="79"/> 2284 + <rect key="frame" x="0.0" y="50" width="414" height="80"/>
2285 <autoresizingMask key="autoresizingMask"/> 2285 <autoresizingMask key="autoresizingMask"/>
2286 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5x6-NG-BBQ" id="7Ha-bG-aYy"> 2286 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5x6-NG-BBQ" id="7Ha-bG-aYy">
2287 - <rect key="frame" x="0.0" y="0.0" width="414" height="79"/> 2287 + <rect key="frame" x="0.0" y="0.0" width="414" height="80"/>
2288 <autoresizingMask key="autoresizingMask"/> 2288 <autoresizingMask key="autoresizingMask"/>
2289 <subviews> 2289 <subviews>
2290 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dwe-Hj-Zch"> 2290 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dwe-Hj-Zch">
2291 - <rect key="frame" x="20" y="0.0" width="374" height="79"/> 2291 + <rect key="frame" x="20" y="0.0" width="374" height="80"/>
2292 <subviews> 2292 <subviews>
2293 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jxX-dy-R3y"> 2293 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jxX-dy-R3y">
2294 - <rect key="frame" x="0.0" y="0.0" width="205.5" height="79"/> 2294 + <rect key="frame" x="0.0" y="0.0" width="205.5" height="80"/>
2295 </imageView> 2295 </imageView>
2296 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DIv-Ip-CVk"> 2296 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DIv-Ip-CVk">
2297 - <rect key="frame" x="215.5" y="30" width="148.5" height="19"/> 2297 + <rect key="frame" x="215.5" y="30" width="148.5" height="20"/>
2298 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> 2298 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
2299 - <color key="textColor" red="0.22745098039215686" green="0.32156862745098036" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> 2299 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2300 <nil key="highlightedColor"/> 2300 <nil key="highlightedColor"/>
2301 </label> 2301 </label>
2302 </subviews> 2302 </subviews>
...@@ -2346,11 +2346,11 @@ ...@@ -2346,11 +2346,11 @@
2346 <outlet property="delegate" destination="wy8-hC-CyC" id="mdR-Aj-QGh"/> 2346 <outlet property="delegate" destination="wy8-hC-CyC" id="mdR-Aj-QGh"/>
2347 </connections> 2347 </connections>
2348 </tableView> 2348 </tableView>
2349 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NqU-qs-YbE"> 2349 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="NqU-qs-YbE">
2350 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> 2350 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/>
2351 </imageView> 2351 </imageView>
2352 </subviews> 2352 </subviews>
2353 - <color key="backgroundColor" red="0.2196078431372549" green="0.32156862745098036" blue="0.40392156862745099" alpha="1" colorSpace="calibratedRGB"/> 2353 + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
2354 <constraints> 2354 <constraints>
2355 <constraint firstItem="Obj-Bh-L89" firstAttribute="top" secondItem="gxz-nY-dFI" secondAttribute="top" id="ECw-Zp-2Tr"/> 2355 <constraint firstItem="Obj-Bh-L89" firstAttribute="top" secondItem="gxz-nY-dFI" secondAttribute="top" id="ECw-Zp-2Tr"/>
2356 <constraint firstItem="NqU-qs-YbE" firstAttribute="leading" secondItem="gxz-nY-dFI" secondAttribute="leading" id="EOR-Jd-ced"/> 2356 <constraint firstItem="NqU-qs-YbE" firstAttribute="leading" secondItem="gxz-nY-dFI" secondAttribute="leading" id="EOR-Jd-ced"/>
...@@ -2360,6 +2360,11 @@ ...@@ -2360,6 +2360,11 @@
2360 <constraint firstAttribute="bottom" secondItem="Obj-Bh-L89" secondAttribute="bottom" id="lop-u2-nwa"/> 2360 <constraint firstAttribute="bottom" secondItem="Obj-Bh-L89" secondAttribute="bottom" id="lop-u2-nwa"/>
2361 <constraint firstItem="Obj-Bh-L89" firstAttribute="leading" secondItem="gxz-nY-dFI" secondAttribute="leading" id="q6N-T6-U0n"/> 2361 <constraint firstItem="Obj-Bh-L89" firstAttribute="leading" secondItem="gxz-nY-dFI" secondAttribute="leading" id="q6N-T6-U0n"/>
2362 </constraints> 2362 </constraints>
2363 + <variation key="default">
2364 + <mask key="subviews">
2365 + <exclude reference="NqU-qs-YbE"/>
2366 + </mask>
2367 + </variation>
2363 </view> 2368 </view>
2364 </subviews> 2369 </subviews>
2365 <viewLayoutGuide key="safeArea" id="DnC-uL-X1U"/> 2370 <viewLayoutGuide key="safeArea" id="DnC-uL-X1U"/>
......
...@@ -107,22 +107,22 @@ extension UIViewController { ...@@ -107,22 +107,22 @@ extension UIViewController {
107 107
108 let titleLabel = UILabel(frame: CGRect(x: 0, y: 0, width: uiscreen.width * 0.7, height: uiscreen.height * 0.03)) 108 let titleLabel = UILabel(frame: CGRect(x: 0, y: 0, width: uiscreen.width * 0.7, height: uiscreen.height * 0.03))
109 titleLabel.text = title 109 titleLabel.text = title
110 - titleLabel.textColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) 110 + titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
111 111
112 // Fix width for ipad 112 // Fix width for ipad
113 if UIDevice.current.userInterfaceIdiom == .pad { 113 if UIDevice.current.userInterfaceIdiom == .pad {
114 // iPad 114 // iPad
115 if (fontWeight == "bold") { 115 if (fontWeight == "bold") {
116 - titleLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 20) 116 + titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20)
117 } else { 117 } else {
118 - titleLabel.font = UIFont(name: "PFSquareSansPro-Medium", size: 20) 118 + titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20)
119 } 119 }
120 } else { 120 } else {
121 // not iPad (iPhone, mac, tv, carPlay, unspecified) 121 // not iPad (iPhone, mac, tv, carPlay, unspecified)
122 if (fontWeight == "bold") { 122 if (fontWeight == "bold") {
123 - titleLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 17) 123 + titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 17)
124 } else { 124 } else {
125 - titleLabel.font = UIFont(name: "PFSquareSansPro-Medium", size: 17) 125 + titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 17)
126 } 126 }
127 } 127 }
128 titleLabel.adjustsFontSizeToFitWidth = true 128 titleLabel.adjustsFontSizeToFitWidth = true
......