Improve logic

Author: kirklandsign

dl3/android/DeepLabV3Demo/app/src/main/java/org/pytorch/executorchexamples/dl3/MainActivity.java

@@ -63,13 +63,11 @@ public class MainActivity extends Activity implements Runnable {
   private static final String MODEL_FILENAME = "dl3_xnnpack_fp32.pte";
   private String mModelPath; // Will be set in onCreate using getFilesDir()
 
-  private final ArrayList<String> mImageFiles = new ArrayList<>();
+  // Sample images from assets
+  private static final String[] SAMPLE_IMAGES = {"corgi.jpeg", "deeplab.jpg", "dog.jpg"};
+  private int mCurrentSampleIndex = 0;
 
-  private int mCurrentImageIndex = 0;
-
-  private static final int REQUEST_READ_EXTERNAL_STORAGE = 1001;
   private static final int REQUEST_PICK_IMAGE = 1002;
-  private static final String LOCAL_IMAGE_DIR = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + "/";
 
   // see http://host.robots.ox.ac.uk:8080/pascal/VOC/voc2007/segexamples/index.html for the list of
   // classes with indexes
@@ -177,75 +175,22 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
   }
 
-  private void loadImagesFromLocal() {
-    // Load images from /data/local & /sdcard/Pictures
-    boolean hasAnyLocalFiles = populateImagePathFromLocal();
-    boolean isImageShown = showImage();
-    if (hasAnyLocalFiles && isImageShown) {
-      showUIMessage(this, "Refreshed images from external storage and/or Assets folder");
-    }
-  }
-
-  private boolean showImage() {
-    boolean isImageShown = false;
-    if (mImagename == null) {
-      showUIMessage(this, "No image to display");
-      mImageView.setImageBitmap(null);
-      return isImageShown;
-    }
+  private void loadSampleImage() {
     try {
-      if (mImagename.startsWith("/")) {
-        mBitmap = BitmapFactory.decodeFile(mImagename);
-      } else {
-        mBitmap = BitmapFactory.decodeStream(getAssets().open(mImagename));
-      }
+      String imageName = SAMPLE_IMAGES[mCurrentSampleIndex];
+      mBitmap = BitmapFactory.decodeStream(getAssets().open(imageName));
       if (mBitmap != null) {
         mBitmap = Bitmap.createScaledBitmap(mBitmap, 224, 224, true);
         mImageView.setImageBitmap(mBitmap);
-        isImageShown = true;
       }
     } catch (IOException e) {
-      Log.e("ImageSegmentation", "Error reading image", e);
-      mImageView.setImageBitmap(null);
+      Log.e("MainActivity", "Error loading sample image", e);
     }
-    return isImageShown;
   }
 
-  private boolean populateImagePathFromLocal() {
-    boolean hasLocalFiles = false;
-    File dir = new File(LOCAL_IMAGE_DIR);
-    File[] files = dir.listFiles((d, name) ->
-            name.endsWith(".jpg") || name.endsWith(".jpeg") || name.endsWith(".png"));
-    ArrayList<String> imageList = new ArrayList<>();
-    if (files != null && files.length > 0) {
-      for (int i = 0; i < files.length; i++) {
-        mImageFiles.add(files[i].getAbsolutePath());
-        hasLocalFiles = true;
-      }
-      mImagename = mImageFiles.get(0);
-    } else {
-      mImagename = null;
-    }
-
-    return hasLocalFiles;
-  }
-
-  private void populateImagePathFromAssets() {
-    try {
-      String[] allFiles = getAssets().list("");
-      if (allFiles != null && allFiles.length > 0) {
-        for (String file : allFiles) {
-          if (file.endsWith(".jpg") || file.endsWith(".jpeg") || file.endsWith(".png")) {
-            mImageFiles.add(file);
-          }
-        }
-        mCurrentImageIndex = 0;
-        mImagename = !mImageFiles.isEmpty() ? mImageFiles.get(0) : null;
-      }
-    } catch (IOException e) {
-      Log.e("ImageSegmentation", "Error listing assets", e);
-      finish();
-    }
+  private void nextSampleImage() {
+    mCurrentSampleIndex = (mCurrentSampleIndex + 1) % SAMPLE_IMAGES.length;
+    loadSampleImage();
   }
 
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -261,7 +206,7 @@ protected void onCreate(Bundle savedInstanceState) {
       finish();
     }
 
-    // Initialize all views first!
+    // Initialize all views
     mImageView = findViewById(R.id.imageView);
     mButtonXnnpack = findViewById(R.id.xnnpackButton);
     mDownloadModelButton = findViewById(R.id.downloadModelButton);
@@ -272,57 +217,39 @@ protected void onCreate(Bundle savedInstanceState) {
     // Set model path to app's private storage
     mModelPath = getFilesDir().getAbsolutePath() + "/" + MODEL_FILENAME;
 
-    populateImagePathFromAssets();
-    showImage();
+    // Load first sample image
+    loadSampleImage();
 
     // Check if model exists and load it, otherwise show download button
     loadModelOrShowDownloadButton();
-    mImageView.setImageBitmap(mBitmap);
 
     // Download button click handler
     mDownloadModelButton.setOnClickListener(v -> downloadModel());
 
+    // Next sample image button
     final Button buttonNext = findViewById(R.id.nextButton);
-    buttonNext.setOnClickListener(
-        new View.OnClickListener() {
-          public void onClick(View v) {
-            if (mImageFiles == null || mImageFiles.isEmpty()) {
-              // No images available
-              return;
-            }
-            // Move to the next image, wrap around if at the end
-            mCurrentImageIndex = (mCurrentImageIndex + 1) % mImageFiles.size();
-            mImagename = mImageFiles.get(mCurrentImageIndex);
-            showImage();
-          }
-        });
+    buttonNext.setOnClickListener(v -> nextSampleImage());
 
-    mButtonXnnpack.setOnClickListener(
-        new View.OnClickListener() {
-          public void onClick(View v) {
-            mButtonXnnpack.setEnabled(false);
-            mProgressBar.setVisibility(ProgressBar.VISIBLE);
-            mInferenceTimeText.setVisibility(View.INVISIBLE);
-            mButtonXnnpack.setText(getString(R.string.run_model));
-
-            Thread thread = new Thread(MainActivity.this);
-            thread.start();
-          }
-        });
+    // Run segmentation button
+    mButtonXnnpack.setOnClickListener(v -> {
+      mButtonXnnpack.setEnabled(false);
+      mProgressBar.setVisibility(ProgressBar.VISIBLE);
+      mInferenceTimeText.setVisibility(View.INVISIBLE);
+      mButtonXnnpack.setText(getString(R.string.run_model));
+      new Thread(MainActivity.this).start();
+    });
 
+    // Reset to current sample image
     final Button resetImage = findViewById(R.id.resetImage);
-    resetImage.setOnClickListener(
-            v -> showImage());
+    resetImage.setOnClickListener(v -> loadSampleImage());
 
-    // Pick Image Button - opens gallery
+    // Pick Image from gallery
     final Button pickImageButton = findViewById(R.id.loadAndRefreshButton);
-    pickImageButton.setOnClickListener(
-        v -> {
-          Intent intent = new Intent(Intent.ACTION_PICK);
-          intent.setType("image/*");
-          startActivityForResult(intent, REQUEST_PICK_IMAGE);
-        }
-    );
+    pickImageButton.setOnClickListener(v -> {
+      Intent intent = new Intent(Intent.ACTION_PICK);
+      intent.setType("image/*");
+      startActivityForResult(intent, REQUEST_PICK_IMAGE);
+    });
   }
 
   @Override