diff --git a/docs/android/push_help/fcmkeylocation.png b/docs/android/push_help/fcmkeylocation.png index a75fb7c..aeae249 100644 Binary files a/docs/android/push_help/fcmkeylocation.png and b/docs/android/push_help/fcmkeylocation.png differ diff --git a/docs/android/push_help/google_services_json.png b/docs/android/push_help/google_services_json.png index 4e184fb..8dcaa5a 100644 Binary files a/docs/android/push_help/google_services_json.png and b/docs/android/push_help/google_services_json.png differ diff --git a/sample/NearForms/NearForms.csproj b/sample/NearForms/NearForms.csproj index f9e7825..74391e5 100644 --- a/sample/NearForms/NearForms.csproj +++ b/sample/NearForms/NearForms.csproj @@ -48,7 +48,7 @@ ..\packages\Xamarin.Forms.2.4.0.38779\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.NearIT.PCL.2.3.0\lib\NearITSDK\XamarinBridge.PCL.dll + ..\packages\Xamarin.NearIT.PCL.2.3.1\lib\NearITSDK\XamarinBridge.PCL.dll diff --git a/sample/NearForms/packages.config b/sample/NearForms/packages.config index 8b5a9fa..cd15822 100644 --- a/sample/NearForms/packages.config +++ b/sample/NearForms/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/sample/iOS/AppDelegate.cs b/sample/iOS/AppDelegate.cs index 89a1219..a448562 100644 --- 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 index f0ce3f4..089d86e 100644 --- a/sample/iOS/Info.plist +++ b/sample/iOS/Info.plist @@ -43,10 +43,10 @@ XSAppIconAssets Assets.xcassets/AppIcon.appiconset NSLocationAlwaysUsageDescription - New Entry + NearIT NSLocationWhenInUseUsageDescription - New Entry + NearIT NSLocationAlwaysAndWhenInUseUsageDescription - + NearIT diff --git a/sample/iOS/NearForms.iOS.csproj b/sample/iOS/NearForms.iOS.csproj index 9a6e713..96c49ee 100644 --- a/sample/iOS/NearForms.iOS.csproj +++ b/sample/iOS/NearForms.iOS.csproj @@ -1,6 +1,6 @@ - + Debug iPhoneSimulator @@ -84,25 +84,25 @@ - ..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\packages\Xamarin.Forms.2.5.0.75255-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.NearIT.iOS.2.4.0\lib\NearITSDK\NearBridge.dll + ..\packages\Xamarin.NearIT.iOS.2.4.2\lib\NearITSDK\NearBridge.dll - ..\packages\Xamarin.NearIT.iOS.2.4.0\lib\NearITSDK\NeariOSBind.dll + ..\packages\Xamarin.NearIT.iOS.2.4.2\lib\NearITSDK\NeariOSBind.dll - ..\packages\Xamarin.NearIT.iOS.2.4.0\lib\NearITSDK\XamarinBridge.PCL.dll + ..\packages\Xamarin.NearIT.iOS.2.4.2\lib\NearITSDK\XamarinBridge.PCL.dll @@ -134,5 +134,5 @@ - + \ No newline at end of file diff --git a/sample/iOS/packages.config b/sample/iOS/packages.config index f8baa04..abdc12c 100644 --- a/sample/iOS/packages.config +++ b/sample/iOS/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file