nextcloud
/
talk-ios
зеркало из https://github.com/nextcloud/talk-ios.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Rename SettingsUserTableViewCell to UserSettingsTableViewCell. 

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Ivan Sein 2022-02-01 16:56:54 +01:00
Родитель 8de21bf6d1
Коммит d40027e000
4 изменённых файлов: 7 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
NextcloudTalk.xcodeproj/project.pbxproj
Просмотреть файл

@ -262,7 +262,7 @@
9993261EDAC77481FF4EF58A /* libPods-NextcloudTalk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F7C31E9D74F550EAF89931B /* libPods-NextcloudTalk.a */; };
DA1AEFC3270F1FA90088E519 /* DateLabelCustom.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA1AEFC2270F1FA90088E519 /* DateLabelCustom.swift */; };
DA75580F278EEA1000A48A1B /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA75580E278EEA1000A48A1B /* SettingsTableViewController.swift */; };
DA755811278EF3EF00A48A1B /* SettingsUserTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA755810278EF3EF00A48A1B /* SettingsUserTableViewCell.swift */; };
DA755811278EF3EF00A48A1B /* UserSettingsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA755810278EF3EF00A48A1B /* UserSettingsTableViewCell.swift */; };
DA7558132790D65700A48A1B /* AccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA7558122790D65700A48A1B /* AccountTableViewCell.swift */; };
DA7558C6279AE67F00A48A1B /* UserStatusTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA7558C5279AE67F00A48A1B /* UserStatusTableViewController.swift */; };
/* End PBXBuildFile section */
@ -723,7 +723,7 @@
D86091EC1125C3057B9A299B /* Pods-NotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.release.xcconfig"; sourceTree = "<group>"; };
DA1AEFC2270F1FA90088E519 /* DateLabelCustom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateLabelCustom.swift; sourceTree = "<group>"; };
DA75580E278EEA1000A48A1B /* SettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
DA755810278EF3EF00A48A1B /* SettingsUserTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUserTableViewCell.swift; sourceTree = "<group>"; };
DA755810278EF3EF00A48A1B /* UserSettingsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsTableViewCell.swift; sourceTree = "<group>"; };
DA7558122790D65700A48A1B /* AccountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTableViewCell.swift; sourceTree = "<group>"; };
DA7558C5279AE67F00A48A1B /* UserStatusTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserStatusTableViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -1048,7 +1048,7 @@
2C2026A32369F47400DFC89B /* AccountTableViewCell.xib */,
DA7558122790D65700A48A1B /* AccountTableViewCell.swift */,
2C7A1235200E0A5700864818 /* UserSettingsTableViewCell.xib */,
DA755810278EF3EF00A48A1B /* SettingsUserTableViewCell.swift */,
DA755810278EF3EF00A48A1B /* UserSettingsTableViewCell.swift */,
2C78E9E125120DE500E3D4CA /* NCUserStatus.h */,
2C78E9E225120DE500E3D4CA /* NCUserStatus.m */,
DA7558C5279AE67F00A48A1B /* UserStatusTableViewController.swift */,
@ -1821,7 +1821,7 @@
2CA1CCDB1F1F6FCA002FE6A2 /* RoomTableViewCell.m in Sources */,
2CA52AD0267613CB00619610 /* VoiceMessageTableViewCell.m in Sources */,
2C1EF36B25505DCE007C9768 /* NCNavigationController.m in Sources */,
DA755811278EF3EF00A48A1B /* SettingsUserTableViewCell.swift in Sources */,
DA755811278EF3EF00A48A1B /* UserSettingsTableViewCell.swift in Sources */,
DA7558C6279AE67F00A48A1B /* UserStatusTableViewController.swift in Sources */,
2CC007B420D7AE990096D91F /* ResultMultiSelectionTableViewController.m in Sources */,
2CA1CCC31F166CC5002FE6A2 /* NCRoom.m in Sources */,

2
NextcloudTalk/SettingsTableViewController.swift
Просмотреть файл

@ -581,7 +581,7 @@ class SettingsTableViewController: UITableViewController, UITextFieldDelegate {
extension SettingsTableViewController {
// Cell configuration for every section
func userSettingsCell(for indexPath: IndexPath) -> UITableViewCell {
guard let cell = tableView.dequeueReusableCell(withIdentifier: kUserSettingsCellIdentifier, for: indexPath) as? SettingsUserTableViewCell else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: kUserSettingsCellIdentifier, for: indexPath) as? UserSettingsTableViewCell else { return UITableViewCell() }
let activeAccount = NCDatabaseManager.sharedInstance().activeAccount()
cell.userDisplayNameLabel.text = activeAccount.userDisplayName
let accountServer = activeAccount.server

9
NextcloudTalk/SettingsUserTableViewCell.swift → NextcloudTalk/UserSettingsTableViewCell.swift
Просмотреть файл

@ -23,7 +23,7 @@
import UIKit
import NCCommunication
class SettingsUserTableViewCell: UITableViewCell {
class UserSettingsTableViewCell: UITableViewCell {
@IBOutlet weak var userImageView: UIImageView!
@IBOutlet weak var userDisplayNameLabel: UILabel!
@ -32,15 +32,8 @@ class SettingsUserTableViewCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
self.userImageView.layer.cornerRadius = 40.0
self.userImageView.layer.masksToBounds = true
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}

2
NextcloudTalk/UserSettingsTableViewCell.xib
Просмотреть файл

@ -11,7 +11,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="SettingsUserTableViewCell" customModule="NextcloudTalk" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="UserSettingsTableViewCell" customModule="NextcloudTalk" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">