refactored and fixed bugs.

2307vivek · Aug 1, 2021 · a98b676 · a98b676
1 parent 80bc74c
commit a98b676
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/app/src/main/java/com/example/androiddevchallenge/model/DogBreed.kt b/app/src/main/java/com/example/androiddevchallenge/model/DogBreed.kt
@@ -24,5 +24,5 @@
 package com.example.androiddevchallenge.model
 
 data class DogBreed(
-    val name: String
+    val name: String = "Affenpinscher"
 )
diff --git a/app/src/main/java/com/example/androiddevchallenge/ui/AdoptyApp.kt b/app/src/main/java/com/example/androiddevchallenge/ui/AdoptyApp.kt
@@ -82,7 +82,6 @@ fun AdoptyNavigation(splashScreenVisibleCondition: (SplashScreen.KeepOnScreenCon
             HomeScreen(
                 viewModel = viewModel,
                 navController = navController,
-                navBackStackEntry = it,
             )
         }
         composable(Screen.DogDetail.route) {
@@ -94,11 +93,6 @@ fun AdoptyNavigation(splashScreenVisibleCondition: (SplashScreen.KeepOnScreenCon
     }
 }
 
-@Composable
-fun CheckData() {
-    val context = LocalContext.current
-}
-
 @Composable
 fun OfflineDialog(onRetry: () -> Unit) {
     AlertDialog(

diff --git a/app/src/main/java/com/example/androiddevchallenge/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/example/androiddevchallenge/ui/screen/home/HomeScreen.kt
@@ -62,7 +62,6 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import coil.compose.rememberImagePainter
 import com.example.androiddevchallenge.R
@@ -77,7 +76,6 @@ import com.example.androiddevchallenge.ui.screen.home.specialNeeds.DogSpecialNee
 fun HomeScreen(
     viewModel: HomeViewModel,
     navController: NavController,
-    navBackStackEntry: NavBackStackEntry
 ) {
     val viewState by viewModel.state.collectAsState()
     val dogsSpecialNeedLazyListState = rememberLazyListState()
@@ -95,7 +93,6 @@ fun HomeScreen(
                 petState = viewState.petState,
                 specialNeedsDogsState = viewState.specialNeedsDogState,
                 lazyListState = dogsSpecialNeedLazyListState,
-                navBackStackEntry = navBackStackEntry,
                 onDogSelected = {
                     viewModel.onDogSelected(it)
                     navController.navigate(Screen.DogDetail.route)
@@ -115,7 +112,6 @@ fun DogContent(
     specialNeedsDogsState: PetState<PetListResponse>,
     lazyListState: LazyListState,
     onDogSelected: (Pet) -> Unit,
-    navBackStackEntry: NavBackStackEntry
 ) {
     if (dogBreeds.isNotEmpty() && selectedBreed != null) {
         Column(modifier = modifier) {

diff --git a/app/src/main/java/com/example/androiddevchallenge/ui/screen/home/HomeViewModel.kt b/app/src/main/java/com/example/androiddevchallenge/ui/screen/home/HomeViewModel.kt
@@ -45,7 +45,7 @@ class HomeViewModel @Inject constructor(
     private val petRepository: PetRepository
 ) : ViewModel() {
 
-    private val _selectedBreed = MutableStateFlow<DogBreed?>(null)
+    private val _selectedBreed = MutableStateFlow<DogBreed?>(DogBreed())
     private val _petState = MutableStateFlow<PetState<PetListResponse>>(PetState())
     private val _state = MutableStateFlow(HomeScreenViewState())
     private val _specialNeedsDogsState =
@@ -59,7 +59,7 @@ class HomeViewModel @Inject constructor(
         get() = _selectedDog
 
     init {
-        onBreedSelected(DogBreed("Affenpinscher"))
+        onBreedSelected(DogBreed())
         getSpecialNeedsDogs()
 
         viewModelScope.launch {
@@ -112,6 +112,6 @@ class HomeViewModel @Inject constructor(
         val petState: PetState<PetListResponse> = PetState(),
         val specialNeedsDogState: PetState<PetListResponse> = PetState(),
         val dogBreeds: List<DogBreed> = emptyList(),
-        val selectedBreed: DogBreed? = null
+        val selectedBreed: DogBreed? = DogBreed()
     )
 }