-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/add tiscrollview #285
Open
svshkv
wants to merge
7
commits into
master
Choose a base branch
from
feature/add_tiscrollview
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8e1c044
feat: added TIScrollLabel
svshkv a667e3a
chore: bump version 1.8.0
svshkv f643013
refactor: added copyrights
svshkv 47b2119
docs: update docs
svshkv 22a2f76
refactor: added properties
svshkv 9c5c626
fix: changelog text
svshkv 657e0bf
fix: removed LabeledScrollView, added attributedText
svshkv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
59 changes: 59 additions & 0 deletions
59
TIUIElements/Sources/Views/BaseInitializableScrollView.swift
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,59 @@ | ||
// | ||
// Copyright (c) 2021 Touch Instinct | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the Software), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
// | ||
|
||
import TIUIKitCore | ||
import UIKit | ||
|
||
open class BaseInitializableScrollView: UIScrollView, InitializableViewProtocol { | ||
override public init(frame: CGRect) { | ||
super.init(frame: frame) | ||
|
||
initializeView() | ||
} | ||
|
||
required public init?(coder aDecoder: NSCoder) { | ||
super.init(coder: aDecoder) | ||
|
||
initializeView() | ||
} | ||
|
||
// MARK: - InitializableView | ||
open func addViews() { | ||
// override in subclass | ||
} | ||
|
||
open func configureLayout() { | ||
// override in subclass | ||
} | ||
|
||
open func bindViews() { | ||
// override in subclass | ||
} | ||
|
||
open func configureAppearance() { | ||
// override in subclass | ||
} | ||
|
||
open func localize() { | ||
// override in subclass | ||
} | ||
} |
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,17 @@ | ||
# TIScrollLabel | ||
|
||
Позволяет скролить текст, если его размер больше чем размер вью. | ||
|
||
### Особенности | ||
|
||
- Если размер текста будет меньше, чем размер вью, то текст будет отображаться в центре | ||
|
||
### Пример использования | ||
|
||
```swift | ||
label = TIScrollLabel() | ||
label.text = // установка текста | ||
label.font = // установка шрифта | ||
label.textColor = // установка цвета текста | ||
label.textAligment = // установка расположения текста | ||
``` |
113 changes: 113 additions & 0 deletions
113
TIUIElements/Sources/Views/TIScrollLabel/TIScrollLabel/LabeledScrollView.swift
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,113 @@ | ||
// | ||
// Copyright (c) 2021 Touch Instinct | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the Software), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
// | ||
|
||
import UIKit | ||
|
||
open class LabeledScrollView: BaseInitializableScrollView { | ||
|
||
private let textLabel = UILabel() | ||
private let contentView = UIView() | ||
|
||
// MARK: - Configurable Properties | ||
|
||
public var text: String = "" { | ||
didSet { | ||
textLabel.text = text | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ещё attributedText надо добавить |
||
|
||
public var textColor: UIColor = .black { | ||
didSet { | ||
textLabel.textColor = textColor | ||
} | ||
} | ||
|
||
public var font: UIFont = UIFont.systemFont(ofSize: 13) { | ||
didSet { | ||
textLabel.font = font | ||
} | ||
} | ||
|
||
public var textAligment: NSTextAlignment = .center { | ||
kayumovtd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
didSet { | ||
textLabel.textAlignment = textAligment | ||
} | ||
} | ||
|
||
// MARK: - Initialization | ||
|
||
open override func addViews() { | ||
super.addViews() | ||
|
||
addSubview(contentView) | ||
contentView.addSubview(textLabel) | ||
} | ||
|
||
open override func configureAppearance() { | ||
super.configureAppearance() | ||
|
||
showsVerticalScrollIndicator = false | ||
showsHorizontalScrollIndicator = false | ||
backgroundColor = .clear | ||
clipsToBounds = true | ||
|
||
textLabel.numberOfLines = 0 | ||
textLabel.textAlignment = textAligment | ||
textLabel.textColor = textColor | ||
textLabel.font = font | ||
} | ||
|
||
open override func configureLayout() { | ||
super.configureLayout() | ||
|
||
contentView.translatesAutoresizingMaskIntoConstraints = false | ||
textLabel.translatesAutoresizingMaskIntoConstraints = false | ||
|
||
let contentViewBottomConstraint = contentView.bottomAnchor.constraint(equalTo: bottomAnchor) | ||
let contentViewCenterYConstraint = contentView.centerYAnchor.constraint(equalTo: centerYAnchor) | ||
let contentViewHeightConstraint = contentView.heightAnchor.constraint(equalTo: heightAnchor) | ||
|
||
[ | ||
contentViewBottomConstraint, | ||
contentViewCenterYConstraint, | ||
contentViewHeightConstraint | ||
].forEach { $0.priority = .defaultLow } | ||
|
||
NSLayoutConstraint.activate([ | ||
contentView.leadingAnchor.constraint(equalTo: leadingAnchor), | ||
contentView.trailingAnchor.constraint(equalTo: trailingAnchor), | ||
contentView.topAnchor.constraint(equalTo: topAnchor), | ||
contentView.centerXAnchor.constraint(equalTo: centerXAnchor), | ||
contentViewBottomConstraint, | ||
contentViewCenterYConstraint, | ||
contentViewHeightConstraint | ||
]) | ||
|
||
NSLayoutConstraint.activate([ | ||
textLabel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), | ||
textLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), | ||
textLabel.topAnchor.constraint(equalTo: contentView.topAnchor), | ||
textLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), | ||
textLabel.heightAnchor.constraint(equalTo: contentView.heightAnchor) | ||
]) | ||
} | ||
} |
72 changes: 72 additions & 0 deletions
72
TIUIElements/Sources/Views/TIScrollLabel/TIScrollLabel/TIScrollLabel.swift
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,72 @@ | ||
// | ||
// Copyright (c) 2021 Touch Instinct | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the Software), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
// | ||
|
||
import UIKit | ||
import TIUIElements | ||
|
||
open class TIScrollLabel: BaseInitializableView { | ||
|
||
private let labeledScrollView = LabeledScrollView() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. а зачем нам оборачивать LabeledScrollView в ещё одну view? |
||
|
||
public var text: String = "" { | ||
didSet { | ||
labeledScrollView.text = text | ||
} | ||
} | ||
|
||
public var textColor: UIColor = .black { | ||
didSet { | ||
labeledScrollView.textColor = textColor | ||
} | ||
} | ||
|
||
public var font: UIFont = UIFont.systemFont(ofSize: 13) { | ||
didSet { | ||
labeledScrollView.font = font | ||
} | ||
} | ||
|
||
public var textAlignment: NSTextAlignment = .center { | ||
didSet { | ||
labeledScrollView.textAlignment = textAlignment | ||
} | ||
} | ||
|
||
open override func addViews() { | ||
super.addViews() | ||
|
||
addSubview(labeledScrollView) | ||
} | ||
|
||
open override func configureLayout() { | ||
super.configureLayout() | ||
|
||
labeledScrollView.translatesAutoresizingMaskIntoConstraints = false | ||
|
||
NSLayoutConstraint.activate([ | ||
labeledScrollView.leadingAnchor.constraint(equalTo: leadingAnchor), | ||
labeledScrollView.trailingAnchor.constraint(equalTo: trailingAnchor), | ||
labeledScrollView.topAnchor.constraint(equalTo: topAnchor), | ||
labeledScrollView.bottomAnchor.constraint(equalTo: bottomAnchor) | ||
]) | ||
} | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
textAlig_n_ment