misc

samples/Plugin.Maui.Feature.Sample/MainPage.xaml.cs

@@ -4,7 +4,7 @@ namespace Plugin.Maui.Feature.Sample;
 
 public partial class MainPage : ContentPage
 {
-    readonly IOcrService _ocr;
+    private readonly IOcrService _ocr;
 
     public MainPage(IOcrService feature)
     {
@@ -20,6 +20,12 @@ protected override async void OnAppearing()
         await _ocr.InitAsync();
     }
 
+    private void ClearBtn_Clicked(object sender, EventArgs e)
+    {
+        ResultLbl.Text = string.Empty;
+        ClearBtn.IsEnabled = false;
+    }
+
     private async void OpenFromCameraBtn_Clicked(object sender, EventArgs e)
     {
         if (MediaPicker.Default.IsCaptureSupported)
@@ -72,10 +78,4 @@ private async void OpenFromFileBtn_Clicked(object sender, EventArgs e)
             ClearBtn.IsEnabled = true;
         }
     }
-
-    private void ClearBtn_Clicked(object sender, EventArgs e)
-    {
-        ResultLbl.Text = string.Empty;
-        ClearBtn.IsEnabled = false;
-    }
 }

samples/Plugin.Maui.Feature.Sample/MauiProgram.cs

@@ -1,4 +1,3 @@
-using Plugin.Shared.OCR;
 using Plugin.Maui.OCR;
 
 namespace Plugin.Maui.Feature.Sample;
@@ -14,7 +13,8 @@ public static MauiApp CreateMauiApp()
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                 fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-            }).UseOcr();
+            })
+            .UseOcr();
 
         builder.Services.AddTransient<MainPage>();
 

src/Plugin.Maui.OCR/OcrImplementation.android.cs

@@ -17,7 +17,7 @@ internal partial class OcrImplementation : IOcrService
     public static OcrResult ProcessOcrResult(Java.Lang.Object result)
     {
         var ocrResult = new OcrResult();
-        var textResult = (Xamarin.Google.MLKit.Vision.Text.Text)result;
+        var textResult = (Text)result;
 
         ocrResult.AllText = textResult.GetText();
         foreach (var block in textResult.TextBlocks)
@@ -46,7 +46,6 @@ public Task InitAsync(System.Threading.CancellationToken ct = default)
         // Initialization might not be required for ML Kit's on-device text recognition,
         // but you can perform any necessary setup here.
 
-
         return Task.CompletedTask;
     }
 
@@ -59,21 +58,21 @@ public async Task<OcrResult> RecognizeTextAsync(byte[] imageData, System.Threadi
         using var textScanner = TextRecognition.GetClient(TextRecognizerOptions.DefaultOptions);
 
         MlKitException? lastException = null;
-        var maxRetries = 5;
+        const int MaxRetries = 5;
 
-        for (var retry = 0; retry < maxRetries; retry++)
+        for (var retry = 0; retry < MaxRetries; retry++)
         {
             try
             {
-                // Try to perform the OCR operation
+                // Try to perform the OCR operation. We should be installing the model necessary when this app is installed, but just in case ..
                 return ProcessOcrResult(await ToAwaitableTask(textScanner.Process(inputImage).AddOnSuccessListener(new OnSuccessListener()).AddOnFailureListener(new OnFailureListener())));
             }
-            catch (MlKitException ex) when (ex.Message.Contains("Waiting for the text optional module to be downloaded"))
+            catch (MlKitException ex) when ((ex.Message ?? string.Empty).Contains("Waiting for the text optional module to be downloaded"))
             {
                 // If the specific exception is caught, log it and wait before retrying
                 lastException = ex;
-                Debug.WriteLine($"OCR model is not ready. Waiting before retrying... Attempt {retry + 1}/{maxRetries}");
-                await Task.Delay(5000);
+                Debug.WriteLine($"OCR model is not ready. Waiting before retrying... Attempt {retry + 1}/{MaxRetries}");
+                await Task.Delay(5000, ct);
             }
         }
 
@@ -86,7 +85,6 @@ public async Task<OcrResult> RecognizeTextAsync(byte[] imageData, System.Threadi
         {
             throw new InvalidOperationException("OCR operation failed without an exception.");
         }
-
     }
 
     private static Task<Java.Lang.Object> ToAwaitableTask(global::Android.Gms.Tasks.Task task)

src/Plugin.Maui.OCR/OcrImplementation.net.cs

@@ -2,6 +2,7 @@
 
 namespace Plugin.Maui.OCR;
 
+// This usually is a placeholder as .NET MAUI apps typically don't run on .NET generic targets unless through unit tests and such
 partial class OcrImplementation : IOcrService
 {
     /// <inheritdoc/>
@@ -10,9 +11,6 @@ public Task InitAsync(CancellationToken ct = default)
         throw new NotImplementedException();
     }
 
-    // TODO Implement your .NET specific code.
-    // This usually is a placeholder as .NET MAUI apps typically don't run on .NET generic targets unless through unit tests and such
-
     /// <inheritdoc/>
     public Task<OcrResult> RecognizeTextAsync(byte[] imageData, CancellationToken ct = default)
     {