diff --git a/MobileApp1.Android/MobileApp1.Android.csproj b/MobileApp1.Android/MobileApp1.Android.csproj index ce91790..5bc5ccc 100644 --- a/MobileApp1.Android/MobileApp1.Android.csproj +++ b/MobileApp1.Android/MobileApp1.Android.csproj @@ -96,5 +96,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/Resource.designer.cs b/MobileApp1.Android/Resources/Resource.designer.cs index 7f37f8e..451556d 100644 --- a/MobileApp1.Android/Resources/Resource.designer.cs +++ b/MobileApp1.Android/Resources/Resource.designer.cs @@ -11683,118 +11683,133 @@ namespace MobileApp1.Droid public const int design_snackbar_background = 2131165292; // aapt resource value: 0x7F07006D - public const int ic_mtrl_checked_circle = 2131165293; + public const int help = 2131165293; // aapt resource value: 0x7F07006E - public const int ic_mtrl_chip_checked_black = 2131165294; + public const int home = 2131165294; // aapt resource value: 0x7F07006F - public const int ic_mtrl_chip_checked_circle = 2131165295; + public const int ic_mtrl_checked_circle = 2131165295; // aapt resource value: 0x7F070070 - public const int ic_mtrl_chip_close_circle = 2131165296; + public const int ic_mtrl_chip_checked_black = 2131165296; // aapt resource value: 0x7F070071 - public const int material_ic_calendar_black_24dp = 2131165297; + public const int ic_mtrl_chip_checked_circle = 2131165297; // aapt resource value: 0x7F070072 - public const int material_ic_clear_black_24dp = 2131165298; + public const int ic_mtrl_chip_close_circle = 2131165298; // aapt resource value: 0x7F070073 - public const int material_ic_edit_black_24dp = 2131165299; + public const int layers = 2131165299; // aapt resource value: 0x7F070074 - public const int material_ic_keyboard_arrow_left_black_24dp = 2131165300; + public const int logout = 2131165300; // aapt resource value: 0x7F070075 - public const int material_ic_keyboard_arrow_right_black_24dp = 2131165301; + public const int material_ic_calendar_black_24dp = 2131165301; // aapt resource value: 0x7F070076 - public const int material_ic_menu_arrow_down_black_24dp = 2131165302; + public const int material_ic_clear_black_24dp = 2131165302; // aapt resource value: 0x7F070077 - public const int material_ic_menu_arrow_up_black_24dp = 2131165303; + public const int material_ic_edit_black_24dp = 2131165303; // aapt resource value: 0x7F070078 - public const int mtrl_dialog_background = 2131165304; + public const int material_ic_keyboard_arrow_left_black_24dp = 2131165304; // aapt resource value: 0x7F070079 - public const int mtrl_dropdown_arrow = 2131165305; + public const int material_ic_keyboard_arrow_right_black_24dp = 2131165305; // aapt resource value: 0x7F07007A - public const int mtrl_ic_arrow_drop_down = 2131165306; + public const int material_ic_menu_arrow_down_black_24dp = 2131165306; // aapt resource value: 0x7F07007B - public const int mtrl_ic_arrow_drop_up = 2131165307; + public const int material_ic_menu_arrow_up_black_24dp = 2131165307; // aapt resource value: 0x7F07007C - public const int mtrl_ic_cancel = 2131165308; + public const int mtrl_dialog_background = 2131165308; // aapt resource value: 0x7F07007D - public const int mtrl_ic_error = 2131165309; + public const int mtrl_dropdown_arrow = 2131165309; // aapt resource value: 0x7F07007E - public const int mtrl_popupmenu_background = 2131165310; + public const int mtrl_ic_arrow_drop_down = 2131165310; // aapt resource value: 0x7F07007F - public const int mtrl_popupmenu_background_dark = 2131165311; + public const int mtrl_ic_arrow_drop_up = 2131165311; // aapt resource value: 0x7F070080 - public const int mtrl_tabs_default_indicator = 2131165312; + public const int mtrl_ic_cancel = 2131165312; // aapt resource value: 0x7F070081 - public const int navigation_empty_icon = 2131165313; + public const int mtrl_ic_error = 2131165313; // aapt resource value: 0x7F070082 - public const int notification_action_background = 2131165314; + public const int mtrl_popupmenu_background = 2131165314; // aapt resource value: 0x7F070083 - public const int notification_bg = 2131165315; + public const int mtrl_popupmenu_background_dark = 2131165315; // aapt resource value: 0x7F070084 - public const int notification_bg_low = 2131165316; + public const int mtrl_tabs_default_indicator = 2131165316; // aapt resource value: 0x7F070085 - public const int notification_bg_low_normal = 2131165317; + public const int navigation_empty_icon = 2131165317; // aapt resource value: 0x7F070086 - public const int notification_bg_low_pressed = 2131165318; + public const int notification_action_background = 2131165318; // aapt resource value: 0x7F070087 - public const int notification_bg_normal = 2131165319; + public const int notification_bg = 2131165319; // aapt resource value: 0x7F070088 - public const int notification_bg_normal_pressed = 2131165320; + public const int notification_bg_low = 2131165320; // aapt resource value: 0x7F070089 - public const int notification_icon_background = 2131165321; + public const int notification_bg_low_normal = 2131165321; // aapt resource value: 0x7F07008A - public const int notification_template_icon_bg = 2131165322; + public const int notification_bg_low_pressed = 2131165322; // aapt resource value: 0x7F07008B - public const int notification_template_icon_low_bg = 2131165323; + public const int notification_bg_normal = 2131165323; // aapt resource value: 0x7F07008C - public const int notification_tile_bg = 2131165324; + public const int notification_bg_normal_pressed = 2131165324; // aapt resource value: 0x7F07008D - public const int notify_panel_notification_icon_bg = 2131165325; + public const int notification_icon_background = 2131165325; // aapt resource value: 0x7F07008E - public const int splash_logo = 2131165326; + public const int notification_template_icon_bg = 2131165326; // aapt resource value: 0x7F07008F - public const int splash_screen = 2131165327; + public const int notification_template_icon_low_bg = 2131165327; // aapt resource value: 0x7F070090 - public const int test_custom_background = 2131165328; + public const int notification_tile_bg = 2131165328; // aapt resource value: 0x7F070091 - public const int tooltip_frame_dark = 2131165329; + public const int notify_panel_notification_icon_bg = 2131165329; // aapt resource value: 0x7F070092 - public const int tooltip_frame_light = 2131165330; + public const int settings = 2131165330; + + // aapt resource value: 0x7F070093 + public const int splash_logo = 2131165331; + + // aapt resource value: 0x7F070094 + public const int splash_screen = 2131165332; + + // aapt resource value: 0x7F070095 + public const int test_custom_background = 2131165333; + + // aapt resource value: 0x7F070096 + public const int tooltip_frame_dark = 2131165334; + + // aapt resource value: 0x7F070097 + public const int tooltip_frame_light = 2131165335; static Drawable() { diff --git a/MobileApp1.Android/Resources/drawable/help.png b/MobileApp1.Android/Resources/drawable/help.png new file mode 100644 index 0000000..58ff6ce Binary files /dev/null and b/MobileApp1.Android/Resources/drawable/help.png differ diff --git a/MobileApp1.Android/Resources/drawable/home.png b/MobileApp1.Android/Resources/drawable/home.png new file mode 100644 index 0000000..dc959eb Binary files /dev/null and b/MobileApp1.Android/Resources/drawable/home.png differ diff --git a/MobileApp1.Android/Resources/drawable/layers.png b/MobileApp1.Android/Resources/drawable/layers.png new file mode 100644 index 0000000..18ab26b Binary files /dev/null and b/MobileApp1.Android/Resources/drawable/layers.png differ diff --git a/MobileApp1.Android/Resources/drawable/logout.png b/MobileApp1.Android/Resources/drawable/logout.png new file mode 100644 index 0000000..0ee107a Binary files /dev/null and b/MobileApp1.Android/Resources/drawable/logout.png differ diff --git a/MobileApp1.Android/Resources/drawable/settings.png b/MobileApp1.Android/Resources/drawable/settings.png new file mode 100644 index 0000000..92be663 Binary files /dev/null and b/MobileApp1.Android/Resources/drawable/settings.png differ diff --git a/MobileApp1/App.xaml.cs b/MobileApp1/App.xaml.cs index 30e7f47..b600287 100644 --- a/MobileApp1/App.xaml.cs +++ b/MobileApp1/App.xaml.cs @@ -17,7 +17,8 @@ namespace MobileApp1 //MainPage = new AppShell(); - MainPage = new NavigationPage(new LoginPage()); + //MainPage = new NavigationPage(new LoginPage()); + MainPage = new MainPage(); } protected override void OnStart() diff --git a/MobileApp1/MobileApp1.csproj b/MobileApp1/MobileApp1.csproj index 4ddbc12..c8c5b6a 100644 --- a/MobileApp1/MobileApp1.csproj +++ b/MobileApp1/MobileApp1.csproj @@ -13,6 +13,9 @@ + + + @@ -21,6 +24,8 @@ + + @@ -36,6 +41,9 @@ CompanyHeaderView.xaml + + BlankPage.xaml + PasswordResetPage.xaml @@ -54,11 +62,17 @@ + + MSBuild:UpdateDesignTimeXaml + MSBuild:UpdateDesignTimeXaml MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + \ No newline at end of file diff --git a/MobileApp1/Models/FlyoutPageItem.cs b/MobileApp1/Models/FlyoutPageItem.cs new file mode 100644 index 0000000..3ae8478 --- /dev/null +++ b/MobileApp1/Models/FlyoutPageItem.cs @@ -0,0 +1,13 @@ +using System; + +namespace MobileApp1.Models +{ + public class FlyoutPageItem + { + public string Title { get; set; } + + public string Icon { get; set; } + + public Type TargetType { get; set; } + } +} diff --git a/MobileApp1/Views/BlankPage.xaml b/MobileApp1/Views/BlankPage.xaml new file mode 100644 index 0000000..d258d81 --- /dev/null +++ b/MobileApp1/Views/BlankPage.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MobileApp1/Views/BlankPage.xaml.cs b/MobileApp1/Views/BlankPage.xaml.cs new file mode 100644 index 0000000..55ed661 --- /dev/null +++ b/MobileApp1/Views/BlankPage.xaml.cs @@ -0,0 +1,16 @@ +using System; +using Xamarin.Forms; + +namespace MobileApp1.Views +{ + public partial class BlankPage : ContentPage + { + public BlankPage() + { + InitializeComponent(); + + label1.Text = Guid.NewGuid().ToString(); + } + + } +} \ No newline at end of file diff --git a/MobileApp1/Views/FlyoutMenuPage.xaml b/MobileApp1/Views/FlyoutMenuPage.xaml new file mode 100644 index 0000000..abbbf1c --- /dev/null +++ b/MobileApp1/Views/FlyoutMenuPage.xaml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MobileApp1/Views/FlyoutMenuPage.xaml.cs b/MobileApp1/Views/FlyoutMenuPage.xaml.cs new file mode 100644 index 0000000..d8958cf --- /dev/null +++ b/MobileApp1/Views/FlyoutMenuPage.xaml.cs @@ -0,0 +1,14 @@ +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace MobileApp1.Views +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class FlyoutMenuPage : ContentPage + { + public FlyoutMenuPage() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/MobileApp1/Views/MainPage.xaml b/MobileApp1/Views/MainPage.xaml new file mode 100644 index 0000000..c6e57fd --- /dev/null +++ b/MobileApp1/Views/MainPage.xaml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/MobileApp1/Views/MainPage.xaml.cs b/MobileApp1/Views/MainPage.xaml.cs new file mode 100644 index 0000000..b2cca79 --- /dev/null +++ b/MobileApp1/Views/MainPage.xaml.cs @@ -0,0 +1,47 @@ +using MobileApp1.Models; +using System; +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace MobileApp1.Views +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class MainPage : FlyoutPage + { + public MainPage() + { + InitializeComponent(); + + flyoutPage.listView.ItemSelected += listView1_OnItemSelected; + } + + //private void ListView_ItemSelected(object sender, SelectedItemChangedEventArgs e) + //{ + // var item = e.SelectedItem as MainPageFlyoutMenuItem; + // if (item == null) + // return; + + // var page = (Page)Activator.CreateInstance(item.TargetType); + // page.Title = item.Title; + + // Detail = new NavigationPage(page); + // IsPresented = false; + + // FlyoutPage.ListView.SelectedItem = null; + //} + + private void listView1_OnItemSelected(object sender, SelectedItemChangedEventArgs e) + { + var item = e.SelectedItem as FlyoutPageItem; + if (item == null) + { + return; + } + + Detail = new NavigationPage((Page)Activator.CreateInstance(item.TargetType)); + flyoutPage.listView.SelectedItem = null; + IsPresented = false; + } + + } +} \ No newline at end of file diff --git a/Resources/graphics-icons.svg b/Resources/graphics-icons.svg new file mode 100644 index 0000000..6510bf1 --- /dev/null +++ b/Resources/graphics-icons.svg @@ -0,0 +1,149 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Resources/graphics.svg b/Resources/graphics-logos.svg similarity index 100% rename from Resources/graphics.svg rename to Resources/graphics-logos.svg