Merge pull request #2 from paulcoding810/feat/show-progress

Show page progress on posts, images, search

Author: paulcoding810

app/src/main/java/com/paulcoding/hviewer/ui/component/HPageProgress.kt

@@ -0,0 +1,10 @@
+package com.paulcoding.hviewer.ui.component
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun HPageProgress(currentPage: Int, totalPage: Int) {
+    Text("$currentPage/$totalPage", fontSize = 10.sp)
+}

app/src/main/java/com/paulcoding/hviewer/ui/page/post/PostPage.kt

@@ -38,6 +38,7 @@ import com.paulcoding.hviewer.model.SiteConfig
 import com.paulcoding.hviewer.ui.component.HBackIcon
 import com.paulcoding.hviewer.ui.component.HImage
 import com.paulcoding.hviewer.ui.component.HLoading
+import com.paulcoding.hviewer.ui.component.HPageProgress
 import com.paulcoding.hviewer.ui.component.HideSystemBars
 import me.saket.telephoto.zoomable.DoubleClickToZoomListener
 import me.saket.telephoto.zoomable.ZoomSpec
@@ -99,6 +100,10 @@ fun PostPage(siteConfig: SiteConfig, postUrl: String, goBack: () -> Unit) {
                     HBackIcon { goBack() }
                 },
                 title = {},
+                actions = {
+                    if (uiState.images.isNotEmpty())
+                        HPageProgress(uiState.postPage, uiState.postTotalPage)
+                }
             )
         }
     }) {

app/src/main/java/com/paulcoding/hviewer/ui/page/posts/PostsPage.kt

@@ -22,7 +22,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -36,6 +39,7 @@ import com.paulcoding.hviewer.ui.component.HEmpty
 import com.paulcoding.hviewer.ui.component.HIcon
 import com.paulcoding.hviewer.ui.component.HImage
 import com.paulcoding.hviewer.ui.component.HLoading
+import com.paulcoding.hviewer.ui.component.HPageProgress
 import com.paulcoding.hviewer.ui.icon.Search
 import kotlinx.coroutines.launch
 
@@ -53,10 +57,13 @@ fun PostsPage(
     val selectedTabIndex = pagerState.currentPage
     val currentPage = listTopic[selectedTabIndex]
     val scope = rememberCoroutineScope()
+    var pageProgress by remember { mutableStateOf(1 to 1) }
+
     Scaffold(topBar = {
         TopAppBar(title = { Text(currentPage.toCapital()) }, navigationIcon = {
             HBackIcon { goBack() }
         }, actions = {
+            HPageProgress(pageProgress.first, pageProgress.second)
             HIcon(imageVector = Search) { navToSearch() }
         })
     }) { paddings ->
@@ -86,7 +93,12 @@ fun PostsPage(
                 modifier = Modifier.fillMaxSize(),
             ) { pageIndex ->
                 val page = listTopic[pageIndex]
-                PageContent(siteConfig, page) { postUrl ->
+                PageContent(
+                    siteConfig,
+                    page,
+                    onPageChange = { currentPage, total ->
+                        pageProgress = currentPage to total
+                    }) { postUrl ->
                     navToImages(postUrl)
                 }
             }
@@ -95,7 +107,12 @@ fun PostsPage(
 }
 
 @Composable
-fun PageContent(siteConfig: SiteConfig, topic: String, onClick: (String) -> Unit) {
+fun PageContent(
+    siteConfig: SiteConfig,
+    topic: String,
+    onPageChange: (Int, Int) -> Unit,
+    onClick: (String) -> Unit
+) {
     val viewModel: PostsViewModel = viewModel(
         factory = PostsViewModelFactory(siteConfig, topic),
         key = topic
@@ -119,6 +136,10 @@ fun PageContent(siteConfig: SiteConfig, topic: String, onClick: (String) -> Unit
         }
     }
 
+    LaunchedEffect(uiState.postsPage, uiState.postsTotalPage) {
+        onPageChange(uiState.postsPage, uiState.postsTotalPage)
+    }
+
     LazyColumn(
         state = listState
     ) {

app/src/main/java/com/paulcoding/hviewer/ui/page/search/SearchPage.kt

@@ -38,6 +38,7 @@ import com.paulcoding.hviewer.model.SiteConfig
 import com.paulcoding.hviewer.ui.component.HBackIcon
 import com.paulcoding.hviewer.ui.component.HEmpty
 import com.paulcoding.hviewer.ui.component.HLoading
+import com.paulcoding.hviewer.ui.component.HPageProgress
 import com.paulcoding.hviewer.ui.icon.EditIcon
 import com.paulcoding.hviewer.ui.page.posts.PostItemView
 
@@ -52,6 +53,7 @@ fun SearchPage(
     val viewModel: SearchViewModel = viewModel(
         factory = SearchViewModelFactory(siteConfig),
     )
+    val uiState by viewModel.stateFlow.collectAsState()
     var query by remember { mutableStateOf(viewModel.stateFlow.value.query) }
     val focusRequester = remember { androidx.compose.ui.focus.FocusRequester() }
     val focusManager = LocalFocusManager.current
@@ -69,7 +71,11 @@ fun SearchPage(
     Scaffold(topBar = {
         TopAppBar(title = { Text("Search") }, navigationIcon = {
             HBackIcon { goBack() }
-        })
+        },
+            actions = {
+                if (uiState.postItems.isNotEmpty())
+                    HPageProgress(uiState.postsPage, uiState.postsTotalPage)
+            })
     }) { paddings ->
         Column(modifier = Modifier.padding(paddings)) {
             Row(