open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
85abefaf 1 parent 8431caec

redesign market history part 1

Inline Side-by-side
Showing 5 changed files with 36 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>1</integer> 10 + <integer>0</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>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -996,6 +996,7 @@ ...@@ -996,6 +996,7 @@
996 <subviews> 996 <subviews>
997 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FP3-6W-wCc"> 997 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FP3-6W-wCc">
998 <rect key="frame" x="0.0" y="0.0" width="206.5" height="50"/> 998 <rect key="frame" x="0.0" y="0.0" width="206.5" height="50"/>
999 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
999 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 1000 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
1000 <state key="normal" title="Button"/> 1001 <state key="normal" title="Button"/>
1001 <connections> 1002 <connections>
...@@ -1004,13 +1005,14 @@ ...@@ -1004,13 +1005,14 @@
1004 </button> 1005 </button>
1005 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UWd-oB-aUz"> 1006 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UWd-oB-aUz">
1006 <rect key="frame" x="206.5" y="0.0" width="1" height="50"/> 1007 <rect key="frame" x="206.5" y="0.0" width="1" height="50"/>
1007 - <color key="backgroundColor" systemColor="systemBackgroundColor"/> 1008 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1008 <constraints> 1009 <constraints>
1009 <constraint firstAttribute="width" constant="1" id="0a5-rg-USn"/> 1010 <constraint firstAttribute="width" constant="1" id="0a5-rg-USn"/>
1010 </constraints> 1011 </constraints>
1011 </view> 1012 </view>
1012 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YkY-Mb-Lq3"> 1013 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YkY-Mb-Lq3">
1013 <rect key="frame" x="207.5" y="0.0" width="206.5" height="50"/> 1014 <rect key="frame" x="207.5" y="0.0" width="206.5" height="50"/>
1015 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1014 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 1016 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
1015 <state key="normal" title="Button"/> 1017 <state key="normal" title="Button"/>
1016 <connections> 1018 <connections>
...@@ -1018,31 +1020,31 @@ ...@@ -1018,31 +1020,31 @@
1018 </connections> 1020 </connections>
1019 </button> 1021 </button>
1020 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xCo-hd-ld3"> 1022 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xCo-hd-ld3">
1021 - <rect key="frame" x="20" y="48" width="167" height="2"/> 1023 + <rect key="frame" x="20" y="43" width="167" height="2"/>
1022 - <color key="backgroundColor" systemColor="systemBackgroundColor"/> 1024 + <color key="backgroundColor" red="0.0" green="0.6470588235294118" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
1023 <constraints> 1025 <constraints>
1024 <constraint firstAttribute="height" constant="2" id="ea9-ou-Eoj"/> 1026 <constraint firstAttribute="height" constant="2" id="ea9-ou-Eoj"/>
1025 </constraints> 1027 </constraints>
1026 </view> 1028 </view>
1027 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mrv-kN-Q4A"> 1029 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mrv-kN-Q4A">
1028 - <rect key="frame" x="227" y="48" width="167" height="2"/> 1030 + <rect key="frame" x="227" y="43" width="167" height="2"/>
1029 - <color key="backgroundColor" systemColor="systemBackgroundColor"/> 1031 + <color key="backgroundColor" red="0.0" green="0.6470588235294118" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
1030 <constraints> 1032 <constraints>
1031 <constraint firstAttribute="height" constant="2" id="nxU-Sv-mU8"/> 1033 <constraint firstAttribute="height" constant="2" id="nxU-Sv-mU8"/>
1032 </constraints> 1034 </constraints>
1033 </view> 1035 </view>
1034 </subviews> 1036 </subviews>
1035 - <color key="backgroundColor" systemColor="systemBackgroundColor"/> 1037 + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1036 <constraints> 1038 <constraints>
1037 <constraint firstItem="UWd-oB-aUz" firstAttribute="leading" secondItem="FP3-6W-wCc" secondAttribute="trailing" id="5OH-rr-9yf"/> 1039 <constraint firstItem="UWd-oB-aUz" firstAttribute="leading" secondItem="FP3-6W-wCc" secondAttribute="trailing" id="5OH-rr-9yf"/>
1038 <constraint firstAttribute="height" constant="50" id="7Xg-3a-EH0"/> 1040 <constraint firstAttribute="height" constant="50" id="7Xg-3a-EH0"/>
1039 <constraint firstAttribute="trailing" secondItem="mrv-kN-Q4A" secondAttribute="trailing" constant="20" id="9nt-ya-vhc"/> 1041 <constraint firstAttribute="trailing" secondItem="mrv-kN-Q4A" secondAttribute="trailing" constant="20" id="9nt-ya-vhc"/>
1040 - <constraint firstAttribute="bottom" secondItem="xCo-hd-ld3" secondAttribute="bottom" id="Aps-1W-xHt"/> 1042 + <constraint firstAttribute="bottom" secondItem="xCo-hd-ld3" secondAttribute="bottom" constant="5" id="Aps-1W-xHt"/>
1041 <constraint firstItem="mrv-kN-Q4A" firstAttribute="leading" secondItem="xCo-hd-ld3" secondAttribute="trailing" constant="40" id="Dls-kq-OTF"/> 1043 <constraint firstItem="mrv-kN-Q4A" firstAttribute="leading" secondItem="xCo-hd-ld3" secondAttribute="trailing" constant="40" id="Dls-kq-OTF"/>
1042 <constraint firstAttribute="bottom" secondItem="FP3-6W-wCc" secondAttribute="bottom" id="Owe-Mv-PnG"/> 1044 <constraint firstAttribute="bottom" secondItem="FP3-6W-wCc" secondAttribute="bottom" id="Owe-Mv-PnG"/>
1043 <constraint firstAttribute="bottom" secondItem="UWd-oB-aUz" secondAttribute="bottom" id="OyZ-zR-C9h"/> 1045 <constraint firstAttribute="bottom" secondItem="UWd-oB-aUz" secondAttribute="bottom" id="OyZ-zR-C9h"/>
1044 <constraint firstItem="YkY-Mb-Lq3" firstAttribute="leading" secondItem="UWd-oB-aUz" secondAttribute="trailing" id="PI7-hs-9iw"/> 1046 <constraint firstItem="YkY-Mb-Lq3" firstAttribute="leading" secondItem="UWd-oB-aUz" secondAttribute="trailing" id="PI7-hs-9iw"/>
1045 - <constraint firstAttribute="bottom" secondItem="mrv-kN-Q4A" secondAttribute="bottom" id="QUD-bC-1Yc"/> 1047 + <constraint firstAttribute="bottom" secondItem="mrv-kN-Q4A" secondAttribute="bottom" constant="5" id="QUD-bC-1Yc"/>
1046 <constraint firstAttribute="trailing" secondItem="YkY-Mb-Lq3" secondAttribute="trailing" id="RAk-Uh-jru"/> 1048 <constraint firstAttribute="trailing" secondItem="YkY-Mb-Lq3" secondAttribute="trailing" id="RAk-Uh-jru"/>
1047 <constraint firstItem="FP3-6W-wCc" firstAttribute="top" secondItem="ATv-R2-0aP" secondAttribute="top" id="Ta5-hu-Fd3"/> 1049 <constraint firstItem="FP3-6W-wCc" firstAttribute="top" secondItem="ATv-R2-0aP" secondAttribute="top" id="Ta5-hu-Fd3"/>
1048 <constraint firstItem="UWd-oB-aUz" firstAttribute="centerX" secondItem="ATv-R2-0aP" secondAttribute="centerX" id="TyX-lq-PKP"/> 1050 <constraint firstItem="UWd-oB-aUz" firstAttribute="centerX" secondItem="ATv-R2-0aP" secondAttribute="centerX" id="TyX-lq-PKP"/>
...@@ -1056,11 +1058,11 @@ ...@@ -1056,11 +1058,11 @@
1056 </view> 1058 </view>
1057 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x9j-kU-Q25"> 1059 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x9j-kU-Q25">
1058 <rect key="frame" x="0.0" y="98" width="414" height="798"/> 1060 <rect key="frame" x="0.0" y="98" width="414" height="798"/>
1059 - <color key="backgroundColor" systemColor="systemBackgroundColor"/> 1061 + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
1060 </view> 1062 </view>
1061 </subviews> 1063 </subviews>
1062 <viewLayoutGuide key="safeArea" id="joj-CT-lhk"/> 1064 <viewLayoutGuide key="safeArea" id="joj-CT-lhk"/>
1063 - <color key="backgroundColor" systemColor="systemBackgroundColor"/> 1065 + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
1064 <constraints> 1066 <constraints>
1065 <constraint firstAttribute="bottom" secondItem="x9j-kU-Q25" secondAttribute="bottom" id="4AK-ds-qXs"/> 1067 <constraint firstAttribute="bottom" secondItem="x9j-kU-Q25" secondAttribute="bottom" id="4AK-ds-qXs"/>
1066 <constraint firstItem="ATv-R2-0aP" firstAttribute="leading" secondItem="joj-CT-lhk" secondAttribute="leading" id="7Fh-SF-POy"/> 1068 <constraint firstItem="ATv-R2-0aP" firstAttribute="leading" secondItem="joj-CT-lhk" secondAttribute="leading" id="7Fh-SF-POy"/>
......
...@@ -32,18 +32,18 @@ import SwiftEventBus ...@@ -32,18 +32,18 @@ import SwiftEventBus
32 setNavigationTitle("Ανάλυση") 32 setNavigationTitle("Ανάλυση")
33 33
34 // tab 34 // tab
35 - leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 35 + leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
36 leftButton.setTitle("Εξαργυρωμένα", for:.normal) 36 leftButton.setTitle("Εξαργυρωμένα", for:.normal)
37 leftButton.backgroundColor = . clear 37 leftButton.backgroundColor = . clear
38 - leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 38 + leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
39 39
40 - rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 40 + rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
41 rightButton.setTitle("Μοιρασμένα δώρα", for:.normal) 41 rightButton.setTitle("Μοιρασμένα δώρα", for:.normal)
42 rightButton.backgroundColor = . clear 42 rightButton.backgroundColor = . clear
43 - rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 43 + rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
44 44
45 - leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) 45 +// leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
46 - rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) 46 +// rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
47 47
48 leftLineView.isHidden = false 48 leftLineView.isHidden = false
49 rightLineView.isHidden = true 49 rightLineView.isHidden = true
...@@ -142,11 +142,11 @@ import SwiftEventBus ...@@ -142,11 +142,11 @@ import SwiftEventBus
142 self.leftLineView.isHidden = false 142 self.leftLineView.isHidden = false
143 self.rightLineView.isHidden = true 143 self.rightLineView.isHidden = true
144 144
145 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 145 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
146 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 146 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
147 147
148 - self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 148 + self.leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
149 - self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 149 + self.rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
150 } 150 }
151 let analysisVC = self.viewControllerAt(0) 151 let analysisVC = self.viewControllerAt(0)
152 pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true) 152 pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true)
...@@ -162,11 +162,11 @@ import SwiftEventBus ...@@ -162,11 +162,11 @@ import SwiftEventBus
162 self.leftLineView.isHidden = true 162 self.leftLineView.isHidden = true
163 self.rightLineView.isHidden = false 163 self.rightLineView.isHidden = false
164 164
165 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 165 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
166 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 166 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
167 167
168 - self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 168 + self.rightButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
169 - self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 169 + self.leftButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
170 } 170 }
171 let analysisVC = self.viewControllerAt(1) 171 let analysisVC = self.viewControllerAt(1)
172 pageController.setViewControllers([analysisVC!], direction:.forward, animated:true) 172 pageController.setViewControllers([analysisVC!], direction:.forward, animated:true)
...@@ -218,19 +218,19 @@ extension MarketLoyaltyAnalysisViewController: UIPageViewControllerDataSource, U ...@@ -218,19 +218,19 @@ extension MarketLoyaltyAnalysisViewController: UIPageViewControllerDataSource, U
218 if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] { 218 if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] {
219 let currentIndex = childVCs[0].index 219 let currentIndex = childVCs[0].index
220 if (currentIndex == 0) { 220 if (currentIndex == 0) {
221 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 221 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
222 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 222 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
223 - self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 223 + self.leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
224 - self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 224 + self.rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
225 self.tabSelected = 0 225 self.tabSelected = 0
226 self.leftLineView.isHidden = false 226 self.leftLineView.isHidden = false
227 self.rightLineView.isHidden = true 227 self.rightLineView.isHidden = true
228 228
229 } else { 229 } else {
230 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 230 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
231 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 231 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
232 - self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 232 + self.rightButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
233 - self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 233 + self.leftButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
234 self.tabSelected = 1 234 self.tabSelected = 1
235 self.leftLineView.isHidden = true 235 self.leftLineView.isHidden = true
236 self.rightLineView.isHidden = false 236 self.rightLineView.isHidden = false
......