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

[ios] Fixed buttons behavior.

Browse source
This commit is contained in:
VladiMihaylenko 2016-01-27 16:14:41 +03:00 • committed by Sergey Yershov
parent c6e99aac4e
commit 5c19d91b83
22 changed files with 263 additions and 285 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Categories/UIKitCategories.mm
View file

@ -1,5 +1,4 @@
#import "Common.h"
#import "UIButton+Coloring.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"
#import "UIKitCategories.h"
@ -246,7 +245,6 @@
- (void)refresh
{
[self changeColoringToOpposite];
UIColor * oppositeNormal = [self titleColorForState:UIControlStateNormal].opposite;
UIColor * oppositeSelected = [self titleColorForState:UIControlStateSelected].opposite;
UIColor * oppositeHightlighted = [self titleColorForState:UIControlStateHighlighted].opposite;

14
iphone/Maps/Classes/Components/MWMButton.h Normal file
View file

@ -0,0 +1,14 @@
typedef NS_ENUM(NSUInteger, MWMButtonColoring)
{
MWMButtonColoringOther,
MWMButtonColoringBlue,
MWMButtonColoringBlack,
MWMButtonColoringGray
};
@interface MWMButton : UIButton
@property (copy, nonatomic) NSString * imageName;
@property (nonatomic) MWMButtonColoring coloring;
@end

144
iphone/Maps/Classes/Components/MWMButton.mm Normal file
View file

@ -0,0 +1,144 @@
#import "MWMButton.h"
#import "UIColor+MapsMeColor.h"
namespace
{
NSString * const kDefaultPattern = @"%@_%@";
NSString * const kHighlightedPattern = @"%@_highlighted_%@";
NSString * const kSelectedPattern = @"%@_selected_%@";
} // namespace
@implementation MWMButton
- (void)setImageName:(NSString *)imageName
{
_imageName = imageName;
[self setDefaultImages];
}
- (void)refresh
{
[self changeColoringToOpposite];
[super refresh];
}
- (void)setColoring:(MWMButtonColoring)coloring
{
_coloring = coloring;
[self.imageView makeImageAlwaysTemplate];
[self setDefaultTintColor];
}
- (void)changeColoringToOpposite
{
if (self.coloring == MWMButtonColoringOther)
{
if (self.imageName)
{
[self setDefaultImages];
self.imageView.image = [self imageForState:self.state];
}
return;
}
if (self.state == UIControlStateNormal)
[self setDefaultTintColor];
else if (self.state == UIControlStateHighlighted)
[self setHighlighted:YES];
else if (self.state == UIControlStateSelected)
[self setSelected:YES];
}
- (void)setDefaultImages
{
NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light";
[self setImage:[UIImage imageNamed:[NSString stringWithFormat:kDefaultPattern, self.imageName, postfix]] forState:UIControlStateNormal];
[self setImage:[UIImage imageNamed:[NSString stringWithFormat:kHighlightedPattern, self.imageName, postfix]] forState:UIControlStateHighlighted];
[self setImage:[UIImage imageNamed:[NSString stringWithFormat:kSelectedPattern, self.imageName, postfix]] forState:UIControlStateSelected];
}
- (void)setHighlighted:(BOOL)highlighted
{
[super setHighlighted:highlighted];
[self.imageView makeImageAlwaysTemplate];
if (highlighted)
{
switch (self.coloring)
{
case MWMButtonColoringBlue:
self.tintColor = [UIColor linkBlueDark];
break;
case MWMButtonColoringBlack:
self.tintColor = [UIColor blackHintText];
break;
case MWMButtonColoringGray:
self.tintColor = [UIColor blackDividers];
break;
case MWMButtonColoringOther:
break;
}
}
else
{
if (self.selected)
return;
[self setDefaultTintColor];
}
}
- (void)setSelected:(BOOL)selected
{
[super setSelected:selected];
[self.imageView makeImageAlwaysTemplate];
if (selected)
{
switch (self.coloring)
{
case MWMButtonColoringBlack:
self.tintColor = [UIColor linkBlue];
break;
case MWMButtonColoringBlue:
case MWMButtonColoringOther:
case MWMButtonColoringGray:
break;
}
}
else
{
[self setDefaultTintColor];
}
}
- (void)setDefaultTintColor
{
switch (self.coloring)
{
case MWMButtonColoringBlack:
self.tintColor = [UIColor blackSecondaryText];
break;
case MWMButtonColoringBlue:
self.tintColor = [UIColor linkBlue];
break;
case MWMButtonColoringGray:
self.tintColor = [UIColor blackHintText];
break;
case MWMButtonColoringOther:
self.imageView.image = [self imageForState:UIControlStateNormal];
break;
}
}
- (void)setColoringName:(NSString *)coloring
{
if ([coloring isEqualToString:@"MWMBlue"])
self.coloring = MWMButtonColoringBlue;
else if ([coloring isEqualToString:@"MWMBlack"])
self.coloring = MWMButtonColoringBlack;
else if ([coloring isEqualToString:@"MWMOther"])
self.coloring = MWMButtonColoringOther;
else if ([coloring isEqualToString:@"MWMGray"])
self.coloring = MWMButtonColoringGray;
else
NSAssert(false, @"Invalid UIButton's coloring!");
}
@end

9
iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMCircularProgress">
@ -15,9 +15,8 @@
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="viF-Ee-7h0">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="viF-Ee-7h0" customClass="MWMButton">
<rect key="frame" x="-6" y="-6" width="44" height="44"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<state key="normal">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@ -28,10 +27,8 @@
</button>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aMt-XV-9UK" userLabel="Spinner">
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
<animations/>
</imageView>
</subviews>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="viF-Ee-7h0" firstAttribute="top" secondItem="2DE-Qh-89K" secondAttribute="top" constant="-6" id="3gS-24-Olj"/>

14
iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
View file

@ -1,7 +1,7 @@
#import "Common.h"
#import "MWMButton.h"
#import "MWMCircularProgress.h"
#import "MWMCircularProgressView.h"
#import "UIButton+Coloring.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"
@ -26,7 +26,7 @@ static inline CGFloat angleWithProgress(CGFloat progress)
@property (weak, nonatomic) IBOutlet MWMCircularProgress * owner;
@property (weak, nonatomic) IBOutlet UIImageView * spinner;
@property (weak, nonatomic) IBOutlet UIButton * button;
@property (weak, nonatomic) IBOutlet MWMButton * button;
@end
@ -102,23 +102,23 @@ static inline CGFloat angleWithProgress(CGFloat progress)
{
case MWMCircularProgressStateNormal:
normalImage = self.images[@(MWMCircularProgressStateNormal)];
self.button.mwm_coloring = MWMButtonColoringBlack;
self.button.coloring = MWMButtonColoringBlack;
break;
case MWMCircularProgressStateSelected:
normalImage = self.images[@(MWMCircularProgressStateSelected)];
self.button.mwm_coloring = MWMButtonColoringBlue;
self.button.coloring = MWMButtonColoringBlue;
break;
case MWMCircularProgressStateProgress:
normalImage = self.images[@(MWMCircularProgressStateProgress)];
self.button.mwm_coloring = MWMButtonColoringBlue;
self.button.coloring = MWMButtonColoringBlue;
break;
case MWMCircularProgressStateFailed:
normalImage = self.images[@(MWMCircularProgressStateFailed)];
self.button.mwm_coloring = MWMButtonColoringBlue;
self.button.coloring = MWMButtonColoringBlue;
break;
case MWMCircularProgressStateCompleted:
normalImage = self.images[@(MWMCircularProgressStateCompleted)];
self.button.mwm_coloring = MWMButtonColoringBlue;
self.button.coloring = MWMButtonColoringBlue;
break;
}
[self.button setImage:normalImage forState:UIControlStateNormal];

22
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
View file

@ -2,8 +2,8 @@
#import "EAGLView.h"
#import "MWMBottomMenuView.h"
#import "MWMBottomMenuViewController.h"
#import "MWMButton.h"
#import "MapsAppDelegate.h"
#import "UIButton+Coloring.h"
#import "UIButton+RuntimeAttributes.h"
#import "UIColor+MapsMeColor.h"
#import "UIFont+MapsMeFonts.h"
@ -24,11 +24,11 @@
@property(weak, nonatomic) IBOutlet UIView * downloadBadge;
@property(weak, nonatomic) IBOutlet UIButton * locationButton;
@property(weak, nonatomic) IBOutlet UIButton * p2pButton;
@property(weak, nonatomic) IBOutlet UIButton * searchButton;
@property(weak, nonatomic) IBOutlet UIButton * bookmarksButton;
@property(weak, nonatomic) IBOutlet UIButton * menuButton;
@property(weak, nonatomic) IBOutlet MWMButton * locationButton;
@property(weak, nonatomic) IBOutlet MWMButton * p2pButton;
@property(weak, nonatomic) IBOutlet MWMButton * searchButton;
@property(weak, nonatomic) IBOutlet MWMButton * bookmarksButton;
@property(weak, nonatomic) IBOutlet MWMButton * menuButton;
@property(weak, nonatomic) IBOutlet UIButton * goButton;
@ -298,11 +298,11 @@
{
if (!isIOSVersionLessThan(8))
return;
auto const coloring = self.p2pButton.mwm_coloring;
self.p2pButton.mwm_coloring = coloring;
self.bookmarksButton.mwm_coloring = coloring;
self.locationButton.mwm_coloring = self.locationButton.mwm_coloring;
self.searchButton.mwm_coloring = self.searchButton.mwm_coloring;
auto const coloring = self.p2pButton.coloring;
self.p2pButton.coloring = coloring;
self.bookmarksButton.coloring = coloring;
self.locationButton.coloring = self.locationButton.coloring;
self.searchButton.coloring = self.searchButton.coloring;
}
#pragma mark - Properties

4
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
View file

@ -3,7 +3,7 @@
#include "platform/location.hpp"
@class MapViewController;
@class MapViewController, MWMButton;
@protocol MWMBottomMenuControllerProtocol<NSObject>
@ -15,7 +15,7 @@
@interface MWMBottomMenuViewController : ViewController
@property(nonatomic) MWMBottomMenuState state;
@property(weak, nonatomic) IBOutlet UIButton * p2pButton;
@property(weak, nonatomic) IBOutlet MWMButton * p2pButton;
@property(nonatomic) CGFloat leftBound;
- (instancetype)initWithParentController:(MapViewController *)controller

16
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -7,11 +7,11 @@
#import "MWMBottomMenuLayout.h"
#import "MWMBottomMenuView.h"
#import "MWMBottomMenuViewController.h"
#import "MWMButton.h"
#import "MWMMapViewControlsManager.h"
#import "MWMSearchManager.h"
#import "SettingsAndMoreVC.h"
#import "Statistics.h"
#import "UIButton+Coloring.h"
#import "UIImageView+Coloring.h"
#import "UIColor+MapsMeColor.h"
#import "UIKitCategories.h"
@ -43,7 +43,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
@property (weak, nonatomic) MapViewController * controller;
@property (weak, nonatomic) IBOutlet UICollectionView * buttonsCollectionView;
@property (weak, nonatomic) IBOutlet UIButton * locationButton;
@property (weak, nonatomic) IBOutlet MWMButton * locationButton;
@property (weak, nonatomic) IBOutlet UICollectionView * additionalButtons;
@property (weak, nonatomic) IBOutlet UILabel * streetLabel;
@ -219,27 +219,27 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
}
else
{
UIButton * locBtn = self.locationButton;
MWMButton * locBtn = self.locationButton;
switch (state)
{
case location::MODE_PENDING_POSITION:
locBtn.mwm_coloring = MWMButtonColoringBlue;
locBtn.coloring = MWMButtonColoringBlue;
break;
case location::MODE_UNKNOWN_POSITION:
[locBtn setImage:[UIImage imageNamed:@"ic_menu_location_follow"] forState:UIControlStateNormal];
locBtn.mwm_coloring = MWMButtonColoringGray;
locBtn.coloring = MWMButtonColoringGray;
break;
case location::MODE_NOT_FOLLOW:
[locBtn setImage:[UIImage imageNamed:@"ic_menu_location_get_position"] forState:UIControlStateNormal];
locBtn.mwm_coloring = MWMButtonColoringBlack;
locBtn.coloring = MWMButtonColoringBlack;
break;
case location::MODE_FOLLOW:
[locBtn setImage:[UIImage imageNamed:@"ic_menu_location_follow"] forState:UIControlStateNormal];
locBtn.mwm_coloring = MWMButtonColoringBlue;
locBtn.coloring = MWMButtonColoringBlue;
break;
case location::MODE_ROTATE_AND_FOLLOW:
[locBtn setImage:[UIImage imageNamed:@"ic_menu_location_follow_and_rotate"] forState:UIControlStateNormal];
locBtn.mwm_coloring = MWMButtonColoringBlue;
locBtn.coloring = MWMButtonColoringBlue;
break;
}
}

18
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib
View file

@ -28,7 +28,7 @@
<view opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kbJ-If-gUR" userLabel="MainButtons">
<rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0b-7N-YrO" userLabel="Location">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0b-7N-YrO" userLabel="Location" customClass="MWMButton">
<rect key="frame" x="0.0" y="0.0" width="64" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="locationButton"/>
@ -40,19 +40,19 @@
<action selector="locationButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="8yA-JL-DUf"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xQ0-ZK-UXk" userLabel="P2P">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xQ0-ZK-UXk" userLabel="P2P" customClass="MWMButton">
<rect key="frame" x="64" y="0.0" width="64" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="p2pButton"/>
<state key="normal" image="ic_menu_point_to_point"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="point2PointButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="s4j-nH-gFP"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IzQ-aQ-aPH" userLabel="Search">
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IzQ-aQ-aPH" userLabel="Search" customClass="MWMButton">
<rect key="frame" x="128" y="0.0" width="64" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="searchButton"/>
@ -61,25 +61,25 @@
</constraints>
<state key="normal" image="ic_menu_search"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="searchButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="Orp-zQ-HVP"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qVh-dm-DDH" userLabel="Bookmarks">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qVh-dm-DDH" userLabel="Bookmarks" customClass="MWMButton">
<rect key="frame" x="192" y="0.0" width="64" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="bookmarksButton"/>
<state key="normal" image="ic_menu_bookmark_list"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="bookmarksButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="6rq-3I-Tcp"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YLY-C4-SBu" userLabel="Menu">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YLY-C4-SBu" userLabel="Menu" customClass="MWMButton">
<rect key="frame" x="256" y="0.0" width="64" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="menuButton"/>
@ -88,7 +88,7 @@
</constraints>
<state key="normal" image="ic_menu"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="menuButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="RZO-bi-Zfz"/>

4
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -189,7 +189,7 @@ extern NSString * const kAlohalyticsTapEventKey;
[self.navigationManager.routePreview removeFromSuperview];
[self didCancelRouting];
self.navigationManager.state = MWMNavigationDashboardStateHidden;
self.menuController.p2pButton.selected = NO;
static_cast<UIButton *>(self.menuController.p2pButton).selected = NO;
}];
}
}
@ -285,7 +285,7 @@ extern NSString * const kAlohalyticsTapEventKey;
- (void)buildRouteFrom:(MWMRoutePoint const &)from to:(MWMRoutePoint const &)to
{
self.menuController.p2pButton.selected = YES;
static_cast<UIButton *>(self.menuController.p2pButton).selected = YES;
self.navigationManager.routePreview.extendButton.selected = NO;
MapsAppDelegate.theApp.routingPlaneMode = MWMRoutingPlaneModePlacePage;
if (from == MWMRoutePoint::MWMRoutePointZero())

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.xib
View file

@ -14,7 +14,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aNc-6m-i8r" userLabel="VisibilityButton">
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aNc-6m-i8r" userLabel="VisibilityButton" customClass="MWMButton">
<rect key="frame" x="0.0" y="0.0" width="60" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="g2n-JI-FYq"/>
@ -24,7 +24,7 @@
</state>
<state key="selected" image="ic_show"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="toggleVisibility" destination="KGk-i7-Jjw" eventType="touchUpInside" id="kEx-DN-uuu"/>

8
iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.xib
View file

@ -16,14 +16,14 @@
<rect key="frame" x="0.0" y="0.0" width="56" height="116"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="NO3-Xl-Oka" userLabel="ZoomIn">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="NO3-Xl-Oka" userLabel="ZoomIn" customClass="MWMButton">
<rect key="frame" x="0.0" y="0.0" width="56" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="btn_zoom_in_light">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="mwm_name" value="btn_zoom_in"/>
<userDefinedRuntimeAttribute type="string" keyPath="imageName" value="btn_zoom_in"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="zoomTouchDown:" destination="-1" eventType="touchDown" id="5VF-m8-Lwc"/>
@ -31,14 +31,14 @@
<action selector="zoomTouchUpOutside:" destination="-1" eventType="touchUpOutside" id="w6V-A2-cZM"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hwn-8L-cFX" userLabel="ZoomOut">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hwn-8L-cFX" userLabel="ZoomOut" customClass="MWMButton">
<rect key="frame" x="0.0" y="60" width="56" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="btn_zoom_out_light">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="mwm_name" value="btn_zoom_out"/>
<userDefinedRuntimeAttribute type="string" keyPath="imageName" value="btn_zoom_out"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="zoomTouchDown:" destination="-1" eventType="touchDown" id="o4X-Kp-9ka"/>

1
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -11,7 +11,6 @@
#import "MWMRoutePreview.h"
#import "MWMTextToSpeech.h"
#import "Statistics.h"
#import "UIButton+Coloring.h"
static NSString * const kRoutePreviewXibName = @"MWMRoutePreview";
static NSString * const kRoutePreviewIPADXibName = @"MWMiPadRoutePreview";

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib
View file

@ -28,7 +28,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iZT-dR-FZ0" customClass="SolidTouchView">
<rect key="frame" x="0.0" y="0.0" width="736" height="90"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qvD-ft-rlE" userLabel="Cancel">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qvD-ft-rlE" userLabel="Cancel" customClass="MWMButton">
<rect key="frame" x="0.0" y="23" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="eaN-bt-8sb"/>
@ -38,7 +38,7 @@
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="navigationCancelPressed:" destination="-1" eventType="touchUpInside" id="cDi-Qi-vvq"/>
@ -211,7 +211,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ULL-In-aAg">
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ULL-In-aAg" customClass="MWMButton">
<rect key="frame" x="692" y="22" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="MB8-2E-wAL"/>
@ -220,7 +220,7 @@
<state key="normal" image="ic_voice_off"/>
<state key="selected" image="ic_voice_on"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="soundTap:" destination="-1" eventType="touchUpInside" id="WA3-uq-qo0"/>

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNiPadNavigationDashboard.xib
View file

@ -29,13 +29,13 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Ou-1e-eFR" customClass="SolidTouchView">
<rect key="frame" x="0.0" y="0.0" width="360" height="186"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xLk-1L-mbP" userLabel="Cancel">
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xLk-1L-mbP" userLabel="Cancel" customClass="MWMButton">
<rect key="frame" x="6" y="6" width="44" height="44"/>
<state key="normal" image="ic_nav_bar_close">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="navigationCancelPressed:" destination="-1" eventType="touchUpInside" id="aAu-j5-Y4z"/>
@ -87,7 +87,7 @@
<constraint firstAttribute="centerX" secondItem="AZa-ok-2IV" secondAttribute="centerX" multiplier="3:1" id="sVn-sG-v3Q"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aqb-lr-tzL">
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aqb-lr-tzL" customClass="MWMButton">
<rect key="frame" x="312" y="6" width="44" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="UqN-lJ-bXU"/>
@ -96,7 +96,7 @@
<state key="normal" image="ic_voice_off"/>
<state key="selected" image="ic_voice_on"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="soundTap:" destination="-1" eventType="touchUpInside" id="aqG-hG-ebJ"/>

10
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib
View file

@ -29,7 +29,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9t0-Kj-KTa" customClass="SolidTouchView">
<rect key="frame" x="0.0" y="0.0" width="320" height="132"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CJi-qt-H0B" userLabel="Cancel">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CJi-qt-H0B" userLabel="Cancel" customClass="MWMButton">
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="Ok9-eV-7ac"/>
@ -39,7 +39,7 @@
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="navigationCancelPressed:" destination="-1" eventType="touchUpInside" id="FHv-ny-D7o"/>
@ -170,7 +170,7 @@
<color key="minimumTrackTintColor" red="0.0" green="0.0" blue="0.0" alpha="0.56000000000000005" colorSpace="custom" customColorSpace="sRGB"/>
<color key="maximumTrackTintColor" red="0.0" green="0.0" blue="0.0" alpha="0.080000000000000002" colorSpace="calibratedRGB"/>
</slider>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YYH-DO-DXQ">
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YYH-DO-DXQ" customClass="MWMButton">
<rect key="frame" x="276" y="2" width="44" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="g60-zB-ibp"/>
@ -179,7 +179,7 @@
<state key="normal" image="ic_voice_off"/>
<state key="selected" image="ic_voice_on"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="soundTap:" destination="-1" eventType="touchUpInside" id="mDK-P2-VpS"/>
@ -246,7 +246,7 @@
</view>
</objects>
<resources>
<image name="ic_direction" width="96" height="96"/>
<image name="ic_direction" width="64" height="64"/>
<image name="ic_nav_bar_close" width="44" height="44"/>
<image name="ic_voice_off" width="28" height="28"/>
<image name="ic_voice_on" width="28" height="28"/>

4
iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib
View file

@ -14,14 +14,14 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHW-h6-k3U" userLabel="Cancel Button">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHW-h6-k3U" userLabel="Cancel Button" customClass="MWMButton">
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="6T7-Ur-RWl"/>
</constraints>
<state key="normal" image="ic_clear_sys"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="cancelTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="UKS-mG-ZJG"/>

16
iphone/Maps/Classes/PlacePageActionBar.xib
View file

@ -11,14 +11,14 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pZD-rg-W4y" userLabel="BackButton">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pZD-rg-W4y" userLabel="BackButton" customClass="MWMButton">
<rect key="frame" x="0.0" y="-5" width="80" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="ic_back_api">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="backTap" destination="iN0-l3-epB" eventType="touchUpInside" id="C4S-yq-52j"/>
@ -36,14 +36,14 @@
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular10"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Jtm-w6-q1e" userLabel="ShareButton">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Jtm-w6-q1e" userLabel="ShareButton" customClass="MWMButton">
<rect key="frame" x="80" y="-5" width="80" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="ic_menu_share">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="shareTap" destination="iN0-l3-epB" eventType="touchUpInside" id="PGT-Ie-Gmr"/>
@ -61,13 +61,13 @@
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular10"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="66j-hn-azO" userLabel="SaveButton">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="66j-hn-azO" userLabel="SaveButton" customClass="MWMButton">
<rect key="frame" x="160" y="-5" width="80" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="" image="ic_bookmarks_off"/>
<state key="selected" image="ic_bookmarks_on"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="bookmarkTap:" destination="iN0-l3-epB" eventType="touchUpInside" id="sTn-J9-JAv"/>
@ -85,14 +85,14 @@
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular10"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6cp-1o-ehc" userLabel="RouteButton">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6cp-1o-ehc" userLabel="RouteButton" customClass="MWMButton">
<rect key="frame" x="240" y="-5" width="80" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="ic_route">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="routeTap" destination="iN0-l3-epB" eventType="touchUpInside" id="mAp-BH-2qW"/>

16
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -788,10 +788,8 @@
F626D52E1C3E6CAA00C17D15 /* MWMTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */; };
F626D52F1C3E83F800C17D15 /* MWMTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */; };
F626D5301C3E840600C17D15 /* MWMNightModeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6B2E61E1C3D5F31005562DF /* MWMNightModeController.mm */; };
F626D5321C3E845600C17D15 /* UIButton+Coloring.mm in Sources */ = {isa = PBXBuildFile; fileRef = F62F1D971C32B968006CF38E /* UIButton+Coloring.mm */; };
F626D5331C3E846E00C17D15 /* UIImageView+Coloring.mm in Sources */ = {isa = PBXBuildFile; fileRef = F62F1D941C3281F1006CF38E /* UIImageView+Coloring.mm */; };
F62F1D951C3281F1006CF38E /* UIImageView+Coloring.mm in Sources */ = {isa = PBXBuildFile; fileRef = F62F1D941C3281F1006CF38E /* UIImageView+Coloring.mm */; };
F62F1D981C32B968006CF38E /* UIButton+Coloring.mm in Sources */ = {isa = PBXBuildFile; fileRef = F62F1D971C32B968006CF38E /* UIButton+Coloring.mm */; };
F63732961AE9431E00A03764 /* MWMBasePlacePageView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63732951AE9431E00A03764 /* MWMBasePlacePageView.mm */; };
F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; };
F63774EA1B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */; };
@ -888,6 +886,8 @@
F6FE2C151B04A44E009814AA /* MWMPlacePageEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE2C141B04A44E009814AA /* MWMPlacePageEntity.mm */; };
F6FEA8291C57B583007223CC /* MWMEditorSpacerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */; };
F6FEA82A1C57B583007223CC /* MWMEditorSpacerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */; };
F6FEA82D1C58E89B007223CC /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; };
F6FEA82E1C58F108007223CC /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; };
F6FF2E2B1B8C5C020063FD1F /* MWMNextTurnPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FF2E2A1B8C5C020063FD1F /* MWMNextTurnPanel.xib */; };
F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; };
FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; };
@ -1468,8 +1468,6 @@
F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTableViewCell.mm; sourceTree = "<group>"; };
F62F1D931C3281F1006CF38E /* UIImageView+Coloring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+Coloring.h"; sourceTree = "<group>"; };
F62F1D941C3281F1006CF38E /* UIImageView+Coloring.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIImageView+Coloring.mm"; sourceTree = "<group>"; };
F62F1D961C32B968006CF38E /* UIButton+Coloring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Coloring.h"; sourceTree = "<group>"; };
F62F1D971C32B968006CF38E /* UIButton+Coloring.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIButton+Coloring.mm"; sourceTree = "<group>"; };
F63732941AE9431E00A03764 /* MWMBasePlacePageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBasePlacePageView.h; sourceTree = "<group>"; };
F63732951AE9431E00A03764 /* MWMBasePlacePageView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBasePlacePageView.mm; sourceTree = "<group>"; };
F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutingDisclaimerAlert.xib; sourceTree = "<group>"; };
@ -1615,6 +1613,8 @@
F6FE2C141B04A44E009814AA /* MWMPlacePageEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageEntity.mm; sourceTree = "<group>"; };
F6FEA8271C57B583007223CC /* MWMEditorSpacerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorSpacerCell.h; sourceTree = "<group>"; };
F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorSpacerCell.m; sourceTree = "<group>"; };
F6FEA82B1C58E89B007223CC /* MWMButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMButton.h; sourceTree = "<group>"; };
F6FEA82C1C58E89B007223CC /* MWMButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMButton.mm; sourceTree = "<group>"; };
F6FF2E2A1B8C5C020063FD1F /* MWMNextTurnPanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNextTurnPanel.xib; sourceTree = "<group>"; };
F785EB3E16386FC4003A38A8 /* BookmarkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BookmarkCell.h; path = Bookmarks/BookmarkCell.h; sourceTree = SOURCE_ROOT; };
F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BookmarkCell.mm; path = Bookmarks/BookmarkCell.mm; sourceTree = SOURCE_ROOT; };
@ -2194,6 +2194,8 @@
346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */,
F6791B111C43DEA7007A8A6E /* MWMStartButton.h */,
F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */,
F6FEA82B1C58E89B007223CC /* MWMButton.h */,
F6FEA82C1C58E89B007223CC /* MWMButton.mm */,
);
path = Components;
sourceTree = "<group>";
@ -2636,8 +2638,6 @@
342AD7711B53D32F00E0B997 /* UIView+RuntimeAttributes.mm */,
342AD76D1B53D30C00E0B997 /* UIButton+RuntimeAttributes.h */,
342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.mm */,
F62F1D961C32B968006CF38E /* UIButton+Coloring.h */,
F62F1D971C32B968006CF38E /* UIButton+Coloring.mm */,
F62F1D931C3281F1006CF38E /* UIImageView+Coloring.h */,
F62F1D941C3281F1006CF38E /* UIImageView+Coloring.mm */,
9747264218323080006B7CB7 /* UIKitCategories.h */,
@ -4002,6 +4002,7 @@
349A357A1B53D4C9009677EE /* MWMCircularProgress.mm in Sources */,
FAA5C2A2144F135F005337F6 /* LocationManager.mm in Sources */,
34B82ADA1B847FFC00180497 /* MWMSearchCell.mm in Sources */,
F6FEA82D1C58E89B007223CC /* MWMButton.mm in Sources */,
34181E8D1C0ECF210081B586 /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
F66A8FAC1B09F137001B9C97 /* MWMiPadPlacePage.mm in Sources */,
978F9240183B660F000D6C7C /* SettingsViewController.mm in Sources */,
@ -4078,7 +4079,6 @@
3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */,
342AD76F1B53D30C00E0B997 /* UIButton+RuntimeAttributes.mm in Sources */,
349C26B91BB04ED30005DF2F /* MWMBottomMenuView.mm in Sources */,
F62F1D981C32B968006CF38E /* UIButton+Coloring.mm in Sources */,
349A358C1B53EABC009677EE /* MWMSearchDownloadMapRequest.mm in Sources */,
F63732961AE9431E00A03764 /* MWMBasePlacePageView.mm in Sources */,
F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */,
@ -4237,7 +4237,6 @@
6741A9F71BF340DE002C974C /* MWMPedestrianShareAlert.mm in Sources */,
6741A9F81BF340DE002C974C /* MWMSharePedestrianRoutesToastActivityItem.mm in Sources */,
6741A9F91BF340DE002C974C /* MWMSearchSuggestionCell.mm in Sources */,
F626D5321C3E845600C17D15 /* UIButton+Coloring.mm in Sources */,
34181E961C0ECF210081B586 /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */,
34ABA61C1C2D4DCC00FE1BEC /* UITextField+RuntimeAttributes.mm in Sources */,
6741A9FA1BF340DE002C974C /* MWMBookmarkColorViewController.mm in Sources */,
@ -4305,6 +4304,7 @@
6741AA241BF340DE002C974C /* UIButton+RuntimeAttributes.mm in Sources */,
6741AA251BF340DE002C974C /* MWMBottomMenuView.mm in Sources */,
6741AA261BF340DE002C974C /* MWMSearchDownloadMapRequest.mm in Sources */,
F6FEA82E1C58F108007223CC /* MWMButton.mm in Sources */,
6741AA271BF340DE002C974C /* MWMBasePlacePageView.mm in Sources */,
6741AA281BF340DE002C974C /* MWMAlert.mm in Sources */,
6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */,

50
iphone/Maps/Mapsme.storyboard
View file

@ -1660,14 +1660,14 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
</userDefinedRuntimeAttributes>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IHU-D3-OHh">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IHU-D3-OHh" customClass="MWMButton">
<rect key="frame" x="520" y="0.0" width="48" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="48" id="YRa-pI-t6A"/>
</constraints>
<state key="normal" image="ic_more"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMGray"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="localChangesAction" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="Ycj-6E-vDD"/>
@ -1715,6 +1715,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CCh-RG-hju">
@ -1768,6 +1769,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
@ -1824,6 +1826,27 @@ the world. Join us!</string>
<constraint firstAttribute="width" constant="28" id="hdo-64-JVl"/>
</constraints>
</imageView>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U4B-pb-aFf">
<rect key="frame" x="16" y="394" width="568" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="Mm9-WB-LKh"/>
</constraints>
<state key="normal" title="Login with Facebook"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="login_with_facebook"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="loginFacebook" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="osd-dp-2jK"/>
<segue destination="anB-7S-ebY" kind="custom" identifier="" customClass="MWMSegue" id="KS5-GV-A1p"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_facebook" translatesAutoresizingMaskIntoConstraints="NO" id="bGN-fy-oFg">
<rect key="frame" x="32" y="402" width="28" height="28"/>
<constraints>
@ -1900,27 +1923,6 @@ the world. Join us!</string>
<action selector="logout" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="BCT-mT-JzT"/>
</connections>
</button>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U4B-pb-aFf">
<rect key="frame" x="16" y="394" width="568" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="Mm9-WB-LKh"/>
</constraints>
<state key="normal" title="Login with Facebook"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="login_with_facebook"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="loginFacebook" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="osd-dp-2jK"/>
<segue destination="anB-7S-ebY" kind="custom" identifier="" customClass="MWMSegue" id="KS5-GV-A1p"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="VTY-T1-l6q" firstAttribute="centerY" secondItem="cT8-b7-zTj" secondAttribute="centerY" id="0Jf-e2-H65"/>
@ -2551,7 +2553,7 @@ the world. Join us!</string>
<resources>
<image name="btn_back_arrow" width="12" height="20"/>
<image name="ic_arrow_gray" width="28" height="28"/>
<image name="ic_arrow_gray_down" width="14" height="8"/>
<image name="ic_arrow_gray_down" width="28" height="28"/>
<image name="ic_device" width="28" height="28"/>
<image name="ic_more" width="28" height="28"/>
<image name="ic_upload" width="28" height="28"/>

16
iphone/Maps/UIButton+Coloring.h
View file

@ -1,16 +0,0 @@
typedef NS_ENUM(NSUInteger, MWMButtonColoring)
{
MWMButtonColoringOther,
MWMButtonColoringBlue,
MWMButtonColoringBlack,
MWMButtonColoringGray
};
@interface UIButton (Coloring)
@property (nonatomic) MWMButtonColoring mwm_coloring;
@property (copy, nonatomic) NSString * mwm_name;
- (void)changeColoringToOpposite;
@end

160
iphone/Maps/UIButton+Coloring.mm
View file

@ -1,160 +0,0 @@
#import "UIButton+Coloring.h"
#import "UIColor+MapsMeColor.h"
#import <objc/runtime.h>
namespace
{
NSString * const kDefaultPattern = @"%@_%@";
NSString * const kHighlightedPattern = @"%@_highlighted_%@";
NSString * const kSelectedPattern = @"%@_selected_%@";
} // namespace
@implementation UIButton (Coloring)
- (void)setMwm_name:(NSString *)mwm_name
{
objc_setAssociatedObject(self, @selector(mwm_name), mwm_name, OBJC_ASSOCIATION_COPY_NONATOMIC);
[self setDefaultImages];
}
- (NSString *)mwm_name
{
return objc_getAssociatedObject(self, @selector(mwm_name));
}
- (void)setMwm_coloring:(MWMButtonColoring)mwm_coloring
{
objc_setAssociatedObject(self, @selector(mwm_coloring), @(mwm_coloring), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
[self.imageView makeImageAlwaysTemplate];
[self setDefaultTintColor];
}
- (void)changeColoringToOpposite
{
if (self.mwm_coloring == MWMButtonColoringOther)
{
if (self.mwm_name)
{
[self setDefaultImages];
self.imageView.image = [self imageForState:self.state];
}
return;
}
if (self.state == UIControlStateNormal)
[self setDefaultTintColor];
else if (self.state == UIControlStateHighlighted)
[self setHighlighted:YES];
else if (self.state == UIControlStateSelected)
[self setSelected:YES];
}
- (void)setDefaultImages
{
NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light";
[self setImage:[UIImage imageNamed:[NSString stringWithFormat:kDefaultPattern, self.mwm_name, postfix]] forState:UIControlStateNormal];
[self setImage:[UIImage imageNamed:[NSString stringWithFormat:kHighlightedPattern, self.mwm_name, postfix]] forState:UIControlStateHighlighted];
[self setImage:[UIImage imageNamed:[NSString stringWithFormat:kSelectedPattern, self.mwm_name, postfix]] forState:UIControlStateSelected];
}
- (void)setHighlighted:(BOOL)highlighted
{
[super setHighlighted:highlighted];
UIImage * image = [self imageForState:highlighted ? UIControlStateHighlighted : UIControlStateNormal];
if (highlighted)
{
self.imageView.image = image;
[self.imageView makeImageAlwaysTemplate];
switch (self.mwm_coloring)
{
case MWMButtonColoringBlue:
self.tintColor = [UIColor linkBlueDark];
break;
case MWMButtonColoringBlack:
self.tintColor = [UIColor blackHintText];
break;
case MWMButtonColoringGray:
self.tintColor = [UIColor blackDividers];
break;
case MWMButtonColoringOther:
break;
}
}
else
{
if (self.selected)
return;
self.imageView.image = image;
[self.imageView makeImageAlwaysTemplate];
[self setDefaultTintColor];
}
}
- (void)setSelected:(BOOL)selected
{
[super setSelected:selected];
if (UIImage * image = [self imageForState:selected ? UIControlStateSelected : UIControlStateNormal])
{
self.imageView.image = image;
[self.imageView makeImageAlwaysTemplate];
}
if (selected)
{
switch (self.mwm_coloring)
{
case MWMButtonColoringBlack:
self.tintColor = [UIColor linkBlue];
break;
case MWMButtonColoringBlue:
case MWMButtonColoringOther:
case MWMButtonColoringGray:
break;
}
}
else
{
[self setDefaultTintColor];
}
}
- (void)setDefaultTintColor
{
switch (self.mwm_coloring)
{
case MWMButtonColoringBlack:
self.tintColor = [UIColor blackSecondaryText];
break;
case MWMButtonColoringBlue:
self.tintColor = [UIColor linkBlue];
break;
case MWMButtonColoringGray:
self.tintColor = [UIColor blackHintText];
break;
case MWMButtonColoringOther:
self.imageView.image = [self imageForState:UIControlStateNormal];
break;
}
}
- (MWMButtonColoring)mwm_coloring
{
return static_cast<MWMButtonColoring>([objc_getAssociatedObject(self, @selector(mwm_coloring)) integerValue]);
}
- (void)setColoring:(NSString *)coloring
{
if ([coloring isEqualToString:@"MWMBlue"])
self.mwm_coloring = MWMButtonColoringBlue;
else if ([coloring isEqualToString:@"MWMBlack"])
self.mwm_coloring = MWMButtonColoringBlack;
else if ([coloring isEqualToString:@"MWMOther"])
self.mwm_coloring = MWMButtonColoringOther;
else if ([coloring isEqualToString:@"MWMGray"])
self.mwm_coloring = MWMButtonColoringGray;
else
NSAssert(false, @"Invalid UIButton's coloring!");
}
@end