From 044a67bf6d22127a625cbf322fa15ef29006228e Mon Sep 17 00:00:00 2001
From: D4rK7355608 <d4rk7355608@gmail.com>
Date: Thu, 10 Oct 2024 21:37:00 +0300
Subject: [PATCH] Android Studio suggestions

---
 .idea/inspectionProfiles/Project_Default.xml  |   3 +
 ...Update_at_10_1_2024_11_20_AM__Changes_.xml |   4 -
 .../cleaner/ui/components/CarouselLayout.kt   | 155 ++++++++++++++++++
 .../ui/screens/appmanager/AppManagerScreen.kt |  21 ++-
 .../ui/screens/loading/LoadingScreen.kt       |  23 +++
 .../ui/screens/memory/MemoryManagerScreen.kt  | 133 +--------------
 6 files changed, 197 insertions(+), 142 deletions(-)
 delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_10_1_2024_11_20_AM__Changes_.xml
 create mode 100644 app/src/main/kotlin/com/d4rk/cleaner/ui/components/CarouselLayout.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/cleaner/ui/screens/loading/LoadingScreen.kt

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index daf6259..4f85904 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -35,6 +35,9 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_10_1_2024_11_20_AM__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_10_1_2024_11_20_AM__Changes_.xml
deleted file mode 100644
index 7ce9eae..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_10_1_2024_11_20_AM__Changes_.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_10_1_2024_11_20_AM_[Changes]" date="1727770820875" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_10_1_2024_11_20_AM_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 10/1/2024 11:20 AM [Changes]" />
-</changelist>
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/components/CarouselLayout.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/CarouselLayout.kt
new file mode 100644
index 0000000..8056366
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/components/CarouselLayout.kt
@@ -0,0 +1,155 @@
+package com.d4rk.cleaner.ui.components
+
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.Transition
+import androidx.compose.animation.core.animateDp
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+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.graphicsLayer
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.lerp
+import com.d4rk.cleaner.ui.components.animations.hapticPagerSwipe
+import kotlin.math.absoluteValue
+
+@Composable
+fun <T> CarouselLayout(
+    items: List<T>,
+    sidePadding: Dp,
+    pagerState: PagerState,
+    itemContent: @Composable (item: T) -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+    ) {
+        HorizontalPager(
+            state = pagerState,
+            modifier = Modifier
+                .fillMaxWidth()
+                .hapticPagerSwipe(pagerState),
+            contentPadding = PaddingValues(horizontal = sidePadding),
+        ) { page ->
+            val pageOffset = remember(pagerState.currentPage, page) {
+                (pagerState.currentPage - page).absoluteValue.toFloat()
+            }
+            CarouselItem(items[page], pageOffset, itemContent)
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        DotsIndicator(
+            modifier = Modifier
+                .align(Alignment.CenterHorizontally)
+                .padding(bottom = 8.dp),
+            totalDots = items.size,
+            selectedIndex = pagerState.currentPage,
+            dotSize = 6.dp,
+        )
+    }
+}
+
+@Composable
+fun <T> CarouselItem(
+    item: T,
+    pageOffset: Float,
+    itemContent: @Composable (item: T) -> Unit
+) {
+    val scale = animateFloatAsState(
+        targetValue = lerp(0.95f, 1f, 1f - pageOffset.coerceIn(0f, 1f)),
+        animationSpec = tween(250),
+        label = "Carousel Item Scale for Page $pageOffset"
+    ).value
+
+    val alpha = lerp(0.5f, 1f, 1f - pageOffset.coerceIn(0f, 1f))
+
+    Card(
+        modifier = Modifier
+            .fillMaxWidth()
+            .graphicsLayer {
+                scaleX = scale
+                scaleY = scale
+                this.alpha = alpha
+            }
+    ) {
+        itemContent(item)
+    }
+}
+
+@Composable
+fun DotsIndicator(
+    modifier: Modifier = Modifier,
+    totalDots: Int,
+    selectedIndex: Int,
+    selectedColor: Color = MaterialTheme.colorScheme.primary,
+    unSelectedColor: Color = Color.Gray,
+    dotSize: Dp,
+    animationDuration: Int = 300
+) {
+    val transition: Transition<Int> =
+        updateTransition(targetState = selectedIndex, label = "Dot Transition")
+
+    LazyRow(
+        modifier = modifier
+            .wrapContentWidth()
+            .height(dotSize),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        items(count = totalDots, key = { index -> index }) { index ->
+            val animatedDotSize: Dp by transition.animateDp(transitionSpec = {
+                tween(durationMillis = animationDuration, easing = FastOutSlowInEasing)
+            }, label = "Dot Size Animation") {
+                if (it == index) dotSize else dotSize / 1.4f
+            }
+
+            val isSelected: Boolean = index == selectedIndex
+            val size: Dp = if (isSelected) animatedDotSize else animatedDotSize
+
+            IndicatorDot(
+                color = if (isSelected) selectedColor else unSelectedColor, size = size
+            )
+
+            if (index != totalDots - 1) {
+                Spacer(modifier = Modifier.padding(horizontal = 2.dp))
+            }
+        }
+    }
+}
+
+@Composable
+fun IndicatorDot(
+    modifier: Modifier = Modifier,
+    size: Dp,
+    color: Color,
+) {
+    Box(
+        modifier = modifier
+            .size(size)
+            .clip(CircleShape)
+            .background(color)
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/appmanager/AppManagerScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/appmanager/AppManagerScreen.kt
index b04e819..914accc 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/appmanager/AppManagerScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/appmanager/AppManagerScreen.kt
@@ -62,10 +62,11 @@ import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.model.ui.appmanager.ui.ApkInfo
 import com.d4rk.cleaner.data.model.ui.error.UiErrorModel
 import com.d4rk.cleaner.data.model.ui.screens.UiAppManagerModel
-import com.d4rk.cleaner.ui.components.dialogs.ErrorAlertDialog
-import com.d4rk.cleaner.utils.PermissionsUtils
 import com.d4rk.cleaner.ui.components.animations.bounceClick
 import com.d4rk.cleaner.ui.components.animations.hapticPagerSwipe
+import com.d4rk.cleaner.ui.components.dialogs.ErrorAlertDialog
+import com.d4rk.cleaner.ui.screens.loading.LoadingScreen
+import com.d4rk.cleaner.utils.PermissionsUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.io.File
@@ -86,12 +87,16 @@ fun AppManagerScreen() {
     val pagerState: PagerState = rememberPagerState(pageCount = { tabs.size })
     val coroutineScope: CoroutineScope = rememberCoroutineScope()
     val isLoading: Boolean by viewModel.isLoading.collectAsState()
+
     val transition: Transition<Boolean> =
         updateTransition(targetState = !isLoading, label = "LoadingTransition")
+
+    val progressAlpha: Float by transition.animateFloat(label = "Progress Alpha") {
+        if (it) 0f else 1f
+    }
     val contentAlpha: Float by transition.animateFloat(label = "Content Alpha") {
         if (it) 1f else 0f
     }
-
     val uiState: UiAppManagerModel by viewModel.uiState.collectAsState()
     val uiErrorModel: UiErrorModel by viewModel.uiErrorModel.collectAsState()
 
@@ -107,14 +112,12 @@ fun AppManagerScreen() {
     }
 
     if (isLoading) {
-        Box(
-            modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center
-        ) {
-            CircularProgressIndicator()
-        }
+        LoadingScreen(progressAlpha)
     } else {
         Column(
-            modifier = Modifier.alpha(contentAlpha),
+            modifier = Modifier
+                .fillMaxSize()
+                .alpha(contentAlpha)
         ) {
             TabRow(
                 selectedTabIndex = pagerState.currentPage,
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/loading/LoadingScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/loading/LoadingScreen.kt
new file mode 100644
index 0000000..60faeb8
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/loading/LoadingScreen.kt
@@ -0,0 +1,23 @@
+package com.d4rk.cleaner.ui.screens.loading
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+
+@Composable
+fun LoadingScreen(progressAlpha: Float) {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .animateContentSize()
+            .alpha(progressAlpha),
+        contentAlignment = Alignment.Center
+    ) {
+        CircularProgressIndicator()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt
index 9debee5..529f3e4 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/memory/MemoryManagerScreen.kt
@@ -5,17 +5,11 @@ import android.content.Context
 import android.view.SoundEffectConstants
 import android.view.View
 import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.Transition
-import androidx.compose.animation.core.animateDp
 import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
 import androidx.compose.animation.core.updateTransition
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -24,14 +18,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowLeft
 import androidx.compose.material.icons.outlined.Android
@@ -44,7 +34,6 @@ import androidx.compose.material.icons.outlined.MusicNote
 import androidx.compose.material.icons.outlined.SnippetFolder
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
@@ -57,30 +46,25 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.lerp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.data.model.ui.error.UiErrorModel
 import com.d4rk.cleaner.data.model.ui.memorymanager.RamInfo
 import com.d4rk.cleaner.data.model.ui.memorymanager.StorageInfo
 import com.d4rk.cleaner.data.model.ui.screens.UiMemoryManagerModel
+import com.d4rk.cleaner.ui.components.CarouselLayout
 import com.d4rk.cleaner.ui.components.StorageProgressBar
 import com.d4rk.cleaner.ui.components.animations.bounceClick
-import com.d4rk.cleaner.ui.components.animations.hapticPagerSwipe
 import com.d4rk.cleaner.ui.components.dialogs.ErrorAlertDialog
+import com.d4rk.cleaner.ui.screens.loading.LoadingScreen
 import com.d4rk.cleaner.utils.PermissionsUtils
 import com.d4rk.cleaner.utils.cleaning.StorageUtils.formatSize
-import kotlin.math.absoluteValue
 
 @Composable
 fun MemoryManagerComposable() {
@@ -118,15 +102,7 @@ fun MemoryManagerComposable() {
     }
 
     if (isLoading) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .animateContentSize()
-                .alpha(progressAlpha),
-            contentAlignment = Alignment.Center
-        ) {
-            CircularProgressIndicator()
-        }
+        LoadingScreen(progressAlpha)
     } else {
         Column(
             modifier = Modifier
@@ -135,7 +111,7 @@ fun MemoryManagerComposable() {
         ) {
             CarouselLayout(
                 items = listOf(uiState.storageInfo, uiState.ramInfo),
-                peekPreviewWidth = 24.dp,
+                sidePadding = 24.dp,
                 pagerState = pagerState
             ) { item ->
                 when (item) {
@@ -146,15 +122,6 @@ fun MemoryManagerComposable() {
 
             Spacer(modifier = Modifier.height(16.dp))
 
-            DotsIndicator(
-                modifier = Modifier.align(Alignment.CenterHorizontally),
-                totalDots = 2,
-                selectedIndex = pagerState.currentPage,
-                dotSize = 6.dp
-            )
-
-            Spacer(modifier = Modifier.height(16.dp))
-
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -189,44 +156,6 @@ fun MemoryManagerComposable() {
     }
 }
 
-@Composable
-fun <T> CarouselLayout(
-    items: List<T>,
-    peekPreviewWidth: Dp,
-    pagerState: PagerState,
-    itemContent: @Composable (item: T) -> Unit
-) {
-    HorizontalPager(
-        state = pagerState,
-        modifier = Modifier
-            .fillMaxWidth()
-            .hapticPagerSwipe(pagerState),
-        contentPadding = PaddingValues(horizontal = peekPreviewWidth)
-    ) { page ->
-        val pageOffset: Float = (pagerState.currentPage - page).toFloat().absoluteValue
-
-        val scale: Float by animateFloatAsState(
-            targetValue = lerp(
-                start = 0.95f, stop = 1f, fraction = 1f - pageOffset.coerceIn(0f, 1f)
-            ),
-            animationSpec = tween(durationMillis = 250),
-            label = "Carousel Item Scale Animation"
-        )
-        val alpha: Float =
-            lerp(start = 0.5f, stop = 1f, fraction = 1f - pageOffset.coerceIn(0f, 1f))
-
-        Card(modifier = Modifier
-            .fillMaxWidth()
-            .graphicsLayer {
-                scaleX = scale
-                scaleY = scale
-                this.alpha = alpha
-            }) {
-            itemContent(items[page])
-        }
-    }
-}
-
 @Composable
 fun StorageInfoCard(storageInfo: StorageInfo) {
 
@@ -375,58 +304,4 @@ fun RamInfoCard(ramInfo: RamInfo) {
         )
         StorageInfoText(label = stringResource(id = R.string.total_ram), size = ramInfo.totalRam)
     }
-}
-
-@Composable
-fun DotsIndicator(
-    modifier: Modifier = Modifier,
-    @Suppress("SameParameterValue") totalDots: Int,
-    selectedIndex: Int,
-    selectedColor: Color = MaterialTheme.colorScheme.primary,
-    unSelectedColor: Color = Color.Gray,
-    dotSize: Dp,
-    animationDuration: Int = 300
-) {
-    val transition: Transition<Int> =
-        updateTransition(targetState = selectedIndex, label = "Dot Transition")
-
-    LazyRow(
-        modifier = modifier
-            .wrapContentWidth()
-            .height(dotSize),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        items(count = totalDots, key = { index -> index }) { index ->
-            val animatedDotSize: Dp by transition.animateDp(transitionSpec = {
-                tween(durationMillis = animationDuration, easing = FastOutSlowInEasing)
-            }, label = "Dot Size Animation") {
-                if (it == index) dotSize else dotSize / 1.4f
-            }
-
-            val isSelected: Boolean = index == selectedIndex
-            val size: Dp = if (isSelected) animatedDotSize else animatedDotSize
-
-            IndicatorDot(
-                color = if (isSelected) selectedColor else unSelectedColor, size = size
-            )
-
-            if (index != totalDots - 1) {
-                Spacer(modifier = Modifier.padding(horizontal = 2.dp))
-            }
-        }
-    }
-}
-
-@Composable
-fun IndicatorDot(
-    modifier: Modifier = Modifier,
-    size: Dp,
-    color: Color,
-) {
-    Box(
-        modifier = modifier
-            .size(size)
-            .clip(CircleShape)
-            .background(color)
-    )
 }
\ No newline at end of file