From 7b3018e6084bf271a134e1d11a392cdc516c61f9 Mon Sep 17 00:00:00 2001 From: Ajai Prabhu G S Date: Fri, 8 Feb 2019 20:39:03 +0530 Subject: [PATCH] border check so that BAU flow wont get affected --- MVMCoreUI/Atoms/Views/MFTextView.h | 8 ++++---- MVMCoreUI/Atoms/Views/MFTextView.m | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/MFTextView.h b/MVMCoreUI/Atoms/Views/MFTextView.h index 9d568b6a..da147a5f 100644 --- a/MVMCoreUI/Atoms/Views/MFTextView.h +++ b/MVMCoreUI/Atoms/Views/MFTextView.h @@ -24,15 +24,15 @@ @interface MFTextView : UIView -@property (weak, nonatomic) id delegate; +@property (weak, nonatomic, nullable) id delegate; @property (weak, nonatomic) IBOutlet CustomTextView *textView; @property (assign, nonatomic) BOOL hideBorder; -@property (strong, nonatomic) UIBezierPath *borderPath; +@property (strong, nonatomic, nullable) UIBezierPath *borderPath; @property (nonatomic, readwrite) BOOL errorShowing; -@property (weak, nonatomic) SeparatorView *bottomLine; +@property (weak, nonatomic, nullable) SeparatorView *bottomLine; -+(MFTextView *) MFTextViewWithPlaceholderString:(NSString *) placeholder delegate:(id) delegate; ++(MFTextView *_Nullable) MFTextViewWithPlaceholderString:(NSString *_Nullable) placeholder delegate:(id _Nullable ) delegate; - (void)makeBordersForTextView; diff --git a/MVMCoreUI/Atoms/Views/MFTextView.m b/MVMCoreUI/Atoms/Views/MFTextView.m index 5234b076..866c6c00 100644 --- a/MVMCoreUI/Atoms/Views/MFTextView.m +++ b/MVMCoreUI/Atoms/Views/MFTextView.m @@ -200,9 +200,7 @@ view.textView.smartInsertDeleteType = UITextSmartInsertDeleteTypeNo; } [view didSetFont:view.textView.font]; - -// self.bottomLine = bottomLine; - + view.hideBorder = YES; return view; } @@ -210,12 +208,14 @@ #pragma mark - bordered textview - (void)makeBordersForTextView { - SeparatorView *bottomLine = [SeparatorView separatorAddToView:self position:SeparatorPositionBot]; + [SeparatorView separatorAddToView:self position:SeparatorPositionBot]; self.placeHolderLabel.font = [MFStyler fontB3]; [self.textView setFont:[MFStyler fontB2]]; [self.textView setTextContainerInset:UIEdgeInsetsMake(PaddingTwo, PaddingTwo, PaddingTwo, PaddingOne)]; - [MVMCoreUICommonViewsUtility addDismissToolbar:self.textView delegate:self.delegate]; - self.errorShowing = false; + [MVMCoreUICommonViewsUtility addDismissToolbarToTextView:self.textView delegate:self.delegate]; + self.errorShowing = NO; + self.hideBorder = NO; + [self layoutIfNeeded]; } - (void)addBezierPathForBorders { @@ -245,9 +245,8 @@ - (void)drawRect:(CGRect)rect { [super drawRect:rect]; [self.borderPath removeAllPoints]; - self.layer.cornerRadius = 0; - self.hideBorder = false; if (!self.hideBorder) { + self.layer.cornerRadius = 0; [self addBezierPathForBorders]; } }