pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] fix divider color in PP

Browse source 
https://jira.mail.ru/browse/MAPSME-13116
This commit is contained in:
Aleksey Belousov 2020-04-03 04:22:49 +03:00 • committed by Vladimir Byko-Ianko
parent 6c9acab793
commit bfaec78b33
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Core/Theme/Colors.swift
View file

@ -24,6 +24,7 @@ class DayColors: IColors {
var blackSecondaryText = UIColor(0, 0, 0, alpha54)
var blackHintText = UIColor(0, 0, 0, alpha26)
var blackDividers = UIColor(0, 0, 0, alpha12)
var solidDividers = UIColor(224, 224, 224, alpha100)
var white = UIColor(255, 255, 255, alpha100)
var whitePrimaryText = UIColor(255, 255, 255, alpha87);
var whitePrimaryTextHighlighted = UIColor(255, 255, 255, alpha30);
@ -94,6 +95,7 @@ class NightColors: IColors {
var blackSecondaryText = UIColor(255, 255, 255, alpha70)
var blackHintText = UIColor(255, 255, 255, alpha30)
var blackDividers = UIColor(255, 255, 255, alpha12)
var solidDividers = UIColor(84, 86, 90, alpha100)
var white = UIColor(60, 64, 68, alpha100)
var whitePrimaryText = UIColor(255, 255, 255, alpha87)
var whitePrimaryTextHighlighted = UIColor(255, 255, 255, alpha30)

1
iphone/Maps/Core/Theme/Components/IColors.swift
View file

@ -34,6 +34,7 @@ let alpha100: CGFloat = 1.0
var blackSecondaryText: UIColor { get }
var blackHintText: UIColor { get }
var blackDividers: UIColor { get }
var solidDividers: UIColor { get }
var white: UIColor { get }
var whitePrimaryText: UIColor { get }
var whitePrimaryTextHighlighted: UIColor { get }

4
iphone/Maps/Core/Theme/GlobalStyleSheet.swift
View file

@ -82,6 +82,10 @@ class GlobalStyleSheet: IStyleSheet {
s.backgroundColor = colors.blackDividers
}
theme.add(styleName: "SolidDivider") { (s) -> (Void) in
s.backgroundColor = colors.solidDividers
}
theme.add(styleName: "Background") { (s) -> (Void) in
s.backgroundColor = colors.white
}

6
iphone/Maps/UI/PlacePage/PlacePage.storyboard
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
<capability name="collection view cell content view" minToolsVersion="11.0"/>
@ -47,7 +47,7 @@
<constraint firstAttribute="height" constant="1" id="G2u-nx-IJt"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SolidDivider"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="inM-UW-vpv">