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

[ios][android] Removed unused Place Page divider to free more space

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2021-07-11 19:20:46 +02:00 • committed by Alexander Borsuk
parent a15c728bd1
commit 15bc264b2e
4 changed files with 0 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -343,7 +343,6 @@
990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990F33B524BC915200D0F426 /* SearchActionBarView.swift */; };
9917D17F2397B1D600A7E06E /* IPadModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */; };
991FCA2423B11E61009AD684 /* BookmarksStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */; };
993416F82534427300526F6E /* PlacePageDividerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993416F72534427300526F6E /* PlacePageDividerViewController.swift */; };
993DF0B523F6B2EF00AC231A /* PlacePageElevationLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993DF0B423F6B2EF00AC231A /* PlacePageElevationLayout.swift */; };
993DF0C823F6BD0600AC231A /* ElevationDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993DF0C323F6BD0600AC231A /* ElevationDetailsViewController.swift */; };
993DF0C923F6BD0600AC231A /* ElevationDetailsBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993DF0C423F6BD0600AC231A /* ElevationDetailsBuilder.swift */; };
@ -1171,7 +1170,6 @@
990F33B524BC915200D0F426 /* SearchActionBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchActionBarView.swift; sourceTree = "<group>"; };
9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = "<group>"; };
991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksStyleSheet.swift; sourceTree = "<group>"; };
993416F72534427300526F6E /* PlacePageDividerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageDividerViewController.swift; sourceTree = "<group>"; };
993DF0B423F6B2EF00AC231A /* PlacePageElevationLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageElevationLayout.swift; sourceTree = "<group>"; };
993DF0C323F6BD0600AC231A /* ElevationDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElevationDetailsViewController.swift; sourceTree = "<group>"; };
993DF0C423F6BD0600AC231A /* ElevationDetailsBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElevationDetailsBuilder.swift; sourceTree = "<group>"; };
@ -2796,7 +2794,6 @@
99A906DC23F6F7030005872B /* PlacePagePreviewViewController.swift */,
99A906D823F6F7030005872B /* WikiDescriptionViewController.swift */,
4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */,
993416F72534427300526F6E /* PlacePageDividerViewController.swift */,
99C964222428C0D500E41723 /* PlacePageHeader */,
993DF0C223F6BD0600AC231A /* ElevationDetails */,
99DEF9D523E420D2006BFD21 /* ElevationProfile */,
@ -3959,7 +3956,6 @@
F6E2FDE91E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
34AB665F1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */,
34B846A82029E8110081ECCD /* BMCDefaultViewModel.swift in Sources */,
993416F82534427300526F6E /* PlacePageDividerViewController.swift in Sources */,
993DF12123F6BDB100AC231A /* UIViewControllerRenderer.swift in Sources */,
34D3AFF61E37A36A004100F9 /* UICollectionView+Cells.swift in Sources */,
4767CDA420AAF66B00BD8166 /* NSAttributedString+HTML.swift in Sources */,

13
iphone/Maps/UI/PlacePage/Components/PlacePageDividerViewController.swift
View file

@ -1,13 +0,0 @@
final class PlacePageDividerViewController: UIViewController {
@IBOutlet private var titleLabel: UILabel!
var titleText: String? {
didSet {
titleLabel.text = titleText
}
}
override func viewDidLoad() {
super.viewDidLoad()
}
}

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

@ -1806,51 +1806,6 @@
</objects>
<point key="canvasLocation" x="928.79999999999995" y="-1147.3763118440781"/>
</scene>
<!--Place Page Divider View Controller-->
<scene sceneID="ssa-Cp-vZM">
<objects>
<viewController storyboardIdentifier="PlacePageDividerViewController" id="Fbp-36-gx4" customClass="PlacePageDividerViewController" customModule="Organic_Maps" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="2C0-Bt-PID">
<rect key="frame" x="0.0" y="0.0" width="375" height="12"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="26u-8Z-O72">
<rect key="frame" x="0.0" y="0.0" width="375" height="12"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="12" id="KL4-Xx-964"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qAB-6K-R8S">
<rect key="frame" x="16" y="0.0" width="35.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="semibold14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="qpe-E9-MPN"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="26u-8Z-O72" secondAttribute="bottom" id="4hN-V9-IVJ"/>
<constraint firstItem="qAB-6K-R8S" firstAttribute="top" secondItem="qpe-E9-MPN" secondAttribute="top" id="CZC-ad-yrY"/>
<constraint firstItem="qAB-6K-R8S" firstAttribute="leading" secondItem="qpe-E9-MPN" secondAttribute="leading" constant="16" id="NZv-FF-oAZ"/>
<constraint firstItem="qpe-E9-MPN" firstAttribute="trailing" secondItem="26u-8Z-O72" secondAttribute="trailing" id="S6F-EV-Yka"/>
<constraint firstItem="26u-8Z-O72" firstAttribute="leading" secondItem="qpe-E9-MPN" secondAttribute="leading" id="Ydh-8A-9vt"/>
<constraint firstItem="26u-8Z-O72" firstAttribute="top" secondItem="2C0-Bt-PID" secondAttribute="top" id="qH0-hB-sbl"/>
</constraints>
</view>
<size key="freeformSize" width="375" height="12"/>
<connections>
<outlet property="titleLabel" destination="qAB-6K-R8S" id="kZx-Ki-Aji"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8z9-RX-mes" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="926" y="2897"/>
</scene>
</scenes>
<resources>
<image name="dialog_btn_press" width="280" height="44"/>

21
iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
View file

@ -44,20 +44,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
return vc
} ()
lazy var descriptionDividerViewController: PlacePageDividerViewController = {
let vc = storyboard.instantiateViewController(ofType: PlacePageDividerViewController.self)
vc.view.isHidden = true
vc.titleText = L("placepage_place_description").uppercased()
return vc
} ()
lazy var keyInformationDividerViewController: PlacePageDividerViewController = {
let vc = storyboard.instantiateViewController(ofType: PlacePageDividerViewController.self)
vc.view.isHidden = true
vc.titleText = L("key_information_title").uppercased()
return vc
} ()
lazy var bookmarkViewController: PlacePageBookmarkViewController = {
let vc = storyboard.instantiateViewController(ofType: PlacePageBookmarkViewController.self)
vc.view.isHidden = true
@ -106,13 +92,11 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
private func configureViewControllers() -> [UIViewController] {
var viewControllers = [UIViewController]()
viewControllers.append(previewViewController)
viewControllers.append(descriptionDividerViewController)
viewControllers.append(wikiDescriptionViewController)
if let wikiDescriptionHtml = placePageData.wikiDescriptionHtml {
wikiDescriptionViewController.descriptionHtml = wikiDescriptionHtml
if placePageData.bookmarkData?.bookmarkDescription == nil {
wikiDescriptionViewController.view.isHidden = false
descriptionDividerViewController.view.isHidden = false
}
}
@ -120,14 +104,9 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
if let bookmarkData = placePageData.bookmarkData {
bookmarkViewController.bookmarkData = bookmarkData
bookmarkViewController.view.isHidden = false
if let description = bookmarkData.bookmarkDescription, description.isEmpty == false {
descriptionDividerViewController.view.isHidden = false
}
}
if placePageData.infoData != nil {
viewControllers.append(keyInformationDividerViewController)
keyInformationDividerViewController.view.isHidden = false
viewControllers.append(infoViewController)
}