Merge branch 'master' of https://github.com/TheByteArray/Convertit

Author: codewithtamim

README.md

@@ -27,6 +27,7 @@
   <img src="images/image1.png" alt="Screenshot 1" width="200"/>
   <img src="images/image2.png" alt="Screenshot 2" width="200"/>
   <img src="images/image3.png" alt="Screenshot 3" width="200"/>
+  <img src="images/image4.png" alt="Screenshot 3" width="200"/>
 </p>
 
 ---
@@ -139,7 +140,7 @@ Whether it's bug fixes, new features, or improvements, we appreciate your contri
 ---
 ## Contributors
 
-![Contributors](https://contributors-img.web.app/image?repo=CodeWithTamim/ConvertIt)
+![Contributors](https://contributors-img.web.app/image?repo=TheByteArray/ConvertIt)
 
 ---
 

app/libs/taglib.aar

@@ -7,7 +7,10 @@
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-sdk tools:overrideLibrary="com.arthenica.ffmpegkit" android:minSdkVersion="21" />
+    <uses-sdk
+        android:minSdkVersion="21"
+        tools:overrideLibrary="com.kyant.taglib,com.arthenica.ffmpegkit" />
+
 
     <application
         android:name=".App"

app/src/main/AndroidManifest.xml

@@ -38,13 +38,18 @@ class App : Application() {
 
     private fun initChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationManagerCompat.from(this).createNotificationChannel(
-                NotificationChannel(
-                    CHANNEL_ID,
-                    CHANNEL_NAME,
-                    NotificationManager.IMPORTANCE_DEFAULT,
-                ),
-            )
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_LOW,
+            ).apply {
+                description = "Notifications for audio conversion progress and completion"
+                setShowBadge(false)
+                enableLights(false)
+                enableVibration(false)
+                setSound(null, null)
+            }
+            NotificationManagerCompat.from(this).createNotificationChannel(channel)
         }
     }
 

app/src/main/java/com/nasahacker/convertit/App.kt

@@ -0,0 +1,59 @@
+package com.nasahacker.convertit.dto
+
+import com.kyant.taglib.Picture
+
+/**
+ * @author Tamim Hossain
+ * @email [email protected]
+ * @license Apache-2.0
+ *
+ * ConvertIt is a free and easy-to-use audio converter app.
+ * It supports popular audio formats like MP3 and M4A.
+ * With options for high-quality bitrates ranging from 128k to 320k,
+ * ConvertIt offers a seamless conversion experience tailored to your needs.
+ */
+
+data class Metadata(
+    val title: String = "",
+    val artist: String = "",
+    val album: String = "",
+    val albumArtist: String = "",
+    val genre: String = "",
+    val year: String = "",
+    val track: String = "",
+    val comment: String = "",
+    val pictures: List<Picture> = emptyList(),
+    val propertyMap: Map<String, Array<String>> = emptyMap()
+) {
+    fun toPropertyMap(): Map<String, Array<String>> {
+        val map = mutableMapOf<String, Array<String>>()
+        
+        if (title.isNotBlank()) map["TITLE"] = arrayOf(title)
+        if (artist.isNotBlank()) map["ARTIST"] = arrayOf(artist)
+        if (album.isNotBlank()) map["ALBUM"] = arrayOf(album)
+        if (albumArtist.isNotBlank()) map["ALBUMARTIST"] = arrayOf(albumArtist)
+        if (genre.isNotBlank()) map["GENRE"] = arrayOf(genre)
+        if (year.isNotBlank()) map["DATE"] = arrayOf(year)
+        if (track.isNotBlank()) map["TRACKNUMBER"] = arrayOf(track)
+        if (comment.isNotBlank()) map["COMMENT"] = arrayOf(comment)
+        
+        return map
+    }
+    
+    companion object {
+        fun fromPropertyMap(propertyMap: Map<String, Array<String>>, pictures: List<Picture> = emptyList()): Metadata {
+            return Metadata(
+                title = propertyMap["TITLE"]?.firstOrNull() ?: "",
+                artist = propertyMap["ARTIST"]?.firstOrNull() ?: "",
+                album = propertyMap["ALBUM"]?.firstOrNull() ?: "",
+                albumArtist = propertyMap["ALBUMARTIST"]?.firstOrNull() ?: "",
+                genre = propertyMap["GENRE"]?.firstOrNull() ?: "",
+                year = propertyMap["DATE"]?.firstOrNull() ?: propertyMap["YEAR"]?.firstOrNull() ?: "",
+                track = propertyMap["TRACKNUMBER"]?.firstOrNull() ?: "",
+                comment = propertyMap["COMMENT"]?.firstOrNull() ?: "",
+                pictures = pictures,
+                propertyMap = propertyMap
+            )
+        }
+    }
+} 

app/src/main/java/com/nasahacker/convertit/dto/Metadata.kt

@@ -41,7 +41,9 @@ import com.nasahacker.convertit.util.AppConfig.IS_SUCCESS
 import com.nasahacker.convertit.util.AppConfig.URI_LIST
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import com.arthenica.ffmpegkit.FFmpegKit
 
 class ConvertItService : Service() {
     companion object {
@@ -50,9 +52,23 @@ class ConvertItService : Service() {
     }
 
     private val notificationId = 1
+    private var conversionJob: Job? = null
 
     override fun onBind(intent: Intent?): IBinder? = null
 
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.i(TAG, "Service destroyed")
+        
+        // Cancel ongoing conversion job
+        conversionJob?.cancel()
+        conversionJob = null
+        
+        // Cancel all FFmpeg sessions
+        FFmpegKit.cancel()
+        Log.i(TAG, "Cancelled all FFmpeg sessions in onDestroy")
+    }
+
     override fun onCreate() {
         super.onCreate()
         Log.i(TAG, "Service created - Process ID: ${android.os.Process.myPid()}")
@@ -70,7 +86,16 @@ class ConvertItService : Service() {
 
         if (intent?.action == ACTION_STOP_SERVICE) {
             Log.i(TAG, "Stopping service as per user request. startId: $startId")
-            showCompletionNotification(false)
+            
+            // Cancel ongoing conversion job
+            conversionJob?.cancel()
+            conversionJob = null
+            
+            // Cancel all FFmpeg sessions
+            FFmpegKit.cancel()
+            Log.i(TAG, "Cancelled all FFmpeg sessions")
+            
+            showCompletionNotification(success = false, cancelled = true)
             broadcastConversionResult(Intent().apply { action = CONVERT_BROADCAST_ACTION }, false)
             stopForegroundService()
             return START_NOT_STICKY
@@ -105,7 +130,7 @@ class ConvertItService : Service() {
             return START_NOT_STICKY
         }
 
-        CoroutineScope(Dispatchers.IO).launch {
+        conversionJob = CoroutineScope(Dispatchers.IO).launch {
             try {
                 Log.i(TAG, "Starting audio conversion for ${uriList.size} files. startId: $startId")
                 AppUtil.convertAudio(
@@ -210,22 +235,30 @@ class ConvertItService : Service() {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
         )
 
-        val progressText = if (isIndeterminate) {
-            getString(R.string.label_converting_audio)
+        val (title, contentText) = if (isIndeterminate) {
+            getString(R.string.converting_audio_files) to getString(R.string.label_converting_audio)
         } else {
-            "Conversion in progress: $progress%"
+            // Put percentage in title for better visibility on Android 15+
+            "${getString(R.string.converting_audio_files)} ($progress%)" to getString(R.string.label_conversion_progress, progress)
         }
 
         Log.d(
-            TAG, "Creating progress notification: $progressText (Indeterminate: $isIndeterminate)"
+            TAG, "Creating progress notification: $title - $contentText (Indeterminate: $isIndeterminate)"
         )
 
         return NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentTitle(getString(R.string.converting_audio_files))
-            .setContentText(progressText).setSmallIcon(R.mipmap.ic_launcher_foreground)
-            .setProgress(100, progress, isIndeterminate).setAutoCancel(false).setOngoing(true)
-            .setDefaults(0).setOnlyAlertOnce(true)
-            .addAction(R.drawable.baseline_stop_24, "Stop", stopPendingIntent).build()
+            .setContentTitle(title)
+            .setContentText(contentText)
+            .setSmallIcon(R.mipmap.ic_launcher_foreground)
+            .setProgress(100, progress, isIndeterminate)
+            .setAutoCancel(false)
+            .setOngoing(true)
+            .setDefaults(0)
+            .setOnlyAlertOnce(true)
+            .setPriority(NotificationCompat.PRIORITY_LOW)
+            .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+            .addAction(R.drawable.baseline_stop_24, getString(R.string.label_stop), stopPendingIntent)
+            .build()
     }
 
     private fun updateNotification(progress: Int) {
@@ -244,13 +277,13 @@ class ConvertItService : Service() {
         Log.v(TAG, "Updated notification: Progress $progress%")
     }
 
-    private fun showCompletionNotification(success: Boolean) {
+    private fun showCompletionNotification(success: Boolean, cancelled: Boolean = false) {
         stopForegroundService()
 
-        val notificationText = if (success) {
-            getString(R.string.conversion_success)
-        } else {
-            getString(R.string.conversion_failed)
+        val notificationText = when {
+            cancelled -> getString(R.string.conversion_cancelled)
+            success -> getString(R.string.conversion_success)
+            else -> getString(R.string.conversion_failed)
         }
 
         Log.i(TAG, "Showing completion notification: $notificationText")

app/src/main/java/com/nasahacker/convertit/service/ConvertItService.kt

@@ -51,8 +51,7 @@ fun DialogConvertAlertDialog(
                 Icon(
                     imageVector = Icons.Default.Settings,
                     contentDescription = null,
-                    tint = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.size(28.dp)
+                    tint = MaterialTheme.colorScheme.primary
                 )
             },
             title = {