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

[iphonex] [ios] Updated place page action bar layout.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-12-26 18:39:23 +03:00 • committed by Roman Kuznetsov
parent d2f53a6f53
commit fd2b8e7d9d
8 changed files with 93 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/UI/AvailableArea/PlacePageArea.swift
View file

@ -1,4 +1,8 @@
final class PlacePageArea: AvailableArea {
override var areaFrame: CGRect {
return frame
}
override func isAreaAffectingView(_ other: UIView) -> Bool {
return !other.placePageAreaAffectDirections.isEmpty
}

1
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.h
View file

@ -28,6 +28,7 @@
@property(nonatomic) BOOL isBookmark;
@property(nonatomic) BOOL isAreaNotDownloaded;
- (void)setVisible:(BOOL)visible;
- (void)setDownloadingProgress:(CGFloat)progress;
- (void)setDownloadingState:(MWMCircularProgressState)state;

20
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm
View file

@ -16,11 +16,12 @@ extern NSString * const kAlohalyticsTapEventKey;
}
@property(copy, nonatomic) IBOutletCollection(UIView) NSArray<UIView *> * buttons;
@property(weak, nonatomic) IBOutlet UIImageView * separator;
@property(weak, nonatomic) id<MWMActionBarSharedData> data;
@property(weak, nonatomic) id<MWMActionBarProtocol> delegate;
@property(nonatomic) NSLayoutConstraint * visibleConstraint;
@end
@implementation MWMPlacePageActionBar
@ -30,6 +31,7 @@ extern NSString * const kAlohalyticsTapEventKey;
MWMPlacePageActionBar * bar =
[NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject;
bar.delegate = delegate;
bar.translatesAutoresizingMaskIntoConstraints = NO;
return bar;
}
@ -352,16 +354,22 @@ extern NSString * const kAlohalyticsTapEventKey;
[vc presentViewController:alertController animated:YES completion:nil];
}
- (void)setVisible:(BOOL)visible
{
self.visibleConstraint.active = NO;
NSLayoutYAxisAnchor * bottomAnchor = self.superview.bottomAnchor;
if (@available(iOS 11.0, *))
bottomAnchor = self.superview.safeAreaLayoutGuide.bottomAnchor;
self.alpha = visible ? 1 : 0;
self.visibleConstraint = [bottomAnchor constraintEqualToAnchor:visible ? self.bottomAnchor : self.topAnchor];
self.visibleConstraint.active = YES;
}
#pragma mark - Layout
- (void)layoutSubviews
{
[super layoutSubviews];
self.width = self.superview.width;
if (IPAD)
self.maxY = self.superview.height;
self.separator.width = self.width;
CGFloat const buttonWidth = self.width / m_visibleButtons.size();
for (UIView * button in self.buttons)
{

60
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.xib
View file

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@ -11,37 +15,67 @@
<rect key="frame" x="0.0" y="0.0" width="360" height="48"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="WPU-f0-gXc">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EPN-YR-G6Y">
<rect key="frame" x="-100" y="0.0" width="560" height="148"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
</userDefinedRuntimeAttributes>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="WPU-f0-gXc">
<rect key="frame" x="0.0" y="0.0" width="360" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="7JI-Ia-wWj"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
</userDefinedRuntimeAttributes>
</imageView>
<view tag="1" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ctK-eb-hsj" userLabel="First">
<rect key="frame" x="0.0" y="0.0" width="90" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="First"/>
</view>
<view tag="2" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j7d-3d-R7Z" userLabel="Second">
<rect key="frame" x="90" y="0.0" width="90" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="Second"/>
</view>
<view tag="3" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xtb-qr-MYt" userLabel="Third">
<rect key="frame" x="180" y="0.0" width="90" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="Third"/>
</view>
<view tag="4" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A9L-Jr-3Qt" userLabel="Fourth">
<rect key="frame" x="270" y="0.0" width="90" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="Fourth"/>
</view>
</subviews>
<color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" red="0.95075207948684692" green="0.95072358846664429" blue="0.95073974132537842" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="EPN-YR-G6Y" secondAttribute="trailing" constant="-100" id="1Yz-8I-5ir">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstItem="EPN-YR-G6Y" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="-100" id="4Gq-tX-248">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstAttribute="trailing" secondItem="WPU-f0-gXc" secondAttribute="trailing" id="OoZ-zr-1rp"/>
<constraint firstItem="WPU-f0-gXc" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Q43-U2-YPD"/>
<constraint firstAttribute="bottom" secondItem="WPU-f0-gXc" secondAttribute="bottom" priority="999" constant="47" id="eX4-Qs-lAP"/>
<constraint firstItem="EPN-YR-G6Y" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="lZI-8f-kct"/>
<constraint firstItem="WPU-f0-gXc" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="q6T-8P-VNl"/>
<constraint firstAttribute="bottom" secondItem="EPN-YR-G6Y" secondAttribute="bottom" constant="-100" id="tXE-mh-UBf">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="separator" destination="WPU-f0-gXc" id="jB7-uz-676"/>
<outletCollection property="buttons" destination="j7d-3d-R7Z" id="zQ7-1E-mim"/>
<outletCollection property="buttons" destination="Xtb-qr-MYt" id="ODg-IK-Yj1"/>
<outletCollection property="buttons" destination="A9L-Jr-3Qt" id="Sdq-bh-P1v"/>

16
iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPadPlacePageLayoutImpl.mm
View file

@ -55,16 +55,14 @@ CGFloat const kBottomOffset = 36;
- (void)onShow
{
auto ppView = self.placePageView;
auto actionBar = self.actionBar;
ppView.tableView.scrollEnabled = NO;
actionBar.alpha = 0;
ppView.alpha = 0;
ppView.origin = {- kPlacePageWidth, self.topBound};
[self.ownerView addSubview:ppView];
place_page_layout::animate(^{
[self.actionBar setVisible:YES];
ppView.alpha = 1;
actionBar.alpha = 1;
ppView.minX = self.leftBound;
});
@ -196,8 +194,18 @@ CGFloat const kBottomOffset = 36;
if (actionBar)
{
auto superview = self.placePageView;
actionBar.origin = {0., superview.height - actionBar.height};
[superview addSubview:actionBar];
NSLayoutXAxisAnchor * leadingAnchor = superview.leadingAnchor;
NSLayoutXAxisAnchor * trailingAnchor = superview.trailingAnchor;
if (@available(iOS 11.0, *))
{
UILayoutGuide * safeAreaLayoutGuide = superview.safeAreaLayoutGuide;
leadingAnchor = safeAreaLayoutGuide.leadingAnchor;
trailingAnchor = safeAreaLayoutGuide.trailingAnchor;
}
[actionBar.leadingAnchor constraintEqualToAnchor:leadingAnchor].active = YES;
[actionBar.trailingAnchor constraintEqualToAnchor:trailingAnchor].active = YES;
[actionBar setVisible:NO];
}
else
{

21
iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm
View file

@ -77,8 +77,7 @@ CGFloat const kMinOffset = 1;
dispatch_async(dispatch_get_main_queue(), ^{
place_page_layout::animate(^{
auto actionBar = self.actionBar;
actionBar.maxY = actionBar.superview.height;
[self.actionBar setVisible:YES];
auto const targetOffset =
self.state == State::Expanded ? self.expandedContentOffset : self.bottomContentOffset;
[self setAnimatedContentOffset:targetOffset];
@ -89,7 +88,6 @@ CGFloat const kMinOffset = 1;
- (void)onClose
{
place_page_layout::animate(^{
self.actionBar.minY = self.ownerView.height;
[self setAnimatedContentOffset:0];
},^{
id<MWMPlacePageLayoutDelegate> delegate = self.delegate;
@ -113,9 +111,6 @@ CGFloat const kMinOffset = 1;
sv.delegate = self;
auto const size = frame.size;
self.placePageView.minY = size.height;
auto actionBar = self.actionBar;
actionBar.frame = {{0., frame.origin.y + size.height - actionBar.height},
{size.width, actionBar.height}};
[self.delegate onPlacePageTopBoundChanged:self.scrollView.contentOffset.y];
[self setAnimatedContentOffset:self.state == State::Top ? self.topContentOffset
: self.bottomContentOffset];
@ -138,8 +133,6 @@ CGFloat const kMinOffset = 1;
- (void)heightWasChanged
{
dispatch_async(dispatch_get_main_queue(), ^{
auto actionBar = self.actionBar;
actionBar.maxY = actionBar.superview.height;
if (self.state == State::Bottom)
[self setAnimatedContentOffset:self.bottomContentOffset];
});
@ -351,8 +344,18 @@ CGFloat const kMinOffset = 1;
if (actionBar)
{
auto superview = self.ownerView;
actionBar.minY = superview.height;
[superview addSubview:actionBar];
NSLayoutXAxisAnchor * leadingAnchor = superview.leadingAnchor;
NSLayoutXAxisAnchor * trailingAnchor = superview.trailingAnchor;
if (@available(iOS 11.0, *))
{
UILayoutGuide * safeAreaLayoutGuide = superview.safeAreaLayoutGuide;
leadingAnchor = safeAreaLayoutGuide.leadingAnchor;
trailingAnchor = safeAreaLayoutGuide.trailingAnchor;
}
[actionBar.leadingAnchor constraintEqualToAnchor:leadingAnchor].active = YES;
[actionBar.trailingAnchor constraintEqualToAnchor:trailingAnchor].active = YES;
[actionBar setVisible:NO];
}
else
{

15
iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm
View file

@ -82,21 +82,6 @@ CGFloat const kTableViewTopInset = -36;
[self.tableView removeObserver:self forKeyPath:kTableViewContentSizeKeyPath context:kContext];
}
- (void)layoutSubviews
{
[super layoutSubviews];
if (!IPAD)
return;
for (UIView * sv in self.subviews)
{
if (![sv isKindOfClass:[MWMPlacePageActionBar class]])
continue;
sv.maxY = self.height;
break;
}
}
#pragma mark - VisibleArea
- (MWMAvailableAreaAffectDirections)visibleAreaAffectDirections

11
iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.xib
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -15,7 +15,7 @@
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMPPView">
<view clipsSubviews="YES" contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMPPView">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@ -81,9 +81,4 @@
<resources>
<image name="ic_anchor_up" width="22" height="6"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
</simulatedMetricsContainer>
</document>