Edit note screen

RomanPodymov · Jul 5, 2023 · 79abc46 · 79abc46
1 parent e57c00d
commit 79abc46
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 83 deletions.
diff --git a/NotesApplication/RPNotesUI/Controllers/RPNoteEdit/RPNoteEditNavigationController.h b/NotesApplication/RPNotesUI/Controllers/RPNoteEdit/RPNoteEditNavigationController.h
diff --git a/NotesApplication/RPNotesUI/Controllers/RPNoteEdit/RPNoteEditNavigationController.m b/NotesApplication/RPNotesUI/Controllers/RPNoteEdit/RPNoteEditNavigationController.m
diff --git a/NotesApplication/RPNotesUI/Controllers/RPNoteEdit/RPNoteEditViewController.m b/NotesApplication/RPNotesUI/Controllers/RPNoteEdit/RPNoteEditViewController.m
@@ -21,20 +21,24 @@ typedef NS_ENUM(NSUInteger, NOTE_CONTROLLER_ERROR_CODE) {
 
 @interface RPNoteEditViewController ()
 
-@property (weak, nonatomic) IBOutlet UITextView *textViewNote;
+@property (weak, nonatomic) UITextView *textViewNote;
 
 @end
 
 @implementation RPNoteEditViewController
 
 #pragma mark UIKit methods
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
+- (void)addSubviews {
+    [super addSubviews];
+    UITextView *textViewNote = [UITextView new];
+    [self.view addSubview:textViewNote];
+    self.textViewNote = textViewNote;
     [self setupTextViewNote];
 }
 
-- (void)updateViewConstraints {
+- (void)setupConstraints {
+    [super setupConstraints];
     NSNumber* textViewNoteTopOffset = RPCustomization.sharedInstance.noteEditGeometry.textViewTopOffset;
     NSNumber* textViewNoteLeftOffset = RPCustomization.sharedInstance.noteEditGeometry.textViewLeftOffset;
     NSNumber* textViewNoteBottomOffset = RPCustomization.sharedInstance.noteEditGeometry.textViewBottomOffset;
@@ -43,13 +47,10 @@ - (void)updateViewConstraints {
                                                                                textViewNoteLeftOffset.floatValue,
                                                                                textViewNoteBottomOffset.floatValue,
                                                                                textViewNoteRightOffset.floatValue)];
-    [super updateViewConstraints];
 }
 
-- (IBAction)onBackBarButtonPressed:(id)sender {
-    [self dismissViewControllerAnimated:YES completion:^{
-
-    }];
+- (void)onLeftBarButtonItemTap {
+    [self.navigationController popViewControllerAnimated:YES];
 }
 
 - (IBAction)onRightBarButtonPressed:(id)sender {

diff --git a/NotesApplication/RPNotesUI/Controllers/RPNotesList/RPNotesListViewController.m b/NotesApplication/RPNotesUI/Controllers/RPNotesList/RPNotesListViewController.m
@@ -16,7 +16,6 @@
 #import "RPLocalizationMaster.h"
 #import "RPCustomization.h"
 #import "RPNoteEditViewController.h"
-#import "RPNoteEditNavigationController.h"
 #import "RPNotesListTableViewCell.h"
 #import "RPLanguagesViewController.h"
 
@@ -26,10 +25,6 @@
 
 NSString* const TABLE_VIEW_ACCESS_LABEL = @"Notes table view";
 
-NSString* const segueShowNoteAdd = @"showNoteAdd";
-NSString* const segueShowNoteEdit = @"showNoteEdit";
-NSString* const segueShowLanguages = @"showLanguages";
-
 @interface RPNotesListViewController ()
 
 @property (weak, nonatomic) UITableView *notesTableView;
@@ -57,6 +52,17 @@ -(void)onLeftBarButtonItemTap {
     [self.navigationController pushViewController:languagesViewController animated:YES];
 }
 
+-(void)onRightBarButtonItemTap {
+    [self openEditScreen:CONTROLLER_MODE_ADD note:nil];
+}
+
+- (void)openEditScreen:(CONTROLLER_MODE)mode note:(RPNote* _Nullable)note {
+    RPNoteEditViewController* noteEditViewController = [RPNoteEditViewController new];
+    noteEditViewController.controllerMode = mode;
+    [noteEditViewController setupWithData:note];
+    [self.navigationController pushViewController:noteEditViewController animated:YES];
+}
+
 #pragma mark UIKit methods
 
 - (void)setupConstraints {
@@ -73,43 +79,6 @@ - (void)setupConstraints {
     [self.notesMessageView autoSetDimension:ALDimensionHeight toSize:RPCustomization.sharedInstance.notesGeometry.messageHeight.floatValue];
 }
 
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    if ([segue.identifier isEqualToString:segueShowNoteAdd] ||
-        [segue.identifier isEqualToString:segueShowNoteEdit]) {
-        if ([segue.destinationViewController isKindOfClass:[RPNoteEditNavigationController class]]) {
-            [self prepareNoteEditController:segue.destinationViewController
-                                       note:[RPNotesListViewController noteFromSender:sender]
-                             controllerMode:[RPNotesListViewController controllerModeForSegue:segue.identifier]];
-        }
-    } else if ([segue.identifier isEqualToString:segueShowLanguages]) {
-
-    }
-}
-
-+ (RPNote* _Nullable)noteFromSender:(id)sender {
-    if ([sender isKindOfClass:[RPNote class]]) {
-        return sender;
-    }
-    return nil;
-}
-
-+ (CONTROLLER_MODE)controllerModeForSegue:(NSString* const)segueName {
-    if ([segueName isEqualToString:segueShowNoteAdd]) {
-        return CONTROLLER_MODE_ADD;
-    } else if ([segueName isEqualToString:segueShowNoteEdit]) {
-        return CONTROLLER_MODE_WATCH;
-    }
-    return CONTROLLER_MODE_UNKNOWN;
-}
-
-- (void)prepareNoteEditController:(RPNoteEditNavigationController*)noteEditNavigationController
-                             note:(RPNote*)note
-                   controllerMode:(CONTROLLER_MODE)controllerMode {
-    RPNoteEditViewController* noteEditController = noteEditNavigationController.viewControllers.firstObject;
-    noteEditController.controllerMode = controllerMode;
-    [noteEditController setupWithData:note];
-}
-
 #pragma mark Bar customization
 
 -(NSString* _Nullable)textForLeftBarItem {
@@ -210,7 +179,7 @@ - (CGFloat)tableView:(UITableView *)tableView estimatedHeightForRowAtIndexPath:(
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    [self performSegueWithIdentifier:segueShowNoteEdit sender:[_notes objectAtIndex:indexPath.row]];
+    [self openEditScreen:CONTROLLER_MODE_WATCH note:self.notes[indexPath.row]];
 }
 
 @end