Skip to content

Ui kit 2.5.0.0 #36

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.

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

Merged
merged 18 commits into from
Feb 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified EssentialUIKit.Android/Assets/UIFontIcons.ttf
Binary file not shown.
16,232 changes: 16,232 additions & 0 deletions EssentialUIKit.Android/Resources/Resource.designer.cs

Large diffs are not rendered by default.

Binary file modified EssentialUIKit.UWP/Assets/UIFontIcons.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion EssentialUIKit.UWP/Package.appxmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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-245cf10c509f" Publisher="CN=mageshkumarkrishnan" Version="1.0.0.0" />
<Identity Name="5ec79b0c-66cc-42d1-b51b-245cf10c509f" Publisher="CN=EssentialUIKit" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="ec0cc741-fd3e-485c-81be-68815c480690" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Essential UI Kit</DisplayName>
Expand Down
Binary file modified EssentialUIKit.iOS/Resources/UIFontIcons.ttf
Binary file not shown.
Binary file added EssentialUIKit/AppLayout/Icons/notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion EssentialUIKit/AppLayout/Models/Category.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Globalization;
using Xamarin.Forms.Internals;

namespace EssentialUIKit.AppLayout.Models
Expand Down Expand Up @@ -34,7 +35,7 @@ public string TemplateCount
{
get
{
return this.Pages.Count > 1 ? $"{this.Pages.Count.ToString()} Templates" : $"{this.Pages.Count.ToString()} Template";
return this.Pages.Count > 1 ? $"{this.Pages.Count.ToString(CultureInfo.InvariantCulture)} Templates" : $"{this.Pages.Count.ToString(CultureInfo.InvariantCulture)} Template";
}
}

Expand Down
44 changes: 30 additions & 14 deletions EssentialUIKit/AppLayout/TemplateList.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Samples>

<Category Icon="log-in.png" Name="Forms" IsUpdated="True" Description="Get the user’s details to authenticate, create a profile, and enter credit card information for online payment portal.">
<Category Icon="log-in.png" Name="Forms" Description="Get the user’s details to authenticate, create a profile, and enter credit card information for online payment portal.">
<Page Name="Simple Login Page" Description="If you want a simple and clean authentication form, just add this page to your application. Email validation is done within this form." PageName="Views.Forms.SimpleLoginPage"/>
<Page Name="Simple Sign Up Page" Description="This is a supporting form for a simple login page that can be modified to match any of your login pages on the fly. Email validation is done in this form." PageName="Views.Forms.SimpleSignUpPage"/>
<Page Name="Simple Reset Password Page" Description="This page is used for resetting a password with existing credentials or signing up if the user doesn’t have credentials yet." PageName="Views.Forms.SimpleResetPasswordPage"/>
Expand All @@ -14,7 +14,7 @@
<Page Name="Tabbed Login Page" Description="This page is a multi-tabbed user interface where one tab provides a login page and another tab provides a sign-up form." PageName="Views.Forms.TabbedForm"/>
<Page Name="Add Card Page" Description="This page allows users to enter their credit card information to be used in an online payment portal." PageName="Views.Forms.AddCardPage"/>
<Page Name="Add Profile Page" Description="This page allows users to add a new entry to their contacts with additional information such as name and phone number." PageName="Views.Forms.AddProfilePage"/>
<Page Name="Business Registration Form Page" IsNew="True" Description="This page allows users to add business details such as name, email address, and phone number." PageName="Views.Forms.BusinessRegistrationFormPage"/>
<Page Name="Business Registration Form Page" Description="This page allows users to add business details such as name, email address, and phone number." PageName="Views.Forms.BusinessRegistrationFormPage"/>
</Category>

<Category Icon="catalog.png" Name="Catalog" Description="Let the users select from the list of items that includes titles, brief descriptions, and photos.">
Expand Down Expand Up @@ -60,9 +60,20 @@

<Category Icon="navigation.png" Name="Navigation" IsUpdated="True" Description="Enable your users to navigate between pages or items at a high level.">
<Page Name="Bottom Navigation Page" Description="This page displays a navigation interface with icons and labels at the bottom." PageName="Views.Navigation.BottomNavigationPage"/>
<Page Name="Navigation List Card Page" Description="This page displays an item as a card in a list. Each card carries an image of the item, its description, and an overall rating. " PageName="Views.Navigation.NavigationListCardPage"/>
<Page Name="Navigation Tile Card Page" Description="This page displays an item as a card in a tile layout. Each tile contains an image of the item, its description, and an overall rating." PageName="Views.Navigation.NavigationTileCardPage"/>
<Page Name="Songs Page" IsNew="True" Description="This page displays an item as a card in a tile layout. Each tile contains an image, the name of a song, and the song’s composer." PageName="Views.Navigation.SongsPage"/>
<Page Name="Navigation List Card Page" Description="This page displays items in a list. Each card carries an image, description, and the overall rating of an item. " PageName="Views.Navigation.NavigationListCardPage"/>
<Page Name="Navigation Tile Card Page" Description="This page displays items in a tile layout. Each tile contains an image, description, and the overall rating of an item." PageName="Views.Navigation.NavigationTileCardPage"/>
<Page Name="Songs Page" Description="This page displays items in a tile layout. Each tile contains an image, the name of a song, and its composer." PageName="Views.Navigation.SongsPage"/>
<Page Name="FAQs Page" IsNew="True" Description="This page displays items in an expander layout. Each item contains a question and answer for a FAQ section." PageName="Views.Navigation.FAQPage"/>
<Page Name="Contacts List" IsNew="True" Description="This page displays a list of contacts and avatars." PageName="Views.Navigation.ContactsPage"/>
<Page Name="Songs Play List" IsNew="True" Description="This page displays items in a tile layout. Each tile contains the name of a song and its composer, and a menu icon." PageName="Views.Navigation.SongsPlayListPage"/>
<Page Name="Movies List" IsNew="True" Description="This page displays items in a tile layout. Each tile contains the name, year of release, and ratings of a movie." PageName="Views.Navigation.MoviesListPage"/>
<Page Name="Names List" IsNew="True" Description="This page displays group names as a list." PageName="Views.Navigation.NamesListPage"/>
<Page Name="Restaurant Page" IsNew="True" Description="This page displays Restaurant lists, items description, Offers and an overall rating." PageName="Views.Navigation.RestaurantPage"/>
<Page Name="Icon Names List " IsNew="True" Description="The icon names list page displays contact lists with icons and a Next option." PageName="Views.Navigation.IconNamesListPage"/>
<Page Name="Suggestion Page" IsNew="True" Description="A suggestion page shows profile names, profile IDs, and an option to let viewers follow accounts." PageName="Views.Navigation.SuggestionPage"/>
<Page Name="App Usage Page" IsNew="True" Description="This page shows the usage of apps, displaying the app names, progress bars, and progress bar values." PageName="Views.Navigation.AppUsagePage"/>
<Page Name="Documents List Page" IsNew="True" Description="This page shows a list of documents, displaying the name of the document, the size of the document, and the time it was last updated." PageName="Views.Navigation.DocumentsListPage"/>
<Page Name="Selectable Name Page " IsNew="True" Description="This page shows a selectable list of names with grouping." PageName="Views.Navigation.SelectableNamePage"/>
</Category>

<Category Icon="on-boarding.png" Name="Onboarding" Description="Get your users started with a new app or experience with step-by--step instructions.">
Expand Down Expand Up @@ -91,10 +102,10 @@
<Page Name="Payment Page" Description="View card and payment details" PageName="Views.Transaction.PaymentPage" Platform="UWP"/>
</Category>

<Category Icon="bookmark.png" IsUpdated="True" Name="Bookmark" Description="Interfaces for users to save shopping items, articles, or pages they’d like to return to later. Users can add or remove items they’ve saved as needed.">
<Category Icon="bookmark.png" Name="Bookmark" Description="Interfaces for users to save shopping items, articles, or pages they’d like to return to later. Users can add or remove items they’ve saved as needed.">
<Page Name="Wishlist Page" Description="This page displays a list of items that an online shopper has saved to potentially purchase later." PageName="Views.Bookmarks.WishlistPage"/>
<Page Name="Cart Page" IsUpdated="True" Description="This page displays a list of products as items added to a cart in a shopping application. The page also allows you to remove items from the shopping cart. " PageName="Views.Bookmarks.CartPage"/>
<Page Name="Article Bookmarks Page" IsUpdated="True" Description="This page displays bookmarked articles in a list. Each list card carries the image, title, author name, created date, and estimated time to read the article." PageName="Views.Bookmarks.BookmarksPage"/>
<Page Name="Cart Page" Description="This page displays a list of products as items added to a cart in a shopping application. The page also allows you to remove items from the shopping cart. " PageName="Views.Bookmarks.CartPage"/>
<Page Name="Article Bookmarks Page" Description="This page displays bookmarked articles in a list. Each list card carries the image, title, author name, created date, and estimated time to read the article." PageName="Views.Bookmarks.BookmarksPage"/>
</Category>

<Category Icon="history.png" Name="History" Description="Displays a list of recent actions performed by the user. It can also be used to show the recent transactions in financial apps or recent purchases in shopping apps. ">
Expand All @@ -116,17 +127,22 @@
</Category>

<Category Icon="tracking.png" Name="Tracking" Description="Displays various trackings like train status, product delivery status, and more.">
<Page Name="Product Delivery Tracking Page" Description="This page displays a live train’s present status with the estimated time of arrival at a specified destination." PageName="Views.Tracking.ProductDeliveryTrackingPage"/>
<Page Name="Prodcut Delivery Tracking Page" Description="This page displays a live train’s present status with the estimated time of arrival at a specified destination." PageName="Views.Tracking.ProductDeliveryTrackingPage"/>
</Category>

<Category Icon="dashboard.png" Name="Dashboard" IsUpdated="True" Description="A beautifully presented interface relevant to common real-world use cases.">
<Category Icon="dashboard.png" Name="Dashboard" Description="A beautifully presented interface relevant to common real-world use cases.">
<Page Name="Stock Overview Page" Description="This page displays a dashboard for stock market data visualization." PageName="Views.Dashboard.StockOverviewPage"/>
<Page Name="Health Care Page" IsNew="True" Description="This page displays a dashboard for health-care data visualization." PageName="Views.Dashboard.HealthCarePage"/>
<Page Name="Health Care Page" Description="This page displays a dashboard for health-care data visualization." PageName="Views.Dashboard.HealthCarePage"/>
</Category>

<Category Icon="setting.png" Name="Settings" IsUpdated="True" Description="Display various types of settings pages.">
<Category Icon="setting.png" Name="Settings" Description="Display various types of settings pages.">
<Page Name="Setting Page" Description="This page displays a simple settings page that includes account, notification, and support settings." PageName="Views.Settings.SettingPage"/>
<Page Name="Help Page" IsNew="True" Description="This page displays a simple help page that provides help with recent orders and other queries." PageName="Views.Settings.HelpPage"/>
<Page Name="Help Page" Description="This page displays a simple help page that provides help with recent orders and other queries." PageName="Views.Settings.HelpPage"/>
</Category>

</Samples>
<Category Icon="notification.png" Name="Notification" IsUpdated="True" Description="Display various types of notification pages.">
<Page Name="Task Notification Page" IsNew="True" Description="This page displays notifications for tasks, showing descriptions, task IDs, and times." PageName="Views.Notification.TaskNotificationPage"/>
<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"/>
</Category>

</Samples>
25 changes: 3 additions & 22 deletions EssentialUIKit/AppLayout/ViewModels/HomePageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,6 @@ public class HomePageViewModel

public List<Category> Templates { get; set; }

public Category SelectedCategory
{
set
{
if (value == null) return;

//XmlSerializer xmlSerializer = new XmlSerializer(typeof(Category));

//using (StringWriter textWriter = new StringWriter())
//{
// xmlSerializer.Serialize(textWriter, value);

// var url = HttpUtility.UrlEncode(textWriter.ToString());

// Shell.Current.GoToAsync($@"templatepage?data1={url}", true);
//}
}
}

/// <summary>
/// Initializes a new instance for the <see cref="HomePageViewModel" /> class.
/// </summary>
Expand All @@ -56,7 +37,7 @@ private void PopulateList()
xmlReader.Read();
Category category = null;
var hasAdded = false;
var runtimePlatform = Device.RuntimePlatform.ToLower();
var runtimePlatform = Device.RuntimePlatform.ToUpperInvariant();

while (!xmlReader.EOF)
{
Expand All @@ -72,7 +53,7 @@ private void PopulateList()
}

var platform = GetDataFromXmlReader(xmlReader, "Platform");
if (string.IsNullOrEmpty(platform) || platform.ToLower().Contains(runtimePlatform))
if (string.IsNullOrEmpty(platform) || platform.ToUpperInvariant().Contains(runtimePlatform))
{
var categoryName = GetDataFromXmlReader(xmlReader, "Name");
var description = GetDataFromXmlReader(xmlReader, "Description");
Expand Down Expand Up @@ -110,7 +91,7 @@ private void PopulateList()
{
var platform = GetDataFromXmlReader(xmlReader, "Platform");

if (string.IsNullOrEmpty(platform) || platform.ToLower().Contains(runtimePlatform))
if (string.IsNullOrEmpty(platform) || platform.ToUpperInvariant().Contains(runtimePlatform))
{
var templateName = GetDataFromXmlReader(xmlReader, "Name");
var description = GetDataFromXmlReader(xmlReader, "Description");
Expand Down
18 changes: 0 additions & 18 deletions EssentialUIKit/AppLayout/ViewModels/TemplatePageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,6 @@ public class TemplatePageViewModel : INotifyPropertyChanged

#region Public Properties

/// <summary>
/// Sets the query data.
/// </summary>
public string QueryData
{
set
{
var decodedString = HttpUtility.UrlDecode(value);

var serializer = new XmlSerializer(typeof(Category));

using (var reader = new StringReader(decodedString))
{
this.SelectedCategory = (Category)serializer.Deserialize(reader);
}
}
}

/// <summary>
/// Gets or sets the selected category.
/// </summary>
Expand Down
10 changes: 0 additions & 10 deletions EssentialUIKit/AppLayout/Views/TemplateHostPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
namespace EssentialUIKit.AppLayout.Views
{
[Preserve(AllMembers = true)]
[QueryProperty("QueryData", "data")]
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class TemplateHostPage
{
Expand Down Expand Up @@ -37,15 +36,6 @@ public TemplateHostPage(Template selectedTemplate)

#endregion

#region Properties

public string QueryData
{
set => this.LoadPage(value);
}

#endregion

#region Methods

protected override void OnSizeAllocated(double width, double height)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ public class SegmentedControlSelectionBehavior : Behavior<SfSegmentedControl>
/// Gets or sets the CommandProperty, and it is a bindable property.
/// </summary>
public static readonly BindableProperty CommandProperty =
BindableProperty.Create("Command", typeof(ICommand), typeof(SegmentedControlCommandBehavior));
BindableProperty.Create(nameof(Command), typeof(ICommand), typeof(SegmentedControlCommandBehavior));

/// <summary>
/// Gets or sets the CommandParameterProperty, and it is a bindable property.
/// </summary>
public static readonly BindableProperty CommandParameterProperty =
BindableProperty.Create("CommandParameter", typeof(object), typeof(SegmentedControlCommandBehavior));
BindableProperty.Create(nameof(CommandParameter), typeof(object), typeof(SegmentedControlCommandBehavior));

/// <summary>
/// Gets or sets the ParentBindingContextProperty, and it is a bindable property.
/// </summary>
public static readonly BindableProperty ParentBindingContextProperty =
BindableProperty.Create("ParentBindingContext", typeof(object), typeof(SegmentedControlCommandBehavior));
BindableProperty.Create(nameof(ParentBindingContext), typeof(object), typeof(SegmentedControlCommandBehavior));

/// <summary>
/// Gets or sets the Command.
Expand Down
4 changes: 2 additions & 2 deletions EssentialUIKit/Behaviors/ECommerce/ExpanderBehavior.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ public class ExpanderBehavior : Behavior<SfExpander>
/// Gets or sets the CommandProperty, and it is a bindable property.
/// </summary>
public static readonly BindableProperty CommandProperty =
BindableProperty.Create("Command", typeof(ICommand), typeof(ExpanderBehavior));
BindableProperty.Create(nameof(Command), typeof(ICommand), typeof(ExpanderBehavior));

/// <summary>
/// Gets or sets the CommandParameterProperty, and it is a bindable property.
/// </summary>
public static readonly BindableProperty CommandParameterProperty =
BindableProperty.Create("CommandParameter", typeof(object), typeof(ExpanderBehavior));
BindableProperty.Create(nameof(CommandParameter), typeof(object), typeof(ExpanderBehavior));

/// <summary>
/// Gets or sets the Command.
Expand Down
2 changes: 1 addition & 1 deletion EssentialUIKit/Behaviors/ECommerce/FrameTapBehavior.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class FrameTapBehavior : Behavior<Frame>
/// Gets or sets the CommandParameterProperty, and it is a bindable property.
/// </summary>
public static readonly BindableProperty CommandParameterProperty =
BindableProperty.Create("CommandParameter", typeof(object), typeof(FrameTapBehavior));
BindableProperty.Create(nameof(CommandParameter), typeof(object), typeof(FrameTapBehavior));

/// <summary>
/// Gets or sets the CommandParameter.
Expand Down
Loading