Refactor: Reorder imports and remove unused code

MihaiCristianCondrea · MihaiCristianCondrea · commit e7a9e93149b8 · 2025-08-11T10:06:07.000+03:00
- Reorder imports in multiple files to follow a consistent style.
- Remove unused `android.view.View` and `android.view.SoundEffectConstants` imports.
- Increment `versionCode` to 221.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
         applicationId = "com.d4rk.cleaner"
         minSdk = 23
         targetSdk = 36
-        versionCode = 220
+        versionCode = 221
         versionName = "3.5.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         @Suppress("UnstableApiUsage")
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/Cleaner.kt b/app/src/main/kotlin/com/d4rk/cleaner/Cleaner.kt
@@ -4,7 +4,6 @@ package com.d4rk.cleaner
 
 import android.app.Activity
 import android.os.Bundle
-import android.content.ComponentCallbacks2
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/apps/manager/data/ApkFileManagerImpl.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/apps/manager/data/ApkFileManagerImpl.kt
@@ -8,11 +8,11 @@ import android.provider.MediaStore
 import com.d4rk.android.libs.apptoolkit.core.domain.model.network.DataState
 import com.d4rk.cleaner.app.apps.manager.domain.data.model.ApkInfo
 import com.d4rk.cleaner.app.apps.manager.domain.interfaces.ApkFileManager
+import com.d4rk.cleaner.core.data.datastore.DataStore
 import com.d4rk.cleaner.core.domain.model.network.Errors
 import com.d4rk.cleaner.core.utils.extensions.toError
 import com.d4rk.cleaner.core.utils.helpers.DirectoryScanner
 import com.d4rk.cleaner.core.utils.helpers.shouldSkip
-import com.d4rk.cleaner.core.data.datastore.DataStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/apps/manager/ui/AppManagerViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/apps/manager/ui/AppManagerViewModel.kt
@@ -28,14 +28,14 @@ import com.d4rk.cleaner.app.apps.manager.domain.usecases.ShareApkUseCase
 import com.d4rk.cleaner.app.apps.manager.domain.usecases.ShareAppUseCase
 import com.d4rk.cleaner.app.apps.manager.domain.usecases.UninstallAppUseCase
 import com.d4rk.cleaner.core.utils.helpers.CleaningEventBus
-import java.util.Locale
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import java.util.Locale
 
 class AppManagerViewModel(
     application: Application,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/auto/AutoCleanWorker.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/auto/AutoCleanWorker.kt
@@ -5,13 +5,13 @@ import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.d4rk.android.libs.apptoolkit.core.domain.model.network.DataState
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.FileTypesData
+import com.d4rk.cleaner.app.clean.scanner.domain.`interface`.ScannerRepositoryInterface
 import com.d4rk.cleaner.app.clean.scanner.domain.usecases.AnalyzeFilesUseCase
 import com.d4rk.cleaner.app.clean.scanner.domain.usecases.DeleteFilesUseCase
 import com.d4rk.cleaner.app.clean.scanner.domain.usecases.GetEmptyFoldersUseCase
 import com.d4rk.cleaner.app.clean.scanner.domain.usecases.GetFileTypesUseCase
 import com.d4rk.cleaner.app.images.utils.ImageHashUtils
 import com.d4rk.cleaner.app.settings.cleaning.utils.constants.ExtensionsConstants
-import com.d4rk.cleaner.app.clean.scanner.domain.`interface`.ScannerRepositoryInterface
 import com.d4rk.cleaner.core.data.datastore.DataStore
 import com.d4rk.cleaner.core.utils.extensions.partialMd5
 import com.d4rk.cleaner.core.utils.helpers.CleaningEventBus
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/AnalyzeScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/AnalyzeScreen.kt
@@ -29,10 +29,10 @@ import com.d4rk.cleaner.app.clean.analyze.ui.components.dialogs.DeleteOrTrashCon
 import com.d4rk.cleaner.app.clean.analyze.ui.components.dialogs.GlobalSelectAllWarningDialog
 import com.d4rk.cleaner.app.clean.analyze.ui.components.tabs.TabsContent
 import com.d4rk.cleaner.app.clean.nofilesfound.ui.NoFilesFoundScreen
+import com.d4rk.cleaner.app.clean.scanner.domain.actions.ScannerEvent
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.FileEntry
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.UiScannerModel
-import com.d4rk.cleaner.app.clean.scanner.domain.actions.ScannerEvent
 import com.d4rk.cleaner.app.clean.scanner.ui.ScannerViewModel
 import com.d4rk.cleaner.app.clean.scanner.ui.components.TwoRowButtons
 import kotlinx.coroutines.CoroutineScope
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/components/FileCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/components/FileCard.kt
@@ -1,7 +1,6 @@
 package com.d4rk.cleaner.app.clean.analyze.ui.components
 
 import android.content.Context
-import android.view.SoundEffectConstants
 import android.view.View
 import androidx.compose.foundation.background
 import androidx.compose.foundation.basicMarquee
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/components/FilesGrid.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/components/FilesGrid.kt
@@ -1,6 +1,5 @@
 package com.d4rk.cleaner.app.clean.analyze.ui.components
 
-import android.view.View
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/components/StatusRowSelectAll.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/components/StatusRowSelectAll.kt
@@ -1,6 +1,5 @@
 package com.d4rk.cleaner.app.clean.analyze.ui.components
 
-import android.view.View
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.tween
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/components/DashboardActionCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/components/DashboardActionCard.kt
@@ -1,8 +1,8 @@
 package com.d4rk.cleaner.app.clean.dashboard.ui.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -58,11 +58,11 @@ fun DashboardActionCard(
                         Modifier
                             .bounceClick()
                             .clickable(
-                            interactionSource = remember { MutableInteractionSource() },
-                            indication = null,
-                            enabled = headerEnabled,
-                            onClick = it
-                        )
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null,
+                                enabled = headerEnabled,
+                                onClick = it
+                            )
                     } ?: Modifier,
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.spacedBy(SizeConstants.MediumSize)
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/largefiles/ui/LargeFilesScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/largefiles/ui/LargeFilesScreen.kt
@@ -24,9 +24,9 @@ import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.app.clean.analyze.ui.components.CleaningAnimationScreen
 import com.d4rk.cleaner.app.clean.analyze.ui.components.FilesByDateSection
-import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
 import com.d4rk.cleaner.app.clean.largefiles.domain.actions.LargeFilesEvent
 import com.d4rk.cleaner.app.clean.largefiles.domain.data.model.ui.UiLargeFilesModel
+import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
 import org.koin.compose.viewmodel.koinViewModel
 import java.io.File
 
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/domain/actions/MemoryAction.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/domain/actions/MemoryAction.kt
@@ -2,7 +2,4 @@ package com.d4rk.cleaner.app.clean.memory.domain.actions
 
 import com.d4rk.android.libs.apptoolkit.core.ui.base.handling.ActionEvent
 
-sealed class MemoryAction : ActionEvent {
-    // Define UI actions here if needed
-    // object ShowErrorMessage : MemoryAction(val message: String)
-}
+sealed class MemoryAction : ActionEvent
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/domain/actions/MemoryEvent.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/domain/actions/MemoryEvent.kt
@@ -3,7 +3,6 @@ package com.d4rk.cleaner.app.clean.memory.domain.actions
 import com.d4rk.android.libs.apptoolkit.core.ui.base.handling.UiEvent
 
 sealed class MemoryEvent : UiEvent {
-    object LoadMemoryData : MemoryEvent() // Event to trigger initial data loading
-    object ToggleListExpanded : MemoryEvent() // Event to toggle the storage breakdown list
-    // Add other events as needed (e.g., RefreshData)
+    object LoadMemoryData : MemoryEvent()
+    object ToggleListExpanded : MemoryEvent()
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/domain/interfaces/MemoryRepository.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/domain/interfaces/MemoryRepository.kt
@@ -1,6 +1,6 @@
 package com.d4rk.cleaner.app.clean.memory.domain.interfaces
 
-import com.d4rk.cleaner.app.clean.memory.domain.data.model.RamInfo // Assuming these are now in domain
+import com.d4rk.cleaner.app.clean.memory.domain.data.model.RamInfo
 import com.d4rk.cleaner.app.clean.memory.domain.data.model.StorageInfo
 
 interface MemoryRepository {
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/ui/components/MemoryManagerShimmer.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/memory/ui/components/MemoryManagerShimmer.kt
@@ -33,7 +33,6 @@ import androidx.compose.ui.util.lerp
 import com.d4rk.android.libs.apptoolkit.core.ui.components.carousel.DotsIndicator
 import com.d4rk.android.libs.apptoolkit.core.ui.components.modifiers.hapticPagerSwipe
 import com.d4rk.android.libs.apptoolkit.core.ui.components.modifiers.shimmerEffect
-import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.ExtraTinyHorizontalSpacer
 import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.ExtraTinyVerticalSpacer
 import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.LargeVerticalSpacer
 import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.MediumVerticalSpacer
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/data/ScannerRepositoryImpl.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/data/ScannerRepositoryImpl.kt
@@ -20,6 +20,8 @@ import com.d4rk.cleaner.core.utils.extensions.clearClipboardCompat
 import com.d4rk.cleaner.core.utils.extensions.partialMd5
 import com.d4rk.cleaner.core.utils.helpers.DirectoryScanner
 import com.d4rk.cleaner.core.utils.helpers.FileDeletionHelper
+import com.d4rk.cleaner.core.utils.helpers.isProtectedAndroidDir
+import com.d4rk.cleaner.core.utils.helpers.shouldSkip
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -28,8 +30,6 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
-import com.d4rk.cleaner.core.utils.helpers.shouldSkip
-import com.d4rk.cleaner.core.utils.helpers.isProtectedAndroidDir
 
 class ScannerRepositoryImpl(
     private val application: Application, private val dataStore: DataStore
@@ -149,7 +149,7 @@ class ScannerRepositoryImpl(
     }
 
     override suspend fun getTrashFiles(): List<File> {
-        return withContext(context = Dispatchers.IO) { // Assuming you have Dispatchers available or inject them
+        return withContext(context = Dispatchers.IO) {
             val trashDir =
                 File(application.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "Trash")
             if (trashDir.exists()) trashDir.listFiles()?.toList() ?: emptyList()
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/operations/CleaningManager.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/operations/CleaningManager.kt
@@ -1,9 +1,9 @@
 package com.d4rk.cleaner.app.clean.scanner.domain.operations
 
 import com.d4rk.android.libs.apptoolkit.core.domain.model.network.DataState
+import com.d4rk.cleaner.app.clean.scanner.domain.`interface`.ScannerRepositoryInterface
 import com.d4rk.cleaner.app.clean.scanner.domain.usecases.DeleteFilesUseCase
 import com.d4rk.cleaner.app.clean.scanner.domain.usecases.UpdateTrashSizeUseCase
-import com.d4rk.cleaner.app.clean.scanner.domain.`interface`.ScannerRepositoryInterface
 import com.d4rk.cleaner.core.domain.model.network.Errors
 import kotlinx.coroutines.flow.first
 import java.io.File
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/usecases/GetDuplicatesUseCase.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/usecases/GetDuplicatesUseCase.kt
@@ -3,13 +3,13 @@ package com.d4rk.cleaner.app.clean.scanner.domain.usecases
 import com.d4rk.android.libs.apptoolkit.core.di.DispatcherProvider
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.FileEntry
 import com.d4rk.cleaner.core.utils.extensions.partialMd5
-import java.io.File
-import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
+import java.io.File
+import java.util.concurrent.ConcurrentHashMap
 
 class GetDuplicatesUseCase(
     private val dispatchers: DispatcherProvider
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/usecases/GetFileTypesUseCase.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/usecases/GetFileTypesUseCase.kt
@@ -14,8 +14,6 @@ class GetFileTypesUseCase(
         runCatching {
             val fileTypesData = homeRepository.getFileTypes()
             emit(DataState.Success(data = fileTypesData))
-        }.onFailure { e ->
-            //  emit(DataState.Error(error = e.message.toString()))
         }
     }
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/usecases/GetStorageInfoUseCase.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/domain/usecases/GetStorageInfoUseCase.kt
@@ -10,10 +10,8 @@ import kotlinx.coroutines.flow.flow
 class GetStorageInfoUseCase(private val homeRepository: ScannerRepositoryInterface) {
     operator fun invoke(): Flow<DataState<UiScannerModel, Errors>> = flow {
         runCatching {
-            val storageInfo = homeRepository.getStorageInfo() // Call suspending repository function
+            val storageInfo = homeRepository.getStorageInfo()
             emit(DataState.Success(data = storageInfo))
-        }.onFailure { e ->
-            // emit(DataState.Error(error = e.message.toString()))
         }
     }
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/CleanOperationHandler.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/CleanOperationHandler.kt
@@ -19,8 +19,8 @@ import com.d4rk.cleaner.app.clean.scanner.work.FileCleanupWorker
 import com.d4rk.cleaner.app.settings.cleaning.utils.constants.ExtensionsConstants
 import com.d4rk.cleaner.core.data.datastore.DataStore
 import com.d4rk.cleaner.core.domain.model.network.Errors
-import com.d4rk.cleaner.core.utils.helpers.FileGroupingHelper
 import com.d4rk.cleaner.core.utils.extensions.selectedFiles
+import com.d4rk.cleaner.core.utils.helpers.FileGroupingHelper
 import com.d4rk.cleaner.core.utils.helpers.isProtectedAndroidDir
 import com.d4rk.cleaner.core.work.FileCleanWorkEnqueuer
 import com.d4rk.cleaner.core.work.FileCleaner
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/ScannerViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/ScannerViewModel.kt
@@ -59,7 +59,6 @@ import kotlinx.coroutines.yield
 import java.io.File
 import java.util.UUID
 
-// Making this configurable clarifies the wait after cleaning tasks.
 private const val EMPTY_FOLDERS_HIDE_DURATION_MS = 5 * 60 * 1000L
 
 @OptIn(ExperimentalCoroutinesApi::class)
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/WeeklyCleanStreakCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/WeeklyCleanStreakCard.kt
@@ -14,8 +14,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.AutoAwesome
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.rounded.AutoAwesome
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/trash/domain/usecases/GetTrashFilesUseCase.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/trash/domain/usecases/GetTrashFilesUseCase.kt
@@ -14,8 +14,6 @@ class GetTrashFilesUseCase(
         runCatching {
             val trashFiles = repository.getTrashFiles()
             emit(DataState.Success(data = trashFiles))
-        }.onFailure {
-            // e -> emit(DataState.Error(e))
         }
     }
 
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/trash/ui/TrashScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/trash/ui/TrashScreen.kt
@@ -25,8 +25,8 @@ import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.app.clean.analyze.ui.components.CleaningAnimationScreen
 import com.d4rk.cleaner.app.clean.analyze.ui.components.FilesByDateSection
-import com.d4rk.cleaner.app.clean.scanner.ui.components.TwoRowButtons
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
+import com.d4rk.cleaner.app.clean.scanner.ui.components.TwoRowButtons
 import com.d4rk.cleaner.app.clean.trash.domain.actions.TrashEvent
 import com.d4rk.cleaner.app.clean.trash.domain.data.model.ui.UiTrashModel
 import org.koin.compose.viewmodel.koinViewModel
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/whatsapp/details/ui/components/DetailsStatusRow.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/whatsapp/details/ui/components/DetailsStatusRow.kt
@@ -1,6 +1,5 @@
 package com.d4rk.cleaner.app.clean.whatsapp.details.ui.components
 
-import android.view.View
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.tween
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/whatsapp/summary/data/WhatsAppCleanerRepositoryImpl.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/whatsapp/summary/data/WhatsAppCleanerRepositoryImpl.kt
@@ -3,10 +3,10 @@ package com.d4rk.cleaner.app.clean.whatsapp.summary.data
 import android.app.Application
 import android.os.Environment
 import android.text.format.Formatter
+import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.model.DeleteResult
 import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.model.DirectorySummary
 import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.model.WhatsAppMediaSummary
 import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.repository.WhatsAppCleanerRepository
-import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.model.DeleteResult
 import com.d4rk.cleaner.app.clean.whatsapp.utils.constants.WhatsAppMediaConstants
 import com.d4rk.cleaner.core.utils.helpers.FileDeletionHelper
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/whatsapp/summary/ui/WhatsappCleanerSummaryScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/whatsapp/summary/ui/WhatsappCleanerSummaryScreen.kt
@@ -39,15 +39,15 @@ import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.SmallVertical
 import com.d4rk.android.libs.apptoolkit.core.ui.effects.LifecycleEventsEffect
 import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
 import com.d4rk.cleaner.R
+import com.d4rk.cleaner.app.clean.analyze.ui.components.CleaningAnimationScreen
+import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
 import com.d4rk.cleaner.app.clean.whatsapp.details.ui.WhatsAppDetailsActivity
 import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.actions.WhatsAppCleanerEvent
 import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.model.DirectoryItem
 import com.d4rk.cleaner.app.clean.whatsapp.summary.domain.model.UiWhatsAppCleanerModel
 import com.d4rk.cleaner.app.clean.whatsapp.summary.ui.components.CleanerInfoCard
 import com.d4rk.cleaner.app.clean.whatsapp.summary.ui.components.DirectoryGrid
 import com.d4rk.cleaner.app.clean.whatsapp.summary.ui.components.WhatsAppEmptyState
-import com.d4rk.cleaner.app.clean.analyze.ui.components.CleaningAnimationScreen
-import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
 import com.d4rk.cleaner.app.clean.whatsapp.utils.constants.WhatsAppMediaConstants
 import org.koin.compose.koinInject
 import org.koin.compose.viewmodel.koinViewModel
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/core/ui/components/GridCardItem.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/core/ui/components/GridCardItem.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/images/compressor/ui/ImageOptimizerScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/images/compressor/ui/ImageOptimizerScreen.kt
@@ -15,10 +15,10 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Card
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Tab
@@ -29,7 +29,6 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/images/compressor/ui/components/tabs/QuickCompressTab.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/images/compressor/ui/components/tabs/QuickCompressTab.kt
@@ -22,10 +22,10 @@ import androidx.compose.ui.unit.dp
 import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.LargeVerticalSpacer
 import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.SmallHorizontalSpacer
 import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
+import com.d4rk.cleaner.R
 import com.d4rk.cleaner.app.images.compressor.domain.data.model.CompressionLevel
 import com.d4rk.cleaner.app.images.compressor.ui.ImageOptimizerViewModel
 import com.d4rk.cleaner.app.images.utils.getCompressionLevelFromSliderValue
-import com.d4rk.cleaner.R
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/main/ui/components/navigation/CleanerTopAppBar.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/main/ui/components/navigation/CleanerTopAppBar.kt
@@ -143,7 +143,7 @@ fun CleanerTopAppBar(
                                     ) {
                                         Icon(
                                             imageVector = Icons.Outlined.Close,
-                                            contentDescription = "Clear search" // Consider using stringResource
+                                            contentDescription = "Clear search"
                                         )
                                     }
                                 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/core/data/datastore/DataStore.kt b/app/src/main/kotlin/com/d4rk/cleaner/core/data/datastore/DataStore.kt
@@ -5,8 +5,8 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.longPreferencesKey
-import androidx.datastore.preferences.core.stringSetPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.core.stringSetPreferencesKey
 import com.d4rk.android.libs.apptoolkit.data.datastore.CommonDataStore
 import com.d4rk.cleaner.core.utils.constants.datastore.AppDataStoreConstants
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/core/utils/extensions/SelectionExtensions.kt b/app/src/main/kotlin/com/d4rk/cleaner/core/utils/extensions/SelectionExtensions.kt
