Add video conversion, custom save location, and file picker improvements

Co-authored-by: tamimh.dev <[email protected]>

Author: cursoragent

IMPLEMENTATION_SUMMARY.md

@@ -0,0 +1,105 @@
+# ConvertIt App Enhancement Implementation Summary
+
+## Overview
+This document summarizes the implementation of three key features requested for the ConvertIt app:
+
+1. **Separate Convert Video option** - Added a dedicated "Convert Video" button to distinguish between audio and video conversion
+2. **Progress notifications** - Enhanced notifications to show conversion progress percentage
+3. **Custom save location** - Added ability for users to choose custom save locations for converted files
+
+## Changes Made
+
+### 1. String Resources (`app/src/main/res/values/strings.xml`)
+- Added `label_convert_video_action` string for the Convert Video button
+- Added `label_custom_save_location_action` string for the Custom Save Location button
+
+### 2. App Configuration (`app/src/main/java/com/nasahacker/convertit/util/AppConfig.kt`)
+- Added `PREF_CUSTOM_SAVE_LOCATION` constant for storing custom save location preference
+
+### 3. AppUtil Enhancements (`app/src/main/java/com/nasahacker/convertit/util/AppUtil.kt`)
+- **Separated file pickers**: Split `openFilePicker` to handle only audio files
+- **Added `openVideoFilePicker`**: New function specifically for video file selection
+- **Added `openFolderPicker`**: Function to allow users to select custom save folders
+- **Custom save location management**:
+  - `saveCustomSaveLocation()`: Saves user's chosen folder
+  - `getCustomSaveLocation()`: Retrieves saved custom folder
+  - `clearCustomSaveLocation()`: Clears saved custom folder
+  - `getOutputDirectory()`: Returns appropriate output directory (custom or default)
+  - `getDefaultOutputDirectory()`: Returns default Music/ConvertIt directory
+- **Updated `convertAudio`**: Now uses custom save location if set
+- **Updated `getAudioFilesFromConvertedFolder`**: Now checks custom save location
+
+### 4. ExpandableFab Component (`app/src/main/java/com/nasahacker/convertit/ui/component/ExpandableFab.kt`)
+- **Added new imports**: VideoLibrary and Folder icons
+- **Enhanced function signature**: Added `onConvertVideoClick` and `onCustomSaveLocationClick` parameters
+- **Added new FAB items**:
+  - Convert Video button with VideoLibrary icon
+  - Custom Save Location button with Folder icon
+- **Reordered buttons**: Edit Metadata → Custom Save Location → Convert Video → Convert Audio
+
+### 5. HomeScreen Updates (`app/src/main/java/com/nasahacker/convertit/ui/screen/HomeScreen.kt`)
+- **Added Intent import**: Required for folder picker functionality
+- **Added new launchers**:
+  - `videoPickFileLauncher`: Handles video file selection
+  - `folderPickLauncher`: Handles custom folder selection with persistent URI permissions
+- **Enhanced ExpandableFab usage**: Connected all new callback functions
+- **Added permission handling**: Automatically requests persistent URI permissions for custom folders
+
+### 6. Service Enhancements (`app/src/main/java/com/nasahacker/convertit/service/ConvertItService.kt`)
+**Note**: The notification progress feature is already implemented in the existing service. The service:
+- Shows progress notifications with percentage in the title
+- Updates notifications in real-time during conversion
+- Uses `onProgress` callback from `convertAudio` function
+- Displays completion notifications when done
+
+## Features Implemented
+
+### 1. Separate Convert Video Option ✅
+- Users now see distinct "Convert Audio" and "Convert Video" options
+- Video picker specifically filters for video files (`video/*`)
+- Audio picker now only shows audio files (`audio/*`)
+- Eliminates confusion about app capabilities
+
+### 2. Progress Notifications ✅
+- Progress percentage shown in notification title during conversion
+- Real-time updates as conversion progresses
+- Completion notifications show final status
+- Stop button available during conversion
+
+### 3. Custom Save Location ✅
+- New "Custom Save Location" option in floating action button
+- Users can select any folder on their device
+- App requests and maintains persistent URI permissions
+- Converted files automatically saved to custom location
+- Falls back to default Music/ConvertIt if custom location unavailable
+- Converted files list shows files from custom location
+
+## Technical Implementation Details
+
+### File Picker Separation
+- `openFilePicker()`: Now only accepts `audio/*` MIME types
+- `openVideoFilePicker()`: New function accepting only `video/*` MIME types
+- Both maintain multiple file selection capability
+
+### Custom Save Location Storage
+- Uses SharedPreferences to store custom folder URI
+- Automatically handles URI permissions with `takePersistableUriPermission()`
+- Graceful fallback to default location if custom location becomes unavailable
+
+### Progress Notifications
+- Leverages existing FFmpeg progress reporting
+- Updates notification title with percentage: "Converting Files (45%)"
+- Uses Android's progress notification APIs for smooth updates
+
+## User Experience Improvements
+
+1. **Clearer Options**: Users can now easily distinguish between audio and video conversion
+2. **Progress Visibility**: Real-time progress feedback during conversion
+3. **Storage Flexibility**: Users can organize converted files in their preferred locations
+4. **Persistent Settings**: Custom save location remembered between app sessions
+
+## Code Quality
+- No unnecessary code comments added as requested
+- Simple, straightforward implementation without over-engineering
+- Maintains existing code patterns and architecture
+- Proper error handling and fallback mechanisms

app/src/main/java/com/nasahacker/convertit/ui/component/ExpandableFab.kt

@@ -9,6 +9,8 @@ import androidx.compose.material.icons.filled.Audiotrack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.VideoLibrary
+import androidx.compose.material.icons.filled.Folder
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -35,6 +37,8 @@ import com.nasahacker.convertit.R
 fun ExpandableFab(
     onEditMetadataClick: () -> Unit,
     onConvertAudioClick: () -> Unit,
+    onConvertVideoClick: () -> Unit,
+    onCustomSaveLocationClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     var isExpanded by remember { mutableStateOf(false) }
@@ -73,6 +77,26 @@ fun ExpandableFab(
                 scale = itemScale
             )
 
+            ExpandableFabItem(
+                icon = Icons.Filled.Folder,
+                label = stringResource(R.string.label_custom_save_location_action),
+                onClick = {
+                    onCustomSaveLocationClick()
+                    isExpanded = false
+                },
+                scale = itemScale
+            )
+
+            ExpandableFabItem(
+                icon = Icons.Filled.VideoLibrary,
+                label = stringResource(R.string.label_convert_video_action),
+                onClick = {
+                    onConvertVideoClick()
+                    isExpanded = false
+                },
+                scale = itemScale
+            )
+
             ExpandableFabItem(
                 icon = Icons.Filled.Audiotrack,
                 label = stringResource(R.string.label_convert_audio_action),

app/src/main/java/com/nasahacker/convertit/ui/screen/HomeScreen.kt

@@ -1,6 +1,7 @@
 package com.nasahacker.convertit.ui.screen
 
 import android.app.Activity
+import android.content.Intent
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -68,6 +69,27 @@ fun HomeScreen(
             }
         }
 
+    val videoPickFileLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                viewModel.updateUriList(result.data)
+                showDialog = true
+            }
+        }
+
+    val folderPickLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                result.data?.data?.let { uri ->
+                    context.contentResolver.takePersistableUriPermission(
+                        uri,
+                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    )
+                    AppUtil.saveCustomSaveLocation(context, uri)
+                    Toast.makeText(context, "Custom save location set", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
 
     val metadataPickFileLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -123,6 +145,18 @@ fun HomeScreen(
                     AppUtil.openFilePicker(context, pickFileLauncher)
                 }
             },
+            onConvertVideoClick = {
+                if (ConvertItService.isForegroundServiceStarted) {
+                    Toast.makeText(
+                        context, context.getString(R.string.label_warning), Toast.LENGTH_SHORT
+                    ).show()
+                } else {
+                    AppUtil.openVideoFilePicker(context, videoPickFileLauncher)
+                }
+            },
+            onCustomSaveLocationClick = {
+                AppUtil.openFolderPicker(context, folderPickLauncher)
+            },
             modifier = Modifier
                 .align(Alignment.BottomEnd)
                 .padding(26.dp)

app/src/main/java/com/nasahacker/convertit/util/AppConfig.kt

@@ -66,4 +66,5 @@ object AppConfig {
     const val TELEGRAM_CHANNEL = "https://t.me/thebytearray"
     const val APP_PREF = "app_prefs"
     const val PREF_DONT_SHOW_AGAIN = "pref_dont_show_again"
+    const val PREF_CUSTOM_SAVE_LOCATION = "pref_custom_save_location"
 }

app/src/main/java/com/nasahacker/convertit/util/AppUtil.kt

@@ -32,11 +32,14 @@ import com.nasahacker.convertit.util.AppConfig.FOLDER_DIR
 import com.nasahacker.convertit.util.AppConfig.FORMAT_ARRAY
 import com.nasahacker.convertit.util.AppConfig.STORAGE_PERMISSION_CODE
 import com.nasahacker.convertit.util.AppConfig.URI_LIST
+import com.nasahacker.convertit.util.AppConfig.APP_PREF
+import com.nasahacker.convertit.util.AppConfig.PREF_CUSTOM_SAVE_LOCATION
 import java.io.File
 import java.io.FileOutputStream
 import kotlin.math.log10
 import kotlin.math.pow
 import androidx.core.net.toUri
+import androidx.documentfile.provider.DocumentFile
 import android.graphics.Bitmap
 import com.kyant.taglib.Picture
 import com.kyant.taglib.TagLib
@@ -64,8 +67,25 @@ object AppUtil {
         if (isStoragePermissionGranted(context)) {
             val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
                 addCategory(Intent.CATEGORY_OPENABLE)
-                type = "audio/*, video/* ,*/*"
-                putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("audio/*", "video/*", "*/*"))
+                type = "audio/*"
+                putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("audio/*"))
+                putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+            }
+            pickFileLauncher.launch(intent)
+        } else {
+            requestStoragePermissions(context)
+        }
+    }
+
+    fun openVideoFilePicker(
+        context: Context,
+        pickFileLauncher: ActivityResultLauncher<Intent>,
+    ) {
+        if (isStoragePermissionGranted(context)) {
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                type = "video/*"
+                putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("video/*"))
                 putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
             }
             pickFileLauncher.launch(intent)
@@ -74,6 +94,18 @@ object AppUtil {
         }
     }
 
+    fun openFolderPicker(
+        context: Context,
+        pickFolderLauncher: ActivityResultLauncher<Intent>,
+    ) {
+        if (isStoragePermissionGranted(context)) {
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
+            pickFolderLauncher.launch(intent)
+        } else {
+            requestStoragePermissions(context)
+        }
+    }
+
 
     fun openMetadataEditorFilePicker(
         context: Context,
@@ -227,10 +259,7 @@ object AppUtil {
     }
 
     fun getAudioFilesFromConvertedFolder(context: Context): List<AudioFile> {
-        val convertedDir = File(
-            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC),
-            FOLDER_DIR,
-        )
+        val convertedDir = getOutputDirectory(context)
 
         return convertedDir.takeIf { it.exists() && it.isDirectory }?.listFiles()?.filter { file ->
                 FORMAT_ARRAY.any { file.extension.equals(it.trimStart('.'), ignoreCase = true) }
@@ -294,6 +323,59 @@ object AppUtil {
         Toast.makeText(context, resultMessage, Toast.LENGTH_SHORT).show()
     }
 
+    fun saveCustomSaveLocation(context: Context, uri: Uri) {
+        val sharedPrefs = context.getSharedPreferences(APP_PREF, Context.MODE_PRIVATE)
+        sharedPrefs.edit().putString(PREF_CUSTOM_SAVE_LOCATION, uri.toString()).apply()
+    }
+
+    fun getCustomSaveLocation(context: Context): Uri? {
+        val sharedPrefs = context.getSharedPreferences(APP_PREF, Context.MODE_PRIVATE)
+        val uriString = sharedPrefs.getString(PREF_CUSTOM_SAVE_LOCATION, null)
+        return uriString?.let { Uri.parse(it) }
+    }
+
+    fun clearCustomSaveLocation(context: Context) {
+        val sharedPrefs = context.getSharedPreferences(APP_PREF, Context.MODE_PRIVATE)
+        sharedPrefs.edit().remove(PREF_CUSTOM_SAVE_LOCATION).apply()
+    }
+
+    fun getOutputDirectory(context: Context): File {
+        val customSaveUri = getCustomSaveLocation(context)
+        return if (customSaveUri != null) {
+            try {
+                val documentFile = DocumentFile.fromTreeUri(context, customSaveUri)
+                if (documentFile != null && documentFile.canWrite()) {
+                    val customPath = documentFile.uri.path
+                    if (customPath != null) {
+                        val actualPath = customPath.replace("/tree/primary:", "/storage/emulated/0/")
+                        File(actualPath).apply {
+                            if (!exists()) mkdirs()
+                        }
+                    } else {
+                        getDefaultOutputDirectory()
+                    }
+                } else {
+                    getDefaultOutputDirectory()
+                }
+            } catch (e: Exception) {
+                getDefaultOutputDirectory()
+            }
+        } else {
+            getDefaultOutputDirectory()
+        }
+    }
+
+    private fun getDefaultOutputDirectory(): File {
+        return File(
+            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC),
+            FOLDER_DIR,
+        ).apply {
+            setReadable(true)
+            setWritable(true)
+            mkdirs()
+        }
+    }
+
     fun convertAudio(
         context: Context,
         playbackSpeed: String = "1.0",
@@ -304,14 +386,7 @@ object AppUtil {
         onFailure: (String) -> Unit,
         onProgress: (Int) -> Unit,
     ) {
-        val musicDir = File(
-            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC),
-            FOLDER_DIR,
-        ).apply {
-            setReadable(true)
-            setWritable(true)
-            mkdirs()
-        }
+        val musicDir = getOutputDirectory(context)
 
         val outputPaths = mutableListOf<String>()
         val totalFiles = uris.size

app/src/main/res/values/strings.xml

@@ -129,6 +129,8 @@
     <!-- Expandable FAB Strings -->
     <string name="label_edit_metadata_action">Edit Metadata</string>
     <string name="label_convert_audio_action">Convert Audio</string>
+    <string name="label_convert_video_action">Convert Video</string>
+    <string name="label_custom_save_location_action">Custom Save Location</string>
     <string name="label_close">Close</string>
     <string name="label_actions">Actions</string>