mirror of
https://github.com/bitwarden/mobile
synced 2026-01-06 18:43:43 +00:00
Android styles and theme, updated to extended controls
This commit is contained in:
@@ -22,7 +22,6 @@ namespace Bit.iOS.Controls
|
||||
if(view != null)
|
||||
{
|
||||
SetBorder(view);
|
||||
SetPlaceholderTextColor(view);
|
||||
SetMaxLength(view);
|
||||
}
|
||||
}
|
||||
@@ -35,32 +34,28 @@ namespace Bit.iOS.Controls
|
||||
|
||||
if(e.PropertyName == ExtendedEntry.HasBorderProperty.PropertyName
|
||||
|| e.PropertyName == ExtendedEntry.HasOnlyBottomBorderProperty.PropertyName
|
||||
|| e.PropertyName == ExtendedEntry.BorderColorProperty.PropertyName)
|
||||
|| e.PropertyName == ExtendedEntry.BottomBorderColorProperty.PropertyName)
|
||||
{
|
||||
SetBorder(view);
|
||||
}
|
||||
if(e.PropertyName == ExtendedEntry.PlaceholderTextColorProperty.PropertyName)
|
||||
{
|
||||
SetPlaceholderTextColor(view);
|
||||
}
|
||||
}
|
||||
|
||||
private void SetBorder(ExtendedEntry view)
|
||||
{
|
||||
if(view.HasBorder && view.HasOnlyBottomBorder)
|
||||
if(view.HasOnlyBottomBorder)
|
||||
{
|
||||
var borderLayer = new CALayer();
|
||||
borderLayer.MasksToBounds = true;
|
||||
borderLayer.Frame = new CGRect(0f, Frame.Height / 2, Frame.Width, 1f);
|
||||
borderLayer.BorderColor = view.BorderColor.ToCGColor();
|
||||
borderLayer.BorderWidth = 1.0f;
|
||||
borderLayer.Frame = new CGRect(0f, Frame.Height / 2, Frame.Width * 2, 1f);
|
||||
borderLayer.BorderColor = view.BottomBorderColor.ToCGColor();
|
||||
borderLayer.BorderWidth = 1f;
|
||||
|
||||
Control.Layer.AddSublayer(borderLayer);
|
||||
Control.BorderStyle = UITextBorderStyle.None;
|
||||
}
|
||||
else if(view.HasBorder)
|
||||
{
|
||||
Control.BorderStyle = UITextBorderStyle.Line;
|
||||
Control.BorderStyle = UITextBorderStyle.RoundedRect;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -76,20 +71,5 @@ namespace Bit.iOS.Controls
|
||||
return newLength <= view.MaxLength;
|
||||
};
|
||||
}
|
||||
|
||||
private void SetPlaceholderTextColor(ExtendedEntry view)
|
||||
{
|
||||
if(string.IsNullOrEmpty(view.Placeholder) == false && view.PlaceholderTextColor != Color.Default)
|
||||
{
|
||||
var placeholderString = new NSAttributedString(
|
||||
view.Placeholder,
|
||||
new UIStringAttributes()
|
||||
{
|
||||
ForegroundColor = view.PlaceholderTextColor.ToUIColor()
|
||||
});
|
||||
|
||||
Control.AttributedPlaceholder = placeholderString;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
64
src/iOS/Controls/ExtendedPickerRenderer.cs
Normal file
64
src/iOS/Controls/ExtendedPickerRenderer.cs
Normal file
@@ -0,0 +1,64 @@
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using Bit.App.Controls;
|
||||
using Bit.iOS.Controls;
|
||||
using CoreAnimation;
|
||||
using CoreGraphics;
|
||||
using UIKit;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Platform.iOS;
|
||||
|
||||
[assembly: ExportRenderer(typeof(ExtendedPicker), typeof( ExtendedPickerRenderer ) )]
|
||||
namespace Bit.iOS.Controls
|
||||
{
|
||||
public class ExtendedPickerRenderer : PickerRenderer
|
||||
{
|
||||
protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
|
||||
{
|
||||
base.OnElementChanged(e);
|
||||
|
||||
var view = e.NewElement as ExtendedPicker;
|
||||
if(view != null)
|
||||
{
|
||||
SetBorder(view);
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
|
||||
{
|
||||
base.OnElementPropertyChanged(sender, e);
|
||||
|
||||
var view = (ExtendedPicker)Element;
|
||||
|
||||
if(e.PropertyName == ExtendedPicker.HasBorderProperty.PropertyName
|
||||
|| e.PropertyName == ExtendedPicker.HasOnlyBottomBorderProperty.PropertyName
|
||||
|| e.PropertyName == ExtendedPicker.BottomBorderColorProperty.PropertyName)
|
||||
{
|
||||
SetBorder(view);
|
||||
}
|
||||
}
|
||||
|
||||
private void SetBorder( ExtendedPicker view )
|
||||
{
|
||||
if(view.HasOnlyBottomBorder)
|
||||
{
|
||||
var borderLayer = new CALayer();
|
||||
borderLayer.MasksToBounds = true;
|
||||
borderLayer.Frame = new CGRect( 0f, Frame.Height / 2, Frame.Width * 2, 1f );
|
||||
borderLayer.BorderColor = view.BottomBorderColor.ToCGColor();
|
||||
borderLayer.BorderWidth = 1f;
|
||||
|
||||
Control.Layer.AddSublayer( borderLayer );
|
||||
Control.BorderStyle = UITextBorderStyle.None;
|
||||
}
|
||||
else if(view.HasBorder)
|
||||
{
|
||||
Control.BorderStyle = UITextBorderStyle.RoundedRect;
|
||||
}
|
||||
else
|
||||
{
|
||||
Control.BorderStyle = UITextBorderStyle.None;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user