updated: logout moved to profile page

Shaur · Shaur · commit c66577e67ef1 · 2025-06-19T09:45:53.000+03:00
fixed: ignored network error meanwhile reading state update
diff --git a/app/src/main/java/com/home/reader/component/dto/ProfileDto.kt b/app/src/main/java/com/home/reader/component/dto/ProfileDto.kt
@@ -0,0 +1,5 @@
+package com.home.reader.component.dto
+
+data class ProfileDto(
+    val username: String
+)
diff --git a/app/src/main/java/com/home/reader/ui/AppViewModelProvider.kt b/app/src/main/java/com/home/reader/ui/AppViewModelProvider.kt
@@ -12,6 +12,7 @@ import com.home.reader.ui.reader.viewmodel.ReaderViewModel
 import com.home.reader.ui.series.viewmodel.SeriesViewModel
 import com.home.reader.ui.common.component.viewmodel.NavigationMenuViewModel
 import com.home.reader.ui.common.component.viewmodel.UpdateOnResumeViewModel
+import com.home.reader.ui.profile.ProfileViewModel
 
 object AppViewModelProvider {
     val Factory = viewModelFactory {
@@ -65,6 +66,12 @@ object AppViewModelProvider {
                 context = readerApplication().applicationContext
             )
         }
+
+        initializer {
+            ProfileViewModel(
+                userRepository = readerApplication().container.userRepository
+            )
+        }
     }
 }
 
diff --git a/app/src/main/java/com/home/reader/ui/common/component/NavigationMenu.kt b/app/src/main/java/com/home/reader/ui/common/component/NavigationMenu.kt
@@ -2,7 +2,6 @@ package com.home.reader.ui.common.component
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.AccountCircle
-import androidx.compose.material.icons.rounded.Close
 import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.ShoppingCart
 import androidx.compose.material3.Icon
@@ -41,7 +40,11 @@ fun NavigationMenu(
                 selected = currentDestination.value == "login",
                 onClick = {
                     currentDestination.value = "login"
-                    if (loginState.value == null) controller.navigate(NavigationRoutes.Unauthenticated.Login)
+                    if (loginState.value == null) {
+                        controller.navigate(NavigationRoutes.Unauthenticated.Login)
+                    } else {
+                        controller.navigate(NavigationRoutes.Authenticated.Profile)
+                    }
                 }
             )
 
@@ -65,13 +68,6 @@ fun NavigationMenu(
                         controller.navigate(NavigationRoutes.Authenticated.Catalogue)
                     }
                 )
-
-                item(
-                    icon = { Icon(Icons.Rounded.Close, contentDescription = "Log out") },
-                    label = { Text(text = "Log out") },
-                    selected = false,
-                    onClick = { viewModel.logout() }
-                )
             }
         },
         content = content
diff --git a/app/src/main/java/com/home/reader/ui/common/component/viewmodel/NavigationMenuViewModel.kt b/app/src/main/java/com/home/reader/ui/common/component/viewmodel/NavigationMenuViewModel.kt
@@ -19,10 +19,4 @@ class NavigationMenuViewModel(
         }
     }
 
-    fun logout() {
-        viewModelScope.launch {
-            userRepository.delete()
-            loginState.value = null
-        }
-    }
 }
diff --git a/app/src/main/java/com/home/reader/ui/navigation/NavigationRoutes.kt b/app/src/main/java/com/home/reader/ui/navigation/NavigationRoutes.kt
@@ -27,6 +27,9 @@ sealed class NavigationRoutes {
 
         @Serializable
         object Catalogue : Authenticated()
+
+        @Serializable
+        object Profile : Authenticated()
     }
 
 }
diff --git a/app/src/main/java/com/home/reader/ui/navigation/NestedNavigation.kt b/app/src/main/java/com/home/reader/ui/navigation/NestedNavigation.kt
@@ -6,11 +6,13 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
+import com.home.reader.component.dto.ProfileDto
 import com.home.reader.persistence.entity.User
 import com.home.reader.ui.catalogue.screen.CatalogueScreen
 import com.home.reader.ui.common.component.NavigationMenu
 import com.home.reader.ui.issues.screen.IssuesScreen
 import com.home.reader.ui.login.screen.LoginScreen
+import com.home.reader.ui.profile.ProfileScreen
 import com.home.reader.ui.reader.configuration.ReaderConfig
 import com.home.reader.ui.reader.screen.ReaderScreen
 import com.home.reader.ui.series.screen.SeriesScreen
@@ -21,7 +23,11 @@ fun NavGraphBuilder.authenticatedGraph(
     currentPosition: MutableState<String>
 ) {
     composable<NavigationRoutes.Authenticated.Series> {
-        NavigationMenu(loginState = loginState, controller = controller, currentDestination = currentPosition) {
+        NavigationMenu(
+            loginState = loginState,
+            controller = controller,
+            currentDestination = currentPosition
+        ) {
             SeriesScreen(
                 loginState = loginState,
                 onNavigateToIssuesScreen = { id, name ->
@@ -33,7 +39,11 @@ fun NavGraphBuilder.authenticatedGraph(
 
     composable<NavigationRoutes.Authenticated.Issues> {
         val config: NavigationRoutes.Authenticated.Issues = it.toRoute()
-        NavigationMenu(loginState = loginState, controller = controller, currentDestination = currentPosition) {
+        NavigationMenu(
+            loginState = loginState,
+            controller = controller,
+            currentDestination = currentPosition
+        ) {
             IssuesScreen(
                 seriesId = config.seriesId,
                 seriesName = config.name,
@@ -45,16 +55,37 @@ fun NavGraphBuilder.authenticatedGraph(
     composable<ReaderConfig> { ReaderScreen(config = it.toRoute()) }
 
     composable<NavigationRoutes.Unauthenticated.Login> {
-        NavigationMenu(loginState = loginState, controller = controller, currentDestination = currentPosition) {
+        NavigationMenu(
+            loginState = loginState,
+            controller = controller,
+            currentDestination = currentPosition
+        ) {
             LoginScreen(navigateOnSuccess = { controller.navigate(NavigationRoutes.Authenticated.Series) })
         }
     }
 
     composable<NavigationRoutes.Authenticated.Catalogue> {
-        NavigationMenu(loginState = loginState, controller = controller, currentDestination = currentPosition) {
+        NavigationMenu(
+            loginState = loginState,
+            controller = controller,
+            currentDestination = currentPosition
+        ) {
             CatalogueScreen(
                 onNavigateToReaderScreen = { config -> controller.navigate(config) }
             )
         }
     }
+
+    composable<NavigationRoutes.Authenticated.Profile> {
+        NavigationMenu(
+            loginState = loginState,
+            controller = controller,
+            currentDestination = currentPosition
+        ) {
+            ProfileScreen(
+                profile = ProfileDto(username = loginState.value?.username ?: ""),
+                navigateOnExit = { controller.navigate(NavigationRoutes.Authenticated.Series) }
+            )
+        }
+    }
 }
diff --git a/app/src/main/java/com/home/reader/ui/profile/ProfileScreen.kt b/app/src/main/java/com/home/reader/ui/profile/ProfileScreen.kt
@@ -0,0 +1,70 @@
+package com.home.reader.ui.profile
+
+import android.graphics.Color
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ExitToApp
+import androidx.compose.material.icons.rounded.AccountCircle
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.home.reader.component.dto.ProfileDto
+import com.home.reader.ui.AppViewModelProvider
+
+@Composable
+fun ProfileScreen(
+    viewModel: ProfileViewModel = viewModel(factory = AppViewModelProvider.Factory),
+    profile: ProfileDto,
+    navigateOnExit: () -> Unit
+) {
+    Column(
+        modifier = Modifier.padding(top = 50.dp)
+    ) {
+        Row(modifier = Modifier.height(40.dp)) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxHeight().weight(2f)
+            ) {
+                Icon(Icons.Rounded.AccountCircle, contentDescription = "Account")
+                Text(text = profile.username)
+            }
+
+
+            IconButton(
+                onClick = {
+                    viewModel.logout()
+                    navigateOnExit()
+                }
+            ) {
+                Icon(Icons.AutoMirrored.Filled.ExitToApp, contentDescription = "Exit")
+            }
+        }
+
+    }
+}
+
+@Composable
+@Preview(
+    showBackground = true,
+    backgroundColor = Color.WHITE.toLong()
+)
+private fun Preview() {
+    val profile = ProfileDto(
+        username = "Username"
+    )
+
+    MaterialTheme {
+        ProfileScreen(profile = profile){}
+    }
+}
diff --git a/app/src/main/java/com/home/reader/ui/profile/ProfileViewModel.kt b/app/src/main/java/com/home/reader/ui/profile/ProfileViewModel.kt
@@ -0,0 +1,27 @@
+package com.home.reader.ui.profile
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.home.reader.persistence.entity.User
+import com.home.reader.persistence.repository.UserRepository
+import kotlinx.coroutines.launch
+
+class ProfileViewModel(
+    private val userRepository: UserRepository
+) : ViewModel() {
+    var loginState = mutableStateOf<User?>(null)
+
+    init {
+        viewModelScope.launch {
+            loginState.value = userRepository.get()
+        }
+    }
+
+    fun logout() {
+        viewModelScope.launch {
+            userRepository.delete()
+            loginState.value = null
+        }
+    }
+}
diff --git a/app/src/main/java/com/home/reader/ui/reader/viewmodel/ReaderViewModel.kt b/app/src/main/java/com/home/reader/ui/reader/viewmodel/ReaderViewModel.kt
@@ -75,9 +75,15 @@ class ReaderViewModel(
         state.value = state.value.copy(currentPage = page)
         viewModelScope.launch(Dispatchers.IO) {
             when (state.value.mode) {
-                ReaderMode.REMOTE -> api.updateProgress(state.value.externalId!!, page)
+                ReaderMode.REMOTE -> {
+                    try {
+                        api.updateProgress(state.value.externalId!!, page)
+                    } catch (_: Exception) {
+                        //TODO save to database and post later
+                    }
+                }
                 ReaderMode.LOCAL -> issueRepository.updateState(state.value.id!!, page)
-                else -> {
+                ReaderMode.CACHED -> {
                     try {
                         api.updateProgress(state.value.externalId!!, page)
                     } catch (_: Exception) {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import com.home.reader.ui.reader.viewmodel.ReaderViewModel`
`12`	`12`	`import com.home.reader.ui.series.viewmodel.SeriesViewModel`
`13`	`13`	`import com.home.reader.ui.common.component.viewmodel.NavigationMenuViewModel`
`14`	`14`	`import com.home.reader.ui.common.component.viewmodel.UpdateOnResumeViewModel`
	`15`	`+import com.home.reader.ui.profile.ProfileViewModel`
`15`	`16`
`16`	`17`	`object AppViewModelProvider {`
`17`	`18`	`val Factory = viewModelFactory {`
`@@ -65,6 +66,12 @@ object AppViewModelProvider {`
`65`	`66`	`context = readerApplication().applicationContext`
`66`	`67`	`)`
`67`	`68`	`}`
	`69`	`+`
	`70`	`+ initializer {`
	`71`	`+ ProfileViewModel(`
	`72`	`+ userRepository = readerApplication().container.userRepository`
	`73`	`+ )`
	`74`	`+ }`
`68`	`75`	`}`
`69`	`76`	`}`
`70`	`77`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,4 @@ class NavigationMenuViewModel(`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`- fun logout() {`
`23`		`- viewModelScope.launch {`
`24`		`- userRepository.delete()`
`25`		`- loginState.value = null`
`26`		`- }`
`27`		`- }`
`28`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ sealed class NavigationRoutes {`
`27`	`27`
`28`	`28`	`@Serializable`
`29`	`29`	`object Catalogue : Authenticated()`
	`30`	`+`
	`31`	`+ @Serializable`
	`32`	`+ object Profile : Authenticated()`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`}`