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

Use insetGrouped tableview style for settings views. 

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Ivan Sein 2023-04-12 17:27:49 +02:00
Родитель e5a3f32d84
Коммит 5e37ccc6a6
9 изменённых файлов: 20 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
NextcloudTalk/Base.lproj/Main.storyboard
Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ecK-na-6ig">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ecK-na-6ig">
<device id="ipad12_9rounded" orientation="landscape" layout="fullscreen" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -156,16 +156,15 @@
<scene sceneID="ZbW-mC-4pI">
<objects>
<tableViewController id="IZS-G3-LBe" customClass="SettingsTableViewController" customModule="NextcloudTalk" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="b5X-rI-l6i">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="b5X-rI-l6i">
<rect key="frame" x="0.0" y="0.0" width="1366" height="950"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="y90-mb-BxJ">
<rect key="frame" x="0.0" y="55.5" width="1366" height="51.5"/>
<rect key="frame" x="20" y="55.5" width="1326" height="51.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="y90-mb-BxJ" id="XO0-Yu-aVx">
<rect key="frame" x="0.0" y="0.0" width="1366" height="51.5"/>
<rect key="frame" x="0.0" y="0.0" width="1326" height="51.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
@ -210,9 +209,6 @@
</scenes>
<resources>
<image name="app-logo-callkit" width="40" height="40"/>
<systemColor name="groupTableViewBackgroundColor">
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="secondaryLabelColor">
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>

4
NextcloudTalk/DetailedOptionsSelectorTableViewController.h
Просмотреть файл

@ -48,8 +48,8 @@ typedef enum DetailedOptionsSelectorType {
@property (nonatomic, strong) NSString *senderId;
@property (nonatomic, assign) DetailedOptionsSelectorType type;
- (instancetype)initWithOptions:(NSArray *)options forSenderIdentifier:(NSString *)senderId;
- (instancetype)initWithAccounts:(NSArray *)accounts;
- (instancetype)initWithOptions:(NSArray *)options forSenderIdentifier:(NSString *)senderId andStyle:(UITableViewStyle)style;
- (instancetype)initWithAccounts:(NSArray *)accounts andStyle:(UITableViewStyle)style;
@end

8
NextcloudTalk/DetailedOptionsSelectorTableViewController.m
Просмотреть файл

@ -34,9 +34,9 @@
@implementation DetailedOptionsSelectorTableViewController
- (instancetype)initWithOptions:(NSArray *)options forSenderIdentifier:(NSString *)senderId
- (instancetype)initWithOptions:(NSArray *)options forSenderIdentifier:(NSString *)senderId andStyle:(UITableViewStyle)style
{
self = [super initWithStyle:UITableViewStyleGrouped];
self = [super initWithStyle:style];
self.options = options;
self.senderId = senderId;
@ -45,9 +45,9 @@
return self;
}
- (instancetype)initWithAccounts:(NSArray *)accounts
- (instancetype)initWithAccounts:(NSArray *)accounts andStyle:(UITableViewStyle)style
{
self = [super initWithStyle:UITableViewStyleGrouped];
self = [super initWithStyle:style];
self.options = accounts;
self.type = DetailedOptionsSelectorTypeAccounts;

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

@ -121,7 +121,7 @@ class DiagnosticsTableViewController: UITableViewController {
signalingSections.append(AllSignalingSections.kSignalingSectionStunServers.rawValue)
signalingSections.append(AllSignalingSections.kSignalingSectionTurnServers.rawValue)
super.init(style: .grouped)
super.init(style: .insetGrouped)
}
required init?(coder: NSCoder) {

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

@ -287,7 +287,7 @@
[importedAccounts addObject:option];
}
DetailedOptionsSelectorTableViewController *accountSelectorVC = [[DetailedOptionsSelectorTableViewController alloc] initWithAccounts:importedAccounts];
DetailedOptionsSelectorTableViewController *accountSelectorVC = [[DetailedOptionsSelectorTableViewController alloc] initWithAccounts:importedAccounts andStyle:UITableViewStyleInsetGrouped];
accountSelectorVC.title = NSLocalizedString(@"Import account", nil);
accountSelectorVC.delegate = self;
NCNavigationController *accountSelectorNC = [[NCNavigationController alloc] initWithRootViewController:accountSelectorVC];

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -14,11 +14,10 @@
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="i5M-Pr-FkT">
<tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="insetGrouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="NQg-xp-Ubj"/>
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="Tng-2m-Rnh"/>
<outlet property="delegate" destination="-1" id="9aC-8N-iBw"/>
@ -26,9 +25,4 @@
<point key="canvasLocation" x="140" y="129"/>
</tableView>
</objects>
<resources>
<systemColor name="groupTableViewBackgroundColor">
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

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

@ -252,7 +252,7 @@ extension UserProfileTableViewController {
options.append(publishedOption)
}
let optionSelectorVC = DetailedOptionsSelectorTableViewController(options: options, forSenderIdentifier: field)
let optionSelectorVC = DetailedOptionsSelectorTableViewController(options: options, forSenderIdentifier: field, andStyle: .insetGrouped)
if let optionSelectorVC = optionSelectorVC {
optionSelectorVC.title = title
optionSelectorVC.delegate = self

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

@ -106,7 +106,7 @@ class UserProfileTableViewController: UITableViewController, DetailedOptionsSele
}
init(withAccount account: TalkAccount) {
super.init(style: .grouped)
super.init(style: .insetGrouped)
self.account = account
}

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

@ -32,7 +32,7 @@ class UserStatusTableViewController: UITableViewController, DetailedOptionsSelec
var userStatus: NCUserStatus?
init(userStatus: NCUserStatus?) {
super.init(style: .grouped)
super.init(style: .insetGrouped)
self.userStatus = userStatus
}
@ -102,7 +102,7 @@ class UserStatusTableViewController: UITableViewController, DetailedOptionsSelec
options.append(dndOption)
options.append(invisibleOption)
let optionSelectorVC = DetailedOptionsSelectorTableViewController(options: options, forSenderIdentifier: nil)
let optionSelectorVC = DetailedOptionsSelectorTableViewController(options: options, forSenderIdentifier: nil, andStyle: .insetGrouped)
if let optionSelectorVC = optionSelectorVC {
optionSelectorVC.title = NSLocalizedString("Online status", comment: "")
optionSelectorVC.delegate = self