Refactor: Update Storage Access Framework sample and icons

-   Renamed `GetDocument` to `GetContentSample` for clarity.
-   Removed the `@Sample` annotation from `GetContentSample` as it is managed in `SampleDemo` now.
-   Added new icons in the `drawable` folder to replace `Material Icons`.
-   Updated `FileCard` to use `DrawableRes` instead of `ImageVector`.
-   Replaced the filter icon with a new one.
-   Updated `SampleDemo` to use the renamed `GetContentSample`.
-   Clean up deleted `StorageSampleActivity`.

Author: yrezgui

app/src/main/java/com/example/platform/app/SampleDemo.kt

@@ -63,6 +63,7 @@ import com.example.platform.shared.MinSdkBox
 import com.example.platform.storage.mediastore.MediaStoreQuerySample
 import com.example.platform.storage.mediastore.SelectedPhotosAccessSample
 import com.example.platform.storage.photopicker.PhotoPickerSample
+import com.example.platform.storage.storageaccessframework.GetContentSample
 import com.example.platform.ui.appwidgets.AppWidgets
 import com.example.platform.ui.constraintlayout.AdvancedArrangementFragment
 import com.example.platform.ui.constraintlayout.AdvancedChainsFragment
@@ -566,6 +567,14 @@ val SAMPLE_DEMOS by lazy {
             apiSurface = StorageApiSurface,
             content = { MediaStoreQuerySample() },
         ),
+        ComposableSampleDemo(
+            id = "storageaccessframework-getcontent",
+            name = "Storage Access Framework - GET_CONTENT",
+            description = "Open a document using the Storage Access Framework",
+            documentation = "https://developer.android.com/training/data-storage/shared/documents-files#open-file",
+            apiSurface = StorageApiSurface,
+            content = { GetContentSample() },
+        ),
         ComposableSampleDemo(
             id = "selected-photos-access",
             name = "Selected Photos Access",

samples/storage/src/main/java/com/example/platform/storage/StorageSampleActivity.kt

@@ -28,7 +28,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.FilterAlt
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -51,8 +50,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
+import com.example.platform.storage.R
 import com.example.platform.storage.storageaccessframework.shared.AudioFileCard
 import com.example.platform.storage.storageaccessframework.shared.BinaryFileCard
 import com.example.platform.storage.storageaccessframework.shared.FileRecord
@@ -61,16 +62,10 @@ import com.example.platform.storage.storageaccessframework.shared.ImageFileCard
 import com.example.platform.storage.storageaccessframework.shared.PdfFileCard
 import com.example.platform.storage.storageaccessframework.shared.TextFileCard
 import com.example.platform.storage.storageaccessframework.shared.VideoFileCard
-import com.google.android.catalog.framework.annotations.Sample
 import kotlinx.coroutines.launch
 
-@Sample(
-    name = "GetDocument",
-    description = "Open a document using the Storage Access Framework",
-    documentation = "https://developer.android.com/training/data-storage/shared/documents-files#open-file",
-)
 @Composable
-fun GetDocument() {
+fun GetContentSample() {
     val coroutineScope = rememberCoroutineScope()
     val context = LocalContext.current
     var selectedFilter by remember { mutableStateOf(FileType.Any) }
@@ -127,7 +122,7 @@ fun GetDocument() {
                         ) {
                             IconButton(onClick = { expanded = true }) {
                                 Icon(
-                                    Icons.Default.FilterAlt,
+                                    painter = painterResource(R.drawable.ic_filter_alt_24),
                                     contentDescription = "Localized description",
                                 )
                             }

samples/storage/src/main/java/com/example/platform/storage/storageaccessframework/GetDocument.kt renamed to samples/storage/src/main/java/com/example/platform/storage/storageaccessframework/GetContentSample.kt

@@ -19,6 +19,7 @@ package com.example.platform.storage.storageaccessframework.shared
 import android.content.Context
 import android.net.Uri
 import android.text.format.Formatter
+import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -28,13 +29,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
-import androidx.compose.material.icons.filled.AudioFile
-import androidx.compose.material.icons.filled.Description
-import androidx.compose.material.icons.filled.Image
-import androidx.compose.material.icons.filled.PictureAsPdf
-import androidx.compose.material.icons.filled.VideoFile
 import androidx.compose.material3.Button
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.Icon
@@ -49,13 +43,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
+import com.example.platform.storage.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.BufferedReader
@@ -64,7 +59,7 @@ import java.io.InputStreamReader
 @Composable
 fun FileCard(
     file: FileRecord,
-    icon: ImageVector,
+    @DrawableRes iconResourceId: Int,
     contentPreview: @Composable (() -> Unit)? = null,
 ) {
     val sizeLabel = Formatter.formatShortFileSize(LocalContext.current, file.size)
@@ -81,7 +76,7 @@ fun FileCard(
             verticalAlignment = Alignment.Top,
         ) {
             Icon(
-                imageVector = icon,
+                painter = painterResource(iconResourceId),
                 contentDescription = null,
                 modifier = Modifier.size(42.dp),
             )
@@ -106,7 +101,7 @@ fun FileCard(
 
 @Composable
 fun ImageFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = null) {
-    FileCard(file, Icons.Default.Image) {
+    FileCard(file, R.drawable.ic_image_24) {
         if (contentPreview != null) {
             Spacer(modifier = Modifier.height(16.dp))
             contentPreview()
@@ -132,7 +127,7 @@ fun ImageFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? =
 
 @Composable
 fun VideoFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = null) {
-    FileCard(file, Icons.Default.VideoFile) {
+    FileCard(file, R.drawable.ic_video_file_24) {
         if (contentPreview != null) {
             Spacer(modifier = Modifier.height(16.dp))
             contentPreview()
@@ -158,7 +153,7 @@ fun VideoFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? =
 
 @Composable
 fun AudioFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = null) {
-    FileCard(file, Icons.Default.AudioFile) {
+    FileCard(file, R.drawable.ic_audio_file_24) {
         if (contentPreview != null) {
             Spacer(modifier = Modifier.height(16.dp))
             contentPreview()
@@ -194,7 +189,7 @@ fun AudioFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? =
 
 @Composable
 fun TextFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = null) {
-    FileCard(file, Icons.Default.Description) {
+    FileCard(file, R.drawable.ic_description_24) {
         if (contentPreview != null) {
             Spacer(modifier = Modifier.height(16.dp))
             contentPreview()
@@ -230,7 +225,7 @@ fun TextFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = n
 
 @Composable
 fun PdfFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = null) {
-    FileCard(file, Icons.Default.PictureAsPdf) {
+    FileCard(file, R.drawable.ic_picture_as_pdf_24) {
         if (contentPreview != null) {
             Spacer(modifier = Modifier.height(16.dp))
             contentPreview()
@@ -266,7 +261,7 @@ fun PdfFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = nu
 
 @Composable
 fun BinaryFileCard(file: FileRecord, contentPreview: @Composable (() -> Unit)? = null) {
-    FileCard(file, Icons.AutoMirrored.Filled.InsertDriveFile) {
+    FileCard(file, R.drawable.ic_insert_drive_file_24) {
         if (contentPreview != null) {
             Spacer(modifier = Modifier.height(16.dp))
             contentPreview()

samples/storage/src/main/java/com/example/platform/storage/storageaccessframework/shared/FileCard.kt

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8L14,2zM16,13h-3v3.75c0,1.24 -1.01,2.25 -2.25,2.25S8.5,17.99 8.5,16.75c0,-1.24 1.01,-2.25 2.25,-2.25c0.46,0 0.89,0.14 1.25,0.38V11h4V13zM13,9V3.5L18.5,9H13z"/>
+    
+</vector>

samples/storage/src/main/res/drawable/ic_audio_file_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+    
+</vector>

samples/storage/src/main/res/drawable/ic_description_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
+    
+</vector>

samples/storage/src/main/res/drawable/ic_filter_alt_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+    
+</vector>

samples/storage/src/main/res/drawable/ic_image_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
+    
+</vector>

samples/storage/src/main/res/drawable/ic_insert_drive_file_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM11.5,9.5c0,0.83 -0.67,1.5 -1.5,1.5L9,11v2L7.5,13L7.5,7L10,7c0.83,0 1.5,0.67 1.5,1.5v1zM16.5,11.5c0,0.83 -0.67,1.5 -1.5,1.5h-2.5L12.5,7L15,7c0.83,0 1.5,0.67 1.5,1.5v3zM20.5,8.5L19,8.5v1h1.5L20.5,11L19,11v2h-1.5L17.5,7h3v1.5zM9,9.5h1v-1L9,8.5v1zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM14,11.5h1v-3h-1v3z"/>
+    
+</vector>

samples/storage/src/main/res/drawable/ic_picture_as_pdf_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M14,2H6.01c-1.1,0 -2,0.89 -2,2L4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V8L14,2zM13,9V3.5L18.5,9H13zM14,14l2,-1.06v4.12L14,16v1c0,0.55 -0.45,1 -1,1H9c-0.55,0 -1,-0.45 -1,-1v-4c0,-0.55 0.45,-1 1,-1h4c0.55,0 1,0.45 1,1V14z"/>
+    
+</vector>