Fixes

shinyorg · Dec 4, 2023 · 46a4b47 · 46a4b47
1 parent ba33a49
commit 46a4b47
Show file tree

Hide file tree

Showing 10 changed files with 431 additions and 304 deletions.
diff --git a/Sample/HealthTestViewModel.cs b/Sample/HealthTestViewModel.cs
@@ -54,7 +54,7 @@ IHealthService health
     [Reactive] public DateTimeOffset Start { get; set; }
     [Reactive] public DateTimeOffset End { get; set; }
 
-    [Reactive] public string ErrorText { get; private set; }
+    [Reactive] public string? ErrorText { get; private set; }
     [Reactive] public int Steps { get; private set; }
     [Reactive] public double Calories { get; private set; }
     [Reactive] public double Distance { get; private set; }

diff --git a/Sample/Platforms/Android/AndroidManifest.xml b/Sample/Platforms/Android/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config">
-	</application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.shiny.health" android:versionCode="1" android:versionName="1.0">
+	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true" android:label="Shiny Health"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
-</manifest>
+	<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+	<uses-sdk />
+</manifest>
diff --git a/Sample/Platforms/Android/Resources/xml/network_security_config.xml b/Sample/Platforms/Android/Resources/xml/network_security_config.xml
diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -46,6 +46,11 @@
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.1" />
 		<PackageReference Include="Shiny.Framework" Version="4.0.0-beta-0013" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+    </ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
+		<GoogleServicesJson Include="Platforms\Android\google-services.json" />
     </ItemGroup>
 
 	<ItemGroup>

diff --git a/Shiny.Health/IHealthService.cs b/Shiny.Health/IHealthService.cs
@@ -11,7 +11,13 @@ public interface IHealthService
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="cancelToken"></param>
+    /// <param name="permission"></param>
+    /// <returns></returns>
+    AccessState GetCurrentStatus(Permission permission);
+
+    /// <summary>
+    /// 
+    /// </summary>
     /// <param name="permissions"></param>
     /// <returns></returns>
     Task<bool> IsAuthorized(params Permission[] permissions);
@@ -20,7 +26,6 @@ public interface IHealthService
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="cancelToken"></param>
     /// <param name="permissions"></param>
     /// <returns></returns>
     Task<bool> RequestPermission(params Permission[] permissions);
@@ -48,5 +53,5 @@ Task<IEnumerable<HealthResult<T>>> Query<T>(
     /// <typeparam name="T"></typeparam>
     /// <param name="metric"></param>
     /// <returns></returns>
-    IObservable<T> Monitor<T>(HealthMetric<T> metric);
+    //IObservable<T> Monitor<T>(HealthMetric<T> metric);
 }