Skip to content

Revert "Updated the latest changes." #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Updated the latest changes." #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
0 ...UIKit/Resources/Fonts/Montserrat-Bold.ttf → ...lUIKit.Android/Assets/Montserrat-Bold.ttf
View file
Open in desktop
File renamed without changes.
0 ...Kit/Resources/Fonts/Montserrat-Medium.ttf → ...IKit.Android/Assets/Montserrat-Medium.ttf
View file
Open in desktop
File renamed without changes.
0 ...it/Resources/Fonts/Montserrat-Regular.ttf → ...Kit.Android/Assets/Montserrat-Regular.ttf
View file
Open in desktop
File renamed without changes.
0 ...t/Resources/Fonts/Montserrat-SemiBold.ttf → ...it.Android/Assets/Montserrat-SemiBold.ttf
View file
Open in desktop
File renamed without changes.
0 ...tialUIKit/Resources/Fonts/UIFontIcons.ttf → ...ntialUIKit.Android/Assets/UIFontIcons.ttf
View file
Open in desktop
File renamed without changes.
81 changes: 34 additions & 47 deletions EssentialUIKit.Android/EssentialUIKit.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
<AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</PropertyGroup>

<PropertyGroup>
<CodeAnalysisRuleSet>..\EssentialUIKit\StyleCop.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
Expand All @@ -64,74 +59,66 @@
<PackageReference Include="SkiaSharp.Views.Forms">
<Version>1.68.0</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.Buttons" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.Cards" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.Core" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.Buttons" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.Cards" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.Core" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.DataSource">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.GridCommon">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfCalendar">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfChart">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfComboBox" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfComboBox" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfGauge">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfMaps" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfMaps" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfParallaxView">
<Version>18.4.0.31</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfPicker">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfProgressBar">
<Version>18.4.0.31</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfRating" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfRotator" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.Expander" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfListView" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfBadgeView" Version="18.4.0.31" />
<PackageReference Include="Syncfusion.Xamarin.SfRating" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfRotator" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.Expander" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfListView" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfBadgeView" Version="17.4.0.44" />
<PackageReference Include="Syncfusion.Xamarin.SfTabView">
<Version>18.4.0.31</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.6.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
<Version>1.0.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Google.Android.Material">
<Version>1.2.1.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.2.0.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser">
<Version>1.3.0.4</Version>
<Version>17.4.0.44</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991250" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
<Compile Include="Renderers\CalenderDatePickerRenderer.cs" />
<Compile Include="Renderers\ParallaxListViewRenderer.cs" />
<Compile Include="Renderers\BorderlessEditorRenderer.cs" />
<Compile Include="Renderers\BorderlessEntryRenderer.cs" />
<Compile Include="Renderers\TransitionNavigationPageRenderer.cs" />
<Compile Include="Renderers\TemplateHostViewRenderer.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SplashScreenActivity.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Montserrat-Bold.ttf" />
<AndroidAsset Include="Assets\Montserrat-Medium.ttf" />
<AndroidAsset Include="Assets\Montserrat-Regular.ttf" />
<AndroidAsset Include="Assets\Montserrat-SemiBold.ttf" />
<AndroidAsset Include="Assets\UIFontIcons.ttf" />
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
<None Include="Properties\AndroidManifest.xml">
Expand Down Expand Up @@ -245,6 +232,9 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\SplashScreen.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\ChatMessageBackground.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-land\ChatMessageBackground.png" />
</ItemGroup>
Expand Down Expand Up @@ -284,9 +274,6 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable\Visa.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\ChatMessageBackground.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\build\tools\Syncfusion.CodeAnalysis.StyleCop\tools\StyleCop.MsBuild.targets" Condition="Exists('..\build\tools\Syncfusion.CodeAnalysis.StyleCop\tools\StyleCop.MsBuild.targets')" />
<Target Name="BeforeBuild" Condition=" $(SetVersion) == true ">
Expand Down
6 changes: 3 additions & 3 deletions EssentialUIKit.Android/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion EssentialUIKit.Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="8" android:versionName="18.4" package="com.syncfusion.xamarin.uikit" android:installLocation="internalOnly">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="8" android:versionName="6.1" package="com.syncfusion.xamarin.uikit" android:installLocation="internalOnly">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="Essential UI Kit"></application>
</manifest>
4 changes: 1 addition & 3 deletions EssentialUIKit.Android/Renderers/BorderlessEditorRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@ public class BorderlessEditorRenderer : EditorRenderer
{
#region Constructor

public BorderlessEditorRenderer()
: base(Application.Context)
public BorderlessEditorRenderer() : base(Application.Context)
{
}

#endregion

#region Methods

/// <summary>
/// Used to set the transparent color for editor control background property.
/// </summary>
Expand Down
7 changes: 3 additions & 4 deletions EssentialUIKit.Android/Renderers/BorderlessEntryRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ namespace EssentialUIKit.Droid
{
public class BorderlessEntryRenderer : EntryRenderer
{
public BorderlessEntryRenderer()
: base(Application.Context)
public BorderlessEntryRenderer() : base(Application.Context)
{
}

Expand All @@ -21,8 +20,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Entry> 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);
}
}
}
Expand Down
11 changes: 5 additions & 6 deletions EssentialUIKit.Android/Renderers/CalenderDatePickerRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ namespace EssentialUIKit.Droid
/// </summary>
public class CalenderDatePickerRenderer : DatePickerRenderer
{
public CalenderDatePickerRenderer(Context context)
: base(context)
public CalenderDatePickerRenderer(Context context) : base(context)
{
}

Expand All @@ -26,10 +25,10 @@ protected override void OnElementChanged(ElementChangedEventArgs<DatePicker> 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);
}
}
}
Expand Down
11 changes: 5 additions & 6 deletions EssentialUIKit.Android/Renderers/ParallaxListViewRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,27 @@ public class ParallaxListViewRenderer : ListViewRenderer
{
private int previousScrollPosition;

public ParallaxListViewRenderer(Context context)
: base(context)
public ParallaxListViewRenderer(Context context) : base(context)
{
}

protected override void OnElementChanged(ElementChangedEventArgs<ListView> 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) =>
{
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));
};
}
}
Expand Down
9 changes: 2 additions & 7 deletions EssentialUIKit.Android/Renderers/TemplateHostViewRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ namespace EssentialUIKit.Droid.Renderers
{
public class TemplateHostViewRenderer : ViewRenderer
{
public TemplateHostViewRenderer(Context context)
: base(context)
public TemplateHostViewRenderer(Context context) : base(context)
{
}

Expand Down Expand Up @@ -56,21 +55,17 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.V
{
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 = this.GetNativeView(pageView?.Template, pageView);
#pragma warning restore CA2000 // Dispose objects before losing scope

if (nativePage != null)
{
this.SetNativeControl(nativePage.View);
}
else
{
#pragma warning disable CA2000 // Dispose objects before losing scope
this.SetNativeControl(new TextView(this.Context) { Text = "There is no loaded page" });
#pragma warning restore CA2000 // Dispose objects before losing scope
}
}

Expand Down
35 changes: 0 additions & 35 deletions EssentialUIKit.Android/Renderers/TransitionNavigationPageRenderer.cs
View file
Open in desktop

This file was deleted.

Binary file modified EssentialUIKit.Android/Resources/drawable/ChatMessageBackground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions EssentialUIKit.Android/SplashScreenActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@

namespace EssentialUIKit.Droid
{
[Activity(Theme = "@style/Theme.Splash", MainLauncher = true, NoHistory = true, Icon = "@drawable/Icon")]
[Activity(Theme = "@style/Theme.Splash",
MainLauncher = true,
NoHistory = true, Icon = "@drawable/Icon")]
public class SplashScreenActivity : Activity
{
protected override void OnCreate(Bundle bundle)
{
this.Window.DecorView.SystemUiVisibility = (StatusBarVisibility)((int)this.Window.DecorView.SystemUiVisibility ^ (int)SystemUiFlags.LayoutStable ^ (int)SystemUiFlags.LayoutFullscreen);
this.Window.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
this.Window.SetFlags(WindowManagerFlags.Fullscreen, WindowManagerFlags.Fullscreen);
Window.DecorView.SystemUiVisibility = (StatusBarVisibility)((int)Window.DecorView.SystemUiVisibility ^ (int)SystemUiFlags.LayoutStable ^ (int)SystemUiFlags.LayoutFullscreen);
Window.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);
Window.SetFlags(WindowManagerFlags.Fullscreen, WindowManagerFlags.Fullscreen);
base.OnCreate(bundle);
this.StartActivity(typeof(MainActivity));
}
Expand Down
7 changes: 3 additions & 4 deletions EssentialUIKit.UWP/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,15 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
typeof(Syncfusion.XForms.UWP.PopupLayout.SfPopupLayoutRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.UWP.Expander.SfExpanderRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.UWP.Cards.SfCardViewRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.Pickers.UWP.SfDatePickerRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.UWP.BadgeView.SfBadgeViewRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.UWP.Buttons.SfSegmentedControlRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.SfMaps.XForms.UWP.SfMapsRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.UWP.ProgressBar.SfLinearProgressRenderer).GetTypeInfo().Assembly,
typeof(Syncfusion.XForms.UWP.ProgressBar.SfLinearProgressRenderer).GetTypeInfo().Assembly
};
Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
Xamarin.Forms.Forms.Init(e, assembliesToInclude);

if (e?.PreviousExecutionState == ApplicationExecutionState.Terminated)
if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
{
// TODO: Load state from previously suspended application
}
Expand All @@ -94,7 +93,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
// When the navigation stack isn't restored navigate to the first page,
// configuring the new page by passing required information as a navigation
// parameter
rootFrame.Navigate(typeof(MainPage), e?.Arguments);
rootFrame.Navigate(typeof(MainPage), e.Arguments);
}

//// Ensure the current window is active
Expand Down
Binary file added EssentialUIKit.UWP/Assets/Montserrat-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added EssentialUIKit.UWP/Assets/Montserrat-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added EssentialUIKit.UWP/Assets/Montserrat-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added EssentialUIKit.UWP/Assets/Montserrat-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added EssentialUIKit.UWP/Assets/UIFontIcons.ttf
View file
Open in desktop
Binary file not shown.
Loading