felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move Row and Section to individual classes

Browse Source
This commit is contained in:
ismailgulek
2020-07-30 18:07:35 +03:00
parent ca88aecad5
commit aa8a95d6dc
6 changed files with 183 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/Models/Row.h
+32
View File
@@ -0,0 +1,32 @@
//
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// Row object for tableviews
@interface Row: NSObject
@property (nonatomic, assign) NSInteger tag;
+ (instancetype)rowWithTag:(NSInteger)tag;
- (instancetype)initWithTag:(NSInteger)tag;
@end
NS_ASSUME_NONNULL_END
Riot/Modules/Settings/Models/Row.m
+35
View File
@@ -0,0 +1,35 @@
//
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#import "Row.h"
@implementation Row
+ (instancetype)rowWithTag:(NSInteger)tag
{
return [[self alloc] initWithTag:tag];
}
- (instancetype)initWithTag:(NSInteger)tag
{
self = [super init];
if (self) {
self.tag = tag;
}
return self;
}
@end
Riot/Modules/Settings/Models/Section.h
+39
View File
@@ -0,0 +1,39 @@
//
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@class Row;
/// Section object for tableviews
@interface Section: NSObject
@property (nonatomic, assign) NSInteger tag;
@property (nonatomic, strong) NSMutableArray<Row*> *rows;
@property (nonatomic, copy) NSString *headerTitle;
+ (instancetype)sectionWithTag:(NSInteger)tag;
- (instancetype)initWithTag:(NSInteger)tag;
- (void)addRow:(Row *)row;
- (void)addRowWithTag:(NSInteger)tag;
- (NSInteger)indexOfRowForTag:(NSInteger)tag;
@end
NS_ASSUME_NONNULL_END
Riot/Modules/Settings/Models/Section.m
+54
View File
@@ -0,0 +1,54 @@
//
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#import "Section.h"
#import "Row.h"
@implementation Section
+ (instancetype)sectionWithTag:(NSInteger)tag
{
return [[self alloc] initWithTag:tag];
}
- (instancetype)initWithTag:(NSInteger)tag
{
self = [super init];
if (self) {
self.tag = tag;
_rows = [NSMutableArray arrayWithCapacity:10];
}
return self;
}
- (void)addRow:(Row *)row
{
[_rows addObject:row];
}
- (void)addRowWithTag:(NSInteger)tag
{
[_rows addObject:[Row rowWithTag:tag]];
}
- (NSInteger)indexOfRowForTag:(NSInteger)tag
{
return [_rows indexOfObjectPassingTest:^BOOL(Row * _Nonnull row, NSUInteger idx, BOOL * _Nonnull stop) {
return row.tag == tag;
}];
}
@end
Riot/Modules/Settings/SettingsViewController.m
+3 -75
View File
@@ -42,6 +42,9 @@
#import "GroupsDataSource.h"
#import "GroupTableViewCellWithSwitch.h"
#import "Row.h"
#import "Section.h"
#import "GBDeviceInfo_iOS.h"
#import "Riot-Swift.h"
@@ -157,81 +160,6 @@ enum
typedef void (^blockSettingsViewController_onReadyToDestroy)(void);
#pragma mark - Row
@interface Row: NSObject
@property (nonatomic, assign) NSInteger tag;
@end
@implementation Row
+ (instancetype)rowWithTag:(NSInteger)tag
{
return [[self alloc] initWithTag:tag];
}
- (instancetype)initWithTag:(NSInteger)tag
{
self = [super init];
if (self) {
self.tag = tag;
}
return self;
}
@end
#pragma mark - Section
@interface Section: NSObject
@property (nonatomic, assign) NSInteger tag;
@property (nonatomic, strong) NSMutableArray<Row*> *rows;
@property (nonatomic, copy) NSString *headerTitle;
- (void)addRow:(Row *)row;
- (void)addRowWithTag:(NSInteger)tag;
@end
@implementation Section
+ (instancetype)sectionWithTag:(NSInteger)tag
{
return [[self alloc] initWithTag:tag];
}
- (instancetype)initWithTag:(NSInteger)tag
{
self = [super init];
if (self) {
self.tag = tag;
_rows = [NSMutableArray arrayWithCapacity:10];
}
return self;
}
- (void)addRow:(Row *)row
{
[_rows addObject:row];
}
- (void)addRowWithTag:(NSInteger)tag
{
[_rows addObject:[Row rowWithTag:tag]];
}
- (NSInteger)indexOfRowForTag:(NSInteger)tag
{
return [_rows indexOfObjectPassingTest:^BOOL(Row * _Nonnull row, NSUInteger idx, BOOL * _Nonnull stop) {
return row.tag == tag;
}];
}
@end
#pragma mark - SettingsViewController
@interface SettingsViewController () <DeactivateAccountViewControllerDelegate,