Skip to content

Commit 7216719

Browse files
Essential UIKit new page changes committed. (#39)
* Essential UIKit new page review changes were committed.
1 parent ad599c0 commit 7216719

File tree

82 files changed

+757
-16601
lines changed

Some content is hidden

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

82 files changed

+757
-16601
lines changed

EssentialUIKit.Android/EssentialUIKit.Android.csproj

100644100755
File mode changed.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.syncfusion.EssentialUIKit" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="6.0" package="com.syncfusion.xamarin.uikit" android:installLocation="internalOnly">
33
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
44
<application android:label="Essential UI Kit"></application>
55
</manifest>

EssentialUIKit.Android/Resources/Resource.designer.cs

Lines changed: 0 additions & 16232 deletions
This file was deleted.

EssentialUIKit.UWP/EssentialUIKit.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<FileAlignment>512</FileAlignment>
1919
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
2020
<PackageCertificateKeyFile>EssentialUIKit.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
21-
<PackageCertificateThumbprint>7C9B62B0DB4A9BB4B30582DB30615CF2470FEC43</PackageCertificateThumbprint>
21+
<PackageCertificateThumbprint>0D118D5BBF91F66E731C1579C6AABF13030FECBF</PackageCertificateThumbprint>
2222
</PropertyGroup>
2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
2424
<DebugSymbols>true</DebugSymbols>
Binary file not shown.
Binary file not shown.

EssentialUIKit/AppLayout/Controls/ParallaxListView.cs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,27 @@ public ParallaxListView() : base(ListViewCachingStrategy.RetainElement)
2424

2525
public static void OnScrollChanged(object sender, ScrollChangedEventArgs e)
2626
{
27-
((ParallaxListView)sender).ScrollChanged?.Invoke((ParallaxListView)sender, e);
27+
((ParallaxListView)sender)?.ScrollChanged?.Invoke((ParallaxListView)sender, e);
2828
}
2929

3030
public static void OnSelectionChanged(object sender, SelectedItemChangedEventArgs e)
3131
{
32-
((ParallaxListView)sender).SelectionChanged(sender, e);
33-
((ParallaxListView)sender).SelectedItem = e.SelectedItem;
34-
((ParallaxListView)sender).SelectedItem = null;
32+
ParallaxListView listView = (ParallaxListView)sender;
33+
if (listView != null)
34+
{
35+
listView.SelectionChanged(sender, e);
36+
listView.SelectedItem = e.SelectedItem;
37+
listView.SelectedItem = null;
38+
}
3539
}
3640

3741
public static void OnSelectionChanged(object sender, int index)
3842
{
39-
var listView = sender as ParallaxListView;
40-
OnSelectionChanged(sender, new SelectedItemChangedEventArgs((listView.ItemsSource as IList)[index], index));
43+
if (sender is ParallaxListView)
44+
{
45+
var listView = sender as ParallaxListView;
46+
OnSelectionChanged(sender, new SelectedItemChangedEventArgs((listView.ItemsSource as IList)[index], index));
47+
}
4148
}
4249

4350
private void ParallaxListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)

EssentialUIKit/AppLayout/TemplateList.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,15 @@
144144
<Page Name="Task Notification Page" IsNew="True" Description="This page displays notifications for tasks, showing descriptions, task IDs, and times." PageName="Views.Notification.TaskNotificationPage"/>
145145
<Page Name="Social Notification Page" IsNew="True" Description="This page displays social media notifications, containing a list of recent notifications and a list of earlier ones." PageName="Views.Notification.SocialNotificationPage"/>
146146
</Category>
147+
148+
<!--<Category Name="Shopping" Description="Simple shopping flow, fetturing catalog detail, cart detail and product checkout.">
149+
<Page Name="Login Page" Description="If you want a simple and clean authentication form, then just add this page to your application. Email validation is done within this form." PageName="Views.Shopping.LoginPage"/>
150+
<Page Name="Shopping Home Page" Description="Simple shopping flow, fetturing catalog detail, cart detail and product checkout" PageName="Views.Shopping.CatalogListPage"/>
151+
<Page Name="Detail Page" Description="View detailed information regarding your orders" PageName="Views.Shopping.DetailPage" />
152+
<Page Name="Shopping Cart Page" Description="View items in your cart for purchase. " PageName="Views.Shopping.CartPage" />
153+
<Page Name="Checkout page" Description="Purchase items in your cart" PageName="Views.Shopping.CheckoutPage"/>
154+
<Page Name="Payment success page" Description="This page notifies the user that their payment was successful." PageName="Views.Shopping.PaymentSuccessPage"/>
155+
<Page Name="Walkthrough animation Page" Description="Guide users through a setup process on color gradient pages" PageName="Views.Shopping.OnBoardingAnimationPage"/>
156+
</Category>-->
147157

148158
</Samples>

EssentialUIKit/AppLayout/Utils.cs

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,34 @@ public static class Extensions
1010
{
1111
public static void ApplyDarkTheme(this ResourceDictionary resources)
1212
{
13-
var mergedDictionaries = resources.MergedDictionaries;
14-
var lightTheme = mergedDictionaries.OfType<LightTheme>().FirstOrDefault();
15-
if (lightTheme != null)
13+
if (resources != null)
1614
{
17-
mergedDictionaries.Remove(lightTheme);
18-
}
15+
var mergedDictionaries = resources.MergedDictionaries;
16+
var lightTheme = mergedDictionaries.OfType<LightTheme>().FirstOrDefault();
17+
if (lightTheme != null)
18+
{
19+
mergedDictionaries.Remove(lightTheme);
20+
}
1921

20-
// mergedDictionaries.Add(new DarkTheme());
21-
AppSettings.Instance.IsDarkTheme = true;
22+
// mergedDictionaries.Add(new DarkTheme());
23+
AppSettings.Instance.IsDarkTheme = true;
24+
}
2225
}
2326

2427
public static void ApplyLightTheme(this ResourceDictionary resources)
2528
{
26-
var mergedDictionaries = resources.MergedDictionaries;
29+
if (resources != null)
30+
{
31+
var mergedDictionaries = resources.MergedDictionaries;
2732

28-
// var darkTheme = mergedDictionaries.OfType<DarkTheme>().FirstOrDefault();
29-
// if (darkTheme != null)
30-
// {
31-
// mergedDictionaries.Remove(darkTheme);
32-
// }
33-
mergedDictionaries.Add(new LightTheme());
34-
AppSettings.Instance.IsDarkTheme = false;
33+
// var darkTheme = mergedDictionaries.OfType<DarkTheme>().FirstOrDefault();
34+
// if (darkTheme != null)
35+
// {
36+
// mergedDictionaries.Remove(darkTheme);
37+
// }
38+
mergedDictionaries.Add(new LightTheme());
39+
AppSettings.Instance.IsDarkTheme = false;
40+
}
3541
}
3642

3743
public static void ApplyColorSet(int index)

EssentialUIKit/AppLayout/ViewModels/HomePageViewModel.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,12 @@ private void PopulateList()
143143

144144
public static string GetDataFromXmlReader(XmlReader reader, string attribute)
145145
{
146-
reader.MoveToAttribute(attribute);
147-
return reader.Value;
146+
if (reader != null)
147+
{
148+
reader.MoveToAttribute(attribute);
149+
return reader.Value;
150+
}
151+
return string.Empty;
148152
}
149153

150154
private string GetUpdateType(string value, string type)

0 commit comments

Comments
 (0)