diff --git a/UndoAssessment.sln b/UndoAssessment.sln index 35ed5ae..44c6f8f 100644 --- a/UndoAssessment.sln +++ b/UndoAssessment.sln @@ -1,65 +1,83 @@  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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.Android", "UndoAssessment\UndoAssessment.Android\UndoAssessment.Android.csproj", "{7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.iOS", "UndoAssessment\UndoAssessment.iOS\UndoAssessment.iOS.csproj", "{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.iOS", "UndoAssessment\UndoAssessment.iOS\UndoAssessment.iOS.csproj", "{F1D8255B-1170-437E-B342-D6AB3E79A3F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment", "UndoAssessment\UndoAssessment\UndoAssessment.csproj", "{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment", "UndoAssessment\UndoAssessment\UndoAssessment.csproj", "{A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}" 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 + Release|Any CPU = Release|Any CPU Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator 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|iPhone.ActiveCfg = Debug|Any CPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhone.Build.0 = Debug|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 - {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}.Release|iPhone.ActiveCfg = Release|iPhone - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhone.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}.Release|iPhone.ActiveCfg = Release|Any CPU - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhone.Build.0 = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|iPhone.Build.0 = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|Any CPU.Build.0 = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|iPhone.ActiveCfg = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|iPhone.Build.0 = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|iPhone.Deploy.0 = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|Any CPU.ActiveCfg = Debug|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|Any CPU.Build.0 = Debug|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|Any CPU.Deploy.0 = Debug|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|iPhone.ActiveCfg = Debug|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|iPhone.Build.0 = Debug|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|iPhone.Deploy.0 = Debug|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|Any CPU.Build.0 = Release|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|Any CPU.Deploy.0 = Release|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|iPhone.ActiveCfg = Release|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|iPhone.Build.0 = Release|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|iPhone.Deploy.0 = Release|iPhone + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {F1D8255B-1170-437E-B342-D6AB3E79A3F3}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|iPhone.Build.0 = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|Any CPU.Build.0 = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|iPhone.ActiveCfg = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|iPhone.Build.0 = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|iPhone.Deploy.0 = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A6783E71-B94D-4DE0-86BE-EC6F74C80FEB}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CE885A8A-A7E6-4B1F-B67D-4F92FA75BBE7} + SolutionGuid = {01C4309C-DFAC-4B64-8F32-BFF99D469CC0} EndGlobalSection EndGlobal diff --git a/UndoAssessment/UndoAssessment.Android/Assets/AboutAssets.txt b/UndoAssessment/UndoAssessment.Android/Assets/AboutAssets.txt index 8760f7c..072563f 100644 --- a/UndoAssessment/UndoAssessment.Android/Assets/AboutAssets.txt +++ b/UndoAssessment/UndoAssessment.Android/Assets/AboutAssets.txt @@ -1,4 +1,4 @@ -Any raw assets you want to be deployed with your application can be placed in +Any raw assets you want to be deployed with your application can be placed in this directory (and child directories) and given a Build Action of "AndroidAsset". These files will be deployed with your package and will be accessible using Android's @@ -17,4 +17,3 @@ public class ReadAsset : Activity Additionally, some Android functions will automatically load asset files: Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); - diff --git a/UndoAssessment/UndoAssessment.Android/MainActivity.cs b/UndoAssessment/UndoAssessment.Android/MainActivity.cs index ef6fa6e..172e801 100644 --- a/UndoAssessment/UndoAssessment.Android/MainActivity.cs +++ b/UndoAssessment/UndoAssessment.Android/MainActivity.cs @@ -25,4 +25,4 @@ public override void OnRequestPermissionsResult(int requestCode, string[] permis base.OnRequestPermissionsResult(requestCode, permissions, grantResults); } } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment.Android/Properties/AndroidManifest.xml b/UndoAssessment/UndoAssessment.Android/Properties/AndroidManifest.xml index 29e5082..c4ec87a 100644 --- a/UndoAssessment/UndoAssessment.Android/Properties/AndroidManifest.xml +++ b/UndoAssessment/UndoAssessment.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff --git a/UndoAssessment/UndoAssessment.Android/Properties/AssemblyInfo.cs b/UndoAssessment/UndoAssessment.Android/Properties/AssemblyInfo.cs index ee16a14..92e44ac 100644 --- a/UndoAssessment/UndoAssessment.Android/Properties/AssemblyInfo.cs +++ b/UndoAssessment/UndoAssessment.Android/Properties/AssemblyInfo.cs @@ -28,4 +28,3 @@ // Add some common permissions, these can be removed if not needed [assembly: UsesPermission(Android.Manifest.Permission.Internet)] [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] - diff --git a/UndoAssessment/UndoAssessment.Android/Resources/AboutResources.txt b/UndoAssessment/UndoAssessment.Android/Resources/AboutResources.txt index 88b21f3..cb30f20 100644 --- a/UndoAssessment/UndoAssessment.Android/Resources/AboutResources.txt +++ b/UndoAssessment/UndoAssessment.Android/Resources/AboutResources.txt @@ -1,4 +1,4 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included +Images, layout descriptions, binary blobs and string dictionaries can be included in your application as resource files. Various Android APIs are designed to operate on the resource IDs instead of dealing with images, strings or binary blobs directly. @@ -48,4 +48,3 @@ public class Resource { You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main to reference the layout/main.xml file, or Resource.strings.first_string to reference the first string in the dictionary file values/strings.xml. - diff --git a/UndoAssessment/UndoAssessment.Android/Resources/Resource.designer.cs b/UndoAssessment/UndoAssessment.Android/Resources/Resource.designer.cs index ca95bb7..7e264ee 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 { diff --git a/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon.xml b/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon.xml index eb2bd3c..88d1d0a 100644 --- a/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon.xml +++ b/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon_round.xml b/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon_round.xml index eb2bd3c..88d1d0a 100644 --- a/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon_round.xml +++ b/UndoAssessment/UndoAssessment.Android/Resources/mipmap-anydpi-v26/icon_round.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment.Android/Resources/values/colors.xml b/UndoAssessment/UndoAssessment.Android/Resources/values/colors.xml index a858e62..d9f6e0b 100644 --- a/UndoAssessment/UndoAssessment.Android/Resources/values/colors.xml +++ b/UndoAssessment/UndoAssessment.Android/Resources/values/colors.xml @@ -1,8 +1,7 @@ - + #FFFFFF #3F51B5 #303F9F #FF4081 - diff --git a/UndoAssessment/UndoAssessment.Android/Resources/values/styles.xml b/UndoAssessment/UndoAssessment.Android/Resources/values/styles.xml index a6cdf31..4b9805f 100644 --- a/UndoAssessment/UndoAssessment.Android/Resources/values/styles.xml +++ b/UndoAssessment/UndoAssessment.Android/Resources/values/styles.xml @@ -1,4 +1,4 @@ - + - + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj b/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj index 5c6316d..31d43d5 100644 --- a/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj +++ b/UndoAssessment/UndoAssessment.Android/UndoAssessment.Android.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - {B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE} + {7471E318-A3D7-4C5B-ADAA-0F491EA3A05E} {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {6968b3a4-1835-46a3-ac5c-1ae33b475983} Library @@ -16,6 +16,7 @@ Properties\AndroidManifest.xml Resources Assets + false v13.0 true true @@ -54,8 +55,8 @@ - - + + @@ -88,7 +89,7 @@ - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1} + {67736D58-A34D-4AA9-8C1D-DA25B8909E81} UndoAssessment diff --git a/UndoAssessment/UndoAssessment.iOS/AppDelegate.cs b/UndoAssessment/UndoAssessment.iOS/AppDelegate.cs index 1c9af5a..69aa663 100644 --- a/UndoAssessment/UndoAssessment.iOS/AppDelegate.cs +++ b/UndoAssessment/UndoAssessment.iOS/AppDelegate.cs @@ -29,4 +29,3 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options) } } } - diff --git a/UndoAssessment/UndoAssessment.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/UndoAssessment/UndoAssessment.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index fc9d330..98f4d03 100644 --- a/UndoAssessment/UndoAssessment.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/UndoAssessment/UndoAssessment.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,4 +1,4 @@ -{ +{ "images": [ { "scale": "2x", @@ -114,4 +114,4 @@ "version": 1, "author": "xcode" } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment.iOS/Info.plist b/UndoAssessment/UndoAssessment.iOS/Info.plist index 3dee8c8..6f49d71 100644 --- a/UndoAssessment/UndoAssessment.iOS/Info.plist +++ b/UndoAssessment/UndoAssessment.iOS/Info.plist @@ -25,7 +25,7 @@ CFBundleDisplayName UndoAssessment CFBundleIdentifier - com.undo.assessment.UndoAssessment + com.companyname.UndoAssessment CFBundleVersion 1.0 UILaunchStoryboardName diff --git a/UndoAssessment/UndoAssessment.iOS/Main.cs b/UndoAssessment/UndoAssessment.iOS/Main.cs index 7f19cb5..9a28b29 100644 --- a/UndoAssessment/UndoAssessment.iOS/Main.cs +++ b/UndoAssessment/UndoAssessment.iOS/Main.cs @@ -18,4 +18,3 @@ static void Main(string[] args) } } } - diff --git a/UndoAssessment/UndoAssessment.iOS/Properties/AssemblyInfo.cs b/UndoAssessment/UndoAssessment.iOS/Properties/AssemblyInfo.cs index fb65566..14c016c 100644 --- a/UndoAssessment/UndoAssessment.iOS/Properties/AssemblyInfo.cs +++ b/UndoAssessment/UndoAssessment.iOS/Properties/AssemblyInfo.cs @@ -34,4 +34,3 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] - diff --git a/UndoAssessment/UndoAssessment.iOS/Resources/LaunchScreen.storyboard b/UndoAssessment/UndoAssessment.iOS/Resources/LaunchScreen.storyboard index 54c419f..00260f3 100644 --- a/UndoAssessment/UndoAssessment.iOS/Resources/LaunchScreen.storyboard +++ b/UndoAssessment/UndoAssessment.iOS/Resources/LaunchScreen.storyboard @@ -1,4 +1,4 @@ - + @@ -37,4 +37,3 @@ - diff --git a/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj b/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj index b77f609..6be0bfe 100644 --- a/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj +++ b/UndoAssessment/UndoAssessment.iOS/UndoAssessment.iOS.csproj @@ -5,7 +5,7 @@ iPhoneSimulator 8.0.30703 2.0 - {4F77CCCB-68DC-4CC7-A528-DB6FF48741D0} + {F1D8255B-1170-437E-B342-D6AB3E79A3F3} {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {89a4fe7c-635d-49c9-8d8c-5cd363c0d68d} Exe @@ -132,13 +132,13 @@ - - + + - {7ED4972A-D279-4E63-B4F5-3D15590D4AA1} + {67736D58-A34D-4AA9-8C1D-DA25B8909E81} UndoAssessment diff --git a/UndoAssessment/UndoAssessment/App.xaml b/UndoAssessment/UndoAssessment/App.xaml index 2bba078..8d088cf 100644 --- a/UndoAssessment/UndoAssessment/App.xaml +++ b/UndoAssessment/UndoAssessment/App.xaml @@ -30,4 +30,3 @@ - diff --git a/UndoAssessment/UndoAssessment/App.xaml.cs b/UndoAssessment/UndoAssessment/App.xaml.cs index 254aae8..1ed35ba 100644 --- a/UndoAssessment/UndoAssessment/App.xaml.cs +++ b/UndoAssessment/UndoAssessment/App.xaml.cs @@ -1,15 +1,15 @@ using System; -using Xamarin.Forms; -using Xamarin.Forms.Xaml; using UndoAssessment.Services; using UndoAssessment.Views; +using Xamarin.Forms; +using Xamarin.Forms.Xaml; namespace UndoAssessment { public partial class App : Application { - public App () + public App() { InitializeComponent(); @@ -17,17 +17,16 @@ public App () MainPage = new AppShell(); } - protected override void OnStart () + protected override void OnStart() { } - protected override void OnSleep () + protected override void OnSleep() { } - protected override void OnResume () + protected override void OnResume() { } } } - diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml b/UndoAssessment/UndoAssessment/AppShell.xaml index 9b3603b..048bc05 100644 --- a/UndoAssessment/UndoAssessment/AppShell.xaml +++ b/UndoAssessment/UndoAssessment/AppShell.xaml @@ -1,4 +1,4 @@ - + + + + + - - - - + + + + + + + + + + + + + + + + + diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml.cs b/UndoAssessment/UndoAssessment/AppShell.xaml.cs index abbe3ed..ef75d2e 100644 --- a/UndoAssessment/UndoAssessment/AppShell.xaml.cs +++ b/UndoAssessment/UndoAssessment/AppShell.xaml.cs @@ -13,8 +13,14 @@ public AppShell() InitializeComponent(); Routing.RegisterRoute(nameof(ItemDetailPage), typeof(ItemDetailPage)); Routing.RegisterRoute(nameof(NewItemPage), typeof(NewItemPage)); + Routing.RegisterRoute(nameof(AssesmentPage), typeof(AssesmentPage)); + Routing.RegisterRoute(nameof(AssesmentResultPage), typeof(AssesmentResultPage)); + Routing.RegisterRoute(nameof(NewUserPage), typeof(NewUserPage)); } + private async void OnMenuItemClicked(object sender, EventArgs e) + { + await Shell.Current.GoToAsync("//LoginPage"); + } } } - diff --git a/UndoAssessment/UndoAssessment/AssemblyInfo.cs b/UndoAssessment/UndoAssessment/AssemblyInfo.cs index 8d603ed..c859952 100644 --- a/UndoAssessment/UndoAssessment/AssemblyInfo.cs +++ b/UndoAssessment/UndoAssessment/AssemblyInfo.cs @@ -1,3 +1,3 @@ -using Xamarin.Forms.Xaml; +using Xamarin.Forms.Xaml; -[assembly: XamlCompilation(XamlCompilationOptions.Compile)] +[assembly: XamlCompilation(XamlCompilationOptions.Compile)] \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/GettingStarted.txt b/UndoAssessment/UndoAssessment/GettingStarted.txt index 39e3d59..411f64b 100644 --- a/UndoAssessment/UndoAssessment/GettingStarted.txt +++ b/UndoAssessment/UndoAssessment/GettingStarted.txt @@ -1,4 +1,4 @@ -Welcome to Xamarin.Forms! Here are some tips to get started building your app. +Welcome to Xamarin.Forms! Here are some tips to get started building your app. Building Your App UI -------------------- @@ -32,4 +32,3 @@ This template uses Shell, an app container that reduces the complexity of your a - An integrated search handler. Open AppShell.xaml to begin exploring. To learn more about Shell visit: https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/introduction - diff --git a/UndoAssessment/UndoAssessment/Image/check.png b/UndoAssessment/UndoAssessment/Image/check.png new file mode 100644 index 0000000..eb97f92 Binary files /dev/null and b/UndoAssessment/UndoAssessment/Image/check.png differ diff --git a/UndoAssessment/UndoAssessment/Image/cross.jpeg b/UndoAssessment/UndoAssessment/Image/cross.jpeg new file mode 100644 index 0000000..c3668c6 Binary files /dev/null and b/UndoAssessment/UndoAssessment/Image/cross.jpeg differ diff --git a/UndoAssessment/UndoAssessment/Models/GetResult.cs b/UndoAssessment/UndoAssessment/Models/GetResult.cs new file mode 100644 index 0000000..37d63d5 --- /dev/null +++ b/UndoAssessment/UndoAssessment/Models/GetResult.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace UndoAssessment.Models +{ + public class GetResult + { + public string errorCode { get; set; } + public string message { get; set; } + public string date { get; set; } + } +} diff --git a/UndoAssessment/UndoAssessment/Models/Item.cs b/UndoAssessment/UndoAssessment/Models/Item.cs index e0c317a..2ea29e3 100644 --- a/UndoAssessment/UndoAssessment/Models/Item.cs +++ b/UndoAssessment/UndoAssessment/Models/Item.cs @@ -8,4 +8,4 @@ public class Item public string Text { get; set; } public string Description { get; set; } } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/Services/IDataStore.cs b/UndoAssessment/UndoAssessment/Services/IDataStore.cs index ca75e0e..70df84f 100644 --- a/UndoAssessment/UndoAssessment/Services/IDataStore.cs +++ b/UndoAssessment/UndoAssessment/Services/IDataStore.cs @@ -13,4 +13,3 @@ public interface IDataStore Task> GetItemsAsync(bool forceRefresh = false); } } - diff --git a/UndoAssessment/UndoAssessment/Services/MockDataStore.cs b/UndoAssessment/UndoAssessment/Services/MockDataStore.cs index f4a318a..6eff564 100644 --- a/UndoAssessment/UndoAssessment/Services/MockDataStore.cs +++ b/UndoAssessment/UndoAssessment/Services/MockDataStore.cs @@ -57,4 +57,4 @@ public async Task> GetItemsAsync(bool forceRefresh = false) return await Task.FromResult(items); } } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/UndoAssessment.csproj b/UndoAssessment/UndoAssessment/UndoAssessment.csproj index 95a3587..e86078b 100644 --- a/UndoAssessment/UndoAssessment/UndoAssessment.csproj +++ b/UndoAssessment/UndoAssessment/UndoAssessment.csproj @@ -3,10 +3,35 @@ netstandard2.0 true + true - - + + + + + + + + + + + + + + + + + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/ViewModels/AboutViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/AboutViewModel.cs index bc178e5..63906c9 100644 --- a/UndoAssessment/UndoAssessment/ViewModels/AboutViewModel.cs +++ b/UndoAssessment/UndoAssessment/ViewModels/AboutViewModel.cs @@ -15,4 +15,4 @@ public AboutViewModel() public ICommand OpenWebCommand { get; } } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/ViewModels/AssesmentResultViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/AssesmentResultViewModel.cs new file mode 100644 index 0000000..c6d6e68 --- /dev/null +++ b/UndoAssessment/UndoAssessment/ViewModels/AssesmentResultViewModel.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Text; +using UndoAssessment.ViewModels; +using Xamarin.Forms; + +namespace Assesment1.ViewModels +{ + [QueryProperty(nameof(User), nameof(User))] + public class AssesmentResultViewModel: BaseViewModel + { + public Command BackToComm { get; } + public AssesmentResultViewModel() + { + Title = "Assesment Result"; + + BackToComm = new Command(BackToCmd); + } + + private async void BackToCmd() + { + await Shell.Current.GoToAsync("//AssesmentPage"); + } + + public string User + { + set + { + UserName = value; + } + } + + private string userName; + public string UserName + { + get => userName; + set => SetProperty(ref userName, value); + } + } +} diff --git a/UndoAssessment/UndoAssessment/ViewModels/AssesmentViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/AssesmentViewModel.cs new file mode 100644 index 0000000..621798b --- /dev/null +++ b/UndoAssessment/UndoAssessment/ViewModels/AssesmentViewModel.cs @@ -0,0 +1,86 @@ +using Newtonsoft.Json; +using System; +using System.Net.Http; +using UndoAssessment; +using UndoAssessment.Models; +using UndoAssessment.ViewModels; +using UndoAssessment.Views; +using Xamarin.Forms; + +namespace Assesment1.ViewModels +{ + public class AssesmentViewModel: BaseViewModel + { + public Command SuccessComm { get; } + public Command FailComm { get; } + public Command AddCommand { get; } + HttpClient client; + public AssesmentViewModel() + { + Title = "Assesment"; + SuccessComm = new Command(SuccessCmd); + FailComm = new Command(FailCmd); + AddCommand = new Command(OnAdd); + } + public async void SuccessCmd() + { + client = new HttpClient(); + Uri uri = new Uri(string.Format("https://malkarakundostagingpublicapi.azurewebsites.net/success")); + + try + { + HttpResponseMessage response = await client.GetAsync(uri); + if (response.IsSuccessStatusCode) + { + string responseContent = response.Content.ReadAsStringAsync().Result; + var result = JsonConvert.DeserializeObject(responseContent); + + await App.Current.MainPage.DisplayAlert("Alert", "Result: " + result.message + "\ndate: " + result.date, "OK"); + } + else + { + string responseContent = response.Content.ReadAsStringAsync().Result; + await App.Current.MainPage.DisplayAlert("Alert", responseContent, "OK"); + } + } + catch(Exception ex) + { + await App.Current.MainPage.DisplayAlert("Alert", ex.Message, "OK"); + } + } + + public async void FailCmd() + { + client = new HttpClient(); + Uri uri = new Uri(string.Format("https://malkarakundostagingpublicapi.azurewebsites.net/fail")); + + try + { + HttpResponseMessage response = await client.GetAsync(uri); + if (response.IsSuccessStatusCode) + { + string responseContent = response.Content.ReadAsStringAsync().Result; + var result = JsonConvert.DeserializeObject(responseContent); + + await App.Current.MainPage.DisplayAlert("Alert", "Result: " + result.message + "\ndate: " + result.date, "OK"); + } + else + { + string responseContent = response.Content.ReadAsStringAsync().Result; + var result = JsonConvert.DeserializeObject(responseContent); + + await App.Current.MainPage.DisplayAlert("Alert", "Error Code: " + result.errorCode + "\nResult: " + result.message + "\ndate: " + result.date, "OK"); + } + } + catch (Exception ex) + { + await App.Current.MainPage.DisplayAlert("Alert", ex.Message, "OK"); + } + } + + private async void OnAdd() + { + await Shell.Current.GoToAsync(nameof(NewUserPage)); + } + } +} diff --git a/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs index e4ee974..76b2098 100644 --- a/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs +++ b/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs @@ -2,11 +2,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.CompilerServices; - -using Xamarin.Forms; - using UndoAssessment.Models; using UndoAssessment.Services; +using Xamarin.Forms; namespace UndoAssessment.ViewModels { @@ -29,7 +27,7 @@ public string Title } protected bool SetProperty(ref T backingStore, T value, - [CallerMemberName]string propertyName = "", + [CallerMemberName] string propertyName = "", Action onChanged = null) { if (EqualityComparer.Default.Equals(backingStore, value)) @@ -54,4 +52,3 @@ protected void OnPropertyChanged([CallerMemberName] string propertyName = "") #endregion } } - diff --git a/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs index 46f210d..f9373bd 100644 --- a/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs +++ b/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs @@ -37,7 +37,7 @@ public string ItemId itemId = value; LoadItemId(value); } - } + } public async void LoadItemId(string itemId) { @@ -55,4 +55,3 @@ public async void LoadItemId(string itemId) } } } - diff --git a/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs index 73165fc..c88f7f9 100644 --- a/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs +++ b/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs @@ -2,11 +2,9 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Threading.Tasks; - -using Xamarin.Forms; - using UndoAssessment.Models; using UndoAssessment.Views; +using Xamarin.Forms; namespace UndoAssessment.ViewModels { @@ -16,7 +14,7 @@ public class ItemsViewModel : BaseViewModel public ObservableCollection Items { get; } public Command LoadItemsCommand { get; } - public Command AddItemCommand { get; } + public Command AddItemCommand { get; } public Command ItemTapped { get; } public ItemsViewModel() @@ -83,4 +81,4 @@ async void OnItemSelected(Item item) await Shell.Current.GoToAsync($"{nameof(ItemDetailPage)}?{nameof(ItemDetailViewModel.ItemId)}={item.Id}"); } } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/ViewModels/LoginViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/LoginViewModel.cs index 0497303..b8f1a0d 100644 --- a/UndoAssessment/UndoAssessment/ViewModels/LoginViewModel.cs +++ b/UndoAssessment/UndoAssessment/ViewModels/LoginViewModel.cs @@ -1,7 +1,7 @@ -using UndoAssessment.Views; -using System; +using System; using System.Collections.Generic; using System.Text; +using UndoAssessment.Views; using Xamarin.Forms; namespace UndoAssessment.ViewModels @@ -22,4 +22,3 @@ private async void OnLoginClicked(object obj) } } } - diff --git a/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs index 2365c77..b07a252 100644 --- a/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs +++ b/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs @@ -16,7 +16,7 @@ public NewItemViewModel() { SaveCommand = new Command(OnSave, ValidateSave); CancelCommand = new Command(OnCancel); - this.PropertyChanged += + this.PropertyChanged += (_, __) => SaveCommand.ChangeCanExecute(); } @@ -55,7 +55,7 @@ private async void OnSave() Text = Text, Description = Description }; - + await DataStore.AddItemAsync(newItem); // This will pop the current page off the navigation stack @@ -63,4 +63,3 @@ private async void OnSave() } } } - diff --git a/UndoAssessment/UndoAssessment/ViewModels/NewUserViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/NewUserViewModel.cs new file mode 100644 index 0000000..53d95c5 --- /dev/null +++ b/UndoAssessment/UndoAssessment/ViewModels/NewUserViewModel.cs @@ -0,0 +1,56 @@ +using System; +using UndoAssessment; +using UndoAssessment.ViewModels; +using UndoAssessment.Views; +using Xamarin.Forms; + +namespace Assesment1.ViewModels +{ + public class NewUserViewModel : BaseViewModel + { + public Command SubmitCommand { get; } + public Command CancelCommand { get; } + public NewUserViewModel() + { + Title = "New User"; + SubmitCommand = new Command(SubmitCmd); + CancelCommand = new Command(CancelCmd); + } + + private bool ValidateSave() + { + return !String.IsNullOrWhiteSpace(UserName) + && !String.IsNullOrWhiteSpace(UserAge); + } + + private async void SubmitCmd() + { + if (ValidateSave() == false) + { + await App.Current.MainPage.DisplayAlert("Alert", "Pelase fill all required field", "OK"); + return; + } + + await Shell.Current.GoToAsync($"{nameof(AssesmentResultPage)}?{nameof(AssesmentResultViewModel.User)}={UserName + " - " + UserAge }"); + } + + private async void CancelCmd() + { + await Shell.Current.GoToAsync("//AssesmentPage"); + } + + private string userName; + public string UserName + { + get => userName; + set => SetProperty(ref userName, value); + } + + private string userAge; + public string UserAge + { + get => userAge; + set => SetProperty(ref userAge, value); + } + } +} diff --git a/UndoAssessment/UndoAssessment/Views/AboutPage.xaml b/UndoAssessment/UndoAssessment/Views/AboutPage.xaml index df98269..f951c71 100644 --- a/UndoAssessment/UndoAssessment/Views/AboutPage.xaml +++ b/UndoAssessment/UndoAssessment/Views/AboutPage.xaml @@ -50,4 +50,3 @@ - diff --git a/UndoAssessment/UndoAssessment/Views/AboutPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/AboutPage.xaml.cs index 4a425c8..ee6f5d0 100644 --- a/UndoAssessment/UndoAssessment/Views/AboutPage.xaml.cs +++ b/UndoAssessment/UndoAssessment/Views/AboutPage.xaml.cs @@ -12,4 +12,4 @@ public AboutPage() InitializeComponent(); } } -} +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/Views/AssesmentPage.xaml b/UndoAssessment/UndoAssessment/Views/AssesmentPage.xaml new file mode 100644 index 0000000..d561c9e --- /dev/null +++ b/UndoAssessment/UndoAssessment/Views/AssesmentPage.xaml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/Views/AssesmentPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/AssesmentPage.xaml.cs new file mode 100644 index 0000000..eb7211f --- /dev/null +++ b/UndoAssessment/UndoAssessment/Views/AssesmentPage.xaml.cs @@ -0,0 +1,37 @@ +using Assesment1.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace UndoAssessment.Views +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class AssesmentPage : ContentPage + { + private AssesmentViewModel _assesmentViewModel; + public AssesmentPage() + { + InitializeComponent(); + _assesmentViewModel = new AssesmentViewModel(); + BindingContext = _assesmentViewModel; + + menuItem1.Source = ImageSource.FromResource("UndoAssessment.Image.check.png"); + menuItem2.Source = ImageSource.FromResource("UndoAssessment.Image.cross.jpeg"); + } + + public void GoSuccess(object sender, EventArgs args) + { + _assesmentViewModel.SuccessCmd(); + } + + public void GoFail(object sender, EventArgs args) + { + _assesmentViewModel.FailCmd(); + } + } +} \ No newline at end of file diff --git a/UndoAssessment/UndoAssessment/Views/AssesmentResultPage.xaml b/UndoAssessment/UndoAssessment/Views/AssesmentResultPage.xaml new file mode 100644 index 0000000..395b279 --- /dev/null +++ b/UndoAssessment/UndoAssessment/Views/AssesmentResultPage.xaml @@ -0,0 +1,18 @@ + + + + + + +