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 @@
<key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
......
......@@ -7,7 +7,7 @@
<key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
......
......@@ -996,6 +996,7 @@
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FP3-6W-wCc">
<rect key="frame" x="0.0" y="0.0" width="206.5" height="50"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Button"/>
<connections>
......@@ -1004,13 +1005,14 @@
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UWd-oB-aUz">
<rect key="frame" x="206.5" y="0.0" width="1" height="50"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="0a5-rg-USn"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YkY-Mb-Lq3">
<rect key="frame" x="207.5" y="0.0" width="206.5" height="50"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Button"/>
<connections>
......@@ -1018,31 +1020,31 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xCo-hd-ld3">
<rect key="frame" x="20" y="48" width="167" height="2"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<rect key="frame" x="20" y="43" width="167" height="2"/>
<color key="backgroundColor" red="0.0" green="0.6470588235294118" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="2" id="ea9-ou-Eoj"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mrv-kN-Q4A">
<rect key="frame" x="227" y="48" width="167" height="2"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<rect key="frame" x="227" y="43" width="167" height="2"/>
<color key="backgroundColor" red="0.0" green="0.6470588235294118" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="2" id="nxU-Sv-mU8"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="UWd-oB-aUz" firstAttribute="leading" secondItem="FP3-6W-wCc" secondAttribute="trailing" id="5OH-rr-9yf"/>
<constraint firstAttribute="height" constant="50" id="7Xg-3a-EH0"/>
<constraint firstAttribute="trailing" secondItem="mrv-kN-Q4A" secondAttribute="trailing" constant="20" id="9nt-ya-vhc"/>
<constraint firstAttribute="bottom" secondItem="xCo-hd-ld3" secondAttribute="bottom" id="Aps-1W-xHt"/>
<constraint firstAttribute="bottom" secondItem="xCo-hd-ld3" secondAttribute="bottom" constant="5" id="Aps-1W-xHt"/>
<constraint firstItem="mrv-kN-Q4A" firstAttribute="leading" secondItem="xCo-hd-ld3" secondAttribute="trailing" constant="40" id="Dls-kq-OTF"/>
<constraint firstAttribute="bottom" secondItem="FP3-6W-wCc" secondAttribute="bottom" id="Owe-Mv-PnG"/>
<constraint firstAttribute="bottom" secondItem="UWd-oB-aUz" secondAttribute="bottom" id="OyZ-zR-C9h"/>
<constraint firstItem="YkY-Mb-Lq3" firstAttribute="leading" secondItem="UWd-oB-aUz" secondAttribute="trailing" id="PI7-hs-9iw"/>
<constraint firstAttribute="bottom" secondItem="mrv-kN-Q4A" secondAttribute="bottom" id="QUD-bC-1Yc"/>
<constraint firstAttribute="bottom" secondItem="mrv-kN-Q4A" secondAttribute="bottom" constant="5" id="QUD-bC-1Yc"/>
<constraint firstAttribute="trailing" secondItem="YkY-Mb-Lq3" secondAttribute="trailing" id="RAk-Uh-jru"/>
<constraint firstItem="FP3-6W-wCc" firstAttribute="top" secondItem="ATv-R2-0aP" secondAttribute="top" id="Ta5-hu-Fd3"/>
<constraint firstItem="UWd-oB-aUz" firstAttribute="centerX" secondItem="ATv-R2-0aP" secondAttribute="centerX" id="TyX-lq-PKP"/>
......@@ -1056,11 +1058,11 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x9j-kU-Q25">
<rect key="frame" x="0.0" y="98" width="414" height="798"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="joj-CT-lhk"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="x9j-kU-Q25" secondAttribute="bottom" id="4AK-ds-qXs"/>
<constraint firstItem="ATv-R2-0aP" firstAttribute="leading" secondItem="joj-CT-lhk" secondAttribute="leading" id="7Fh-SF-POy"/>
......
......@@ -32,18 +32,18 @@ import SwiftEventBus
setNavigationTitle("Ανάλυση")
// tab
leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
leftButton.setTitle("Εξαργυρωμένα", for:.normal)
leftButton.backgroundColor = . clear
leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
rightButton.setTitle("Μοιρασμένα δώρα", for:.normal)
rightButton.backgroundColor = . clear
rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
// leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
// rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
leftLineView.isHidden = false
rightLineView.isHidden = true
......@@ -142,11 +142,11 @@ import SwiftEventBus
self.leftLineView.isHidden = false
self.rightLineView.isHidden = true
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
}
let analysisVC = self.viewControllerAt(0)
pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true)
......@@ -162,11 +162,11 @@ import SwiftEventBus
self.leftLineView.isHidden = true
self.rightLineView.isHidden = false
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
}
let analysisVC = self.viewControllerAt(1)
pageController.setViewControllers([analysisVC!], direction:.forward, animated:true)
......@@ -218,19 +218,19 @@ extension MarketLoyaltyAnalysisViewController: UIPageViewControllerDataSource, U
if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] {
let currentIndex = childVCs[0].index
if (currentIndex == 0) {
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
self.leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
self.tabSelected = 0
self.leftLineView.isHidden = false
self.rightLineView.isHidden = true
} else {
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 15)
self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
self.rightButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
self.tabSelected = 1
self.leftLineView.isHidden = true
self.rightLineView.isHidden = false
......