refactor(capture-sdk): Replace NoResultsActivity with NoResultsFragment

- move the logic from NoResultsActivity into NoResultsFragment - delete NoResultsActivity BSDK-258
gini · Jan 19, 2024 · e2fa698 · e2fa698
1 parent ff2cd70
commit e2fa698
Show file tree

Hide file tree

Showing 14 changed files with 151 additions and 301 deletions.
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/EnterManuallyButtonListener.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/EnterManuallyButtonListener.java
@@ -1,10 +1,10 @@
 package net.gini.android.capture;
 
 import net.gini.android.capture.error.ErrorFragment;
-import net.gini.android.capture.noresults.NoResultsFragmentCompat;
+import net.gini.android.capture.noresults.NoResultsFragment;
 /**
  * <p>
- * Interface used by {@link NoResultsFragmentCompat} and {@link ErrorFragment} to dispatch events to the hosting Activity.
+ * Interface used by {@link NoResultsFragment} and {@link ErrorFragment} to dispatch events to the hosting Activity.
  * </p>
  */
 public interface EnterManuallyButtonListener {

diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCaptureFragment.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/GiniCaptureFragment.kt
@@ -12,6 +12,7 @@ import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import net.gini.android.capture.analysis.AnalysisActivity
 import net.gini.android.capture.analysis.AnalysisFragmentCompat
+import net.gini.android.capture.analysis.AnalysisFragmentCompatDirections
 import net.gini.android.capture.analysis.AnalysisFragmentListener
 import net.gini.android.capture.camera.CameraFragment
 import net.gini.android.capture.camera.CameraFragmentDirections
@@ -24,6 +25,7 @@ import net.gini.android.capture.internal.util.FeatureConfiguration.shouldShowOnb
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction
 import net.gini.android.capture.network.model.GiniCaptureReturnReason
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction
+import net.gini.android.capture.noresults.NoResultsFragment
 import net.gini.android.capture.review.multipage.MultiPageReviewFragment
 import net.gini.android.capture.review.multipage.MultiPageReviewFragmentDirections
 import net.gini.android.capture.review.multipage.MultiPageReviewFragmentListener
@@ -203,8 +205,10 @@ class GiniCaptureFragment(private val analysisIntent: Intent? = null) :
     }
 
     override fun onProceedToNoExtractionsScreen(document: Document) {
-        // TODO: launch the no results fragment for the document
-        // TODO("Not yet implemented")
+        NoResultsFragment.navigateToNoResultsFragment(
+            navController,
+            AnalysisFragmentCompatDirections.toNoResultsFragment(document)
+        )
     }
 
     override fun onDefaultPDFAppAlertDialogCancelled() {
@@ -260,12 +264,20 @@ class CaptureFragmentFactory(
                     analysisFragmentListener
                 )
             }
+
             ErrorFragment::class.java.name -> return ErrorFragment().apply {
                 setListener(
                     enterManuallyButtonListener
                 )
             }
 
+            NoResultsFragment::class.java.name -> return NoResultsFragment()
+                .apply {
+                    setListener(
+                        enterManuallyButtonListener
+                    )
+                }
+
             else -> return super.instantiate(classLoader, className)
         }
     }

diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisActivity.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisActivity.java
@@ -18,7 +18,6 @@
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction;
 import net.gini.android.capture.network.model.GiniCaptureReturnReason;
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction;
-import net.gini.android.capture.noresults.NoResultsActivity;
 import net.gini.android.capture.tracking.AnalysisScreenEvent;
 
 import java.util.ArrayList;
@@ -29,7 +28,6 @@
 import static net.gini.android.capture.camera.CameraActivity.RESULT_ENTER_MANUALLY;
 import static net.gini.android.capture.internal.util.ActivityHelper.enableHomeAsUp;
 import static net.gini.android.capture.internal.util.ActivityHelper.interceptOnBackPressed;
-import static net.gini.android.capture.noresults.NoResultsActivity.NO_RESULT_CANCEL_KEY;
 import static net.gini.android.capture.tracking.EventTrackingHelper.trackAnalysisScreenEvent;
 
 /**
@@ -226,24 +224,7 @@ public void onExtractionsAvailable(
 
     @Override
     public void onProceedToNoExtractionsScreen(@NonNull final Document document) {
-        if (shouldShowGiniCaptureNoResultsScreen(mDocument)) {
-            final Intent noResultsActivity = new Intent(this, NoResultsActivity.class);
-            noResultsActivity.putExtra(NoResultsActivity.EXTRA_IN_DOCUMENT, mDocument);
-            noResultsActivity.setExtrasClassLoader(AnalysisActivity.class.getClassLoader());
-            startActivityForResult(noResultsActivity, NO_RESULT_REQUEST);
-            setResult(RESULT_NO_EXTRACTIONS);
-            if (GiniCapture.hasInstance()) {
-                GiniCapture.getInstance().internal().getImageMultiPageDocumentMemoryStore().clear();
-            }
-        } else {
-            final Intent result = new Intent();
-            setResult(RESULT_OK, result);
-            finish();
-        }
-    }
 
-    public static boolean shouldShowGiniCaptureNoResultsScreen(final Document document) {
-        return document.getType() != Document.Type.QRCode && document.getType() != Document.Type.QR_CODE_MULTI_PAGE;
     }
 
     @Override
@@ -254,7 +235,7 @@ public void onDefaultPDFAppAlertDialogCancelled() {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         if ((requestCode == NO_RESULT_REQUEST) &&
-                ((resultCode == RESULT_CANCELED && data != null && data.hasExtra(NO_RESULT_CANCEL_KEY)) || resultCode == RESULT_ENTER_MANUALLY || resultCode == RESULT_CAMERA_SCREEN)) {
+                ((resultCode == RESULT_CANCELED && data != null) || resultCode == RESULT_ENTER_MANUALLY || resultCode == RESULT_CAMERA_SCREEN)) {
             if (resultCode == RESULT_CAMERA_SCREEN) {
                 if (GiniCapture.hasInstance()) {
                     GiniCapture.getInstance().internal().getImageMultiPageDocumentMemoryStore().clear();

diff --git a/...ure-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisFragmentListener.java b/...ure-sdk/sdk/src/main/java/net/gini/android/capture/analysis/AnalysisFragmentListener.java
@@ -7,7 +7,7 @@
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction;
 import net.gini.android.capture.network.model.GiniCaptureReturnReason;
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction;
-import net.gini.android.capture.noresults.NoResultsFragmentCompat;
+import net.gini.android.capture.noresults.NoResultsFragment;
 
 import java.util.List;
 import java.util.Map;
@@ -38,7 +38,7 @@ void onExtractionsAvailable(
     /**
      * Called when the document has been analyzed and no extractions were received.
      * <p>
-     * You should show the {@link NoResultsFragmentCompat}.
+     * You should show the {@link NoResultsFragment}.
      *
      * @param document contains the reviewed document
      */

diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/CameraActivity.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/CameraActivity.java
@@ -23,18 +23,14 @@
 import net.gini.android.capture.network.model.GiniCaptureCompoundExtraction;
 import net.gini.android.capture.network.model.GiniCaptureReturnReason;
 import net.gini.android.capture.network.model.GiniCaptureSpecificExtraction;
-import net.gini.android.capture.noresults.NoResultsActivity;
 import net.gini.android.capture.review.multipage.MultiPageReviewActivity;
-import net.gini.android.capture.tracking.AnalysisScreenEvent;
 import net.gini.android.capture.tracking.CameraScreenEvent;
 
 import java.util.Map;
 
-import static net.gini.android.capture.analysis.AnalysisActivity.RESULT_NO_EXTRACTIONS;
 import static net.gini.android.capture.internal.util.ActivityHelper.interceptOnBackPressed;
 import static net.gini.android.capture.review.multipage.MultiPageReviewActivity.RESULT_SCROLL_TO_LAST_PAGE;
 import static net.gini.android.capture.review.multipage.MultiPageReviewActivity.SHOULD_SCROLL_TO_LAST_PAGE;
-import static net.gini.android.capture.tracking.EventTrackingHelper.trackAnalysisScreenEvent;
 import static net.gini.android.capture.tracking.EventTrackingHelper.trackCameraScreenEvent;
 
 /**
@@ -300,15 +296,6 @@ public void onExtractionsAvailable(
 
     @Override
     public void noExtractionsFromQRCode(QRCodeDocument qrCodeDocument) {
-        trackAnalysisScreenEvent(AnalysisScreenEvent.NO_RESULTS);
-        final Intent noResultsActivity = new Intent(this, NoResultsActivity.class);
-        noResultsActivity.putExtra(NoResultsActivity.EXTRA_IN_DOCUMENT, qrCodeDocument);
-        noResultsActivity.setExtrasClassLoader(CameraActivity.class.getClassLoader());
-        startActivityForResult(noResultsActivity, NO_RESULT_REQUEST);
-        setResult(RESULT_NO_EXTRACTIONS);
-        if (GiniCapture.hasInstance()) {
-            GiniCapture.getInstance().internal().getImageMultiPageDocumentMemoryStore().clear();
-        }
     }
 
     @Override

diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragment.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragment.kt
@@ -33,8 +33,7 @@ import net.gini.android.capture.internal.util.AlertDialogHelperCompat
  * Your Activity is automatically set as the listener in {@link ErrorFragmentCompat#onCreate(Bundle)}.
  * </p>
  */
-class ErrorFragment : Fragment(), FragmentImplCallback,
-    EnterManuallyButtonListener {
+class ErrorFragment : Fragment(), FragmentImplCallback {
 
     private lateinit var fragmentImpl: ErrorFragmentImpl
     private lateinit var listener: EnterManuallyButtonListener
@@ -118,9 +117,4 @@ class ErrorFragment : Fragment(), FragmentImplCallback,
     }
 
 
-    override fun onEnterManuallyPressed() {
-
-    }
-
-
 }
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragmentImpl.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/error/ErrorFragmentImpl.kt
@@ -48,6 +48,7 @@ class ErrorFragmentImpl(
         if (shouldAllowRetakeImages()) {
             retakeImagesButton.setIntervalClickListener {
                 EventTrackingHelper.trackAnalysisScreenEvent(AnalysisScreenEvent.RETRY)
+                fragment.findNavController().navigate(ErrorFragmentDirections.toCameraFragment())
             }
         } else {
             retakeImagesButton.visibility = View.GONE
@@ -60,9 +61,6 @@ class ErrorFragmentImpl(
             view.findViewById<TextView>(R.id.gc_error_header).text = it
         }
 
-        view.findViewById<Button>(R.id.gc_button_error_retake_images).setOnClickListener {
-            fragment.findNavController().navigate(ErrorFragmentDirections.toCameraFragment())
-        }
 
         errorType?.let {
             view.findViewById<TextView>(R.id.gc_error_header).text =

diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/noresults/NoResultsActivity.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/noresults/NoResultsActivity.java