Add unstyled button for uploading a custom screenshot

Author: lfkellogg

firebase-appdistribution/firebase-appdistribution.gradle

@@ -71,9 +71,10 @@ dependencies {
 
     compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation "androidx.browser:browser:1.3.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation 'androidx.activity:activity:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     androidTestImplementation project(':integ-testing')
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java

@@ -27,6 +27,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.PickVisualMediaRequest;
+import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -100,19 +103,42 @@ private void setupView() {
     findViewById(R.id.backButton).setOnClickListener(v -> finish());
     findViewById(R.id.sendButton).setOnClickListener(this::submitFeedback);
 
+    // Registers a photo picker activity launcher in single-select mode
+    ActivityResultLauncher<PickVisualMediaRequest> pickMedia =
+        registerForActivityResult(
+            new PickVisualMedia(),
+            uri -> {
+              if (uri != null) {
+                LogWrapper.d(TAG, "Selected custom screenshot URI: " + uri);
+                screenshotUri = uri;
+                setupScreenshot();
+              } else {
+                LogWrapper.d(TAG, "No custom screenshot selected. Not changing screenshot URI.");
+              }
+            });
+
+    findViewById(R.id.chooseScreenshotButton)
+        .setOnClickListener(
+            v ->
+                pickMedia.launch(
+                    new PickVisualMediaRequest.Builder()
+                        .setMediaType(new PickVisualMedia.SingleMimeType("image/png"))
+                        .build()));
+
     setupScreenshot();
   }
 
   private void setupScreenshot() {
     blockingExecutor.execute(
         () -> {
-          // do I/O on separate thread in order to not block the UI
-          Bitmap screenshot = screenshotUri == null ? null : readScreenshot();
+          // Do I/O on separate thread in order to not block the UI
+          Bitmap screenshot = readScreenshot(screenshotUri);
           if (screenshot != null) {
             runOnUiThread(
                 () -> {
                   ImageView imageView = findViewById(R.id.screenshotImageView);
                   imageView.setImageBitmap(screenshot);
+                  imageView.setVisibility(VISIBLE);
                   CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
                   checkBox.setChecked(true);
                   checkBox.setOnClickListener(
@@ -132,21 +158,21 @@ private void setupScreenshot() {
   }
 
   @Nullable
-  private Bitmap readScreenshot() {
+  private Bitmap readScreenshot(@Nullable Uri uri) {
+    if (uri == null) {
+      return null;
+    }
     Bitmap bitmap;
     try {
       bitmap =
           ImageUtils.readScaledImage(
-              getContentResolver(),
-              screenshotUri,
-              SCREENSHOT_TARGET_WIDTH_PX,
-              SCREENSHOT_TARGET_HEIGHT_PX);
+              getContentResolver(), uri, SCREENSHOT_TARGET_WIDTH_PX, SCREENSHOT_TARGET_HEIGHT_PX);
     } catch (IOException | SecurityException e) {
-      LogWrapper.e(TAG, "Could not read screenshot image from URI: " + screenshotUri, e);
+      LogWrapper.e(TAG, "Could not read screenshot image from URI: " + uri, e);
       return null;
     }
     if (bitmap == null) {
-      LogWrapper.e(TAG, "Could not decode screenshot image: " + screenshotUri);
+      LogWrapper.e(TAG, "Could not decode screenshot image: " + uri);
     }
     return bitmap;
   }

firebase-appdistribution/src/main/res/layout/activity_feedback.xml

@@ -113,6 +113,12 @@
                     android:scaleType="centerInside"
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/screenshot_image_description" />
+
+                <Button
+                    android:id="@+id/chooseScreenshotButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Gallery" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

firebase-appdistribution/test-app/test-app.gradle

@@ -25,8 +25,8 @@ android {
         applicationId "com.googletest.firebase.appdistribution.testapp"
         minSdkVersion 23
         targetSdkVersion 33
-        versionName "3.1"
-        versionCode 6
+        versionName "3.2"
+        versionCode 7
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }