Compare commits

...

4 Commits

Author SHA1 Message Date
mrustaa 8aeab6b534 update podspec 2020-06-10 20:33:05 +03:00
mrustaa 45ef8d369f update 2020-06-10 20:23:31 +03:00
mrustaa 8e4786465a localizable update 2020-06-10 19:58:31 +03:00
mrustaa 353468f82a podspec update version 2020-06-10 19:16:27 +03:00
23 changed files with 56 additions and 54 deletions
+3 -4
View File
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'ContainerControllerSwift'
s.version = '1.0.8'
s.version = '1.0.9'
s.summary = 'This is a swipe-panel from application: https://www.apple.com/ios/maps/'
# This description is used to generate tags and improve search results.
@@ -33,9 +33,8 @@ TODO: Add long description of the pod here.
# s.ios.deployment_target = '13.0'
s.platform = :ios, "13.0"
s.source_files = 'ContainerControllerSwift/*.{swift}'
s.source_files = 'ContainerControllerSwift/ContainerTable/*.{swift}'
s.source_files = 'ContainerControllerSwift/ContainerCollection/*.{swift}'
s.source_files = 'ContainerControllerSwift/**/*.{swift}'
s.framework = "UIKit"
# s.ios.framework = 'UIKit'
# s.resource_bundles = {
@@ -2,8 +2,8 @@
// ColletionAdapterCell.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 01/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 01/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// ColletionAdapterCellData.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 01/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 01/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// ColletionAdapterItem.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 01/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 01/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// CollectionAdapterTypes.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 01/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 01/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// CollectionAdapterView.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 01/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 01/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// TableAdapterCell.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 17/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 17/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// TableAdapterCellData.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 17/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 17/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// TableAdapterItem.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 17/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 17/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -27,7 +27,7 @@ open class TableAdapterItem: NSObject {
return cellData?.cellHeight() ?? UITableView.automaticDimension
}
func canEditing() -> Bool {
public func canEditing() -> Bool {
return cellData?.canEditing() ?? false
}
@@ -2,8 +2,8 @@
// ContainerTypes.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 21/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 21/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// BlockTableView.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 16/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 16/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -96,7 +96,7 @@ open class TableAdapterView: UITableView {
extension TableAdapterView: UITableViewDataSource {
/// колличество
/// count
public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if !items.isEmpty {
return items.count
@@ -107,7 +107,7 @@ extension TableAdapterView: UITableViewDataSource {
return 0
}
/// ячейка
/// cell
public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if !items.isEmpty {
let item = items[indexPath.row]
@@ -147,7 +147,7 @@ extension TableAdapterView: UITableViewDataSource {
extension TableAdapterView: UITableViewDelegate {
/// высота
/// height
public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if !items.isEmpty {
return items[indexPath.row].height()
@@ -158,7 +158,7 @@ extension TableAdapterView: UITableViewDelegate {
return 0
}
/// нажал
/// select
public func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
selectIndexCallback?(indexPath.row)
@@ -2,8 +2,8 @@
// ExamplesContainerController.swift
// ContainerController
//
// Created by Рустам Мотыгуллин on 31/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 31/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// ExamplesContainerControllerScrollType.swift
// ContainerController
//
// Created by Рустам Мотыгуллин on 03/06/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 03/06/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// ExamplesScrollViews.swift
// ContainerController
//
// Created by Рустам Мотыгуллин on 30/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 30/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// ExampleCell.swift
// ContainerController
//
// Created by Рустам Мотыгуллин on 28/05/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 28/05/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// ExampleCellStyle.swift
// ContainerController
//
// Created by Рустам Мотыгуллин on 02/06/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 02/06/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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="default" indentationWidth="10" rowHeight="64" id="ADc-Wu-299" customClass="TitleTextCell" customModule="ContainerController" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="64" id="ADc-Wu-299" customClass="TitleTextCell" customModule="ContainerControllerSwift_Example" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ADc-Wu-299" id="Qrk-n6-aPT">
<rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Контроллер" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MbP-dL-b7J">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tite" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MbP-dL-b7J">
<rect key="frame" x="16" y="12" width="360" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="14" id="ybu-0n-7d1"/>
@@ -24,7 +24,7 @@
<color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Введите название компании" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="erD-8k-fq0">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subtitle subtitle subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="erD-8k-fq0">
<rect key="frame" x="16" y="32" width="360" height="19"/>
<constraints>
<constraint firstAttribute="height" constant="19" id="DgX-EK-d6R"/>
@@ -2,8 +2,8 @@
// StoryboardController.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 20/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 20/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -2,8 +2,8 @@
// XibView.swift
// PatternsSwift
//
// Created by Рустам Мотыгуллин on 19/04/2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 19/04/2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
@@ -58,7 +58,7 @@
"LNG_MAPS_HR" = "hr";
"LNG_MAPS_WHERE" = "То";
"LNG_MAPS_WHERE" = "To";
"LNG_MAPS_FROM" = "From";
"LNG_MAPS_MY_LOCATION" = "My Location";
@@ -15,8 +15,8 @@ class MapsRouteCellItem: TableAdapterItem {
separator: Bool = true,
selected: Bool = false) {
let cellData = MapsRouteCellData(title ?? "42 мин",
subtitle ?? "улица Поляны\nСамый быстрый",
let cellData = MapsRouteCellData(title ?? "42 min",
subtitle ?? "Street Polyany\nFastest",
darkStyle,
separator,
selected)
@@ -2,8 +2,8 @@
// SceneDelegate.swift
// dwadwa
//
// Created by Рустам Мотыгуллин on 09.06.2020.
// Copyright © 2020 mrusta. All rights reserved.
// Created by mrustaa on 09.06.2020.
// Copyright © 2020 mrustaa. All rights reserved.
//
import UIKit
+4 -1
View File
@@ -1,4 +1,4 @@
[![CI Status](https://img.shields.io/travis/github/mrustaa/ContainerController.svg?style=flat)](https://travis-ci.org/github/mrustaa/ContainerController)
[![Version](https://img.shields.io/cocoapods/v/ContainerControllerSwift.svg?style=flat)](https://cocoapods.org/pods/ContainerControllerSwift)
[![License](https://img.shields.io/cocoapods/l/ContainerControllerSwift.svg?style=flat)](https://cocoapods.org/pods/ContainerControllerSwift)
[![Platform](https://img.shields.io/cocoapods/p/ContainerControllerSwift.svg?style=flat)](https://cocoapods.org/pods/ContainerControllerSwift)
@@ -408,6 +408,9 @@ container.set(trackingPosition: false)
```
![image](https://github.com/mrustaa/gif_presentation/blob/master/ContainerControllerSwift/footerPadding.gif)
![image](https://github.com/mrustaa/gif_presentation/blob/master/ContainerControllerSwift/trackingPosition.gif)
## ContainerControllerDelegate
```swift