From 330e1e6e2db462a6301720262a65d8a13239b369 Mon Sep 17 00:00:00 2001
From: Enoch <adesanyaenoch@gmail.com>
Date: Mon, 11 Nov 2024 19:50:52 +0100
Subject: [PATCH] refactor: moved some ui elements into their own composable

---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .../literarylinc/ui/LiteraryLincApp.kt        |  4 +-
 .../com/enoch02/reader/ReaderListScreen.kt    | 52 ++++--------------
 .../reader/components/NoDocumentView.kt       | 55 +++++++++++++++++++
 .../reader/components/ReaderListItem.kt       |  2 +-
 5 files changed, 71 insertions(+), 46 deletions(-)
 create mode 100644 features/reader/src/main/java/com/enoch02/reader/components/NoDocumentView.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index c969df9..513e717 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-03T05:58:58.351552500Z">
+        <DropdownSelection timestamp="2024-11-08T17:57:56.621617400Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=c33934960906" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\adesa\.android\avd\Pixel_4_API_VanillaIceCream.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/enoch02/literarylinc/ui/LiteraryLincApp.kt b/app/src/main/java/com/enoch02/literarylinc/ui/LiteraryLincApp.kt
index a36ac7d..90b5fb6 100644
--- a/app/src/main/java/com/enoch02/literarylinc/ui/LiteraryLincApp.kt
+++ b/app/src/main/java/com/enoch02/literarylinc/ui/LiteraryLincApp.kt
@@ -216,13 +216,13 @@ fun LiteraryLincApp(navController: NavController) {
                     }
                 },
                 content = { paddingValues ->
+                    RequestNotificationPermission()
+
                     Crossfade(
                         targetState = currentScreen,
                         content = {
                             when (it) {
                                 TopLevelDestination.BOOK_LIST -> {
-                                    RequestNotificationPermission()
-
                                     BookListSortOptionsAlert(
                                         showBookListSortOptions = showBookListSortOptions,
                                         currentBookListSorting = currentBookListSorting,
diff --git a/features/reader/src/main/java/com/enoch02/reader/ReaderListScreen.kt b/features/reader/src/main/java/com/enoch02/reader/ReaderListScreen.kt
index c1f1cf8..5150260 100644
--- a/features/reader/src/main/java/com/enoch02/reader/ReaderListScreen.kt
+++ b/features/reader/src/main/java/com/enoch02/reader/ReaderListScreen.kt
@@ -5,9 +5,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.width
@@ -15,24 +13,21 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+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.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.enoch02.viewer.LLDocumentActivity
 import com.composables.core.ScrollArea
 import com.composables.core.Thumb
 import com.composables.core.ThumbVisibility
@@ -40,7 +35,10 @@ import com.composables.core.VerticalScrollbar
 import com.composables.core.rememberScrollAreaState
 import com.enoch02.database.model.ReaderFilter
 import com.enoch02.database.model.ReaderSorting
+import com.enoch02.reader.components.NoDocumentView
 import com.enoch02.reader.components.ReaderListItem
+import com.enoch02.viewer.LLDocumentActivity
+import kotlinx.coroutines.launch
 import kotlin.time.Duration.Companion.seconds
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -55,6 +53,7 @@ fun ReaderListScreen(
     val context = LocalContext.current
     val arrangedDocs by viewModel.documentsState.collectAsStateWithLifecycle()
     val covers by viewModel.covers.collectAsState(initial = emptyMap())
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(sorting, filter) {
         viewModel.updateFilter(filter)
@@ -72,39 +71,9 @@ fun ReaderListScreen(
 
         is DocumentsState.Loaded -> {
             if (docList.documents.isEmpty()) {
-                Column(
-                    modifier = Modifier.fillMaxSize(),
-                    verticalArrangement = Arrangement.Center,
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    content = {
-                        when (filter) {
-                            ReaderFilter.READING -> {
-                                Text(text = stringResource(R.string.nothing_to_continue))
-                            }
-
-                            ReaderFilter.FAVORITES -> {
-                                Text(text = stringResource(R.string.no_favorite_docs))
-                            }
-
-                            ReaderFilter.COMPLETED -> {
-                                Text(text = stringResource(R.string.no_completed_docs))
-                            }
-
-                            ReaderFilter.ALL -> {
-                                Text(text = stringResource(R.string.no_doc_found))
-                                Button(
-                                    onClick = onScanForDocs,
-                                    content = {
-                                        Text(text = stringResource(R.string.scan_for_new_docs))
-                                    }
-                                )
-                            }
-
-                            ReaderFilter.NO_FILE -> {
-                                Text(text = stringResource(R.string.no_doc_found))
-                            }
-                        }
-                    }
+                NoDocumentView(
+                    filter = filter,
+                    onScanForDocs = onScanForDocs
                 )
             } else {
                 val listState = rememberLazyListState()
@@ -129,6 +98,9 @@ fun ReaderListScreen(
                                             documentInBookList = inBookList,
                                             cover = covers[document.cover],
                                             onClick = {
+                                                scope.launch {
+                                                    listState.animateScrollToItem(0)
+                                                }
                                                 viewModel.createBookListEntry(document)
 
                                                 val intent =
@@ -138,9 +110,7 @@ fun ReaderListScreen(
                                                             data = document.contentUri
                                                             putExtra("id", document.id)
                                                         }
-
                                                 context.startActivity(intent)
-                                                listState.requestScrollToItem(0)
                                             },
                                             onAddToFavoritesClicked = {
                                                 viewModel.toggleFavoriteStatus(document)
diff --git a/features/reader/src/main/java/com/enoch02/reader/components/NoDocumentView.kt b/features/reader/src/main/java/com/enoch02/reader/components/NoDocumentView.kt
new file mode 100644
index 0000000..c50a7c2
--- /dev/null
+++ b/features/reader/src/main/java/com/enoch02/reader/components/NoDocumentView.kt
@@ -0,0 +1,55 @@
+package com.enoch02.reader.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import com.enoch02.database.model.ReaderFilter
+import com.enoch02.reader.R
+
+@Composable
+fun NoDocumentView(
+    modifier: Modifier = Modifier,
+    filter: ReaderFilter,
+    onScanForDocs: () -> Unit
+) {
+    Column(
+        modifier = modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        content = {
+            when (filter) {
+                ReaderFilter.READING -> {
+                    Text(text = stringResource(R.string.nothing_to_continue))
+                }
+
+                ReaderFilter.FAVORITES -> {
+                    Text(text = stringResource(R.string.no_favorite_docs))
+                }
+
+                ReaderFilter.COMPLETED -> {
+                    Text(text = stringResource(R.string.no_completed_docs))
+                }
+
+                ReaderFilter.ALL -> {
+                    Text(text = stringResource(R.string.no_doc_found))
+                    Button(
+                        onClick = onScanForDocs,
+                        content = {
+                            Text(text = stringResource(R.string.scan_for_new_docs))
+                        }
+                    )
+                }
+
+                ReaderFilter.NO_FILE -> {
+                    Text(text = stringResource(R.string.no_doc_found))
+                }
+            }
+        }
+    )
+}
\ No newline at end of file
diff --git a/features/reader/src/main/java/com/enoch02/reader/components/ReaderListItem.kt b/features/reader/src/main/java/com/enoch02/reader/components/ReaderListItem.kt
index edc9a2f..1c808ad 100644
--- a/features/reader/src/main/java/com/enoch02/reader/components/ReaderListItem.kt
+++ b/features/reader/src/main/java/com/enoch02/reader/components/ReaderListItem.kt
@@ -307,7 +307,7 @@ fun ReaderListItem(
         modifier = modifier
             .height(IntrinsicSize.Min)
             .clickable {
-                    onClick()
+                onClick()
             }
     )