Skip to content

Commit

Permalink
Merge pull request #6 from RawoofSharief/master
Browse files Browse the repository at this point in the history
Updated the new 6 screens
  • Loading branch information
MeikandaNayanar authored Sep 17, 2019
2 parents 62aadab + 1deffd8 commit 3aa75f1
Show file tree
Hide file tree
Showing 288 changed files with 18,861 additions and 1,468 deletions.
62 changes: 15 additions & 47 deletions EssentialUIKit.Android/EssentialUIKit.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -50,6 +49,15 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp.Extended">
<Version>1.60.0</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Views.Forms">
<Version>1.68.0</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.Buttons" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.Cards" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.Core" Version="17.2.0.49" />
Expand All @@ -59,6 +67,9 @@
<PackageReference Include="Syncfusion.Xamarin.GridCommon">
<Version>17.2.0.49</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfCalendar">
<Version>17.2.0.49</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfComboBox" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfMaps" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfParallaxView">
Expand All @@ -70,9 +81,8 @@
<PackageReference Include="Syncfusion.Xamarin.Expander" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfListView" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfBadgeView" Version="17.2.0.49" />
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
<PackageReference Include="Xamarin.FFImageLoading.Svg.Forms">
<Version>2.4.11.982</Version>
<PackageReference Include="Syncfusion.Xamarin.SfTabView">
<Version>17.2.0.49</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
Expand Down Expand Up @@ -226,54 +236,12 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable\Pin.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\ChooseGradient.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\ConfirmGradient.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\DeliverGradient.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values-v21\styles.xml">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\EmptyCart.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\LocationAccessDenied.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NoCredits.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NoInternet.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NoItem.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NoPhotos.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NoTasks.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NotEnoughCredit.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\NoVideos.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\PaymentFailed.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\SomethingWentWrong.svg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\PlaceHolder.png" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions EssentialUIKit.Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Android.Content.PM;
using Android.OS;
using Android.Views;
using FFImageLoading.Forms.Platform;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;

namespace EssentialUIKit.Droid
Expand All @@ -21,9 +20,6 @@ protected override void OnCreate(Bundle savedInstanceState)

Syncfusion.XForms.Android.Core.Core.Init(this);

// FFImageLoading library
CachedImageRenderer.Init(true);

this.LoadApplication(new App());

// Change the status bar color
Expand Down
4 changes: 2 additions & 2 deletions EssentialUIKit.Android/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("17.2.0.34")]
[assembly: AssemblyFileVersion("17.2.0.34")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

// Add some common permissions, these can be removed if not needed
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.V

if (nativePage != null)
{
this.SetNativeControl(nativePage as View);
this.SetNativeControl(nativePage.View);
}
else
{
Expand Down
2 changes: 0 additions & 2 deletions EssentialUIKit.UWP/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using FFImageLoading.Forms.Platform;
using Windows.ApplicationModel;
using Windows.ApplicationModel.Activation;
using Windows.Foundation.Metadata;
Expand Down Expand Up @@ -47,7 +46,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
}

Frame rootFrame = Window.Current.Content as Frame;
CachedImageRenderer.Init();

// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
Expand Down
31 changes: 14 additions & 17 deletions EssentialUIKit.UWP/EssentialUIKit.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,11 @@
<Content Include="scale-100\About.png" />
<Content Include="scale-100\Card.png" />
<Content Include="scale-100\ChatMessageBackground.png" />
<Content Include="scale-100\ChooseGradient.svg" />
<Content Include="scale-100\Close.png" />
<Content Include="scale-100\ConfirmGradient.svg" />
<Content Include="scale-100\DeliverGradient.svg" />
<Content Include="scale-100\EmptyCart.svg" />
<Content Include="scale-100\HeaderIcon.png" />
<Content Include="scale-100\HeaderTriangle.png" />
<Content Include="scale-100\Icon.png" />
<Content Include="scale-100\InvertedTriangle.png" />
<Content Include="scale-100\LocationAccessDenied.svg" />
<Content Include="scale-100\LoginBackground.scale-200.png" />
<Content Include="scale-100\LoginBackground.scale-400.png" />
<Content Include="scale-100\LoginBackground.scale-100.png" />
Expand All @@ -152,19 +147,10 @@
<Content Include="Assets\Wide310x150Logo.scale-100.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
<Content Include="Assets\Wide310x150Logo.scale-400.png" />
<Content Include="scale-100\NoCredits.svg" />
<Content Include="scale-100\NoInternet.svg" />
<Content Include="scale-100\NoItem.svg" />
<Content Include="scale-100\NoPhotos.svg" />
<Content Include="scale-100\NoTasks.svg" />
<Content Include="scale-100\NotEnoughCredit.svg" />
<Content Include="scale-100\NoVideos.svg" />
<Content Include="scale-100\OurTeam.png" />
<Content Include="scale-100\PaymentFailed.svg" />
<Content Include="scale-100\Pin.png" />
<Content Include="scale-100\PlaceHolder.png" />
<Content Include="scale-100\PlaceHolderRectangle.png" />
<Content Include="scale-100\SomethingWentWrong.svg" />
<Content Include="Properties\Default.rd.xml" />
</ItemGroup>
<ItemGroup>
Expand All @@ -178,6 +164,15 @@
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp.Extended">
<Version>1.60.0</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Views.Forms">
<Version>1.68.0</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.Buttons" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.Cards" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.Core" Version="17.2.0.49" />
Expand All @@ -187,6 +182,9 @@
<PackageReference Include="Syncfusion.Xamarin.GridCommon">
<Version>17.2.0.49</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfCalendar">
<Version>17.2.0.49</Version>
</PackageReference>
<PackageReference Include="Syncfusion.Xamarin.SfComboBox" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfMaps" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfParallaxView">
Expand All @@ -198,9 +196,8 @@
<PackageReference Include="Syncfusion.Xamarin.Expander" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfListView" Version="17.2.0.49" />
<PackageReference Include="Syncfusion.Xamarin.SfBadgeView" Version="17.2.0.49" />
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
<PackageReference Include="Xamarin.FFImageLoading.Svg.Forms">
<Version>2.4.11.982</Version>
<PackageReference Include="Syncfusion.Xamarin.SfTabView">
<Version>17.2.0.49</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
Expand Down
4 changes: 1 addition & 3 deletions EssentialUIKit.UWP/MainPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using FFImageLoading.Forms.Platform;
using Syncfusion.ListView.XForms.UWP;
using Syncfusion.ListView.XForms.UWP;

namespace EssentialUIKit.UWP
{
Expand All @@ -10,7 +9,6 @@ public MainPage()
this.InitializeComponent();
SfListViewRenderer.Init();
new Syncfusion.SfMaps.XForms.UWP.SfMapsRenderer();
CachedImageRenderer.Init();
LoadApplication(new EssentialUIKit.App());
}
}
Expand Down
6 changes: 3 additions & 3 deletions EssentialUIKit.UWP/Package.appxmanifest
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="5ec79b0c-66cc-42d1-b51b-245cf10c509e" Publisher="CN=mageshkumarkrishnan" Version="1.0.0.0" />
<Identity Name="5ec79b0c-66cc-42d1-b51b-245cf10c509f" Publisher="CN=mageshkumarkrishnan" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="ec0cc741-fd3e-485c-81be-68815c480690" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Xamarin UI Kit</DisplayName>
<DisplayName>Essential UI Kit</DisplayName>
<PublisherDisplayName>13b62328-5064-4777-a9c4-5eb16127a28a</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
Expand All @@ -15,7 +15,7 @@
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="EssentialUIKit.UWP.App">
<uap:VisualElements DisplayName="Xamarin UI Kit" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="EssentialUIKit.UWP" BackgroundColor="transparent">
<uap:VisualElements DisplayName="Essential UI Kit" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="EssentialUIKit.UWP" BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo" />
Expand Down
4 changes: 2 additions & 2 deletions EssentialUIKit.UWP/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("17.2.0.34")]
[assembly: AssemblyFileVersion("17.2.0.34")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: ComVisible(false)]
9 changes: 5 additions & 4 deletions EssentialUIKit.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using FFImageLoading.Forms.Platform;
using Foundation;
using Foundation;
using Syncfusion.ListView.XForms.iOS;
using Syncfusion.SfCalendar.XForms.iOS;
using Syncfusion.SfMaps.XForms.iOS;
using Syncfusion.SfRating.XForms.iOS;
using Syncfusion.SfRotator.XForms.iOS;
Expand All @@ -13,6 +13,7 @@
using Syncfusion.XForms.iOS.Expander;
using Syncfusion.XForms.iOS.Graphics;
using Syncfusion.XForms.iOS.PopupLayout;
using Syncfusion.XForms.iOS.TabView;
using UIKit;

namespace EssentialUIKit.iOS
Expand Down Expand Up @@ -47,9 +48,9 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
SfBadgeViewRenderer.Init();
SfSegmentedControlRenderer.Init();
Core.Init();
CachedImageRenderer.Init();
new SfMapsRenderer();
CachedImageRenderer.Init();
SfTabViewRenderer.Init();
SfCalendarRenderer.Init();

////UIView statusBar = UIApplication.SharedApplication.ValueForKey(new NSString("statusBar")) as UIView;
////if (statusBar.RespondsToSelector(new ObjCRuntime.Selector("setBackgroundColor:")))
Expand Down
Loading

0 comments on commit 3aa75f1

Please sign in to comment.