Merge branch 'release/2.4.1'

nearit · Nov 21, 2017 · b9f499f · b9f499f
2 parents ed0aedb + 4c1b5a6
commit b9f499f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 34 deletions.
diff --git a/docs/android/push_help/fcmkeylocation.png b/docs/android/push_help/fcmkeylocation.png
diff --git a/docs/android/push_help/google_services_json.png b/docs/android/push_help/google_services_json.png
diff --git a/sample/NearForms/NearForms.csproj b/sample/NearForms/NearForms.csproj
@@ -48,7 +48,7 @@
       <HintPath>..\packages\Xamarin.Forms.2.4.0.38779\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="XamarinBridge.PCL">
-      <HintPath>..\packages\Xamarin.NearIT.PCL.2.3.0\lib\NearITSDK\XamarinBridge.PCL.dll</HintPath>
+      <HintPath>..\packages\Xamarin.NearIT.PCL.2.3.1\lib\NearITSDK\XamarinBridge.PCL.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/sample/NearForms/packages.config b/sample/NearForms/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Xamarin.Forms" version="2.4.0.38779" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.NearIT.PCL" version="2.3.0" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.NearIT.PCL" version="2.3.1" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
diff --git a/sample/iOS/AppDelegate.cs b/sample/iOS/AppDelegate.cs
@@ -20,9 +20,9 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
             LoadApplication(new App());
 
             NearBridgeiOS.SetApiKey();
-            /*var ApiKey = loadApiKey();
-            Console.WriteLine(ApiKey);
-            NITManager.SetupWithApiKey(ApiKey);*/
+
+            UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Alert, (approved, err) => {});
+            UNUserNotificationCenter.Current.Delegate = new UserNotificationDelegate();
 
             CLLocationManager LocationManager = new CLLocationManager();
             LocationManager.AuthorizationChanged += (s, e) =>
@@ -35,25 +35,10 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 
             LocationManager.RequestAlwaysAuthorization();
 
-            UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Alert, (approved, err) => { });
-            UNUserNotificationCenter.Current.Delegate = new UserNotificationDelegate();
 
             return base.FinishedLaunching(app, options);
         }
 
-        public string loadApiKey()
-        {
-            NSDictionary settings = NSDictionary.FromFile("Keys.plist");
-
-            if (settings != null)
-            {
-                var value = settings.ValueForKey(new NSString("apiKey"));
-                if (value != null) return value.ToString();
-            }
-
-            return "";
-        }
-
         public override void RegisteredForRemoteNotifications(UIApplication application, NSData deviceToken)
         {
             Console.WriteLine("RegisteredForRemoteNotifications");

diff --git a/sample/iOS/Info.plist b/sample/iOS/Info.plist
@@ -43,10 +43,10 @@
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>New Entry</string>
+	<string>NearIT</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>New Entry</string>
+	<string>NearIT</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string></string>
+	<string>NearIT</string>
 </dict>
 </plist>
diff --git a/sample/iOS/NearForms.iOS.csproj b/sample/iOS/NearForms.iOS.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Xamarin.Forms.2.5.0.75255-pre3\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.2.5.0.75255-pre3\build\netstandard1.0\Xamarin.Forms.props')" />
+  <Import Project="..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -84,25 +84,25 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.iOS">
-      <HintPath>..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="NearBridge">
-      <HintPath>..\packages\Xamarin.NearIT.iOS.2.4.0\lib\NearITSDK\NearBridge.dll</HintPath>
+      <HintPath>..\packages\Xamarin.NearIT.iOS.2.4.2\lib\NearITSDK\NearBridge.dll</HintPath>
     </Reference>
     <Reference Include="NeariOSBind">
-      <HintPath>..\packages\Xamarin.NearIT.iOS.2.4.0\lib\NearITSDK\NeariOSBind.dll</HintPath>
+      <HintPath>..\packages\Xamarin.NearIT.iOS.2.4.2\lib\NearITSDK\NeariOSBind.dll</HintPath>
     </Reference>
     <Reference Include="XamarinBridge.PCL">
-      <HintPath>..\packages\Xamarin.NearIT.iOS.2.4.0\lib\NearITSDK\XamarinBridge.PCL.dll</HintPath>
+      <HintPath>..\packages\Xamarin.NearIT.iOS.2.4.2\lib\NearITSDK\XamarinBridge.PCL.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -134,5 +134,5 @@
     <BundleResource Include="Keys.plist" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Forms.2.5.0.75255-pre3\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.5.0.75255-pre3\build\netstandard1.0\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" />
 </Project>
diff --git a/sample/iOS/packages.config b/sample/iOS/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Forms" version="2.5.0.75255-pre3" targetFramework="xamarinios10" />
-  <package id="Xamarin.NearIT.iOS" version="2.4.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="xamarinios10" />
+  <package id="Xamarin.NearIT.iOS" version="2.4.2" targetFramework="xamarinios10" />
 </packages>