LivingAi
/
android-app
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

temp #1

Merged
ankit merged 2 commits from temp into dev 2025-12-21 09:59:25 +00:00
Conversation 0 Commits 2 Files Changed 18 +35 -35
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04d06cd16d - Show all commits

46
app/src/main/java/com/example/livingai_lg/ui/navigation/AppNavigation.kt
View File

@ -281,30 +281,30 @@ fun AppNavigation(
)
}
composable(AppScreen.BUY_ANIMALS_FILTERS) {
FilterScreen(
onBackClick = {
navController.popBackStack()
},
onSubmitClick = {navController.navigate(AppScreen.BUY_ANIMALS)},
onCancelClick = {
navController.popBackStack()
},
)
}
// composable(AppScreen.BUY_ANIMALS_FILTERS) {
// FilterScreen(
// onBackClick = {
// navController.popBackStack()
// },
// onSubmitClick = {navController.navigate(AppScreen.BUY_ANIMALS)},
// onCancelClick = {
// navController.popBackStack()
// },
// )
// }
composable(AppScreen.BUY_ANIMALS_SORT) {
SortScreen(
onApplyClick = {navController.navigate(AppScreen.BUY_ANIMALS)},
onBackClick = {
navController.popBackStack()
},
onCancelClick = {
navController.popBackStack()
},
)
}
// composable(AppScreen.BUY_ANIMALS_SORT) {
// SortScreen(
// onApplyClick = {navController.navigate(AppScreen.BUY_ANIMALS)},
// onBackClick = {
// navController.popBackStack()
// },
// onCancelClick = {
// navController.popBackStack()
// },
//
// )
// }
composable(AppScreen.SAVED_LISTINGS) {
SavedListingsScreen(

22
app/src/main/java/com/example/livingai_lg/ui/navigation/navigation_legacy/MainNavGraph.kt
View File

@ -95,17 +95,17 @@ fun NavGraphBuilder.mainNavGraph(navController: NavController) {
}
composable(AppScreen.BUY_ANIMALS_FILTERS) {
FilterScreen(
onBackClick = {
navController.popBackStack()
},
onSubmitClick = {navController.navigate(AppScreen.BUY_ANIMALS)},
onCancelClick = {
navController.popBackStack()
},
)
}
// composable(AppScreen.BUY_ANIMALS_FILTERS) {
// FilterScreen(
// onBackClick = {
// navController.popBackStack()
// },
// onSubmitClick = {navController.navigate(AppScreen.BUY_ANIMALS)},
// onCancelClick = {
// navController.popBackStack()
// },
// )
// }
composable(AppScreen.BUY_ANIMALS_SORT) {
SortScreen(

2
app/src/main/java/com/example/livingai_lg/ui/screens/BuyScreen.kt
View File

@ -138,7 +138,7 @@ fun BuyScreen(
// Animal type filter buttons
AnimalTypeSelector(
animalTypes = animalTypes,
selectedAnimalType = selectedAnimalType
selectedAnimalType =
) { }
// Ad space banner