diff --git a/EssentialUIKit/Resources/Fonts/Montserrat-Bold.ttf b/EssentialUIKit.Android/Assets/Montserrat-Bold.ttf similarity index 100% rename from EssentialUIKit/Resources/Fonts/Montserrat-Bold.ttf rename to EssentialUIKit.Android/Assets/Montserrat-Bold.ttf diff --git a/EssentialUIKit/Resources/Fonts/Montserrat-Medium.ttf b/EssentialUIKit.Android/Assets/Montserrat-Medium.ttf similarity index 100% rename from EssentialUIKit/Resources/Fonts/Montserrat-Medium.ttf rename to EssentialUIKit.Android/Assets/Montserrat-Medium.ttf diff --git a/EssentialUIKit/Resources/Fonts/Montserrat-Regular.ttf b/EssentialUIKit.Android/Assets/Montserrat-Regular.ttf similarity index 100% rename from EssentialUIKit/Resources/Fonts/Montserrat-Regular.ttf rename to EssentialUIKit.Android/Assets/Montserrat-Regular.ttf diff --git a/EssentialUIKit/Resources/Fonts/Montserrat-SemiBold.ttf b/EssentialUIKit.Android/Assets/Montserrat-SemiBold.ttf similarity index 100% rename from EssentialUIKit/Resources/Fonts/Montserrat-SemiBold.ttf rename to EssentialUIKit.Android/Assets/Montserrat-SemiBold.ttf diff --git a/EssentialUIKit/Resources/Fonts/UIFontIcons.ttf b/EssentialUIKit.Android/Assets/UIFontIcons.ttf similarity index 100% rename from EssentialUIKit/Resources/Fonts/UIFontIcons.ttf rename to EssentialUIKit.Android/Assets/UIFontIcons.ttf diff --git a/EssentialUIKit.Android/EssentialUIKit.Android.csproj b/EssentialUIKit.Android/EssentialUIKit.Android.csproj index 519153b8..0150bb05 100755 --- a/EssentialUIKit.Android/EssentialUIKit.Android.csproj +++ b/EssentialUIKit.Android/EssentialUIKit.Android.csproj @@ -41,11 +41,6 @@ true false - - - ..\EssentialUIKit\StyleCop.ruleset - - @@ -64,60 +59,48 @@ 1.68.0 - - - + + + - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - + - 18.4.0.31 + 17.4.0.44 - + - 18.4.0.31 - - - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - - - - - - + + + + + + - 18.4.0.31 - - - 1.6.0 - - - - 1.0.0.6 - - - 1.2.1.1 - - - 2.2.0.4 - - - 1.3.0.4 + 17.4.0.44 + + + + + + + @@ -125,13 +108,17 @@ - + + + + + @@ -245,6 +232,9 @@ + + + @@ -284,9 +274,6 @@ - - - diff --git a/EssentialUIKit.Android/MainActivity.cs b/EssentialUIKit.Android/MainActivity.cs index 9703ce97..258d8674 100644 --- a/EssentialUIKit.Android/MainActivity.cs +++ b/EssentialUIKit.Android/MainActivity.cs @@ -12,8 +12,8 @@ namespace EssentialUIKit.Droid public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity { protected override void OnCreate(Bundle savedInstanceState) - { - this.Window.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds); + { + Window.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds); base.OnCreate(savedInstanceState); @@ -24,7 +24,7 @@ protected override void OnCreate(Bundle savedInstanceState) Syncfusion.XForms.Android.PopupLayout.SfPopupLayoutRenderer.Init(); Syncfusion.XForms.Android.Core.Core.Init(this); - + this.LoadApplication(new App()); // Change the status bar color diff --git a/EssentialUIKit.Android/Properties/AndroidManifest.xml b/EssentialUIKit.Android/Properties/AndroidManifest.xml index d6709958..65a58a4d 100644 --- a/EssentialUIKit.Android/Properties/AndroidManifest.xml +++ b/EssentialUIKit.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/EssentialUIKit.Android/Renderers/BorderlessEditorRenderer.cs b/EssentialUIKit.Android/Renderers/BorderlessEditorRenderer.cs index 8a784632..d49bf991 100644 --- a/EssentialUIKit.Android/Renderers/BorderlessEditorRenderer.cs +++ b/EssentialUIKit.Android/Renderers/BorderlessEditorRenderer.cs @@ -14,15 +14,13 @@ public class BorderlessEditorRenderer : EditorRenderer { #region Constructor - public BorderlessEditorRenderer() - : base(Application.Context) + public BorderlessEditorRenderer() : base(Application.Context) { } #endregion #region Methods - /// /// Used to set the transparent color for editor control background property. /// diff --git a/EssentialUIKit.Android/Renderers/BorderlessEntryRenderer.cs b/EssentialUIKit.Android/Renderers/BorderlessEntryRenderer.cs index d2f65828..ac922623 100644 --- a/EssentialUIKit.Android/Renderers/BorderlessEntryRenderer.cs +++ b/EssentialUIKit.Android/Renderers/BorderlessEntryRenderer.cs @@ -9,8 +9,7 @@ namespace EssentialUIKit.Droid { public class BorderlessEntryRenderer : EntryRenderer { - public BorderlessEntryRenderer() - : base(Application.Context) + public BorderlessEntryRenderer() : base(Application.Context) { } @@ -21,8 +20,8 @@ protected override void OnElementChanged(ElementChangedEventArgs e) if (this.Control != null) { this.Control.SetBackground(null); - this.Control.Gravity = GravityFlags.CenterVertical; - this.Control.SetPadding(0, 0, 0, 0); + Control.Gravity = GravityFlags.CenterVertical; + Control.SetPadding(0, 0, 0, 0); } } } diff --git a/EssentialUIKit.Android/Renderers/CalenderDatePickerRenderer.cs b/EssentialUIKit.Android/Renderers/CalenderDatePickerRenderer.cs index 41b6b82d..ba4d8da8 100644 --- a/EssentialUIKit.Android/Renderers/CalenderDatePickerRenderer.cs +++ b/EssentialUIKit.Android/Renderers/CalenderDatePickerRenderer.cs @@ -11,8 +11,7 @@ namespace EssentialUIKit.Droid /// public class CalenderDatePickerRenderer : DatePickerRenderer { - public CalenderDatePickerRenderer(Context context) - : base(context) + public CalenderDatePickerRenderer(Context context) : base(context) { } @@ -26,10 +25,10 @@ protected override void OnElementChanged(ElementChangedEventArgs e) if (this.Control != null) { this.Control.SetBackground(null); - this.Control.Text = (e?.NewElement as Controls.CalenderDatePicker).PlaceHolderText; - this.Control.SetTextColor(new Android.Graphics.Color(96, 106, 123)); - this.Control.Gravity = Android.Views.GravityFlags.CenterVertical; - this.Control.SetPadding(0, 0, 0, 0); + Control.Text = (e.NewElement as Controls.CalenderDatePicker).PlaceHolderText; + Control.SetTextColor(new Android.Graphics.Color(96, 106, 123)); + Control.Gravity = Android.Views.GravityFlags.CenterVertical; + Control.SetPadding(0, 0, 0, 0); } } } diff --git a/EssentialUIKit.Android/Renderers/ParallaxListViewRenderer.cs b/EssentialUIKit.Android/Renderers/ParallaxListViewRenderer.cs index c3cb63b7..0bbed7a4 100644 --- a/EssentialUIKit.Android/Renderers/ParallaxListViewRenderer.cs +++ b/EssentialUIKit.Android/Renderers/ParallaxListViewRenderer.cs @@ -12,17 +12,16 @@ public class ParallaxListViewRenderer : ListViewRenderer { private int previousScrollPosition; - public ParallaxListViewRenderer(Context context) - : base(context) + public ParallaxListViewRenderer(Context context) : base(context) { } protected override void OnElementChanged(ElementChangedEventArgs e) { base.OnElementChanged(e); - if (e?.NewElement != null) + if (e.NewElement != null) { - (e.NewElement as ParallaxListView).WidthInPixel = this.Context.Resources.DisplayMetrics.WidthPixels; + (e.NewElement as ParallaxListView).WidthInPixel = Context.Resources.DisplayMetrics.WidthPixels; if (this.Control != null) { this.Control.Scroll += (sender, arg) => @@ -30,10 +29,10 @@ protected override void OnElementChanged(ElementChangedEventArgs e) var topView = arg.View.GetChildAt(0); if (this.Control.FirstVisiblePosition == 0) { - this.previousScrollPosition = topView.Top; + previousScrollPosition = topView.Top; } - ParallaxListView.OnScrollChanged(this.Element, new ScrollChangedEventArgs(this.previousScrollPosition)); + ParallaxListView.OnScrollChanged(Element, new ScrollChangedEventArgs(previousScrollPosition)); }; } } diff --git a/EssentialUIKit.Android/Renderers/TemplateHostViewRenderer.cs b/EssentialUIKit.Android/Renderers/TemplateHostViewRenderer.cs index 1c7185cb..2de24c87 100644 --- a/EssentialUIKit.Android/Renderers/TemplateHostViewRenderer.cs +++ b/EssentialUIKit.Android/Renderers/TemplateHostViewRenderer.cs @@ -11,8 +11,7 @@ namespace EssentialUIKit.Droid.Renderers { public class TemplateHostViewRenderer : ViewRenderer { - public TemplateHostViewRenderer(Context context) - : base(context) + public TemplateHostViewRenderer(Context context) : base(context) { } @@ -56,11 +55,9 @@ protected override void OnElementChanged(ElementChangedEventArgstrue true - - - ..\EssentialUIKit\StyleCop.ruleset - - App.xaml @@ -184,49 +179,43 @@ 1.68.0 - - - + + + - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - + - 18.4.0.31 + 17.4.0.44 - + - 18.4.0.31 - - - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - - - - - - + + + + + + - 18.4.0.31 - - - 1.6.0 + 17.4.0.44 - - + + @@ -235,6 +224,11 @@ + + + + + diff --git a/EssentialUIKit.UWP/EssentialUIKit.UWP_TemporaryKey.pfx b/EssentialUIKit.UWP/EssentialUIKit.UWP_TemporaryKey.pfx index df8835c5..f8a79bc0 100644 Binary files a/EssentialUIKit.UWP/EssentialUIKit.UWP_TemporaryKey.pfx and b/EssentialUIKit.UWP/EssentialUIKit.UWP_TemporaryKey.pfx differ diff --git a/EssentialUIKit.UWP/MainPage.xaml.cs b/EssentialUIKit.UWP/MainPage.xaml.cs index 05a45b17..b64d16bb 100644 --- a/EssentialUIKit.UWP/MainPage.xaml.cs +++ b/EssentialUIKit.UWP/MainPage.xaml.cs @@ -8,8 +8,8 @@ public MainPage() { this.InitializeComponent(); SfListViewRenderer.Init(); - Syncfusion.SfMaps.XForms.UWP.SfMapsRenderer.Init(); - this.LoadApplication(new EssentialUIKit.App()); + new Syncfusion.SfMaps.XForms.UWP.SfMapsRenderer(); + LoadApplication(new EssentialUIKit.App()); } } } diff --git a/EssentialUIKit.UWP/Properties/AssemblyInfo.cs b/EssentialUIKit.UWP/Properties/AssemblyInfo.cs index 8326d933..29eed166 100644 --- a/EssentialUIKit.UWP/Properties/AssemblyInfo.cs +++ b/EssentialUIKit.UWP/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/EssentialUIKit.UWP/Renderers/BorderlessEntryRenderer.cs b/EssentialUIKit.UWP/Renderers/BorderlessEntryRenderer.cs index 2f97ec07..7278d646 100644 --- a/EssentialUIKit.UWP/Renderers/BorderlessEntryRenderer.cs +++ b/EssentialUIKit.UWP/Renderers/BorderlessEntryRenderer.cs @@ -20,7 +20,7 @@ protected override void OnElementChanged(ElementChangedEventArgs e) // Make the text vertically aligned at centre of the entry. Style style = new Style(typeof(Windows.UI.Xaml.Controls.ContentControl)); - style.Setters.Add(new Setter(VerticalAlignmentProperty, VerticalAlignment.Center)); + style.Setters.Add(new Setter(VerticalAlignmentProperty, VerticalAlignment.Center)); this.Control.Resources.Add(typeof(Windows.UI.Xaml.Controls.ContentControl), style); } } diff --git a/EssentialUIKit.UWP/Renderers/CalenderDatePickerRenderer.cs b/EssentialUIKit.UWP/Renderers/CalenderDatePickerRenderer.cs index 2adbdabe..e4a8b41a 100644 --- a/EssentialUIKit.UWP/Renderers/CalenderDatePickerRenderer.cs +++ b/EssentialUIKit.UWP/Renderers/CalenderDatePickerRenderer.cs @@ -18,7 +18,7 @@ protected override void OnElementChanged(ElementChangedEventArgs e) { base.OnElementChanged(e); - if (this.Control == null && e?.NewElement != null) + if (this.Control == null && e.NewElement != null) { Windows.UI.Xaml.Controls.CalendarDatePicker datePicker = new Windows.UI.Xaml.Controls.CalendarDatePicker(); datePicker.BorderThickness = new Windows.UI.Xaml.Thickness(0); @@ -26,4 +26,4 @@ protected override void OnElementChanged(ElementChangedEventArgs e) } } } -} \ No newline at end of file +} diff --git a/EssentialUIKit.UWP/Renderers/TemplateHostViewRenderer.cs b/EssentialUIKit.UWP/Renderers/TemplateHostViewRenderer.cs index 44abaedc..df1c2432 100644 --- a/EssentialUIKit.UWP/Renderers/TemplateHostViewRenderer.cs +++ b/EssentialUIKit.UWP/Renderers/TemplateHostViewRenderer.cs @@ -20,7 +20,7 @@ public class TemplateHostViewRenderer : ViewRenderer e) { base.OnElementChanged(e); - var pageView = e?.NewElement as TemplateHostView; + var pageView = e.NewElement as TemplateHostView; if (pageView != null) { diff --git a/EssentialUIKit.UWP/scale-100/ChatMessageBackground.png b/EssentialUIKit.UWP/scale-100/ChatMessageBackground.png index a5d0f528..6fe23783 100644 Binary files a/EssentialUIKit.UWP/scale-100/ChatMessageBackground.png and b/EssentialUIKit.UWP/scale-100/ChatMessageBackground.png differ diff --git a/EssentialUIKit.iOS/AppDelegate.cs b/EssentialUIKit.iOS/AppDelegate.cs index b0180979..bdf0a510 100644 --- a/EssentialUIKit.iOS/AppDelegate.cs +++ b/EssentialUIKit.iOS/AppDelegate.cs @@ -2,7 +2,6 @@ using Syncfusion.ListView.XForms.iOS; using Syncfusion.SfCalendar.XForms.iOS; using Syncfusion.SfChart.XForms.iOS.Renderers; -using Syncfusion.SfGauge.XForms.iOS; using Syncfusion.SfMaps.XForms.iOS; using Syncfusion.SfRating.XForms.iOS; using Syncfusion.SfRotator.XForms.iOS; @@ -12,13 +11,12 @@ using Syncfusion.XForms.iOS.Cards; using Syncfusion.XForms.iOS.ComboBox; using Syncfusion.XForms.iOS.Core; -using Syncfusion.XForms.iOS.EffectsView; using Syncfusion.XForms.iOS.Expander; using Syncfusion.XForms.iOS.Graphics; using Syncfusion.XForms.iOS.PopupLayout; using Syncfusion.XForms.iOS.ProgressBar; using Syncfusion.XForms.iOS.TabView; -using Syncfusion.XForms.Pickers.iOS; +using Syncfusion.SfGauge.XForms.iOS; using UIKit; using Xamarin.Forms; @@ -39,11 +37,9 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options) { Forms.SetFlags("CollectionView_Experimental"); global::Xamarin.Forms.Forms.Init(); - SfEffectsViewRenderer.Init(); this.LoadApplication(new App()); SfButtonRenderer.Init(); SfCheckBoxRenderer.Init(); - SfDatePickerRenderer.Init(); SfBorderRenderer.Init(); SfGradientViewRenderer.Init(); SfListViewRenderer.Init(); @@ -57,7 +53,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options) SfBadgeViewRenderer.Init(); SfSegmentedControlRenderer.Init(); Core.Init(); - SfMapsRenderer.Init(); + new SfMapsRenderer(); SfTabViewRenderer.Init(); SfCalendarRenderer.Init(); SfLinearProgressBarRenderer.Init(); diff --git a/EssentialUIKit.iOS/EssentialUIKit.iOS.csproj b/EssentialUIKit.iOS/EssentialUIKit.iOS.csproj index 0e402bc0..ae210516 100644 --- a/EssentialUIKit.iOS/EssentialUIKit.iOS.csproj +++ b/EssentialUIKit.iOS/EssentialUIKit.iOS.csproj @@ -96,11 +96,6 @@ - - - ..\EssentialUIKit\StyleCop.ruleset - - @@ -119,7 +114,14 @@ + + + + + + Always + @@ -142,48 +144,42 @@ 1.68.0 - - - + + + - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - + - 18.4.0.31 + 17.4.0.44 - + - 18.4.0.31 - - - 18.4.0.31 + 17.4.0.44 - 18.4.0.31 + 17.4.0.44 - - - - - - + + + + + + - 18.4.0.31 + 17.4.0.44 - - 1.6.0 - - + @@ -237,6 +233,9 @@ + + + @@ -427,9 +426,6 @@ - - - diff --git a/EssentialUIKit.iOS/Info.plist b/EssentialUIKit.iOS/Info.plist index 0112fe57..226fa24e 100644 --- a/EssentialUIKit.iOS/Info.plist +++ b/EssentialUIKit.iOS/Info.plist @@ -23,6 +23,14 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIAppFonts + + UIFontIcons.ttf + Montserrat-Bold.ttf + Montserrat-Medium.ttf + Montserrat-Regular.ttf + Montserrat-SemiBold.ttf + MinimumOSVersion 9.0 CFBundleDisplayName diff --git a/EssentialUIKit.iOS/Renderers/CalenderDatePickerRenderer.cs b/EssentialUIKit.iOS/Renderers/CalenderDatePickerRenderer.cs index 07c2ea12..4fd3bdf6 100644 --- a/EssentialUIKit.iOS/Renderers/CalenderDatePickerRenderer.cs +++ b/EssentialUIKit.iOS/Renderers/CalenderDatePickerRenderer.cs @@ -20,7 +20,7 @@ protected override void OnElementChanged(ElementChangedEventArgs e) base.OnElementChanged(e); if (this.Control != null) { - this.Control.Text = (e?.NewElement as Controls.CalenderDatePicker).PlaceHolderText; + this.Control.Text = (e.NewElement as Controls.CalenderDatePicker).PlaceHolderText; this.Control.TextColor = new UIColor(96 / 255, 106 / 255, 123 / 255, 1.0f); this.Control.BorderStyle = UITextBorderStyle.None; this.Control.VerticalAlignment = UIControlContentVerticalAlignment.Center; diff --git a/EssentialUIKit.iOS/Renderers/FrameShadowRenderer.cs b/EssentialUIKit.iOS/Renderers/FrameShadowRenderer.cs index ca4bee8d..51969d85 100644 --- a/EssentialUIKit.iOS/Renderers/FrameShadowRenderer.cs +++ b/EssentialUIKit.iOS/Renderers/FrameShadowRenderer.cs @@ -1,6 +1,6 @@ -using CoreGraphics; -using EssentialUIKit.Controls; +using EssentialUIKit.Controls; using EssentialUIKit.iOS; +using CoreGraphics; using Xamarin.Forms; using Xamarin.Forms.Platform.iOS; @@ -23,8 +23,8 @@ protected override void OnElementChanged(ElementChangedEventArgs element) this.Layer.ShadowOpacity = customShadowFrame.ShadowOpacity; this.Layer.ShadowOffset = new CGSize(customShadowFrame.ShadowOffsetWidth, customShadowFrame.ShadowOffSetHeight); this.Layer.Bounds.Inset(customShadowFrame.BorderWidth, customShadowFrame.BorderWidth); - this.Layer.BorderColor = customShadowFrame.CustomBorderColor.ToCGColor(); - this.Layer.BorderWidth = (float)customShadowFrame.BorderWidth; + Layer.BorderColor = customShadowFrame.CustomBorderColor.ToCGColor(); + Layer.BorderWidth = (float)customShadowFrame.BorderWidth; } } } diff --git a/EssentialUIKit.iOS/Renderers/ParallaxListViewRenderer.cs b/EssentialUIKit.iOS/Renderers/ParallaxListViewRenderer.cs index 9899b652..6b84edec 100644 --- a/EssentialUIKit.iOS/Renderers/ParallaxListViewRenderer.cs +++ b/EssentialUIKit.iOS/Renderers/ParallaxListViewRenderer.cs @@ -14,20 +14,20 @@ public class ParallaxListViewRenderer : ListViewRenderer protected override void OnElementChanged(ElementChangedEventArgs e) { base.OnElementChanged(e); - if (e?.NewElement != null) + if (e.NewElement != null) { (e.NewElement as ParallaxListView).WidthInPixel = UIScreen.MainScreen.Scale * UIScreen.MainScreen.Bounds.Width; if (this.Control != null) { - this.Control.Delegate = new TableViewDelegate(e.NewElement as ParallaxListView, this.Control); + this.Control.Delegate = new TableViewDelegate(e.NewElement as ParallaxListView, Control); } this.Control.Bounces = false; } } - internal class TableViewDelegate : UITableViewDelegate + public class TableViewDelegate : UITableViewDelegate { private ParallaxListView listView; diff --git a/EssentialUIKit.iOS/Renderers/TemplateHostViewRenderer.cs b/EssentialUIKit.iOS/Renderers/TemplateHostViewRenderer.cs index 79d265b7..8d5c895b 100644 --- a/EssentialUIKit.iOS/Renderers/TemplateHostViewRenderer.cs +++ b/EssentialUIKit.iOS/Renderers/TemplateHostViewRenderer.cs @@ -14,11 +14,9 @@ protected override void OnElementChanged(ElementChangedEventArgs e) { base.OnElementChanged(e); - var pageView = e?.NewElement as TemplateHostView; + var pageView = e.NewElement as TemplateHostView; -#pragma warning disable CA2000 // Dispose objects before losing scope - var nativePage = GetNativeView(pageView.Template, pageView); -#pragma warning restore CA2000 // Dispose objects before losing scope + var nativePage = this.GetNativeView(pageView.Template, pageView); this.SetNativeControl((nativePage as UIViewController).View); } @@ -36,7 +34,7 @@ private static Page GetPage(VisualElement element) } } - private static IVisualElementRenderer GetNativeView(Page formsView, TemplateHostView parent) + private IVisualElementRenderer GetNativeView(Page formsView, TemplateHostView parent) { var safeAreaHeight = AppSettings.Instance.SafeAreaHeight; diff --git a/EssentialUIKit.iOS/Resources/ChatMessageBackground.png b/EssentialUIKit.iOS/Resources/ChatMessageBackground.png index a5d0f528..6fe23783 100644 Binary files a/EssentialUIKit.iOS/Resources/ChatMessageBackground.png and b/EssentialUIKit.iOS/Resources/ChatMessageBackground.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x.png b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x.png index fcf81ee8..2423ad91 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x.png and b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x~ipad.png b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x~ipad.png index 91c860b6..e67a8ed7 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x~ipad.png and b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@2x~ipad.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x.png b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x.png index 721cd196..2563845a 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x.png and b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x~ipad.png b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x~ipad.png index 885d1a8e..6f33f7a4 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x~ipad.png and b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@3x~ipad.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@4x.png b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@4x.png index e1e57b35..6b9ea33c 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@4x.png and b/EssentialUIKit.iOS/Resources/LoginBackground-Landscape@4x.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground@2x.png b/EssentialUIKit.iOS/Resources/LoginBackground@2x.png index 8ede1631..3d96efbb 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground@2x.png and b/EssentialUIKit.iOS/Resources/LoginBackground@2x.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground@2x~ipad.png b/EssentialUIKit.iOS/Resources/LoginBackground@2x~ipad.png index 06d4117a..3807d7c2 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground@2x~ipad.png and b/EssentialUIKit.iOS/Resources/LoginBackground@2x~ipad.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground@3x.png b/EssentialUIKit.iOS/Resources/LoginBackground@3x.png index 4a4aeb42..9dd63aea 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground@3x.png and b/EssentialUIKit.iOS/Resources/LoginBackground@3x.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground@3x~ipad.png b/EssentialUIKit.iOS/Resources/LoginBackground@3x~ipad.png index 02f48b92..7063c646 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground@3x~ipad.png and b/EssentialUIKit.iOS/Resources/LoginBackground@3x~ipad.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground@4x.png b/EssentialUIKit.iOS/Resources/LoginBackground@4x.png index 71d68429..a744495b 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground@4x.png and b/EssentialUIKit.iOS/Resources/LoginBackground@4x.png differ diff --git a/EssentialUIKit.iOS/Resources/LoginBackground~ipad.png b/EssentialUIKit.iOS/Resources/LoginBackground~ipad.png index d1156053..b766e939 100644 Binary files a/EssentialUIKit.iOS/Resources/LoginBackground~ipad.png and b/EssentialUIKit.iOS/Resources/LoginBackground~ipad.png differ diff --git a/EssentialUIKit.iOS/Resources/Montserrat-Bold.ttf b/EssentialUIKit.iOS/Resources/Montserrat-Bold.ttf new file mode 100644 index 00000000..1a1edbf8 Binary files /dev/null and b/EssentialUIKit.iOS/Resources/Montserrat-Bold.ttf differ diff --git a/EssentialUIKit.iOS/Resources/Montserrat-Medium.ttf b/EssentialUIKit.iOS/Resources/Montserrat-Medium.ttf new file mode 100644 index 00000000..51a8d657 Binary files /dev/null and b/EssentialUIKit.iOS/Resources/Montserrat-Medium.ttf differ diff --git a/EssentialUIKit.iOS/Resources/Montserrat-Regular.ttf b/EssentialUIKit.iOS/Resources/Montserrat-Regular.ttf new file mode 100644 index 00000000..f7d97613 Binary files /dev/null and b/EssentialUIKit.iOS/Resources/Montserrat-Regular.ttf differ diff --git a/EssentialUIKit.iOS/Resources/Montserrat-SemiBold.ttf b/EssentialUIKit.iOS/Resources/Montserrat-SemiBold.ttf new file mode 100644 index 00000000..b4a169c7 Binary files /dev/null and b/EssentialUIKit.iOS/Resources/Montserrat-SemiBold.ttf differ diff --git a/EssentialUIKit.iOS/Resources/UIFontIcons.ttf b/EssentialUIKit.iOS/Resources/UIFontIcons.ttf new file mode 100644 index 00000000..443072d2 Binary files /dev/null and b/EssentialUIKit.iOS/Resources/UIFontIcons.ttf differ diff --git a/EssentialUIKit/App.xaml b/EssentialUIKit/App.xaml index 97f29d90..1ec8f88e 100644 --- a/EssentialUIKit/App.xaml +++ b/EssentialUIKit/App.xaml @@ -2,4 +2,13 @@ \ No newline at end of file + xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" + xmlns:themes="clr-namespace:EssentialUIKit.Themes;assembly=EssentialUIKit"> + + + + + + + + \ No newline at end of file diff --git a/EssentialUIKit/App.xaml.cs b/EssentialUIKit/App.xaml.cs index 33320370..77259bba 100644 --- a/EssentialUIKit/App.xaml.cs +++ b/EssentialUIKit/App.xaml.cs @@ -1,19 +1,12 @@ -using EssentialUIKit.AppLayout; -using EssentialUIKit.AppLayout.Views; -using Xamarin.Forms; -using Xamarin.Forms.Internals; -using Xamarin.Forms.Xaml; +using EssentialUIKit.AppLayout.Views; #if EnableAppCenterAnalytics using Microsoft.AppCenter; using Microsoft.AppCenter.Analytics; using Microsoft.AppCenter.Crashes; #endif - -[assembly: ExportFont("Montserrat-Bold.ttf", Alias = "Montserrat-Bold")] -[assembly: ExportFont("Montserrat-Medium.ttf", Alias = "Montserrat-Medium")] -[assembly: ExportFont("Montserrat-Regular.ttf", Alias = "Montserrat-Regular")] -[assembly: ExportFont("Montserrat-SemiBold.ttf", Alias = "Montserrat-SemiBold")] -[assembly: ExportFont("UIFontIcons.ttf", Alias = "FontIcons")] +using Xamarin.Forms; +using Xamarin.Forms.Internals; +using Xamarin.Forms.Xaml; namespace EssentialUIKit { @@ -38,19 +31,7 @@ public App() // typeof(Crashes)); #endif - // Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("Please replace the license key here"); - this.InitializeComponent(); - - OSAppTheme currentTheme = Application.Current.RequestedTheme; - - if (currentTheme == OSAppTheme.Light) - { - Application.Current.Resources.ApplyLightTheme(); - } - else - { - Application.Current.Resources.ApplyDarkTheme(); - } + InitializeComponent(); // this.MainPage = new AppShell(); this.MainPage = new NavigationPage(new HomePage()); @@ -60,7 +41,7 @@ public App() #region Properties - public static string ImageServerPath { get; } = "https://cdn.syncfusion.com/essential-ui-kit-for-xamarin.forms/common/uikitimages/"; + public static string BaseImageUrl { get; } = "https://cdn.syncfusion.com/essential-ui-kit-for-xamarin.forms/common/uikitimages/"; #endregion diff --git a/EssentialUIKit/AppLayout/AppSettings.cs b/EssentialUIKit/AppLayout/AppSettings.cs index d06ef69f..436afa23 100644 --- a/EssentialUIKit/AppLayout/AppSettings.cs +++ b/EssentialUIKit/AppLayout/AppSettings.cs @@ -10,46 +10,20 @@ namespace EssentialUIKit [Preserve(AllMembers = true)] public class AppSettings { - private readonly OSAppTheme currentTheme; - private bool enableRTL; private bool isDarkTheme; private int selectedPrimaryColor; - private bool isGridView; - static AppSettings() { Instance = new AppSettings(); } - private AppSettings() - { - this.IsGridView = true; - this.currentTheme = Application.Current.RequestedTheme; - this.selectedPrimaryColor = this.currentTheme == OSAppTheme.Light ? 0 : 1; - } - public static AppSettings Instance { get; } - /// - /// Gets the AndroidSecretCode. - /// - public static string AndroidSecretCode => "88dda0e2-da50-466e-9aa5-36fc504d9ed3"; - - /// - /// Gets the iOSSecretCode. - /// - public static string IOSSecretCode => "b327e367-8f04-4efe-ad7a-85be8c828ec3"; - - /// - /// Gets the UWPSecretCode. - /// - public static string UWPSecretCode => "ca0577ad-4cd2-4258-a35b-465e8f4669d9"; - - public bool IsSafeAreaEnabled { get; set; } + public bool IsSafeAreaEnabled { get; set; } = false; public double SafeAreaHeight { get; set; } @@ -69,6 +43,21 @@ public bool EnableRTL } } + /// + /// Gets the AndroidSecretCode. + /// + public string AndroidSecretCode => "88dda0e2-da50-466e-9aa5-36fc504d9ed3"; + + /// + /// Gets the iOSSecretCode. + /// + public string IOSSecretCode => "b327e367-8f04-4efe-ad7a-85be8c828ec3"; + + /// + /// Gets the UWPSecretCode. + /// + public string UWPSecretCode => "ca0577ad-4cd2-4258-a35b-465e8f4669d9"; + public bool IsDarkTheme { get => this.isDarkTheme; @@ -93,20 +82,6 @@ public bool IsDarkTheme } } - public bool IsGridView - { - get => this.isGridView; - set - { - if (this.isGridView == value) - { - return; - } - - this.isGridView = value; - } - } - public int SelectedPrimaryColor { get => this.selectedPrimaryColor; @@ -118,7 +93,7 @@ public int SelectedPrimaryColor } this.selectedPrimaryColor = value; - ThemePalette.ApplyColorSet(this.selectedPrimaryColor); + Extensions.ApplyColorSet(this.selectedPrimaryColor); } } } diff --git a/EssentialUIKit/AppLayout/AppShell.xaml b/EssentialUIKit/AppLayout/AppShell.xaml index ad308b6f..be2b431f 100644 --- a/EssentialUIKit/AppLayout/AppShell.xaml +++ b/EssentialUIKit/AppLayout/AppShell.xaml @@ -1,13 +1,11 @@  - - - + + + \ No newline at end of file diff --git a/EssentialUIKit/AppLayout/AppShell.xaml.cs b/EssentialUIKit/AppLayout/AppShell.xaml.cs index 7ced15cd..5b8c9750 100644 --- a/EssentialUIKit/AppLayout/AppShell.xaml.cs +++ b/EssentialUIKit/AppLayout/AppShell.xaml.cs @@ -1,12 +1,12 @@ -using System; +#if EnableAppCenterAnalytics +using System.Collections.Generic; +using Microsoft.AppCenter.Analytics; +#endif +using System; using EssentialUIKit.AppLayout.Views; using Xamarin.Forms; using Xamarin.Forms.Internals; using Xamarin.Forms.Xaml; -#if EnableAppCenterAnalytics -using System.Collections.Generic; -using Microsoft.AppCenter.Analytics; -#endif namespace EssentialUIKit.AppLayout { @@ -16,7 +16,7 @@ public partial class AppShell { public AppShell() { - this.InitializeComponent(); + InitializeComponent(); this.Navigating += this.AppShell_Navigating; @@ -24,14 +24,22 @@ public AppShell() Routing.RegisterRoute("templatehostpage", typeof(TemplateHostPage)); } + private void AppShell_Navigating(object sender, ShellNavigatingEventArgs e) + { + // TODO:Pending + var uriString = e.Target.Location.OriginalString; + if (uriString.Contains("?")) + { + var pageNameEndIndex = uriString.IndexOf("?", StringComparison.Ordinal); + } + } + /// /// Invoked when the list item is selected. /// /// The Category /// The Page -#pragma warning disable CA1801 // Review unused parameters - private static void PushEvent(string category, string page) -#pragma warning restore CA1801 // Review unused parameters + private void PushEvent(string category, string page) { #if EnableAppCenterAnalytics Analytics.TrackEvent( @@ -47,15 +55,5 @@ private static void PushEvent(string category, string page) }); #endif } - - private void AppShell_Navigating(object sender, ShellNavigatingEventArgs e) - { - // TODO:Pending - var uriString = e.Target.Location.OriginalString; - if (uriString.Contains("?")) - { - var pageNameEndIndex = uriString.IndexOf("?", StringComparison.Ordinal); - } - } } } \ No newline at end of file diff --git a/EssentialUIKit/AppLayout/Controls/ParallaxListView.cs b/EssentialUIKit/AppLayout/Controls/ParallaxListView.cs index a4fb841f..155ab090 100644 --- a/EssentialUIKit/AppLayout/Controls/ParallaxListView.cs +++ b/EssentialUIKit/AppLayout/Controls/ParallaxListView.cs @@ -8,8 +8,7 @@ namespace EssentialUIKit.AppLayout.Controls [Preserve(AllMembers = true)] public class ParallaxListView : ListView { - public ParallaxListView() - : base(ListViewCachingStrategy.RetainElement) + public ParallaxListView() : base(ListViewCachingStrategy.RetainElement) { if (Device.RuntimePlatform != Device.iOS) { @@ -25,7 +24,7 @@ public ParallaxListView() public static void OnScrollChanged(object sender, ScrollChangedEventArgs e) { - ((ParallaxListView)sender)?.ScrollChanged?.Invoke((ParallaxListView)sender, e); + ((ParallaxListView)sender)?.ScrollChanged?.Invoke((ParallaxListView)sender, e); } public static void OnSelectionChanged(object sender, SelectedItemChangedEventArgs e) @@ -34,7 +33,7 @@ public static void OnSelectionChanged(object sender, SelectedItemChangedEventArg if (listView != null) { listView.SelectionChanged(sender, e); - listView.SelectedItem = e?.SelectedItem; + listView.SelectedItem = e.SelectedItem; listView.SelectedItem = null; } } diff --git a/EssentialUIKit/AppLayout/Models/Category.cs b/EssentialUIKit/AppLayout/Models/Category.cs index a48710c7..8c9d64bb 100644 --- a/EssentialUIKit/AppLayout/Models/Category.cs +++ b/EssentialUIKit/AppLayout/Models/Category.cs @@ -29,7 +29,7 @@ public Category(string name, string icon, string description, string updateType, public string Description { get; set; } - public List