[WIP] Improvement/register masternode

DashWallet/Sources/UI/Menu/Forms/Action/DWActionFormCellModel.h

@@ -0,0 +1,28 @@
+//
+//  Created by Andrew Podkovyrin
+//  Copyright © 2018 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  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 "DWBaseFormCellModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DWActionFormCellModel : DWBaseFormCellModel
+
+@property (nullable, copy, nonatomic) void (^didSelectBlock)(DWActionFormCellModel *cellModel, NSIndexPath *indexPath);
+
+@end
+
+NS_ASSUME_NONNULL_END

DashWallet/Sources/UI/Menu/Forms/Action/DWActionFormCellModel.m

@@ -0,0 +1,26 @@
+//
+//  Created by Andrew Podkovyrin
+//  Copyright © 2018 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  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 "DWActionFormCellModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation DWActionFormCellModel
+
+@end
+
+NS_ASSUME_NONNULL_END

DashWallet/Sources/UI/Menu/Forms/Action/DWActionFormTableViewCell.h

@@ -0,0 +1,29 @@
+//
+//  Created by Andrew Podkovyrin
+//  Copyright © 2018 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  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 "DWActionFormCellModel.h"
+#import "DWBaseFormTableViewCell.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DWActionFormTableViewCell : DWBaseFormTableViewCell
+
+@property (nullable, strong, nonatomic) DWActionFormCellModel *cellModel;
+
+@end
+
+NS_ASSUME_NONNULL_END

DashWallet/Sources/UI/Menu/Forms/Action/DWActionFormTableViewCell.m

@@ -0,0 +1,86 @@
+//
+//  Created by Andrew Podkovyrin
+//  Copyright © 2018 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  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 "DWActionFormTableViewCell.h"
+
+#import "DWSharedUIConstants.h"
+#import "DWUIKit.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DWActionFormTableViewCell ()
+
+@property (readonly, nonatomic, strong) UILabel *titleLabel;
+
+@end
+
+@implementation DWActionFormTableViewCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style
+              reuseIdentifier:(nullable NSString *)reuseIdentifier {
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        UIView *contentView = self.roundedContentView;
+        contentView.backgroundColor = [UIColor dw_dashBlueColor];
+        NSParameterAssert(contentView);
+
+        UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+        titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
+        titleLabel.backgroundColor = [UIColor clearColor];
+        titleLabel.textAlignment = NSTextAlignmentCenter;
+        titleLabel.textColor = [UIColor dw_lightTitleColor];
+        titleLabel.numberOfLines = 0;
+        titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
+        titleLabel.font = [UIFont dw_fontForTextStyle:UIFontTextStyleSubheadline];
+        titleLabel.adjustsFontForContentSizeCategory = YES;
+        titleLabel.minimumScaleFactor = 0.5;
+        titleLabel.adjustsFontSizeToFitWidth = YES;
+        [titleLabel setContentCompressionResistancePriority:UILayoutPriorityRequired - 2
+                                                    forAxis:UILayoutConstraintAxisVertical];
+        [contentView addSubview:titleLabel];
+        _titleLabel = titleLabel;
+
+        const CGFloat margin = DWDefaultMargin();
+        const CGFloat padding = DW_FORM_CELL_VERTICAL_PADDING;
+
+        [NSLayoutConstraint activateConstraints:@[
+            [titleLabel.topAnchor constraintEqualToAnchor:contentView.topAnchor
+                                                 constant:padding],
+            [titleLabel.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor
+                                                     constant:margin],
+            [titleLabel.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor
+                                                    constant:-padding],
+            [titleLabel.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor
+                                                      constant:-margin],
+        ]];
+
+        [self setupObserving];
+    }
+
+    return self;
+}
+
+- (void)setupObserving {
+    [self mvvm_observe:DW_KEYPATH(self, cellModel.title)
+                  with:^(__typeof(self) self, NSString *value) {
+                      self.titleLabel.text = value ?: @" ";
+                  }];
+}
+
+@end
+
+NS_ASSUME_NONNULL_END

DashWallet/Sources/UI/Menu/Forms/DWBaseFormCellModel.h

@@ -16,10 +16,11 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <KVO-MVVM/KVONSObject.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface DWBaseFormCellModel : NSObject
+@interface DWBaseFormCellModel : KVONSObject
 
 @property (nullable, copy, nonatomic) NSString *title;
 @property (assign, nonatomic) NSUInteger tag;

DashWallet/Sources/UI/Menu/Forms/DWBaseFormTableViewCell.h

@@ -20,7 +20,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 extern CGFloat const DW_FORM_CELL_VERTICAL_PADDING;
+extern CGFloat const DW_FORM_CELL_TWOLINE_VERTICAL_PADDING;
 extern CGFloat const DW_FORM_CELL_SPACING;
+extern CGFloat const DW_FORM_CELL_TWOLINE_CONTENT_VERTICAL_SPACING;
+
 
 typedef NS_ENUM(NSUInteger, DWFormCellRoundMask) {
     DWFormCellRoundMask_Top = 1 << 0,

DashWallet/Sources/UI/Menu/Forms/DWBaseFormTableViewCell.m

@@ -25,6 +25,9 @@
 CGFloat const DW_FORM_CELL_VERTICAL_PADDING = 24.0;
 CGFloat const DW_FORM_CELL_SPACING = 10.0;
 
+CGFloat const DW_FORM_CELL_TWOLINE_VERTICAL_PADDING = 16.0;
+CGFloat const DW_FORM_CELL_TWOLINE_CONTENT_VERTICAL_SPACING = 8.0;
+
 static CGFloat const CORNER_RADIUS = 8.0;
 
 static CGFloat SeparatorHeight(void) {

DashWallet/Sources/UI/Menu/Forms/DWFormTableViewController.h

@@ -16,7 +16,10 @@
 //
 #import <UIKit/UIKit.h>
 
+#import "DWActionFormCellModel.h"
 #import "DWFormSectionModel.h"
+#import "DWKeyValueFormCellModel.h"
+#import "DWPublicKeyGenerationCellModel.h"
 #import "DWSelectorFormCellModel.h"
 #import "DWSwitcherFormCellModel.h"
 

DashWallet/Sources/UI/Menu/Forms/DWFormTableViewController.m

@@ -17,7 +17,10 @@
 
 #import "DWFormTableViewController.h"
 
+#import "DWActionFormTableViewCell.h"
+#import "DWKeyValueFormTableViewCell.h"
 #import "DWPlaceholderFormTableViewCell.h"
+#import "DWPublicKeyGenerationTableViewCell.h"
 #import "DWSelectorFormTableViewCell.h"
 #import "DWSharedUIConstants.h"
 #import "DWSwitcherFormTableViewCell.h"
@@ -26,6 +29,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 static CGFloat const DEFAULT_CELL_HEIGHT = 74.0;
+static CGFloat const PUBLIC_KEY_GENERATION_CELL_HEIGHT = 124.0;
 static CGFloat const SECTION_SPACING = 10.0;
 
 @interface DWFormTableViewController ()
@@ -55,6 +59,9 @@ - (void)viewDidLoad {
         DWSelectorFormTableViewCell.class,
         DWSwitcherFormTableViewCell.class,
         DWPlaceholderFormTableViewCell.class,
+        DWKeyValueFormTableViewCell.class,
+        DWPublicKeyGenerationTableViewCell.class,
+        DWActionFormTableViewCell.class,
     ];
 
     for (Class cellClass in cellClasses) {
@@ -145,13 +152,34 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell.roundMask = roundMask;
         return cell;
     }
+    else if ([cellModel isKindOfClass:DWKeyValueFormCellModel.class]) {
+        NSString *cellId = NSStringFromClass(DWKeyValueFormTableViewCell.class);
+        DWKeyValueFormTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId
+                                                                            forIndexPath:indexPath];
+        cell.cellModel = (DWKeyValueFormCellModel *)cellModel;
+        return cell;
+    }
+    else if ([cellModel isKindOfClass:DWPublicKeyGenerationCellModel.class]) {
+        NSString *cellId = NSStringFromClass(DWPublicKeyGenerationTableViewCell.class);
+        DWPublicKeyGenerationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId
+                                                                                   forIndexPath:indexPath];
+        cell.cellModel = (DWPublicKeyGenerationCellModel *)cellModel;
+        return cell;
+    }
     else if ([cellModel isKindOfClass:DWPlaceholderFormCellModel.class]) {
         NSString *cellId = NSStringFromClass(DWPlaceholderFormTableViewCell.class);
         DWPlaceholderFormTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId
                                                                                forIndexPath:indexPath];
         cell.cellModel = (DWPlaceholderFormCellModel *)cellModel;
         return cell;
     }
+    else if ([cellModel isKindOfClass:DWActionFormCellModel.class]) {
+        NSString *cellId = NSStringFromClass(DWActionFormTableViewCell.class);
+        DWActionFormTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId
+                                                                          forIndexPath:indexPath];
+        cell.cellModel = (DWActionFormCellModel *)cellModel;
+        return cell;
+    }
     else {
         NSString *cellModelClass = NSStringFromClass(cellModel.class);
         NSString *cellId = self.customCellModels[cellModelClass];
@@ -182,6 +210,9 @@ - (CGFloat)tableView:(UITableView *)tableView estimatedHeightForRowAtIndexPath:(
     if ([cellModel isKindOfClass:DWPlaceholderFormCellModel.class]) {
         return CGRectGetHeight(tableView.bounds);
     }
+    else if ([cellModel isKindOfClass:DWPublicKeyGenerationTableViewCell.class]) {
+        return PUBLIC_KEY_GENERATION_CELL_HEIGHT;
+    }
     else {
         return DEFAULT_CELL_HEIGHT;
     }
@@ -200,6 +231,22 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             selectorCellModel.didSelectBlock(selectorCellModel, indexPath);
         }
     }
+    else if ([cellModel isKindOfClass:DWActionFormCellModel.class]) {
+        DWActionFormCellModel *actionCellModel = (DWActionFormCellModel *)cellModel;
+        if (actionCellModel.didSelectBlock) {
+            actionCellModel.didSelectBlock(actionCellModel, indexPath);
+        }
+    }
+    else if ([cellModel isKindOfClass:DWKeyValueFormCellModel.class]) {
+        DWKeyValueFormCellModel *keyValueCellModel = (DWKeyValueFormCellModel *)cellModel;
+        DWKeyValueFormTableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
+        if (cell) {
+            [cell resignFirstResponder];
+        }
+        if (keyValueCellModel.actionBlock) {
+            keyValueCellModel.actionBlock();
+        }
+    }
     else if ([cellModel isKindOfClass:DWSwitcherFormCellModel.class]) {
         DWSwitcherFormCellModel *switcherCellModel = (DWSwitcherFormCellModel *)cellModel;
         switcherCellModel.on = !switcherCellModel.on;

DashWallet/Sources/UI/Menu/Forms/KeyValue/DWKeyValueFormCellModel.h

@@ -0,0 +1,36 @@
+//
+//  Created by Sam Westrich
+//  Copyright © 2019 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  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 "DWBaseFormCellModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DWKeyValueFormCellModel : DWBaseFormCellModel
+
+@property (readonly, nonatomic) NSString *placeholderText;
+@property (copy, nonatomic) NSString *valueText;
+@property (assign, nonatomic) BOOL editable;
+@property (copy, nonatomic) NSAttributedString *actionText;
+@property (nullable, copy, nonatomic) void (^didChangeValueBlock)(DWKeyValueFormCellModel *cellModel);
+@property (nullable, copy, nonatomic) void (^actionBlock)(void);
+
+- (instancetype)initWithTitle:(nullable NSString *)title valueText:(NSString *)valueText NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithTitle:(nullable NSString *)title valueText:(NSString *)valueText placeholderText:(NSString *)placeholderText actionText:(NSAttributedString *)actionText;
+
+@end
+
+NS_ASSUME_NONNULL_END