diff --git a/Mear/Mear.Android/MainActivity.cs b/Mear/Mear.Android/MainActivity.cs index dfb42cd..b0d8097 100644 --- a/Mear/Mear.Android/MainActivity.cs +++ b/Mear/Mear.Android/MainActivity.cs @@ -24,6 +24,7 @@ namespace Mear.Droid Xamarin.Essentials.Platform.Init(this, savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState); LoadApplication(new App()); + } public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults) { diff --git a/Mear/Mear.Android/Mear.Android.csproj b/Mear/Mear.Android/Mear.Android.csproj index e1c9559..2cd3a18 100644 --- a/Mear/Mear.Android/Mear.Android.csproj +++ b/Mear/Mear.Android/Mear.Android.csproj @@ -55,6 +55,15 @@ 0.6.1 + + 0.6.1 + + + 106.6.9 + + + 1.5.231 + diff --git a/Mear/Mear.iOS/Mear.iOS.csproj b/Mear/Mear.iOS/Mear.iOS.csproj index 1685df6..366854c 100644 --- a/Mear/Mear.iOS/Mear.iOS.csproj +++ b/Mear/Mear.iOS/Mear.iOS.csproj @@ -124,8 +124,17 @@ - - + + 0.6.1 + + + 106.6.9 + + + 1.5.231 + + + diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.dll deleted file mode 100644 index d62b5b9..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.dll.mdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.dll.mdb deleted file mode 100644 index 1c051d0..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.dll.mdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.iOS.exe b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.iOS.exe deleted file mode 100644 index 05640b3..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.iOS.exe and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.iOS.pdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.iOS.pdb deleted file mode 100644 index cedb82f..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.iOS.pdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.pdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.pdb deleted file mode 100644 index 425815c..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Mear.pdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Essentials.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Essentials.dll deleted file mode 100644 index a0949b9..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Essentials.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Essentials.pdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Essentials.pdb deleted file mode 100644 index 89d3cb2..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Essentials.pdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Core.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Core.dll deleted file mode 100644 index 41981da..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Core.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Core.pdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Core.pdb deleted file mode 100644 index f8a1a79..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Core.pdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.dll deleted file mode 100644 index 5285068..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.iOS.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.iOS.dll deleted file mode 100644 index 78317c1..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.iOS.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.iOS.pdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.iOS.pdb deleted file mode 100644 index f24b0db..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Platform.iOS.pdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Xaml.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Xaml.dll deleted file mode 100644 index c4f54da..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Xaml.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Xaml.pdb b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Xaml.pdb deleted file mode 100644 index e6ed30e..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/Xamarin.Forms.Xaml.pdb and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ar/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ar/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index e5a1780..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ar/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ca/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ca/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 8d6f144..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ca/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/cs/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/cs/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index b1db39c..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/cs/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/da/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/da/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 9c6fbb2..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/da/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/de/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/de/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 64cbbdb..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/de/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/el/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/el/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index bc51d03..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/el/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/es/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/es/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index b20cba6..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/es/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/fi/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/fi/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index f51a68e..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/fi/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/fr/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/fr/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index ef3ce9f..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/fr/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/he/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/he/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index fcfd8ff..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/he/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hi/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hi/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index e474ea6..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hi/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hr/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hr/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index db10a79..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hr/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hu/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hu/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 54403da..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/hu/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/id/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/id/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 8a61169..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/id/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/it/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/it/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 7887d1c..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/it/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ja/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ja/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index e801572..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ja/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ko/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ko/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 4eee578..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ko/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ms/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ms/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index c55cb9e..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ms/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/nb/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/nb/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index f264d8c..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/nb/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/nl/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/nl/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 7f12371..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/nl/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pl/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pl/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 8cfce90..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pl/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pt-BR/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pt-BR/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index b5e634e..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pt-BR/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pt/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pt/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 9a033ce..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/pt/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ro/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ro/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 79e25b1..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ro/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ru/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ru/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 23a9750..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/ru/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/sk/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/sk/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 1672005..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/sk/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/sv/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/sv/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 236b7db..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/sv/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/th/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/th/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index eb62579..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/th/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/tr/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/tr/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index c6208cf..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/tr/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/uk/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/uk/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 15c8016..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/uk/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/vi/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/vi/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 95dbd86..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/vi/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-HK/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-HK/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 0cb5973..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-HK/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-Hans/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-Hans/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index d93068e..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-Hans/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-Hant/Xamarin.Forms.Platform.iOS.resources.dll b/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-Hant/Xamarin.Forms.Platform.iOS.resources.dll deleted file mode 100644 index 3af265f..0000000 Binary files a/Mear/Mear.iOS/bin/iPhoneSimulator/Debug/zh-Hant/Xamarin.Forms.Platform.iOS.resources.dll and /dev/null differ diff --git a/Mear/Mear/App.xaml.cs b/Mear/Mear/App.xaml.cs index bcdf8dd..0d6b858 100644 --- a/Mear/Mear/App.xaml.cs +++ b/Mear/Mear/App.xaml.cs @@ -12,7 +12,7 @@ namespace Mear { InitializeComponent(); - MainPage = new MusicLibrary(); + MainPage = new Landing(); } protected override void OnStart() diff --git a/Mear/Mear/Constants/API/API.cs b/Mear/Mear/Constants/API/API.cs new file mode 100644 index 0000000..b18eef2 --- /dev/null +++ b/Mear/Mear/Constants/API/API.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Mear.Constants.API +{ + public class API + { + #region Fields + private static string _apiUrl = @"https://www..com/"; + private string _apiVersion; + #endregion + + + #region Properties + public static string ApiUrl + { + get => _apiUrl; + } + #endregion + + + #region Constructors + #endregion + + + #region Methods + #endregion + } +} diff --git a/Mear/Mear/Managers/LoginManager.cs b/Mear/Mear/Managers/LoginManager.cs new file mode 100644 index 0000000..e2a01b6 --- /dev/null +++ b/Mear/Mear/Managers/LoginManager.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Newtonsoft.Json; +using RestSharp; + +using Mear.Constants.API; +using Mear.Models.Authentication; + +namespace Mear.Managers +{ + public class LoginManager + { + #region Fields + private User _user; + #endregion + + + #region Properties + #endregion + + + #region Constructors + public LoginManager(User user) + { + _user = user; + } + #endregion + + + #region Methods + public LoginResult Login() + { + try + { + var client = new RestClient(API.ApiUrl); + var request = new RestRequest(@"api/login", Method.POST); + var userJson = JsonConvert.SerializeObject(_user); + + request.AddParameter("application/json; charset=utf-8", userJson, ParameterType.RequestBody); + request.RequestFormat = DataFormat.Json; + + var response = client.Execute(request); + + var loginResult = JsonConvert.DeserializeObject(response.Content); + + return loginResult; + } + catch (Exception ex) + { + var msg = ex.Message; + } + + return null; + } + #endregion + } +} diff --git a/Mear/Mear/Managers/RegisterManager.cs b/Mear/Mear/Managers/RegisterManager.cs new file mode 100644 index 0000000..a7393d2 --- /dev/null +++ b/Mear/Mear/Managers/RegisterManager.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Newtonsoft.Json; +using RestSharp; + +using Mear.Constants.API; +using Mear.Models; +using Mear.Models.Authentication; + +namespace Mear.Managers +{ + public class RegisterManager + { + #region Fields + private User _user; + #endregion + + + #region Properties + #endregion + + + #region Constructors + public RegisterManager(User user) + { + _user = user; + } + #endregion + + + #region Methods + public RegisterResult RegisterUser() + { + try + { + var client = new RestClient(API.ApiUrl); + var request = new RestRequest(@"api/register", Method.POST); + var userJson = JsonConvert.SerializeObject(_user); + request.AddParameter("application/json; charset=utf-8", userJson, ParameterType.RequestBody); + request.RequestFormat = DataFormat.Json; + + var response = client.Execute(request); + + var registerResult = JsonConvert.DeserializeObject(response.Content); + + return registerResult; + } + catch (Exception ex) + { + var msg = ex.Message; + } + + return null; + } + #endregion + } +} diff --git a/Mear/Mear/Mear.csproj b/Mear/Mear/Mear.csproj index 162bff7..f930dcb 100644 --- a/Mear/Mear/Mear.csproj +++ b/Mear/Mear/Mear.csproj @@ -13,6 +13,9 @@ + + + @@ -34,9 +37,18 @@ MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + MSBuild:UpdateDesignTimeXaml diff --git a/Mear/Mear/Models/Authentication/BaseResult.cs b/Mear/Mear/Models/Authentication/BaseResult.cs new file mode 100644 index 0000000..f6a842f --- /dev/null +++ b/Mear/Mear/Models/Authentication/BaseResult.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Newtonsoft.Json; + +namespace Mear.Models.Authentication +{ + public class BaseResult + { + [JsonProperty("message")] + public string Message { get; set; } + } +} diff --git a/Mear/Mear/Models/Authentication/LoginResult.cs b/Mear/Mear/Models/Authentication/LoginResult.cs new file mode 100644 index 0000000..bf658de --- /dev/null +++ b/Mear/Mear/Models/Authentication/LoginResult.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Newtonsoft.Json; + +namespace Mear.Models.Authentication +{ + public class LoginResult : BaseResult + { + [JsonProperty("id")] + public int UserId { get; set; } + [JsonProperty("username")] + public string Username { get; set; } + [JsonProperty("token")] + public string Token { get; set; } + [JsonProperty("token_type")] + public string TokenType { get; set; } + [JsonProperty("expiration")] + public int Expiration { get; set; } + } +} diff --git a/Mear/Mear/Models/Authentication/RegisterResult.cs b/Mear/Mear/Models/Authentication/RegisterResult.cs new file mode 100644 index 0000000..bce9595 --- /dev/null +++ b/Mear/Mear/Models/Authentication/RegisterResult.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Newtonsoft.Json; + +namespace Mear.Models.Authentication +{ + public class RegisterResult : BaseResult + { + [JsonProperty("username")] + public string Username { get; set; } + [JsonProperty("successfully_registered")] + public bool SuccessfullyRegistered { get; set; } + } +} diff --git a/Mear/Mear/Models/Authentication/User.cs b/Mear/Mear/Models/Authentication/User.cs new file mode 100644 index 0000000..ffa3558 --- /dev/null +++ b/Mear/Mear/Models/Authentication/User.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Newtonsoft.Json; + +namespace Mear.Models.Authentication +{ + public class User + { + [JsonProperty("id")] + public int Id { get; set; } + [JsonProperty("username")] + public string Username { get; set; } + [JsonProperty("nickname")] + public string Nickname { get; set; } + [JsonProperty("password")] + public string Password { get; set; } + [JsonProperty("email")] + public string Email { get; set; } + [JsonProperty("phone_number")] + public string PhoneNumber { get; set; } + [JsonProperty("first_name")] + public string Firstname { get; set; } + [JsonProperty("last_name")] + public string Lastname { get; set; } + [JsonProperty("email_verified")] + public bool EmailVerified { get; set; } + [JsonProperty("date_created")] + public DateTime DateCreated { get; set; } + [JsonProperty("last_login")] + public DateTime? LastLogin { get; set; } + } +} diff --git a/Mear/Mear/Repositories/Database/DBTokenRepository.cs b/Mear/Mear/Repositories/Database/DBTokenRepository.cs new file mode 100644 index 0000000..e8973ff --- /dev/null +++ b/Mear/Mear/Repositories/Database/DBTokenRepository.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Mear.Repositories.Database +{ + public class DBTokenRepository + { + } +} diff --git a/Mear/Mear/Repositories/Mock/MockUserRepository.cs b/Mear/Mear/Repositories/Mock/MockUserRepository.cs new file mode 100644 index 0000000..90a63ff --- /dev/null +++ b/Mear/Mear/Repositories/Mock/MockUserRepository.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Mear.Models.Authentication; + +namespace Mear.Repositories.Mock +{ + public class MockUserRepository + { + #region Fields + private List _users; + #endregion + + + #region Methods + public List Users + { + get => _users; + } + #endregion + + + #region Constructors + public MockUserRepository() + { + InitializeMockUser(); + } + #endregion + + + #region Methods + private void InitializeMockUser() + { + _users = new List(); + + var firstname = ""; + var lastname = ""; + var email = ""; + var phone = ""; + var username = ""; + var password = ""; + + _users.Add(new User + { + Firstname = firstname, + Lastname = lastname, + Email = email, + PhoneNumber = phone, + Username = username, + Password = password + }); + } + #endregion + } +} diff --git a/Mear/Mear/Views/Landing.xaml b/Mear/Mear/Views/Landing.xaml new file mode 100644 index 0000000..3861cc2 --- /dev/null +++ b/Mear/Mear/Views/Landing.xaml @@ -0,0 +1,22 @@ + + + + +