diff --git a/UndoAssessment.sln b/UndoAssessment.sln index 35ed5ae..dda428f 100644 --- a/UndoAssessment.sln +++ b/UndoAssessment.sln @@ -1,60 +1,77 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 25.0.1705.6 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33815.320 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.Android", "UndoAssessment\UndoAssessment.Android\UndoAssessment.Android.csproj", "{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.iOS", "UndoAssessment\UndoAssessment.iOS\UndoAssessment.iOS.csproj", "{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment", "UndoAssessment\UndoAssessment\UndoAssessment.csproj", "{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UndoAssessment", "UndoAssessment\UndoAssessment\UndoAssessment.csproj", "{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Release|iPhoneSimulator = Release|iPhoneSimulator Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator + Debug|x64 = Debug|x64 + Release|Any CPU = Release|Any CPU Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.Build.0 = Release|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhone.ActiveCfg = Debug|Any CPU {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhone.Build.0 = Debug|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|x64.ActiveCfg = Debug|x64 + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|x64.Build.0 = Debug|x64 + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|x64.Deploy.0 = Debug|x64 + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.Build.0 = Release|Any CPU {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhone.ActiveCfg = Release|Any CPU {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhone.Build.0 = Release|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|x64.ActiveCfg = Release|x64 + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|x64.Build.0 = Release|x64 + {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|x64.Deploy.0 = Release|x64 {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.Build.0 = Release|iPhoneSimulator - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhone.ActiveCfg = Debug|iPhone {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhone.Build.0 = Debug|iPhone + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|x64.ActiveCfg = Debug|iPhone + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|x64.Build.0 = Debug|iPhone + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhone.ActiveCfg = Release|iPhone {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhone.Build.0 = Release|iPhone + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|x64.ActiveCfg = Release|iPhone + {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|x64.Build.0 = Release|iPhone {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.Build.0 = Release|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhone.ActiveCfg = Debug|Any CPU {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhone.Build.0 = Debug|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|x64.ActiveCfg = Debug|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|x64.Build.0 = Debug|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.Build.0 = Release|Any CPU {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhone.ActiveCfg = Release|Any CPU {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhone.Build.0 = Release|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|x64.ActiveCfg = Release|Any CPU + {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UndoAssessment/UndoAssessment.Android/Resources/Resource.designer.cs b/UndoAssessment/UndoAssessment.Android/Resources/Resource.designer.cs index ca95bb7..43fdf80 100644 --- a/UndoAssessment/UndoAssessment.Android/Resources/Resource.designer.cs +++ b/UndoAssessment/UndoAssessment.Android/Resources/Resource.designer.cs @@ -2,7 +2,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,7 +14,7 @@ namespace UndoAssessment.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] public partial class Resource { @@ -16536,7 +16535,10 @@ public partial class Drawable public const int icon_about = 2131165291; // aapt resource value: 0x7F07006C - public const int icon_feed = 2131165292; + public const int icon_api = 2131165292; + + // aapt resource value: 0x7F07006D + public const int icon_feed = 2131165293; // aapt resource value: 0x7F070064 public const int ic_arrow_down_24dp = 2131165284; @@ -16559,119 +16561,119 @@ public partial class Drawable // aapt resource value: 0x7F07006A public const int ic_mtrl_chip_close_circle = 2131165290; - // aapt resource value: 0x7F07006D - public const int material_cursor_drawable = 2131165293; - // aapt resource value: 0x7F07006E - public const int material_ic_calendar_black_24dp = 2131165294; + public const int material_cursor_drawable = 2131165294; // aapt resource value: 0x7F07006F - public const int material_ic_clear_black_24dp = 2131165295; + public const int material_ic_calendar_black_24dp = 2131165295; // aapt resource value: 0x7F070070 - public const int material_ic_edit_black_24dp = 2131165296; + public const int material_ic_clear_black_24dp = 2131165296; // aapt resource value: 0x7F070071 - public const int material_ic_keyboard_arrow_left_black_24dp = 2131165297; + public const int material_ic_edit_black_24dp = 2131165297; // aapt resource value: 0x7F070072 - public const int material_ic_keyboard_arrow_next_black_24dp = 2131165298; + public const int material_ic_keyboard_arrow_left_black_24dp = 2131165298; // aapt resource value: 0x7F070073 - public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165299; + public const int material_ic_keyboard_arrow_next_black_24dp = 2131165299; // aapt resource value: 0x7F070074 - public const int material_ic_keyboard_arrow_right_black_24dp = 2131165300; + public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165300; // aapt resource value: 0x7F070075 - public const int material_ic_menu_arrow_down_black_24dp = 2131165301; + public const int material_ic_keyboard_arrow_right_black_24dp = 2131165301; // aapt resource value: 0x7F070076 - public const int material_ic_menu_arrow_up_black_24dp = 2131165302; + public const int material_ic_menu_arrow_down_black_24dp = 2131165302; // aapt resource value: 0x7F070077 - public const int mtrl_dialog_background = 2131165303; + public const int material_ic_menu_arrow_up_black_24dp = 2131165303; // aapt resource value: 0x7F070078 - public const int mtrl_dropdown_arrow = 2131165304; + public const int mtrl_dialog_background = 2131165304; // aapt resource value: 0x7F070079 - public const int mtrl_ic_arrow_drop_down = 2131165305; + public const int mtrl_dropdown_arrow = 2131165305; // aapt resource value: 0x7F07007A - public const int mtrl_ic_arrow_drop_up = 2131165306; + public const int mtrl_ic_arrow_drop_down = 2131165306; // aapt resource value: 0x7F07007B - public const int mtrl_ic_cancel = 2131165307; + public const int mtrl_ic_arrow_drop_up = 2131165307; // aapt resource value: 0x7F07007C - public const int mtrl_ic_error = 2131165308; + public const int mtrl_ic_cancel = 2131165308; // aapt resource value: 0x7F07007D - public const int mtrl_navigation_bar_item_background = 2131165309; + public const int mtrl_ic_error = 2131165309; // aapt resource value: 0x7F07007E - public const int mtrl_popupmenu_background = 2131165310; + public const int mtrl_navigation_bar_item_background = 2131165310; // aapt resource value: 0x7F07007F - public const int mtrl_popupmenu_background_dark = 2131165311; + public const int mtrl_popupmenu_background = 2131165311; // aapt resource value: 0x7F070080 - public const int mtrl_tabs_default_indicator = 2131165312; + public const int mtrl_popupmenu_background_dark = 2131165312; // aapt resource value: 0x7F070081 - public const int navigation_empty_icon = 2131165313; + public const int mtrl_tabs_default_indicator = 2131165313; // aapt resource value: 0x7F070082 - public const int notification_action_background = 2131165314; + public const int navigation_empty_icon = 2131165314; // aapt resource value: 0x7F070083 - public const int notification_bg = 2131165315; + public const int notification_action_background = 2131165315; // aapt resource value: 0x7F070084 - public const int notification_bg_low = 2131165316; + public const int notification_bg = 2131165316; // aapt resource value: 0x7F070085 - public const int notification_bg_low_normal = 2131165317; + public const int notification_bg_low = 2131165317; // aapt resource value: 0x7F070086 - public const int notification_bg_low_pressed = 2131165318; + public const int notification_bg_low_normal = 2131165318; // aapt resource value: 0x7F070087 - public const int notification_bg_normal = 2131165319; + public const int notification_bg_low_pressed = 2131165319; // aapt resource value: 0x7F070088 - public const int notification_bg_normal_pressed = 2131165320; + public const int notification_bg_normal = 2131165320; // aapt resource value: 0x7F070089 - public const int notification_icon_background = 2131165321; + public const int notification_bg_normal_pressed = 2131165321; // aapt resource value: 0x7F07008A - public const int notification_template_icon_bg = 2131165322; + public const int notification_icon_background = 2131165322; // aapt resource value: 0x7F07008B - public const int notification_template_icon_low_bg = 2131165323; + public const int notification_template_icon_bg = 2131165323; // aapt resource value: 0x7F07008C - public const int notification_tile_bg = 2131165324; + public const int notification_template_icon_low_bg = 2131165324; // aapt resource value: 0x7F07008D - public const int notify_panel_notification_icon_bg = 2131165325; + public const int notification_tile_bg = 2131165325; // aapt resource value: 0x7F07008E - public const int preference_list_divider_material = 2131165326; + public const int notify_panel_notification_icon_bg = 2131165326; // aapt resource value: 0x7F07008F - public const int test_custom_background = 2131165327; + public const int preference_list_divider_material = 2131165327; // aapt resource value: 0x7F070090 - public const int tooltip_frame_dark = 2131165328; + public const int test_custom_background = 2131165328; // aapt resource value: 0x7F070091 - public const int tooltip_frame_light = 2131165329; + public const int tooltip_frame_dark = 2131165329; // aapt resource value: 0x7F070092 - public const int xamarin_logo = 2131165330; + public const int tooltip_frame_light = 2131165330; + + // aapt resource value: 0x7F070093 + public const int xamarin_logo = 2131165331; static Drawable() { diff --git a/UndoAssessment/UndoAssessment.Android/Resources/drawable/icon_api.png b/UndoAssessment/UndoAssessment.Android/Resources/drawable/icon_api.png new file mode 100644 index 0000000..16332e9 Binary files /dev/null and b/UndoAssessment/UndoAssessment.Android/Resources/drawable/icon_api.png differ diff --git a/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj b/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj index 5c6316d..0adbf56 100644 --- a/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj +++ b/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj @@ -1,4 +1,4 @@ - + Debug @@ -33,6 +33,11 @@ 4 None false + false + false + false + false + true @@ -44,6 +49,30 @@ true true + + true + bin\x64\Debug\ + DEBUG; + portable + x64 + Off + 8.0 + prompt + false + false + false + false + + + true + bin\x64\Release\ + true + portable + x64 + Off + 8.0 + prompt + @@ -92,5 +121,13 @@ UndoAssessment - - + + + + + + + + + + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment.iOS/Resources/icon_api.png b/UndoAssessment/UndoAssessment.iOS/Resources/icon_api.png new file mode 100644 index 0000000..16332e9 Binary files /dev/null and b/UndoAssessment/UndoAssessment.iOS/Resources/icon_api.png differ diff --git a/UndoAssessment/UndoAssessment.iOS/Resources/icon_api@2x.png b/UndoAssessment/UndoAssessment.iOS/Resources/icon_api@2x.png new file mode 100644 index 0000000..3bae637 Binary files /dev/null and b/UndoAssessment/UndoAssessment.iOS/Resources/icon_api@2x.png differ diff --git a/UndoAssessment/UndoAssessment.iOS/Resources/icon_api@3x.png b/UndoAssessment/UndoAssessment.iOS/Resources/icon_api@3x.png new file mode 100644 index 0000000..11f7f4e Binary files /dev/null and b/UndoAssessment/UndoAssessment.iOS/Resources/icon_api@3x.png differ diff --git a/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj b/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj index b77f609..1578a69 100644 --- a/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj +++ b/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj @@ -142,4 +142,13 @@ UndoAssessment + + + + + + + + + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/App.xaml b/UndoAssessment/UndoAssessment/App.xaml index 2bba078..3d03e83 100644 --- a/UndoAssessment/UndoAssessment/App.xaml +++ b/UndoAssessment/UndoAssessment/App.xaml @@ -27,7 +27,7 @@ - + diff --git a/UndoAssessment/UndoAssessment/App.xaml.cs b/UndoAssessment/UndoAssessment/App.xaml.cs index 254aae8..15e5e59 100644 --- a/UndoAssessment/UndoAssessment/App.xaml.cs +++ b/UndoAssessment/UndoAssessment/App.xaml.cs @@ -3,6 +3,7 @@ using Xamarin.Forms.Xaml; using UndoAssessment.Services; using UndoAssessment.Views; +using System.Security.Authentication.ExtendedProtection; namespace UndoAssessment { @@ -13,7 +14,9 @@ public App () { InitializeComponent(); - DependencyService.Register(); + DependencyService.Register(); // This approach is suitable only for smaller projects. For bigger project, it's better to use DI container. + DependencyService.Register(); + MainPage = new AppShell(); } diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml b/UndoAssessment/UndoAssessment/AppShell.xaml index 9b3603b..b9d21c8 100644 --- a/UndoAssessment/UndoAssessment/AppShell.xaml +++ b/UndoAssessment/UndoAssessment/AppShell.xaml @@ -32,6 +32,7 @@ + +