yayan пре 1 година
родитељ
комит
d8f98b871d

+ 8 - 7
app/src/main/java/io/nexilis/alpha/ui/main/Contact.kt

@@ -43,18 +43,18 @@ fun Contact(navController: NavHostController, mainViewModel: MainViewModel) {
                 all?.get(it)?.f_pin ?: 0
             }
         ) { item ->
-            val product = all?.get(item)
+            val buddies = all?.get(item)
             ListItem(
                 modifier = Modifier.selectable(selected = selectedItem == item, onClick = {
                     selectedItem = item
-                    navController.navigate(Screen.Chat.route + "/${product?.f_pin}") {
+                    navController.navigate(Screen.Chat.route + "/${buddies?.f_pin}") {
                         launchSingleTop = true
                         restoreState = true
                     }
                 }),
                 headlineText = {
                     Text(
-                        product?.first_name ?: "",
+                        buddies?.first_name ?: "",
                         style = MaterialTheme.typography.titleSmall
                     )
                 },
@@ -67,7 +67,8 @@ fun Contact(navController: NavHostController, mainViewModel: MainViewModel) {
                 leadingContent = {
                     AsyncImage(
                         model = ImageRequest.Builder(LocalContext.current)
-                            .data(product?.image_id)
+                            .data("https://digixplatform.com/filepalio/image/${buddies?.image_id}")
+                            .addHeader("Cookie" , "PHPSESSID=123;MOBILE=123")
                             .crossfade(true)
                             .build(),
                         placeholder = rememberVectorPainter(image = Icons.Default.Person),
@@ -76,10 +77,10 @@ fun Contact(navController: NavHostController, mainViewModel: MainViewModel) {
                         modifier = Modifier
                             .size(48.dp)
                             .clip(CircleShape)
-                            .background(Color.LightGray)
-                            .padding(8.dp),
+                            .background(Color.LightGray),
+//                            .padding(8.dp),
                         error = rememberVectorPainter(image = Icons.Default.Person),
-                        colorFilter = ColorFilter.tint(Color.White)
+//                        colorFilter = ColorFilter.tint(Color.White)
                     )
                 }
             )

+ 12 - 5
app/src/main/java/io/nexilis/alpha/ui/main/Main.kt

@@ -68,16 +68,16 @@ fun Main(navController: NavHostController = rememberNavController()) {
             modifier = Modifier.padding(contentPadding),
             route = Graph.home
         ) {
-            composable(Screen.Home.route) { Home(mainViewModel = mainViewModel) }
-            composable(Screen.Chats.route) {
+            composable(route = Screen.Home.route) { Home(mainViewModel = mainViewModel) }
+            composable(route = Screen.Chats.route) {
                 Chats(
                     navController = navController,
                     mainViewModel = mainViewModel
                 )
             }
-            composable(Screen.Profile.route) { Profile(mainViewModel = mainViewModel) }
+            composable(route = Screen.Profile.route) { Profile(mainViewModel = mainViewModel) }
             navigation(startDestination = Screen.Contact.route, route = Graph.child) {
-                composable(Screen.Contact.route) {
+                composable(route = Screen.Contact.route) {
                     Contact(navController = navController, mainViewModel = mainViewModel)
                 }
                 composable(
@@ -93,9 +93,16 @@ fun Main(navController: NavHostController = rememberNavController()) {
                             )
                         }
                 }
-                composable(Screen.Friend.route) {
+                composable(route = Screen.Friend.route) {
                     Friend(navController = navController)
                 }
+                composable(route = Screen.SignUp.route) {
+                    SignUp(navController = navController) {
+                        if (it) {
+                            navController.navigate(Graph.home)
+                        }
+                    }
+                }
             }
         }
     }

+ 3 - 3
app/src/main/java/io/nexilis/alpha/ui/main/Menu.kt

@@ -47,9 +47,9 @@ fun HomeMenu(navController: NavHostController) {
             onClick = {
                 isOpenMenu = false
                 navController.navigate(Screen.SignUp.route) {
-                    popUpTo(navController.graph.findStartDestination().id) {
-                        saveState = true
-                    }
+//                    popUpTo(navController.graph.findStartDestination().id) {
+//                        saveState = true
+//                    }
                     launchSingleTop = true
                     restoreState = true
                 }

+ 0 - 7
app/src/main/java/io/nexilis/alpha/ui/main/Root.kt

@@ -28,13 +28,6 @@ fun Root(navController: NavHostController = rememberNavController()) {
                     }
                 }
             }
-            composable(route = Screen.SignUp.route) {
-                SignUp(navController = navController) {
-                    if (it) {
-                        navController.navigate(Graph.home)
-                    }
-                }
-            }
         }
         composable(route = Graph.home) {
             Main()