-
-
Notifications
You must be signed in to change notification settings - Fork 38
Show purchase status in settings #426
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
3703075
Show purchase status and restore option in settings
iammajid 22a98a5
Remove restore button for subscription users
iammajid b295ee2
Remove restore purchase button from settings
iammajid e94263d
Improve purchase status display in settings
iammajid 5ed8709
Merge branch 'develop' into feature/purchase-status
iammajid d6c38e6
Fix memory leak in PurchaseStatusCell
iammajid 6e48f43
Add ShareVaultViewController to build target
iammajid 7098fe5
Fix unnecessary diff
tobihagemann a24cc04
Replace PurchaseStatusCell with ButtonCellViewModel
tobihagemann 6ecbdad
Refactor settings to use unlockFullVersion terminology
tobihagemann 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,76 @@ | ||
| // | ||
| // PurchaseStatusCell.swift | ||
| // Cryptomator | ||
| // | ||
| // Created by Majid Achhoud on 20.11.24. | ||
| // Copyright © 2024 Skymatic GmbH. All rights reserved. | ||
| // | ||
|
|
||
| import Combine | ||
| import CryptomatorCommonCore | ||
| import UIKit | ||
|
|
||
| class PurchaseStatusCell: UITableViewCell, ConfigurableTableViewCell { | ||
| private let iconImageView = UIImageView() | ||
| private let titleLabel = UILabel() | ||
| private let subtitleLabel = UILabel() | ||
| lazy var subscribers = Set<AnyCancellable>() | ||
|
|
||
| func configure(with viewModel: TableViewCellViewModel) { | ||
| guard let viewModel = viewModel as? PurchaseStatusCellViewModel else { | ||
| return | ||
| } | ||
| iconImageView.image = UIImage(systemName: viewModel.iconName, withConfiguration: UIImage.SymbolConfiguration(pointSize: 22)) | ||
| viewModel.title.$value.assign(to: \.text, on: titleLabel).store(in: &subscribers) | ||
| viewModel.subtitle.$value.assign(to: \.text, on: subtitleLabel).store(in: &subscribers) | ||
| accessoryType = .disclosureIndicator | ||
| selectionStyle = .default | ||
| } | ||
|
|
||
| override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { | ||
| super.init(style: style, reuseIdentifier: reuseIdentifier) | ||
|
|
||
| iconImageView.translatesAutoresizingMaskIntoConstraints = false | ||
| iconImageView.contentMode = .scaleAspectFit | ||
| iconImageView.tintColor = .cryptomatorPrimary | ||
|
|
||
| titleLabel.translatesAutoresizingMaskIntoConstraints = false | ||
| titleLabel.font = .preferredFont(forTextStyle: .body) | ||
| titleLabel.textColor = .label | ||
| titleLabel.numberOfLines = 0 | ||
|
|
||
| subtitleLabel.translatesAutoresizingMaskIntoConstraints = false | ||
| subtitleLabel.font = .preferredFont(forTextStyle: .footnote) | ||
| subtitleLabel.textColor = .secondaryLabel | ||
| subtitleLabel.numberOfLines = 0 | ||
|
|
||
| contentView.addSubview(iconImageView) | ||
| contentView.addSubview(titleLabel) | ||
| contentView.addSubview(subtitleLabel) | ||
|
|
||
| NSLayoutConstraint.activate([ | ||
| iconImageView.leadingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.leadingAnchor), | ||
| iconImageView.centerYAnchor.constraint(equalTo: contentView.centerYAnchor), | ||
| iconImageView.widthAnchor.constraint(equalToConstant: 29), | ||
| iconImageView.heightAnchor.constraint(equalToConstant: 29), | ||
|
|
||
| titleLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 11), | ||
| titleLabel.leadingAnchor.constraint(equalTo: iconImageView.trailingAnchor, constant: 12), | ||
| titleLabel.trailingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.trailingAnchor), | ||
|
|
||
| subtitleLabel.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 4), | ||
| subtitleLabel.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor), | ||
| subtitleLabel.trailingAnchor.constraint(equalTo: titleLabel.trailingAnchor), | ||
| subtitleLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -11) | ||
| ]) | ||
| } | ||
|
|
||
| @available(*, unavailable) | ||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| func removeAllBindings() { | ||
| subscribers.forEach { $0.cancel() } | ||
| } | ||
| } | ||
This file contains hidden or 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,24 @@ | ||
| // | ||
| // PurchaseStatusCellViewModel.swift | ||
| // Cryptomator | ||
| // | ||
| // Created by Majid Achhoud on 20.11.24. | ||
| // Copyright © 2024 Skymatic GmbH. All rights reserved. | ||
| // | ||
|
|
||
| import CryptomatorCommonCore | ||
| import UIKit | ||
|
|
||
| class PurchaseStatusCellViewModel: TableViewCellViewModel { | ||
| override var type: ConfigurableTableViewCell.Type { PurchaseStatusCell.self } | ||
|
|
||
| let iconName: String | ||
| let title: Bindable<String?> | ||
| let subtitle: Bindable<String?> | ||
|
|
||
| init(iconName: String, title: String, subtitle: String) { | ||
| self.iconName = iconName | ||
| self.title = Bindable(title) | ||
| self.subtitle = Bindable(subtitle) | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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.
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.
Uh oh!
There was an error while loading. Please reload this page.