1010#import " ANXTextField.h"
1111
1212#define PADDING 8 .0f
13+ #define MARGIN 6 .0f
1314
1415#define SYSTEM_VERSION_EQUAL_TO (v ) ([[[UIDevice currentDevice ] systemVersion ] compare: v options: NSNumericSearch] == NSOrderedSame)
1516#define SYSTEM_VERSION_GREATER_THAN (v ) ([[[UIDevice currentDevice ] systemVersion ] compare: v options: NSNumericSearch] == NSOrderedDescending)
@@ -245,17 +246,46 @@ - (BOOL)doesKeyboardDisappear:(NSDictionary*)userInfo {
245246
246247- (UIColor*)textFieldBackgroundColor {
247248 if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO (@" 13.0"
248- return UIColor.secondarySystemBackgroundColor ;
249+ return [ UIColor.labelColor colorWithAlphaComponent: 0.2 ] ;
249250 } else {
250251 return [UIColor colorWithRed: 242.0 /255.0 green: 242.0 /255.0 blue: 247.0 /255.0 alpha: 1.0 ];
251252 }
252253}
253254
254255- (UIColor*)textFieldWrapperBackgroundColor {
255256 if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO (@" 13.0"
256- return UIColor.systemBackgroundColor ;
257+ NSLog (@" [ANX] UIColor.labelColor"
258+ return [UIColor.labelColor colorWithAlphaComponent: 0.2 ];
257259 } else {
258- return UIColor.whiteColor ;
260+ UIView* view = [self findTopmostView ];
261+ switch (view.traitCollection .userInterfaceStyle ) {
262+ case UIUserInterfaceStyleDark:
263+ NSLog (@" [ANX] darkTextColor"
264+ return [UIColor.darkTextColor colorWithAlphaComponent: 0.2 ];
265+ default :
266+ NSLog (@" [ANX] lightTextColor"
267+ return [UIColor.lightTextColor colorWithAlphaComponent: 0.2 ];
268+ }
269+ }
270+ }
271+
272+ - (UIBlurEffect*)textFieldWrapperBlurEffect {
273+ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO (@" 13.0"
274+ NSLog (@" [ANX] UIBlurEffectStyleSystemUltraThinMaterial"
275+ return [UIBlurEffect effectWithStyle: UIBlurEffectStyleSystemChromeMaterial];
276+ } else {
277+ UIView* view = [self findTopmostView ];
278+ switch (view.traitCollection .userInterfaceStyle ) {
279+ case UIUserInterfaceStyleDark:
280+ NSLog (@" [ANX] UIBlurEffectStyleDark"
281+ return [UIBlurEffect effectWithStyle: UIBlurEffectStyleDark];
282+ case UIUserInterfaceStyleLight:
283+ NSLog (@" [ANX] UIBlurEffectStyleLight"
284+ return [UIBlurEffect effectWithStyle: UIBlurEffectStyleLight];
285+ default :
286+ NSLog (@" [ANX] UIBlurEffectStyleRegular"
287+ return [UIBlurEffect effectWithStyle: UIBlurEffectStyleRegular];
288+ }
259289 }
260290}
261291
@@ -269,8 +299,8 @@ - (UITextField*)createTextField {
269299
270300 UITextField* inputTextField = [[ANXTextField alloc ] init ];
271301 inputTextField.delegate = self;
272- inputTextField.borderStyle = UITextBorderStyleRoundedRect ;
273- inputTextField.backgroundColor = self. textFieldBackgroundColor ;
302+ inputTextField.borderStyle = UITextBorderStyleNone ;
303+ inputTextField.backgroundColor = UIColor. clearColor ;
274304 inputTextField.clearButtonMode = UITextFieldViewModeAlways;
275305 inputTextField.returnKeyType = UIReturnKeyDone;
276306 inputTextField.secureTextEntry = _params.isSecureTextEntry ;
@@ -282,28 +312,53 @@ - (UITextField*)createTextField {
282312
283313 [inputTextField sizeToFit ];
284314
285- CGFloat textFieldHeight = inputTextField.frame .size .height ;
315+ CGFloat textFieldHeight = inputTextField.frame .size .height + MARGIN * 2 ;
286316 CGFloat wrapperHeight = textFieldHeight + PADDING * 2 ;
287317
288318 CGRect rect = CGRectMake (0.0 , CGRectGetMaxY (view.bounds ) - wrapperHeight,
289319 CGRectGetWidth (view.bounds ), wrapperHeight);
290320
291321 UIView* wrapper = [[UIView alloc ] initWithFrame: rect];
292322 wrapper.hidden = YES ;
293- wrapper.backgroundColor = self. textFieldWrapperBackgroundColor ;
323+ wrapper.backgroundColor = UIColor. clearColor ;
294324 [view addSubview: wrapper];
295325
296- UIView* line = [[UIView alloc ] initWithFrame: CGRectMake (0.0 , -1.0 , wrapper.bounds.size.width, 0.5 )];
297- line.backgroundColor = UIColor.systemGrayColor ;
298- line.alpha = 0.8 ;
299- line.tag = 1198 ;
300- [wrapper addSubview: line];
326+ UIBlurEffect* blurEffect = [self textFieldWrapperBlurEffect ];
327+ UIVisualEffectView* blurView = [[UIVisualEffectView alloc ] initWithEffect: blurEffect];
328+ blurView.frame = wrapper.bounds ;
329+ blurView.autoresizingMask = true ;
330+ blurView.autoresizingMask = UIViewAutoresizingFlexibleWidth & UIViewAutoresizingFlexibleHeight;
331+ [wrapper addSubview: blurView];
332+
333+ // UIVibrancyEffect* vibrancyEffect = [UIVibrancyEffect effectForBlurEffect:blurEffect];
334+ // UIVisualEffectView* vibrancyView = [[UIVisualEffectView alloc] initWithEffect:vibrancyEffect];
335+ // vibrancyView.autoresizingMask = UIViewAutoresizingFlexibleWidth & UIViewAutoresizingFlexibleHeight;
336+
337+
338+
339+ // UIView* line = [[UIView alloc] initWithFrame:CGRectMake(0.0, -1.0, wrapper.bounds.size.width, 0.5)];
340+ // line.backgroundColor = UIColor.systemGrayColor;
341+ // line.alpha = 0.8;
342+ // line.tag = 1198;
343+ // [wrapper addSubview:line];
344+
345+ UIEdgeInsets safeArea = UIEdgeInsetsZero;
346+ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO (@" 13.0"
347+ safeArea = view.safeAreaInsets ;
348+ }
301349
302- UIEdgeInsets safeArea = view.safeAreaInsets ;
303350 CGFloat left = MAX (safeArea.left , PADDING);
304351 CGFloat right = MAX (safeArea.right , PADDING);
352+ CGFloat textFieldWidth = wrapper.bounds .size .width - (left + right);
353+
354+ UIView* background = [[UIView alloc ] initWithFrame: CGRectMake (left, PADDING, textFieldWidth, textFieldHeight)];
355+ background.tag = 1199 ;
356+ [background.layer setCornerRadius: 8.0 ];
357+ background.layer .masksToBounds = true ;
358+ background.backgroundColor = [self textFieldWrapperBackgroundColor ];
359+ [wrapper addSubview: background];
305360
306- inputTextField.frame = CGRectMake (left, PADDING, wrapper. bounds . size . width - (left + right) , textFieldHeight);
361+ inputTextField.frame = CGRectMake (left + MARGIN , PADDING + MARGIN, textFieldWidth - MARGIN * 2 , textFieldHeight - MARGIN * 2 );
307362 [wrapper addSubview: inputTextField];
308363
309364 return inputTextField;
@@ -348,21 +403,33 @@ - (void)adjustTextFieldFrame {
348403
349404 // line
350405
351- UIView* line = [wrapper viewWithTag: 1198 ];
352-
353- CGRect lineFrame = line.frame ;
354- lineFrame.size .width = wrapper.bounds .size .width ;
355- line.frame = lineFrame;
406+ // UIView* line = [wrapper viewWithTag:1198];
407+ //
408+ // CGRect lineFrame = line.frame;
409+ // lineFrame.size.width = wrapper.bounds.size.width;
410+ // line.frame = lineFrame;
356411
357412 // input
358413
359- UIEdgeInsets safeArea = view.safeAreaInsets ;
414+ UIEdgeInsets safeArea = UIEdgeInsetsZero;
415+ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO (@" 13.0"
416+ safeArea = view.safeAreaInsets ;
417+ }
418+
360419 CGFloat left = MAX (safeArea.left , PADDING);
361420 CGFloat right = MAX (safeArea.right , PADDING);
421+ CGFloat textFieldWidth = wrapper.bounds .size .width - (left + right);
422+
423+ // background
424+
425+ UIView* background = [wrapper viewWithTag: 1199 ];
426+ background.frame = CGRectMake (left, PADDING, textFieldWidth, background.frame .size .height );
427+
428+ // input
362429
363430 CGRect inputFrame = self.textField .frame ;
364- inputFrame.origin .x = left;
365- inputFrame.size .width = wrapper. bounds . size . width - (left + right) ;
431+ inputFrame.origin .x = left + MARGIN ;
432+ inputFrame.size .width = textFieldWidth - MARGIN * 2 ;
366433 self.textField .frame = inputFrame;
367434}
368435
0 commit comments