-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4318 from osmandapp/attach_to_the_roads
Attach to the roads
- Loading branch information
Showing
26 changed files
with
1,013 additions
and
235 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // AttachRoadsBannerCell.swift | ||
| // OsmAnd Maps | ||
| // | ||
| // Created by Dmitry Svetlichny on 19.01.2025. | ||
| // Copyright © 2025 OsmAnd. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| @objcMembers | ||
| final class AttachRoadsBannerCell: UITableViewCell { | ||
| @IBOutlet weak var contentContainer: UIView! | ||
| @IBOutlet weak var label: UILabel! | ||
| @IBOutlet weak var button: UIButton! | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // | ||
| // ImageHeaderCell.swift | ||
| // OsmAnd Maps | ||
| // | ||
| // Created by Dmitry Svetlichny on 08.01.2025. | ||
| // Copyright © 2025 OsmAnd. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| final class ImageHeaderCell: UITableViewCell { | ||
| @IBOutlet weak var backgroundImageView: UIImageView! | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | ||
| <device id="retina6_12" orientation="portrait" appearance="light"/> | ||
| <dependencies> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/> | ||
| <capability name="Named colors" minToolsVersion="9.0"/> | ||
| <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| </dependencies> | ||
| <objects> | ||
| <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="AttachRoadsBannerCell" rowHeight="134" id="tUb-iS-Yqk" userLabel="AttachRoadsBannerCell" customClass="AttachRoadsBannerCell" customModule="OsmAnd_Maps" customModuleProvider="target"> | ||
| <rect key="frame" x="0.0" y="0.0" width="393" height="134"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="tUb-iS-Yqk" id="YfM-iR-X4y"> | ||
| <rect key="frame" x="0.0" y="0.0" width="393" height="134"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nJE-Cm-rxU" userLabel="Content Container"> | ||
| <rect key="frame" x="14" y="4" width="365" height="120"/> | ||
| <subviews> | ||
| <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hdr-qR-uSf"> | ||
| <rect key="frame" x="20" y="0.0" width="345" height="84"/> | ||
| <constraints> | ||
| <constraint firstAttribute="height" constant="84" id="MzR-Ab-ibA"/> | ||
| </constraints> | ||
| <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| <color key="textColor" name="textColorPrimary"/> | ||
| <nil key="highlightedColor"/> | ||
| </label> | ||
| <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FnC-WM-WP2" userLabel="Separator View"> | ||
| <rect key="frame" x="20" y="84" width="345" height="1"/> | ||
| <color key="backgroundColor" name="customSeparator"/> | ||
| <constraints> | ||
| <constraint firstAttribute="height" constant="1" id="hd9-48-hhe"/> | ||
| </constraints> | ||
| </view> | ||
| <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fIu-LW-wzj"> | ||
| <rect key="frame" x="20" y="85" width="345" height="48"/> | ||
| <constraints> | ||
| <constraint firstAttribute="height" constant="48" id="wmk-rK-T8l"/> | ||
| </constraints> | ||
| <color key="tintColor" name="textColorActive"/> | ||
| <state key="normal" title="Button"/> | ||
| <buttonConfiguration key="configuration" style="plain" title="Button" titleAlignment="leading"> | ||
| <directionalEdgeInsets key="contentInsets" top="0.0" leading="0.0" bottom="0.0" trailing="0.0"/> | ||
| </buttonConfiguration> | ||
| </button> | ||
| </subviews> | ||
| <color key="backgroundColor" name="groupBg"/> | ||
| <constraints> | ||
| <constraint firstItem="fIu-LW-wzj" firstAttribute="top" secondItem="FnC-WM-WP2" secondAttribute="bottom" id="Ax3-d5-R52"/> | ||
| <constraint firstItem="FnC-WM-WP2" firstAttribute="top" secondItem="Hdr-qR-uSf" secondAttribute="bottom" id="CoG-vx-sqT"/> | ||
| <constraint firstAttribute="bottom" secondItem="fIu-LW-wzj" secondAttribute="bottom" priority="999" id="FaO-8E-1Gq"/> | ||
| <constraint firstAttribute="trailing" secondItem="Hdr-qR-uSf" secondAttribute="trailing" id="Gq4-hl-FFl"/> | ||
| <constraint firstItem="Hdr-qR-uSf" firstAttribute="top" secondItem="nJE-Cm-rxU" secondAttribute="top" id="UHS-Ls-vWK"/> | ||
| <constraint firstItem="Hdr-qR-uSf" firstAttribute="leading" secondItem="nJE-Cm-rxU" secondAttribute="leading" constant="20" symbolic="YES" id="bGo-YU-dfJ"/> | ||
| <constraint firstAttribute="trailing" secondItem="FnC-WM-WP2" secondAttribute="trailing" id="cfj-nb-v7c"/> | ||
| <constraint firstItem="FnC-WM-WP2" firstAttribute="leading" secondItem="nJE-Cm-rxU" secondAttribute="leading" constant="20" symbolic="YES" id="iJX-U2-AlS"/> | ||
| <constraint firstAttribute="trailing" secondItem="fIu-LW-wzj" secondAttribute="trailing" id="uOP-5w-SFm"/> | ||
| <constraint firstItem="fIu-LW-wzj" firstAttribute="leading" secondItem="nJE-Cm-rxU" secondAttribute="leading" constant="20" symbolic="YES" id="zWc-gE-oGm"/> | ||
| </constraints> | ||
| </view> | ||
| </subviews> | ||
| <color key="backgroundColor" name="groupBg"/> | ||
| <constraints> | ||
| <constraint firstItem="nJE-Cm-rxU" firstAttribute="leading" secondItem="YfM-iR-X4y" secondAttribute="leading" constant="14" id="4Xb-Rf-6V5"/> | ||
| <constraint firstAttribute="trailing" secondItem="nJE-Cm-rxU" secondAttribute="trailing" constant="14" id="KqP-YM-vc1"/> | ||
| <constraint firstAttribute="bottom" secondItem="nJE-Cm-rxU" secondAttribute="bottom" constant="10" id="Y4p-H3-7JM"/> | ||
| <constraint firstItem="nJE-Cm-rxU" firstAttribute="top" secondItem="YfM-iR-X4y" secondAttribute="top" constant="4" id="e0Q-cH-vpt"/> | ||
| </constraints> | ||
| </tableViewCellContentView> | ||
| <color key="backgroundColor" name="groupBg"/> | ||
| <connections> | ||
| <outlet property="button" destination="fIu-LW-wzj" id="h6w-id-hxN"/> | ||
| <outlet property="contentContainer" destination="nJE-Cm-rxU" id="lJ6-JX-Vqf"/> | ||
| <outlet property="label" destination="Hdr-qR-uSf" id="FYs-fJ-dFy"/> | ||
| </connections> | ||
| <point key="canvasLocation" x="67.938931297709928" y="-2.8169014084507045"/> | ||
| </tableViewCell> | ||
| </objects> | ||
| <resources> | ||
| <namedColor name="customSeparator"> | ||
| <color red="0.79607843137254897" green="0.7803921568627451" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| </namedColor> | ||
| <namedColor name="groupBg"> | ||
| <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| </namedColor> | ||
| <namedColor name="textColorActive"> | ||
| <color red="0.3411764705882353" green="0.078431372549019607" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| </namedColor> | ||
| <namedColor name="textColorPrimary"> | ||
| <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| </namedColor> | ||
| </resources> | ||
| </document> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | ||
| <device id="retina6_12" orientation="portrait" appearance="light"/> | ||
| <dependencies> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/> | ||
| <capability name="Named colors" minToolsVersion="9.0"/> | ||
| <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| </dependencies> | ||
| <objects> | ||
| <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="202" id="NNk-QA-fBF" userLabel="ImageHeaderCell" customClass="ImageHeaderCell" customModule="OsmAnd_Maps" customModuleProvider="target"> | ||
| <rect key="frame" x="0.0" y="0.0" width="350" height="202"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="NNk-QA-fBF" id="BcU-IY-elF"> | ||
| <rect key="frame" x="0.0" y="0.0" width="350" height="202"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lLD-YM-RnZ"> | ||
| <rect key="frame" x="0.0" y="0.0" width="350" height="202"/> | ||
| <subviews> | ||
| <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Aav-UU-hsW" userLabel="backgroundImageView"> | ||
| <rect key="frame" x="6" y="10" width="338" height="182"/> | ||
| </imageView> | ||
| </subviews> | ||
| <color key="backgroundColor" name="groupBg"/> | ||
| <constraints> | ||
| <constraint firstAttribute="bottom" secondItem="Aav-UU-hsW" secondAttribute="bottom" constant="10" id="0cf-KC-ciO"/> | ||
| <constraint firstItem="Aav-UU-hsW" firstAttribute="leading" secondItem="lLD-YM-RnZ" secondAttribute="leading" constant="6" id="1O8-Qt-7oZ"/> | ||
| <constraint firstAttribute="trailing" secondItem="Aav-UU-hsW" secondAttribute="trailing" constant="6" id="QV2-c8-i18"/> | ||
| <constraint firstItem="Aav-UU-hsW" firstAttribute="top" secondItem="lLD-YM-RnZ" secondAttribute="top" constant="10" id="a6L-sD-1zg"/> | ||
| </constraints> | ||
| </view> | ||
| </subviews> | ||
| <constraints> | ||
| <constraint firstAttribute="trailing" secondItem="lLD-YM-RnZ" secondAttribute="trailing" id="09h-vF-vHY"/> | ||
| <constraint firstItem="lLD-YM-RnZ" firstAttribute="leading" secondItem="BcU-IY-elF" secondAttribute="leading" id="AHR-a6-tNk"/> | ||
| <constraint firstAttribute="bottom" secondItem="lLD-YM-RnZ" secondAttribute="bottom" id="Ar3-Dj-s0P"/> | ||
| <constraint firstItem="lLD-YM-RnZ" firstAttribute="top" secondItem="BcU-IY-elF" secondAttribute="top" id="Hqz-aj-WG9"/> | ||
| <constraint firstItem="lLD-YM-RnZ" firstAttribute="centerX" secondItem="BcU-IY-elF" secondAttribute="centerX" id="gF6-m2-Ll5"/> | ||
| </constraints> | ||
| </tableViewCellContentView> | ||
| <connections> | ||
| <outlet property="backgroundImageView" destination="Aav-UU-hsW" id="Yvi-Ig-tQv"/> | ||
| </connections> | ||
| <point key="canvasLocation" x="36.231884057971016" y="167.41071428571428"/> | ||
| </tableViewCell> | ||
| </objects> | ||
| <resources> | ||
| <namedColor name="groupBg"> | ||
| <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| </namedColor> | ||
| </resources> | ||
| </document> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.