Merge pull request #3 from taublast/dev

Dev

Author: taublast

src/app/ShadersCamera.csproj

@@ -3,10 +3,10 @@
   <PropertyGroup>
 
     <!--<TargetFrameworks>net9.0-ios;</TargetFrameworks>-->
-    <TargetFrameworks>net9.0-android;</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0-android;</TargetFrameworks>-->
 
-    <!--<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>-->
+    <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
     <RootNamespace>ShadersCamera</RootNamespace>
@@ -101,8 +101,8 @@
   </ItemGroup>-->
 
   <ItemGroup>
-    <!--<PackageReference Include="DrawnUi.Maui.Camera" Version="1.9.1.1" />-->
-    <PackageReference Include="AppoMobi.Maui.FastPopups" Version="1.2.1" />
+    <PackageReference Include="DrawnUi.Maui.Camera" Version="1.9.4.1" />
+    <PackageReference Include="AppoMobi.Maui.FastPopups" Version="1.10.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" />
   </ItemGroup>
@@ -156,12 +156,6 @@
   </ItemGroup>
 
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\DrawnUi.Maui\src\Maui\Addons\DrawnUi.Maui.Camera\DrawnUi.Maui.Camera.csproj" />
-  </ItemGroup>
-
-
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

src/app/ViewModels/CameraViewModel.cs

@@ -248,7 +248,7 @@ public TimeSpan RecordingDuration
         if (TouchEffect.CheckLockAndSet())
             return;
 
-        if (Camera?.State == CameraState.On && !Camera.IsBusy)
+        if (Camera?.State == HardwareState.On && !Camera.IsBusy)
         {
             _ = Camera.TakePicture().ConfigureAwait(false);
         }
@@ -267,7 +267,7 @@ public TimeSpan RecordingDuration
         if (TouchEffect.CheckLockAndSet())
             return;
 
-        if (Camera?.State != CameraState.On || Camera.IsBusy)
+        if (Camera?.State != HardwareState.On || Camera.IsBusy)
             return;
 
         if (Mode == CaptureUIMode.Photo)
@@ -355,9 +355,9 @@ private void OnNewPreviewSet(object sender, LoadedImageSource source)
         // was used in detection mode
     }
 
-    private void OnCameraStateChanged(object sender, CameraState state)
+    private void OnCameraStateChanged(object sender, HardwareState state)
     {
-        if (state == CameraState.On)
+        if (state == HardwareState.On)
         {
             if (Camera?.Display != null)
             {

src/app/Views/MainPageCameraFluent.cs

@@ -95,9 +95,9 @@ void AttachCamera()
         /// </summary>
         private bool StartupSuccessChecked;
 
-        private void OnCameraStateChanged(object sender, CameraState state)
+        private void OnCameraStateChanged(object sender, HardwareState state)
         {
-            if (state == CameraState.On)
+            if (state == HardwareState.On)
             {
                 Debug.WriteLine($"[CameraApp] State in ON!");
 
@@ -238,7 +238,7 @@ private void TappedSwitchCamera()
 
         private void TappedTurnCamera()
         {
-            if (CameraControl.State == CameraState.On)
+            if (CameraControl.State == HardwareState.On)
             {
                 CameraControl.IsOn = false;
             }
@@ -251,7 +251,7 @@ private void TappedTurnCamera()
 
         private async void TappedTakePicture(object sender, SkiaGesturesParameters skiaGesturesParameters)
         {
-            if (CameraControl.State == CameraState.On && !CameraControl.IsBusy)
+            if (CameraControl.State == HardwareState.On && !CameraControl.IsBusy)
             {
                 CameraControl.FlashScreen(Color.Parse("#EEFFFFFF"));
                 await CameraControl.TakePicture().ConfigureAwait(false);