diff --git a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
index 3c369dcc62a2dcf2bf2a3877c014e4af83af0fcf..613e47a1decc9a9dc3ebdba7ab12d66da48f27ef 100644
--- a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
+++ b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ namespace azure_m.Droid
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.3.31")]
public partial class Resource
{
diff --git a/azure_m/azure_m/azure_m.Android/Resources/drawable/failure.png b/azure_m/azure_m/azure_m.Android/Resources/drawable/failure.png
index 8dbf69eb1d6dea11ccf0091cbd09df3efac4db93..824534a87d132b4eed846cf7f91e554c3e7ab0b3 100644
Binary files a/azure_m/azure_m/azure_m.Android/Resources/drawable/failure.png and b/azure_m/azure_m/azure_m.Android/Resources/drawable/failure.png differ
diff --git a/azure_m/azure_m/azure_m.Android/Resources/drawable/success.png b/azure_m/azure_m/azure_m.Android/Resources/drawable/success.png
index 824534a87d132b4eed846cf7f91e554c3e7ab0b3..8dbf69eb1d6dea11ccf0091cbd09df3efac4db93 100644
Binary files a/azure_m/azure_m/azure_m.Android/Resources/drawable/success.png and b/azure_m/azure_m/azure_m.Android/Resources/drawable/success.png differ
diff --git a/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj b/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj
index 2a9d12e8082ca50ee27c703a716cabaa7f7a4588..cc4abf658e1f4e9097181147bb5c0d438343b763 100644
--- a/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj
+++ b/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj
@@ -64,7 +64,6 @@
-
@@ -342,10 +341,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/azure_m/azure_m/azure_m/Views/ActivitylogPage.xaml b/azure_m/azure_m/azure_m/Views/ActivitylogPage.xaml
index 4d4ce9f611743272e704ec98afdc4601ebb4ba44..c014b9f89a2d82683b6e2dee38c5718c6486c70b 100644
--- a/azure_m/azure_m/azure_m/Views/ActivitylogPage.xaml
+++ b/azure_m/azure_m/azure_m/Views/ActivitylogPage.xaml
@@ -6,12 +6,20 @@
xmlns:model="clr-namespace:azure_m.Models" x:DataType="local:ActivitylogViewModel">
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/azure_m/azure_m/azure_m/Views/LoginPage.xaml.cs b/azure_m/azure_m/azure_m/Views/LoginPage.xaml.cs
index 0c1315db20408601e48538d234c9895327cad8a3..3dd416480608e93db1014d97b4991db5e31b6eb8 100644
--- a/azure_m/azure_m/azure_m/Views/LoginPage.xaml.cs
+++ b/azure_m/azure_m/azure_m/Views/LoginPage.xaml.cs
@@ -26,7 +26,7 @@ namespace azure_m.Views
{
try
{
- await QueryInfo.getTokenAsync();
+ //await QueryInfo.getTokenAsync();
LoginComplete?.Invoke(this, EventArgs.Empty);
}
catch(Exception ex)
diff --git a/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs b/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
index 837f45f07fc22ad327a6d21b27ff343de00c63a7..c26429c33d87fed58afb571e2e65b713e64d4d15 100644
--- a/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
+++ b/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
@@ -151,12 +151,11 @@ namespace azure_m.Views
DisplayAlert("Alert", "SettingPage", "OK");
}
- public async void OnAlert_Clicked(object sender, EventArgs e)
+ public void OnAlert_Clicked(object sender, EventArgs e)
{
//this.Navigation.PushAsync(new AlertsPage());
DisplayAlert("Alert", "AlertPage", "OK");
- await Navigation.PushAsync(new ActivitylogPage());
}
public void OnAdd_Clicked(object sender, EventArgs e)