refactor: code clean

app/build.gradle.kts

@@ -82,7 +82,7 @@ dependencies {
 
     val material3 = "1.2.0-alpha05"
     val navigationVersion = "2.6.0"
-    val composeBom = platform("androidx.compose:compose-bom:2023.08.00")
+    val composeBom = platform("androidx.compose:compose-bom:2023.10.01")
     val roomVersion = "2.5.2"
 
 

app/src/main/java/com/etb/filemanager/activity/BaseActivity.kt

@@ -31,6 +31,7 @@ abstract class BaseActivity : AppCompatActivity() {
         styleManager.setTheme(optionStyle, this)
     }
 
+    @Suppress("DEPRECATION")
     fun applyConfigurationChangesToActivities(savedInstanceState: Bundle) {
         val intent = Intent(this, SettingsActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK

app/src/main/java/com/etb/filemanager/activity/SettingsActivity.kt

@@ -93,11 +93,9 @@ class SettingsActivity : BaseActivity(),
         }
     }
 
-    fun getIntent(context: Context, vararg paths: String?): Intent {
+    fun getIntent(context: Context, vararg paths: String): Intent {
         val intent = Intent(context, SettingsActivity::class.java)
-        if (paths != null) {
-            intent.data = SettingsActivity().getSettingUri(*paths as Array<out String>)
-        }
+        intent.data = SettingsActivity().getSettingUri(*paths)
         return intent
     }
 

app/src/main/java/com/etb/filemanager/compose/core/presentation/components/NavigationComp.kt

@@ -11,17 +11,16 @@ import android.os.Build
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import com.etb.filemanager.compose.core.presentation.common.ChanneledViewModel
 import com.etb.filemanager.compose.core.presentation.util.Screen
 import com.etb.filemanager.compose.feature.presentation.categorylist.components.CategoryListScreen
+import com.etb.filemanager.files.extensions.parcelable
 import com.etb.filemanager.manager.category.adapter.CategoryFileModel
 import com.etb.filemanager.manager.media.MediaViewScreen
 import com.etb.filemanager.manager.media.model.MediaListInfo
@@ -38,8 +37,6 @@ fun NavigationComp(
 
     ) {
 
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
-
     val navPipe = hiltViewModel<ChanneledViewModel>()
     navPipe
         .initWithNav(navController)
@@ -73,7 +70,7 @@ fun NavigationComp(
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     backStackEntry.arguments?.getParcelable("mediaInfo", MediaListInfo::class.java)
                 } else {
-                    backStackEntry.arguments?.getParcelable("mediaInfo")
+                    backStackEntry.arguments?.parcelable("mediaInfo")
                 }
 
             MediaViewScreen(

app/src/main/java/com/etb/filemanager/compose/feature/presentation/categorylist/CategoryListScreen.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.navigation.compose.rememberNavController
 import com.etb.filemanager.compose.core.presentation.components.NavigationComp
 import com.etb.filemanager.compose.feature.provider.BaseScreen
+import com.etb.filemanager.files.extensions.parcelable
 import com.etb.filemanager.files.util.toggleOrientation
 import com.etb.filemanager.manager.category.adapter.CategoryFileModel
 import com.etb.filemanager.manager.category.adapter.getName
@@ -35,7 +36,7 @@ class CategoryListScreen : BaseScreen() {
             categoryFileModel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 intent.getParcelableExtra("categoryFileModel", CategoryFileModel::class.java)
             } else {
-                intent.getParcelableExtra("categoryFileModel")
+                intent.parcelable("categoryFileModel")
             }
         }
 

app/src/main/java/com/etb/filemanager/compose/feature/presentation/categorylist/apklist/components/ApkComponent.kt

@@ -40,9 +40,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
@@ -66,7 +64,6 @@ import java.nio.file.Paths
 @Composable
 fun ApkItem(apkInfo: AppInfo, appFilter: AppFilter) {
     val resolvedColor = MaterialTheme.colorScheme.onSecondary
-    val colorOnSecondary = Color(resolvedColor.toArgb())
 
     var expanded by remember { mutableStateOf(false) }
     var isAppInfoBottomSheetExpanded by remember { mutableStateOf(false) }
@@ -191,8 +188,6 @@ fun ApkItemOptionsColum(
     onButtonClickShowAppInfo: (() -> Unit)? = null,
     isAppInfoBottomSheetExpanded: Boolean
 ) {
-    val coroutineScope = rememberCoroutineScope()
-    val resolvedColor = MaterialTheme.colorScheme.onSecondary
     val colorOnSecondary = MaterialTheme.colorScheme.surfaceColorAtElevation(2.0.dp)
     val context = LocalContext.current
     val textInfo = if (isAppInfoBottomSheetExpanded) "Open in Settings" else "Info"

app/src/main/java/com/etb/filemanager/compose/feature/presentation/categorylist/components/CategoryListScreen.kt

@@ -76,7 +76,6 @@ fun GeneratingMediaList(
     val coroutineScope = rememberCoroutineScope()
     val context = LocalContext.current
 
-    val mediaListState by viewModel.mediaListState.observeAsState(emptyList())
     val loading by viewModel.loading.observeAsState(initial = true)
 
     val mediaUiState by viewModel.uiState.collectAsStateWithLifecycle()

app/src/main/java/com/etb/filemanager/compose/feature/presentation/categorylist/medialist/compenents/MediaComponents.kt

@@ -7,7 +7,6 @@
 
 package com.etb.filemanager.compose.feature.presentation.categorylist.medialist.compenents
 
-import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -34,19 +33,14 @@ import androidx.compose.material.icons.rounded.PlayCircle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import coil.compose.rememberAsyncImagePainter
-import coil.request.ImageRequest
 import com.bumptech.glide.RequestBuilder
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import com.bumptech.glide.integration.compose.GlideImage
@@ -78,46 +72,13 @@ fun MediaItem(
             context
         ).formatMinSec()
         else null
-    val imageRequest = ImageRequest.Builder(LocalContext.current)
-        .data(media.uri)
-        .memoryCacheKey("${media.uri}_${media.mimeType.value}")
-        .diskCacheKey("${media.uri}_${media.mimeType.value}")
-        .crossfade(true)
-        .bitmapConfig( Bitmap.Config.RGB_565)
-        .build()
-
-    val painter = rememberAsyncImagePainter(
-        model = imageRequest,
-        contentScale = ContentScale.Crop,
-        filterQuality = FilterQuality.None
-    )
-
 
     Box(
         modifier = modifier
             .aspectRatio(1f)
             .size(100.dp)
     ) {
-       /* GlideImage(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(color = MaterialTheme.colorScheme.surfaceContainerHigh),
-            contentDescription = "null",
-            contentScale = ContentScale.Crop,
-            model = media.uri
 
-        ) {
-            it.thumbnail(preloadRequestBuilder)
-                .signature(MediaKey(media.id, media.mimeType))
-                .format(DecodeFormat.PREFER_RGB_565).override(270)
-        }*/
-        /*    AsyncImage(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(color = MaterialTheme.colorScheme.surfaceContainerHigh),
-            model = imageRequest,
-            contentDescription = "image",
-            contentScale = ContentScale.Crop,)*/
         GlideImage(
             modifier = Modifier
                 .fillMaxSize()
@@ -183,9 +144,7 @@ fun LazyGridItemScope.MediaComponent(
     media: Media,
     preloadRequestBuilder: RequestBuilder<Drawable>,
     onItemClick: (Media) -> Unit,
-    onItemLongClick: (Media) -> Unit,
 ) {
-    val isSelected = remember { mutableStateOf(false) }
 
     MediaItem(
         media = media,
@@ -240,7 +199,6 @@ fun MediaGridView(
                 MediaComponent(
                     media = media,
                     onItemClick = { onMediaClick(mediaList.toMediaListInfo(it)) },
-                    onItemLongClick = {},
                     preloadRequestBuilder = preloadRequestBuilder
                 )
             }

app/src/main/java/com/etb/filemanager/compose/feature/presentation/deletedfiles/deletedfileslist/DeletedFileListScreen.kt

@@ -7,7 +7,6 @@
 
 package com.etb.filemanager.compose.feature.presentation.deletedfiles.deletedfileslist
 
-import android.os.Build
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.compose.animation.AnimatedVisibility
@@ -68,8 +67,8 @@ import com.etb.filemanager.R
 import com.etb.filemanager.compose.feature.presentation.deletedfiles.DeletedFileDetailsViewModel
 import com.etb.filemanager.compose.feature.presentation.deletedfiles.DeletedFileEntryViewModel
 import com.etb.filemanager.compose.feature.presentation.deletedfiles.DeletedIFilesViewModel
-import com.etb.filemanager.compose.feature.presentation.deletedfiles.toDeletedFileDetails
 import com.etb.filemanager.compose.feature.presentation.deletedfiles.deletedfileslist.components.BottomSheetInfo
+import com.etb.filemanager.compose.feature.presentation.deletedfiles.toDeletedFileDetails
 import com.etb.filemanager.compose.feature.provider.AppViewModelProvider
 import com.etb.filemanager.compose.feature.provider.BaseScreen
 import com.etb.filemanager.data.deletedfiles.DeletedFile
@@ -92,13 +91,15 @@ class DeletedFileListScreen : BaseScreen() {
         super.onCreate(savedInstanceState)
         val bundle = intent.extras
 
+/*
         if (bundle != null) {
             fileModel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 intent.getParcelableExtra("fileModel", FileModel::class.java)
             } else {
                 intent.getParcelableExtra("fileModel")
             }
         }
+*/
         if (bundle != null) {
             pathList = bundle.getStringArrayList("pathList")?.toList()
         }
@@ -176,7 +177,6 @@ class DeletedFileListScreen : BaseScreen() {
         val colorOnSecondary = Color(resolvedColor.toArgb())
         var expanded by remember { mutableStateOf(false) }
         var deleted by remember { mutableStateOf(false) }
-        var showBottomSheetInfo by remember { mutableStateOf(false) }
 
         val extraHeight by animateDpAsState(
             targetValue = if (expanded) 100.dp else 75.dp, animationSpec = spring(

app/src/main/java/com/etb/filemanager/compose/feature/presentation/deletedfiles/deletedfileslist/components/BottomSheetInfo.kt

@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -22,26 +21,20 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Card
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.ClipboardManager
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.etb.filemanager.R
@@ -80,10 +73,6 @@ private fun BottomSheetContainer(
     content: @Composable () -> Unit
 ) {
 
-    val resolvedColor = MaterialTheme.colorScheme.onSecondary
-    val colorOnSecondary = Color(resolvedColor.toArgb())
-
-
 
     Column(
         modifier = Modifier
@@ -120,7 +109,6 @@ private fun BottomSheetContainer(
 
 @Composable
 fun BottomSheetButtonsRow(){
-    val coroutineScope = rememberCoroutineScope()
     val resolvedColor = MaterialTheme.colorScheme.onSecondary
     val colorOnSecondary = Color(resolvedColor.toArgb())
 
@@ -181,64 +169,5 @@ fun BottomSheetButton(
 
 }
 
-@Preview(showBackground = true, showSystemUi = true)
-@Composable
-fun PreviewBottomSheet(){
-        BottomSheetInfo()
-}
-
-@Composable
-@Preview(showBackground = false)
-fun BottomSheetButtonPreview(){
-    val resolvedColor = MaterialTheme.colorScheme.onSecondary
-    val colorOnSecondary = Color(resolvedColor.toArgb())
-
-    BottomSheetButton(
-        text = "Ok",
-        modifier = Modifier
-            .background(color = colorOnSecondary, shape = AppShapes.cutLeftMedium)){
-
-    }
-}
-
-@Composable
-@Preview
-fun BottomSheetButtonsRowPreview(){
-    BottomSheetButtonsRow()
-}
-
-@Composable
-fun APKInfoRow(
-    modifier: Modifier = Modifier,
-    label: String,
-    content: String,
-) {
-    val clipboardManager: ClipboardManager = LocalClipboardManager.current
 
-    ListItem(
-        modifier = modifier
-            .fillMaxSize()
-            .clip(Shapes.medium),
-        colors = ListItemDefaults.colors(
-            containerColor = Color.Transparent
-        ),
-        headlineContent = {
-            Text(
-                text = label,
-                fontWeight = FontWeight.Medium
-            )
-        },
-        supportingContent = {
-            Text(text = content)
-        }
 
-    )
-}
-@Composable
-@Preview
-fun PreviewBottomSheetContainer(){
-    BottomSheetContainer {
-       APKInfoRow(label = "Labe", content = "conetn",)
-
-    }
-}