Skip to content

Commit 3aa75f1

Browse files
MeikandaNayanarMeikandaNayanar
authored
Merge pull request #6 from RawoofSharief/master
Updated the new 6 screens
2 parents 62aadab + 1deffd8 commit 3aa75f1

File tree

288 files changed

+18861
-1468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+18861
-1468
lines changed

‎EssentialUIKit.Android/EssentialUIKit.Android.csproj‎

Lines changed: 15 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18-
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
2019
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2120
<NuGetPackageImportStamp>
2221
</NuGetPackageImportStamp>
@@ -50,6 +49,15 @@
5049
<Reference Include="System.Xml" />
5150
</ItemGroup>
5251
<ItemGroup>
52+
<PackageReference Include="SkiaSharp.Extended">
53+
<Version>1.60.0</Version>
54+
</PackageReference>
55+
<PackageReference Include="SkiaSharp.Svg">
56+
<Version>1.60.0</Version>
57+
</PackageReference>
58+
<PackageReference Include="SkiaSharp.Views.Forms">
59+
<Version>1.68.0</Version>
60+
</PackageReference>
5361
<PackageReference Include="Syncfusion.Xamarin.Buttons" Version="17.2.0.49" />
5462
<PackageReference Include="Syncfusion.Xamarin.Cards" Version="17.2.0.49" />
5563
<PackageReference Include="Syncfusion.Xamarin.Core" Version="17.2.0.49" />
@@ -59,6 +67,9 @@
5967
<PackageReference Include="Syncfusion.Xamarin.GridCommon">
6068
<Version>17.2.0.49</Version>
6169
</PackageReference>
70+
<PackageReference Include="Syncfusion.Xamarin.SfCalendar">
71+
<Version>17.2.0.49</Version>
72+
</PackageReference>
6273
<PackageReference Include="Syncfusion.Xamarin.SfComboBox" Version="17.2.0.49" />
6374
<PackageReference Include="Syncfusion.Xamarin.SfMaps" Version="17.2.0.49" />
6475
<PackageReference Include="Syncfusion.Xamarin.SfParallaxView">
@@ -70,9 +81,8 @@
7081
<PackageReference Include="Syncfusion.Xamarin.Expander" Version="17.2.0.49" />
7182
<PackageReference Include="Syncfusion.Xamarin.SfListView" Version="17.2.0.49" />
7283
<PackageReference Include="Syncfusion.Xamarin.SfBadgeView" Version="17.2.0.49" />
73-
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
74-
<PackageReference Include="Xamarin.FFImageLoading.Svg.Forms">
75-
<Version>2.4.11.982</Version>
84+
<PackageReference Include="Syncfusion.Xamarin.SfTabView">
85+
<Version>17.2.0.49</Version>
7686
</PackageReference>
7787
<PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
7888
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
@@ -226,54 +236,12 @@
226236
<ItemGroup>
227237
<AndroidResource Include="Resources\drawable\Pin.png" />
228238
</ItemGroup>
229-
<ItemGroup>
230-
<AndroidResource Include="Resources\drawable\ChooseGradient.svg" />
231-
</ItemGroup>
232-
<ItemGroup>
233-
<AndroidResource Include="Resources\drawable\ConfirmGradient.svg" />
234-
</ItemGroup>
235-
<ItemGroup>
236-
<AndroidResource Include="Resources\drawable\DeliverGradient.svg" />
237-
</ItemGroup>
238239
<ItemGroup>
239240
<AndroidResource Include="Resources\values-v21\styles.xml">
240241
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
241242
<SubType>Designer</SubType>
242243
</AndroidResource>
243244
</ItemGroup>
244-
<ItemGroup>
245-
<AndroidResource Include="Resources\drawable\EmptyCart.svg" />
246-
</ItemGroup>
247-
<ItemGroup>
248-
<AndroidResource Include="Resources\drawable\LocationAccessDenied.svg" />
249-
</ItemGroup>
250-
<ItemGroup>
251-
<AndroidResource Include="Resources\drawable\NoCredits.svg" />
252-
</ItemGroup>
253-
<ItemGroup>
254-
<AndroidResource Include="Resources\drawable\NoInternet.svg" />
255-
</ItemGroup>
256-
<ItemGroup>
257-
<AndroidResource Include="Resources\drawable\NoItem.svg" />
258-
</ItemGroup>
259-
<ItemGroup>
260-
<AndroidResource Include="Resources\drawable\NoPhotos.svg" />
261-
</ItemGroup>
262-
<ItemGroup>
263-
<AndroidResource Include="Resources\drawable\NoTasks.svg" />
264-
</ItemGroup>
265-
<ItemGroup>
266-
<AndroidResource Include="Resources\drawable\NotEnoughCredit.svg" />
267-
</ItemGroup>
268-
<ItemGroup>
269-
<AndroidResource Include="Resources\drawable\NoVideos.svg" />
270-
</ItemGroup>
271-
<ItemGroup>
272-
<AndroidResource Include="Resources\drawable\PaymentFailed.svg" />
273-
</ItemGroup>
274-
<ItemGroup>
275-
<AndroidResource Include="Resources\drawable\SomethingWentWrong.svg" />
276-
</ItemGroup>
277245
<ItemGroup>
278246
<AndroidResource Include="Resources\drawable\PlaceHolder.png" />
279247
</ItemGroup>

‎EssentialUIKit.Android/MainActivity.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Android.Content.PM;
33
using Android.OS;
44
using Android.Views;
5-
using FFImageLoading.Forms.Platform;
65
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
76

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

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

24-
// FFImageLoading library
25-
CachedImageRenderer.Init(true);
26-
2723
this.LoadApplication(new App());
2824

2925
// Change the status bar color

‎EssentialUIKit.Android/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
// You can specify all the values or you can default the Build and Revision Numbers
2626
// by using the '*' as shown below:
2727
// [assembly: AssemblyVersion("1.0.*")]
28-
[assembly: AssemblyVersion("17.2.0.34")]
29-
[assembly: AssemblyFileVersion("17.2.0.34")]
28+
[assembly: AssemblyVersion("1.0.0.0")]
29+
[assembly: AssemblyFileVersion("1.0.0.0")]
3030

3131
// Add some common permissions, these can be removed if not needed
3232
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]

‎EssentialUIKit.Android/Renderers/TemplateHostViewRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.V
6262

6363
if (nativePage != null)
6464
{
65-
this.SetNativeControl(nativePage as View);
65+
this.SetNativeControl(nativePage.View);
6666
}
6767
else
6868
{

‎EssentialUIKit.UWP/App.xaml.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Reflection;
4-
using FFImageLoading.Forms.Platform;
54
using Windows.ApplicationModel;
65
using Windows.ApplicationModel.Activation;
76
using Windows.Foundation.Metadata;
@@ -47,7 +46,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
4746
}
4847

4948
Frame rootFrame = Window.Current.Content as Frame;
50-
CachedImageRenderer.Init();
5149

5250
// Do not repeat app initialization when the Window already has content,
5351
// just ensure that the window is active

‎EssentialUIKit.UWP/EssentialUIKit.UWP.csproj‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,11 @@
117117
<Content Include="scale-100\About.png" />
118118
<Content Include="scale-100\Card.png" />
119119
<Content Include="scale-100\ChatMessageBackground.png" />
120-
<Content Include="scale-100\ChooseGradient.svg" />
121120
<Content Include="scale-100\Close.png" />
122-
<Content Include="scale-100\ConfirmGradient.svg" />
123-
<Content Include="scale-100\DeliverGradient.svg" />
124-
<Content Include="scale-100\EmptyCart.svg" />
125121
<Content Include="scale-100\HeaderIcon.png" />
126122
<Content Include="scale-100\HeaderTriangle.png" />
127123
<Content Include="scale-100\Icon.png" />
128124
<Content Include="scale-100\InvertedTriangle.png" />
129-
<Content Include="scale-100\LocationAccessDenied.svg" />
130125
<Content Include="scale-100\LoginBackground.scale-200.png" />
131126
<Content Include="scale-100\LoginBackground.scale-400.png" />
132127
<Content Include="scale-100\LoginBackground.scale-100.png" />
@@ -152,19 +147,10 @@
152147
<Content Include="Assets\Wide310x150Logo.scale-100.png" />
153148
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
154149
<Content Include="Assets\Wide310x150Logo.scale-400.png" />
155-
<Content Include="scale-100\NoCredits.svg" />
156-
<Content Include="scale-100\NoInternet.svg" />
157-
<Content Include="scale-100\NoItem.svg" />
158-
<Content Include="scale-100\NoPhotos.svg" />
159-
<Content Include="scale-100\NoTasks.svg" />
160-
<Content Include="scale-100\NotEnoughCredit.svg" />
161-
<Content Include="scale-100\NoVideos.svg" />
162150
<Content Include="scale-100\OurTeam.png" />
163-
<Content Include="scale-100\PaymentFailed.svg" />
164151
<Content Include="scale-100\Pin.png" />
165152
<Content Include="scale-100\PlaceHolder.png" />
166153
<Content Include="scale-100\PlaceHolderRectangle.png" />
167-
<Content Include="scale-100\SomethingWentWrong.svg" />
168154
<Content Include="Properties\Default.rd.xml" />
169155
</ItemGroup>
170156
<ItemGroup>
@@ -178,6 +164,15 @@
178164
</Page>
179165
</ItemGroup>
180166
<ItemGroup>
167+
<PackageReference Include="SkiaSharp.Extended">
168+
<Version>1.60.0</Version>
169+
</PackageReference>
170+
<PackageReference Include="SkiaSharp.Svg">
171+
<Version>1.60.0</Version>
172+
</PackageReference>
173+
<PackageReference Include="SkiaSharp.Views.Forms">
174+
<Version>1.68.0</Version>
175+
</PackageReference>
181176
<PackageReference Include="Syncfusion.Xamarin.Buttons" Version="17.2.0.49" />
182177
<PackageReference Include="Syncfusion.Xamarin.Cards" Version="17.2.0.49" />
183178
<PackageReference Include="Syncfusion.Xamarin.Core" Version="17.2.0.49" />
@@ -187,6 +182,9 @@
187182
<PackageReference Include="Syncfusion.Xamarin.GridCommon">
188183
<Version>17.2.0.49</Version>
189184
</PackageReference>
185+
<PackageReference Include="Syncfusion.Xamarin.SfCalendar">
186+
<Version>17.2.0.49</Version>
187+
</PackageReference>
190188
<PackageReference Include="Syncfusion.Xamarin.SfComboBox" Version="17.2.0.49" />
191189
<PackageReference Include="Syncfusion.Xamarin.SfMaps" Version="17.2.0.49" />
192190
<PackageReference Include="Syncfusion.Xamarin.SfParallaxView">
@@ -198,9 +196,8 @@
198196
<PackageReference Include="Syncfusion.Xamarin.Expander" Version="17.2.0.49" />
199197
<PackageReference Include="Syncfusion.Xamarin.SfListView" Version="17.2.0.49" />
200198
<PackageReference Include="Syncfusion.Xamarin.SfBadgeView" Version="17.2.0.49" />
201-
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
202-
<PackageReference Include="Xamarin.FFImageLoading.Svg.Forms">
203-
<Version>2.4.11.982</Version>
199+
<PackageReference Include="Syncfusion.Xamarin.SfTabView">
200+
<Version>17.2.0.49</Version>
204201
</PackageReference>
205202
<PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
206203
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />

‎EssentialUIKit.UWP/MainPage.xaml.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using FFImageLoading.Forms.Platform;
2-
using Syncfusion.ListView.XForms.UWP;
1+
using Syncfusion.ListView.XForms.UWP;
32

43
namespace EssentialUIKit.UWP
54
{
@@ -10,7 +9,6 @@ public MainPage()
109
this.InitializeComponent();
1110
SfListViewRenderer.Init();
1211
new Syncfusion.SfMaps.XForms.UWP.SfMapsRenderer();
13-
CachedImageRenderer.Init();
1412
LoadApplication(new EssentialUIKit.App());
1513
}
1614
}

‎EssentialUIKit.UWP/Package.appxmanifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
3-
<Identity Name="5ec79b0c-66cc-42d1-b51b-245cf10c509e" Publisher="CN=mageshkumarkrishnan" Version="1.0.0.0" />
3+
<Identity Name="5ec79b0c-66cc-42d1-b51b-245cf10c509f" Publisher="CN=mageshkumarkrishnan" Version="1.0.0.0" />
44
<mp:PhoneIdentity PhoneProductId="ec0cc741-fd3e-485c-81be-68815c480690" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
6-
<DisplayName>Xamarin UI Kit</DisplayName>
6+
<DisplayName>Essential UI Kit</DisplayName>
77
<PublisherDisplayName>13b62328-5064-4777-a9c4-5eb16127a28a</PublisherDisplayName>
88
<Logo>Assets\StoreLogo.png</Logo>
99
</Properties>
@@ -15,7 +15,7 @@
1515
</Resources>
1616
<Applications>
1717
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="EssentialUIKit.UWP.App">
18-
<uap:VisualElements DisplayName="Xamarin UI Kit" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="EssentialUIKit.UWP" BackgroundColor="transparent">
18+
<uap:VisualElements DisplayName="Essential UI Kit" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="EssentialUIKit.UWP" BackgroundColor="transparent">
1919
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
2020
<uap:ShowNameOnTiles>
2121
<uap:ShowOn Tile="square150x150Logo" />

‎EssentialUIKit.UWP/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
// You can specify all the values or you can default the Build and Revision Numbers
2525
// by using the '*' as shown below:
2626
// [assembly: AssemblyVersion("1.0.*")]
27-
[assembly: AssemblyVersion("17.2.0.34")]
28-
[assembly: AssemblyFileVersion("17.2.0.34")]
27+
[assembly: AssemblyVersion("1.0.0.0")]
28+
[assembly: AssemblyFileVersion("1.0.0.0")]
2929
[assembly: ComVisible(false)]

‎EssentialUIKit.iOS/AppDelegate.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using FFImageLoading.Forms.Platform;
2-
using Foundation;
1+
using Foundation;
32
using Syncfusion.ListView.XForms.iOS;
3+
using Syncfusion.SfCalendar.XForms.iOS;
44
using Syncfusion.SfMaps.XForms.iOS;
55
using Syncfusion.SfRating.XForms.iOS;
66
using Syncfusion.SfRotator.XForms.iOS;
@@ -13,6 +13,7 @@
1313
using Syncfusion.XForms.iOS.Expander;
1414
using Syncfusion.XForms.iOS.Graphics;
1515
using Syncfusion.XForms.iOS.PopupLayout;
16+
using Syncfusion.XForms.iOS.TabView;
1617
using UIKit;
1718

1819
namespace EssentialUIKit.iOS
@@ -47,9 +48,9 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
4748
SfBadgeViewRenderer.Init();
4849
SfSegmentedControlRenderer.Init();
4950
Core.Init();
50-
CachedImageRenderer.Init();
5151
new SfMapsRenderer();
52-
CachedImageRenderer.Init();
52+
SfTabViewRenderer.Init();
53+
SfCalendarRenderer.Init();
5354

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

0 commit comments

Comments
 (0)