Merge latest

jamesmontemagno · Aug 16, 2018 · ba91ba8 · ba91ba8
2 parents 087fb53 + 2d151e4
commit ba91ba8
Show file tree

Hide file tree

Showing 43 changed files with 3,194 additions and 28,346 deletions.
diff --git a/MyWeather.Droid/Helpers/Settings.cs b/MyWeather.Droid/Helpers/Settings.cs
diff --git a/MyWeather.Droid/MainActivity.cs b/MyWeather.Droid/MainActivity.cs
@@ -5,6 +5,7 @@
 using Xamarin.Forms.Platform.Android;
 using Plugin.Permissions;
 using Android.Content.PM;
+using Plugin.CurrentActivity;
 
 namespace MyWeather.Droid
 {
@@ -17,13 +18,13 @@ public class MainActivity : FormsAppCompatActivity
 
 		protected override void OnCreate (Bundle bundle)
 		{
-
 		    ToolbarResource = Resource.Layout.Toolbar;
 		    TabLayoutResource = Resource.Layout.Tabbar;
 
 		    base.OnCreate (bundle);
-
-		    Forms.Init(this, bundle);
+            Xamarin.Essentials.Platform.Init(this, bundle);
+            CrossCurrentActivity.Current.Init(this, bundle);
+            Forms.Init(this, bundle);
 
 		    LoadApplication(new App());
 
@@ -32,6 +33,8 @@ protected override void OnCreate (Bundle bundle)
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
         {
             PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+            Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
         }
     }
 }

diff --git a/MyWeather.Droid/MainApplication.cs b/MyWeather.Droid/MainApplication.cs
diff --git a/MyWeather.Droid/MyWeather.Android.csproj b/MyWeather.Droid/MyWeather.Android.csproj
diff --git a/MyWeather.Droid/Properties/AndroidManifest.xml b/MyWeather.Droid/Properties/AndroidManifest.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.refractored.myweather" 
-          android:installLocation="auto" 
-          android:versionCode="1"
-          android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.refractored.myweather" android:installLocation="auto" android:versionCode="1" android:versionName="1.0">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<application android:label="@string/app_name"
-               tools:replace="android:icon" 
-               android:icon="@mipmap/ic_launcher"
-               android:theme="@style/Theme.MyTheme">
-
-  </application>
+	<application android:label="@string/app_name" tools:replace="android:icon" android:icon="@mipmap/ic_launcher" android:theme="@style/Theme.MyTheme"></application>
 </manifest>
diff --git a/MyWeather.Droid/Properties/AssemblyInfo.cs b/MyWeather.Droid/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using Android.App;
+using System.Reflection;
 using Xamarin.Forms.Xaml;
 
 // Information about this assembly is defined by the following attributes.
@@ -24,3 +25,9 @@
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
 
+
+[assembly: UsesPermission(Android.Manifest.Permission.AccessCoarseLocation)]
+[assembly: UsesPermission(Android.Manifest.Permission.AccessFineLocation)]
+[assembly: UsesFeature("android.hardware.location", Required = false)]
+[assembly: UsesFeature("android.hardware.location.gps", Required = false)]
+[assembly: UsesFeature("android.hardware.location.network", Required = false)]