Merge pull request #6 from CGreenP/dev

CGreenP · web-flow · commit 378f7444a717 · 2025-04-05T17:10:30.000+05:30
feat: Implement Navigation and Update UI State Handling
diff --git a/app/src/main/java/com/example/techexactly/MainActivity.kt b/app/src/main/java/com/example/techexactly/MainActivity.kt
@@ -4,44 +4,19 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.compose.rememberNavController
 import com.example.techexactly.ui.theme.TechExactlyTheme
+import com.example.techexactly.view.navigation.SetupNavGraph
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             TechExactlyTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    Greeting(
-                        name = "Android",
-                        modifier = Modifier.padding(innerPadding)
-                    )
-                }
+                val navController = rememberNavController()
+                SetupNavGraph(navController = navController)
             }
         }
     }
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    TechExactlyTheme {
-        Greeting("Android")
-    }
 }
diff --git a/app/src/main/java/com/example/techexactly/model/dataclass/User.kt b/app/src/main/java/com/example/techexactly/model/dataclass/User.kt
@@ -1,5 +1,8 @@
 package com.example.techexactly.model.dataclass
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 data class User(
     val id: Long,
     val name: String,
@@ -11,6 +14,7 @@ data class User(
     val company: Company,
 )
 
+@Serializable
 data class Address(
     val street: String,
     val suite: String,
@@ -19,11 +23,13 @@ data class Address(
     val geo: Geo,
 )
 
+@Serializable
 data class Geo(
     val lat: String,
     val lng: String,
 )
 
+@Serializable
 data class Company(
     val name: String,
     val catchPhrase: String,
diff --git a/app/src/main/java/com/example/techexactly/view/home/HomeScreenContent.kt b/app/src/main/java/com/example/techexactly/view/home/HomeScreenContent.kt
@@ -1,15 +1,27 @@
 package com.example.techexactly.view.home
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+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.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
 import com.example.techexactly.model.dataclass.User
 import com.example.techexactly.viewmodel.MainViewModel
 import com.example.techexactly.viewmodel.UiState
@@ -24,15 +36,45 @@ fun HomeScreenContent(
     ) {
         when (val state = uiState) {
             is UiState.Error -> {
-                Text(
-                    text = state.errorMessage,
-                    modifier = Modifier.align(Alignment.Center),
-                    style = MaterialTheme.typography.bodyMedium
-                )
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center,
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Warning,
+                        contentDescription = "ERROR",
+                        modifier = Modifier.size(48.dp),
+                        tint = MaterialTheme.colorScheme.error
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = "Error",
+                        modifier = Modifier.fillMaxWidth(),
+                        style = MaterialTheme.typography.headlineSmall,
+                        textAlign = TextAlign.Center,
+                        color = MaterialTheme.colorScheme.error
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = state.errorMessage,
+                        modifier = Modifier.fillMaxWidth(),
+                        style = MaterialTheme.typography.bodyMedium,
+                        textAlign = TextAlign.Center,
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Button(onClick = { mainViewModel.fetchUsers() }) {
+                        Text(text = "Retry?")
+                    }
+                }
             }
 
             is UiState.Loading -> {
-                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+                CircularProgressIndicator(
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(48.dp),
+                    color = MaterialTheme.colorScheme.primary,
+                )
             }
 
             is UiState.Success -> {
diff --git a/app/src/main/java/com/example/techexactly/view/navigation/CustomNavType.kt b/app/src/main/java/com/example/techexactly/view/navigation/CustomNavType.kt
@@ -0,0 +1,34 @@
+package com.example.techexactly.view.navigation
+
+import android.net.Uri
+import android.os.Bundle
+import androidx.navigation.NavType
+import com.example.techexactly.model.dataclass.User
+import kotlinx.serialization.json.Json
+
+object CustomNavType {
+    val UserType = object : NavType<User>(
+        isNullableAllowed = false
+    ) {
+        override fun get(
+            bundle: Bundle, key: String
+        ): User? {
+            return Json.decodeFromString(bundle.getString(key) ?: return null)
+        }
+
+        override fun parseValue(value: String): User {
+            return Json.decodeFromString(Uri.decode(value))
+        }
+
+        override fun serializeAsValue(value: User): String {
+            return Uri.encode(Json.encodeToString(value))
+        }
+
+        override fun put(
+            bundle: Bundle, key: String, value: User
+        ) {
+            bundle.putString(key, Json.encodeToString(value))
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/example/techexactly/view/navigation/NavGraph.kt b/app/src/main/java/com/example/techexactly/view/navigation/NavGraph.kt
@@ -0,0 +1,37 @@
+package com.example.techexactly.view.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.toRoute
+import com.example.techexactly.model.dataclass.User
+import com.example.techexactly.view.home.HomeScreen
+import com.example.techexactly.view.user.UserDetailsScreen
+import kotlin.reflect.typeOf
+
+
+@Composable
+fun SetupNavGraph(
+    navController: NavHostController
+) {
+    NavHost(
+        navController = navController, startDestination = Dest.HomeScreen
+    ) {
+        composable<Dest.HomeScreen> {
+            HomeScreen(
+                onUserClicked = { user ->
+                    navController.navigate(Dest.UserDetailsScreen(user))
+                })
+        }
+        composable<Dest.UserDetailsScreen>(
+            typeMap = mapOf(
+                typeOf<User>() to CustomNavType.UserType
+            )
+        ) {
+            val args = it.toRoute<Dest.UserDetailsScreen>()
+            UserDetailsScreen(
+                user = args.user, onBackClicked = { navController.popBackStack() })
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/techexactly/view/navigation/Screens.kt b/app/src/main/java/com/example/techexactly/view/navigation/Screens.kt
@@ -0,0 +1,14 @@
+package com.example.techexactly.view.navigation
+
+import com.example.techexactly.model.dataclass.User
+import kotlinx.serialization.Serializable
+
+sealed class Dest {
+
+    @Serializable
+    data object HomeScreen : Dest()
+
+    @Serializable
+    data class UserDetailsScreen(val user: User) : Dest()
+
+}
diff --git a/app/src/main/java/com/example/techexactly/viewmodel/MainViewModel.kt b/app/src/main/java/com/example/techexactly/viewmodel/MainViewModel.kt
@@ -18,6 +18,7 @@ class MainViewModel(private val userRepository: UserRepository) : ViewModel() {
 
     fun fetchUsers() {
         viewModelScope.launch {
+            _uiState.value = UiState.Loading
             userRepository.getUsers().collect { result ->
                 when (result.isSuccess) {
                     true -> {
