Migrated Custom Image Selector to Jetpack Compose

app/build.gradle

@@ -47,15 +47,15 @@ dependencies {
 
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
-    implementation "com.google.android.material:material:1.9.0"
+    implementation "com.google.android.material:material:1.12.0"
     implementation 'com.karumi:dexter:5.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     // Jetpack Compose
-    def composeBom = platform('androidx.compose:compose-bom:2024.08.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.10.00')
 
-    implementation "androidx.activity:activity-compose:1.9.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
+    implementation "androidx.activity:activity-compose:1.9.3"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
     implementation (composeBom)
     implementation "androidx.compose.runtime:runtime"
     implementation "androidx.compose.ui:ui"
@@ -65,6 +65,13 @@ dependencies {
     implementation "androidx.compose.foundation:foundation-layout"
     implementation "androidx.compose.material3:material3"
     androidTestImplementation(composeBom)
+    // Adaptive Layout APIs
+    implementation "androidx.compose.material3.adaptive:adaptive:1.0.0"
+    implementation "androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0"
+    implementation "androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0"
+
+    implementation "io.coil-kt:coil-compose:2.6.0"
+    implementation "androidx.navigation:navigation-compose:2.8.3"
 
     implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:$ADAPTER_DELEGATES_VERSION"
     implementation "com.hannesdorfmann:adapterdelegates4-pagination:$ADAPTER_DELEGATES_VERSION"

app/src/main/AndroidManifest.xml

@@ -144,6 +144,7 @@
       android:label="@string/result" />
     <activity
       android:name=".customselector.ui.selector.CustomSelectorActivity"
+      android:windowSoftInputMode="adjustResize"
       android:configChanges="screenSize|keyboard|orientation"
       android:label="@string/title_activity_custom_selector"
       android:parentActivityName=".contributions.MainActivity" />

app/src/main/java/fr/free/nrw/commons/customselector/data/MediaReader.kt

@@ -0,0 +1,71 @@
+package fr.free.nrw.commons.customselector.data
+
+import android.content.ContentUris
+import android.content.Context
+import android.provider.MediaStore
+import android.text.format.DateFormat
+import fr.free.nrw.commons.customselector.domain.model.Image
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import java.util.Calendar
+import java.util.Date
+import javax.inject.Inject
+
+class MediaReader @Inject constructor(private val context: Context) {
+    fun getImages() = flow {
+        val projection = arrayOf(
+            MediaStore.Images.Media._ID,
+            MediaStore.Images.Media.DISPLAY_NAME,
+            MediaStore.Images.Media.DATA,
+            MediaStore.Images.Media.BUCKET_ID,
+            MediaStore.Images.Media.BUCKET_DISPLAY_NAME,
+            MediaStore.Images.Media.DATE_ADDED,
+            MediaStore.Images.Media.MIME_TYPE
+        )
+        val cursor = context.contentResolver.query(
+            MediaStore.Images.Media.EXTERNAL_CONTENT_URI, projection,
+            null, null, MediaStore.Images.Media.DATE_ADDED + " DESC"
+        )
+
+        cursor?.use {
+            val idColumn = cursor.getColumnIndex(MediaStore.Images.Media._ID)
+            val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
+            val dataColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATA)
+            val bucketIdColumn = cursor.getColumnIndex(MediaStore.Images.Media.BUCKET_ID)
+            val bucketNameColumn = cursor.getColumnIndex(MediaStore.Images.Media.BUCKET_DISPLAY_NAME)
+            val dateColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_ADDED)
+            val mimeTypeColumn = cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE)
+
+            while(cursor.moveToNext()) {
+                val id = cursor.getLong(idColumn)
+                val name = cursor.getString(nameColumn)
+                val path = cursor.getString(dataColumn)
+                val bucketId = cursor.getLong(bucketIdColumn)
+                val bucketName = cursor.getString(bucketNameColumn)
+                val date = cursor.getLong(dateColumn)
+                val mimeType = cursor.getString(mimeTypeColumn)
+
+                val validMimeTypes = arrayOf(
+                    "image/jpeg", "image/png", "image/svg+xml", "image/gif",
+                    "image/tiff", "image/webp", "image/x-xcf"
+                )
+                // Skip the media items with unsupported MIME types
+                if(mimeType.lowercase() !in validMimeTypes) continue
+
+                // URI to access the image
+                val uri = ContentUris.withAppendedId(
+                    MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id
+                )
+
+                val calendar = Calendar.getInstance()
+                calendar.timeInMillis = date * 1000L
+                val calendarDate: Date = calendar.time
+                val dateFormat = DateFormat.getMediumDateFormat(context)
+                val formattedDate = dateFormat.format(calendarDate)
+
+                emit(Image(id, name, uri, path, bucketId, bucketName, date = formattedDate))
+            }
+        }
+    }.flowOn(Dispatchers.IO)
+}

app/src/main/java/fr/free/nrw/commons/customselector/model/CallbackStatus.kt → app/src/main/java/fr/free/nrw/commons/customselector/domain/model/CallbackStatus.kt

@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.customselector.model
+package fr.free.nrw.commons.customselector.domain.model
 
 /**
  * sealed class Callback Status.

app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt → app/src/main/java/fr/free/nrw/commons/customselector/domain/model/Folder.kt

@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.customselector.model
+package fr.free.nrw.commons.customselector.domain.model
 
 /**
  * Custom selector data class Folder.

app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt → app/src/main/java/fr/free/nrw/commons/customselector/domain/model/Image.kt

@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.customselector.model
+package fr.free.nrw.commons.customselector.domain.model
 
 import android.net.Uri
 import android.os.Parcel

app/src/main/java/fr/free/nrw/commons/customselector/model/Result.kt → app/src/main/java/fr/free/nrw/commons/customselector/domain/model/Result.kt

@@ -1,4 +1,4 @@
-package fr.free.nrw.commons.customselector.model
+package fr.free.nrw.commons.customselector.domain.model
 
 /**
  * Custom selector data class Result.

app/src/main/java/fr/free/nrw/commons/customselector/helper/ImageHelper.kt

@@ -1,7 +1,7 @@
 package fr.free.nrw.commons.customselector.helper
 
-import fr.free.nrw.commons.customselector.model.Folder
-import fr.free.nrw.commons.customselector.model.Image
+import fr.free.nrw.commons.customselector.domain.model.Folder
+import fr.free.nrw.commons.customselector.domain.model.Image
 
 /**
  * Image Helper object, includes all the static functions and variables required by custom selector.

app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageLoaderListener.kt

@@ -1,6 +1,6 @@
 package fr.free.nrw.commons.customselector.listeners
 
-import fr.free.nrw.commons.customselector.model.Image
+import fr.free.nrw.commons.customselector.domain.model.Image
 
 /**
  * Custom Selector Image Loader Listener

app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageSelectListener.kt

@@ -1,6 +1,6 @@
 package fr.free.nrw.commons.customselector.listeners
 
-import fr.free.nrw.commons.customselector.model.Image
+import fr.free.nrw.commons.customselector.domain.model.Image
 
 /**
  * Custom selector Image select listener

app/src/main/java/fr/free/nrw/commons/customselector/listeners/PassDataListener.kt

@@ -1,6 +1,6 @@
 package fr.free.nrw.commons.customselector.listeners
 
-import fr.free.nrw.commons.customselector.model.Image
+import fr.free.nrw.commons.customselector.domain.model.Image
 
 /**
  * Interface to pass data between fragment and activity

app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapter.kt

@@ -10,8 +10,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import fr.free.nrw.commons.R
 import fr.free.nrw.commons.customselector.listeners.FolderClickListener
-import fr.free.nrw.commons.customselector.model.Folder
-import fr.free.nrw.commons.customselector.model.Image
+import fr.free.nrw.commons.customselector.domain.model.Folder
+import fr.free.nrw.commons.customselector.domain.model.Image
 
 /**
  * Custom selector FolderAdapter.

app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt

@@ -17,7 +17,7 @@ import fr.free.nrw.commons.customselector.helper.ImageHelper
 import fr.free.nrw.commons.customselector.helper.ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY
 import fr.free.nrw.commons.customselector.helper.ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY
 import fr.free.nrw.commons.customselector.listeners.ImageSelectListener
-import fr.free.nrw.commons.customselector.model.Image
+import fr.free.nrw.commons.customselector.domain.model.Image
 import fr.free.nrw.commons.customselector.ui.selector.ImageLoader
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope

app/src/main/java/fr/free/nrw/commons/customselector/ui/components/Buttons.kt

@@ -0,0 +1,87 @@
+package fr.free.nrw.commons.customselector.ui.components
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewLightDark
+import androidx.compose.ui.unit.dp
+import fr.free.nrw.commons.ui.theme.CommonsTheme
+
+@Composable
+fun PrimaryButton(
+    text: String,
+    onClick: ()-> Unit,
+    modifier: Modifier = Modifier,
+    shape: Shape = RoundedCornerShape(12.dp),
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier,
+        shape = shape,
+        contentPadding = PaddingValues(horizontal = 24.dp, vertical = 4.dp)
+    ) {
+        Text(
+            text = text,
+            textAlign = TextAlign.Center
+        )
+    }
+}
+
+@Composable
+fun SecondaryButton(
+    text: String,
+    onClick: ()-> Unit,
+    modifier: Modifier = Modifier,
+    shape: Shape = RoundedCornerShape(12.dp),
+) {
+    OutlinedButton(
+        onClick = onClick,
+        modifier = modifier,
+        border = BorderStroke(1.dp, color = MaterialTheme.colorScheme.primary),
+        shape = shape,
+        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 4.dp)
+    ) {
+        Text(
+            text = text,
+            textAlign = TextAlign.Center
+        )
+    }
+}
+
+@PreviewLightDark
+@Composable
+private fun PrimaryButtonPreview() {
+    CommonsTheme {
+        Surface {
+            PrimaryButton(
+                text = "Primary Button",
+                onClick = { },
+                modifier = Modifier.padding(16.dp)
+            )
+        }
+    }
+}
+
+@PreviewLightDark
+@Composable
+private fun SecondaryButtonPreview() {
+    CommonsTheme {
+        Surface {
+            SecondaryButton(
+                text = "Secondary Button",
+                onClick = { },
+                modifier = Modifier.padding(16.dp)
+            )
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/customselector/ui/components/CustomSelectorBottomBar.kt

@@ -0,0 +1,58 @@
+package fr.free.nrw.commons.customselector.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.PreviewLightDark
+import androidx.compose.ui.unit.dp
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.ui.theme.CommonsTheme
+
+@Composable
+fun CustomSelectorBottomBar(
+    onPrimaryAction: ()-> Unit,
+    onSecondaryAction: ()-> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        SecondaryButton(
+            text = stringResource(R.string.mark_as_not_for_upload).uppercase(),
+            onClick = onSecondaryAction,
+            modifier = Modifier.weight(1f)
+        )
+
+        PrimaryButton(
+            text = stringResource(R.string.upload).uppercase(),
+            onClick = onPrimaryAction,
+            modifier = Modifier
+                .weight(1f)
+                .height(IntrinsicSize.Max)
+        )
+    }
+}
+
+@PreviewLightDark
+@Composable
+private fun CustomSelectorBottomBarPreview() {
+    CommonsTheme {
+        Surface(tonalElevation = 3.dp) {
+            CustomSelectorBottomBar(
+                onPrimaryAction = { },
+                onSecondaryAction = { },
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .fillMaxWidth()
+            )
+        }
+    }
+}