Merge pull request #84 from sammorton11/Apod_Favorites

Apod Favorites Screen - initial
sammorton11 · Jul 1, 2023 · e113e56 · e113e56
2 parents 0492028 + 814a091
commit e113e56
Show file tree

Hide file tree

Showing 26 changed files with 580 additions and 58 deletions.
diff --git a/app/src/androidTest/java/com/samm/space/repository/FakeMediaLibraryRepositoryMock.kt b/app/src/androidTest/java/com/samm/space/repository/FakeMediaLibraryRepositoryMock.kt
@@ -76,7 +76,7 @@ class FakeMediaLibraryRepositoryMock @Inject constructor (
         emit("Fake saved query")
     }
 
-    override fun videoDataFlow(url: String) = flow {
+    override fun mediaDataFlow(url: String) = flow {
         try {
             emit(Resource.Loading())
             val response = getVideoData(url)

diff --git a/app/src/androidTest/java/com/samm/space/tests/error_tests/ApodErrorTests.kt b/app/src/androidTest/java/com/samm/space/tests/error_tests/ApodErrorTests.kt
@@ -10,6 +10,7 @@ import androidx.compose.ui.test.assertTextContains
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.samm.space.features.picture_of_the_day_page.presentation.ApodScreen
 import com.samm.space.features.picture_of_the_day_page.presentation.ApodViewModel
 import com.samm.space.tests.ui_tests.ApodUITest.Companion.serverApod
@@ -52,8 +53,13 @@ class ApodErrorTests: BaseTest() {
                         color = MaterialTheme.colorScheme.background
                     ) {
                         val viewModel: ApodViewModel = hiltViewModel()
-                        val state = viewModel.state
-                        ApodScreen(stateFlow = state, refresh = viewModel::getApodState)
+                        val state = viewModel.state.collectAsStateWithLifecycle().value
+                        ApodScreen(
+                            state = state,
+                            insert = viewModel::insert,
+                            delete = viewModel::delete,
+                            refresh = viewModel::getApodState
+                        )
                     }
                 }
             }

diff --git a/app/src/androidTest/java/com/samm/space/tests/ui_tests/ApodUITest.kt b/app/src/androidTest/java/com/samm/space/tests/ui_tests/ApodUITest.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.samm.space.features.picture_of_the_day_page.presentation.ApodScreen
 import com.samm.space.features.picture_of_the_day_page.presentation.ApodViewModel
 import com.samm.space.ui.theme.SpaceTheme
@@ -58,8 +59,13 @@ class ApodUITest: BaseTest() {
                         color = MaterialTheme.colorScheme.background
                     ) {
                         val viewModel: ApodViewModel = hiltViewModel()
-                        val state = viewModel.state
-                        ApodScreen(stateFlow = state, refresh = viewModel::getApodState)
+                        val state = viewModel.state.collectAsStateWithLifecycle().value
+                        ApodScreen(
+                            state = state,
+                            insert = viewModel::insert,
+                            delete = viewModel::delete,
+                            refresh = viewModel::getApodState
+                        )
                     }
                 }
             }

diff --git a/app/src/main/java/com/samm/space/features/favorites_page/data/database/TypeConverters.kt b/app/src/main/java/com/samm/space/features/favorites_page/data/database/TypeConverters.kt
@@ -5,6 +5,7 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.samm.space.features.nasa_media_library_page.domain.models.Data
 import com.samm.space.features.nasa_media_library_page.domain.models.Link
+import com.samm.space.features.picture_of_the_day_page.domain.models.Apod
 
 class ListConverter {
     @TypeConverter
@@ -46,3 +47,18 @@ class ItemConverter {
         return gson.toJson(listOf(Link("", "", "")))
     }
 }
+
+
+class ApodTypeConverters {
+    private val gson = Gson()
+
+    @TypeConverter
+    fun fromApod(apod: Apod): String {
+        return gson.toJson(apod)
+    }
+
+    @TypeConverter
+    fun toApod(json: String): Apod {
+        return gson.fromJson(json, Apod::class.java)
+    }
+}
diff --git a/app/src/main/java/com/samm/space/features/favorites_page/presentation/ApodFavoritesScreen.kt b/app/src/main/java/com/samm/space/features/favorites_page/presentation/ApodFavoritesScreen.kt
@@ -0,0 +1,151 @@
+package com.samm.space.features.favorites_page.presentation
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
+import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.samm.space.common.presentation.labels.Title
+import com.samm.space.common.presentation.util.WindowInfo
+import com.samm.space.common.presentation.util.rememberWindowInfo
+import com.samm.space.core.MediaType
+import com.samm.space.features.favorites_page.presentation.state.ApodFavoriteState
+import com.samm.space.features.nasa_media_library_page.presentation.library_search_screen.components.cards.ListCardData
+import com.samm.space.features.picture_of_the_day_page.domain.models.Apod
+import com.samm.space.features.picture_of_the_day_page.presentation.components.ApodFavoritesListCard
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ApodFavoritesScreen(
+    state: ApodFavoriteState,
+    insert: (item: Apod) -> Unit,
+    delete: (item: Apod) -> Unit,
+    navigate: (route: String) -> Unit,
+    encodeText: (text: String?) -> String
+) {
+    val apodFavorites = state.apodFavorites?.reversed()
+    val lazyGridState = rememberLazyStaggeredGridState()
+    val window = rememberWindowInfo()
+
+    val gridCells = when (window.screenWidthInfo) {
+        is WindowInfo.WindowType.Compact -> 2
+        is WindowInfo.WindowType.Medium -> 3
+        is WindowInfo.WindowType.Expanded -> 4
+    }
+
+    var filteredFavorites by remember { mutableStateOf(apodFavorites ?: emptyList()) }
+    var filterText by remember { mutableStateOf("") }
+
+    Column(
+        modifier = Modifier
+            .padding(15.dp)
+            .fillMaxSize()
+            .semantics { testTag = "APOD Favorites" }
+    ) {
+        Row(modifier = Modifier.fillMaxWidth()) {
+            Title(text = "APOD Favorites", paddingValue = 8.dp)
+        }
+
+        OutlinedTextField(
+            value = filterText,
+            onValueChange = { newText ->
+                filterText = newText
+                filteredFavorites = apodFavorites?.filter { item ->
+                    item.title.contains(newText, ignoreCase = true)
+                } ?: emptyList()
+            },
+            modifier = Modifier
+                .padding(start = 8.dp, bottom = 11.dp)
+                .semantics { testTag = "Favorites Search Field" },
+            placeholder = { Text(text = "Search Favorites...") }
+        )
+
+        LazyVerticalStaggeredGrid(
+            modifier = Modifier
+                .semantics {
+                    testTag = "Favorites List"
+                },
+            columns = StaggeredGridCells.Fixed(gridCells),
+            state = lazyGridState
+        ) {
+
+            val favoritesToDisplay = if (filterText.isEmpty()) {
+                apodFavorites
+            } else {
+                filteredFavorites
+            }
+
+            favoritesToDisplay?.let { list ->
+                items(list.size) { index ->
+                    val item = list[index]
+
+                    val image = item.hdurl
+
+                    val itemDescription = item.explanation
+                    val itemTitle = item.title
+                    val itemDate = item.date
+
+                    apodFavorites?.let {
+
+                        val listCardData = ListCardData(
+                            apodFavorites = it,
+                            apod = item,
+                            url = image,
+                            image = image,
+                            itemTitle = itemTitle,
+                            dateText = itemDate,
+                            mediaTypeString = MediaType.IMAGE,
+                            description = itemDescription
+                        )
+
+                        ApodFavoritesListCard(
+                            insert = insert,
+                            delete = delete,
+                            encodeText = encodeText,
+                            state = listCardData,
+                            navigate = navigate
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun ApodFavoritesScreenPreview() {
+
+    val state = ApodFavoriteState(
+        apodFavorites = listOf(
+            Apod(
+                id = 125,
+                copyright = "Copyright 2023",
+                date = "2023-06-30",
+                explanation = "This is a fake APOD explanation.",
+                hdurl = "https://images-assets.nasa.gov/image/NHQ201905310026/NHQ201905310026~small.jpg",
+                media_type = "image",
+                service_version = "v1",
+                title = "Fake APOD",
+                url = "https://images-assets.nasa.gov/image/NHQ201905310026/NHQ201905310026~small.jpg"
+            )
+        )
+    )
+    ApodFavoritesScreen(state = state, insert = {}, delete = {}, navigate = {}, encodeText = {""})
+}
diff --git a/...n/presentation/buttons/FavoritesButton.kt → ...ites_page/presentation/FavoritesButton.kt b/...n/presentation/buttons/FavoritesButton.kt → ...ites_page/presentation/FavoritesButton.kt
@@ -1,4 +1,4 @@
-package com.samm.space.common.presentation.buttons
+package com.samm.space.features.favorites_page.presentation
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
@@ -29,7 +29,7 @@ import kotlinx.coroutines.delay
 fun FavoritesButton(
     item: Item,
     favorites: List<Item>?,
-    event: (LibraryUiEvent) -> Unit,
+    event: (LibraryUiEvent) -> Unit
 ) {
 
     val inFavoritesList = favorites?.any { it.href == item.href }

diff --git a/app/src/main/java/com/samm/space/features/favorites_page/presentation/FavoritesScreen.kt b/app/src/main/java/com/samm/space/features/favorites_page/presentation/FavoritesScreen.kt
@@ -0,0 +1,41 @@
+package com.samm.space.features.favorites_page.presentation
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.samm.space.common.presentation.labels.Title
+
+@Composable
+fun FavoritesScreen(navController: NavController) {
+
+    Column(
+        modifier = Modifier.padding(25.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+
+        Title(text = "Favorites", paddingValue = 5.dp)
+
+        Spacer(modifier = Modifier.padding(bottom = 15.dp))
+
+        OutlinedButton(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 10.dp),
+            onClick = { navController.navigate("library-favorites-screen") }) {
+            Text(text = "Library")
+        }
+        OutlinedButton(
+            modifier = Modifier.fillMaxWidth(),
+            onClick = { navController.navigate("apod-favorites-screen") }) {
+            Text(text = "APOD")
+        }
+    }
+}
diff --git a/...rites_page/presentation/FavoriteScreen.kt → ...age/presentation/LibraryFavoriteScreen.kt b/...rites_page/presentation/FavoriteScreen.kt → ...age/presentation/LibraryFavoriteScreen.kt
@@ -31,7 +31,7 @@ import com.samm.space.features.nasa_media_library_page.util.LibraryUiEvent
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun FavoriteScreen(
+fun LibraryFavoritesScreen(
     libraryFavoriteState: LibraryFavoriteState,
     sendEvent: (LibraryUiEvent) -> Unit,
     navigate: (route: String) -> Unit,
@@ -57,7 +57,7 @@ fun FavoriteScreen(
             .semantics { testTag = "Favorites Screen" }
     ) {
         Row(modifier = Modifier.fillMaxWidth()) {
-            Title(text = "Favorites", paddingValue = 8.dp)
+            Title(text = "Library Favorites", paddingValue = 8.dp)
         }
 
         OutlinedTextField(

diff --git a/.../main/java/com/samm/space/features/favorites_page/presentation/state/ApodFavoriteState.kt b/.../main/java/com/samm/space/features/favorites_page/presentation/state/ApodFavoriteState.kt
@@ -3,7 +3,7 @@ package com.samm.space.features.favorites_page.presentation.state
 import com.samm.space.features.picture_of_the_day_page.domain.models.Apod
 
 data class ApodFavoriteState(
-var isLoading: Boolean = false,
-var apodFavorites: List<Apod>?  = null,
-var error: String? = null
+    var isLoading: Boolean = false,
+    var apodFavorites: List<Apod>?  = null,
+    var error: String? = null
 )
diff --git a/...samm/space/features/nasa_media_library_page/data/repository/MediaLibraryRepositoryImpl.kt b/...samm/space/features/nasa_media_library_page/data/repository/MediaLibraryRepositoryImpl.kt
@@ -18,7 +18,7 @@ class MediaLibraryRepositoryImpl @Inject constructor(
     private val api: NasaApi,
     private val apiMetaData: MetadataApi,
     private val database: SpaceExplorerDatabase
-    ): MediaLibraryRepository {
+): MediaLibraryRepository {
 
     private val dataStore = DataStoreManager
 
@@ -32,27 +32,14 @@ class MediaLibraryRepositoryImpl @Inject constructor(
 
     override fun searchImageVideoLibrary(query: String) = flow {
         DataStoreManager.saveLastSearchText(query)
-
-//        try {
-//            emit(Resource.Loading())
-//            val response = getData(query)
-//            Log.d("Response", response.toString())
-//            emit(Resource.Success(response))
-//        }
-//        catch (e: HttpException){
-//            emit(Resource.Error(e.localizedMessage ?: "Unexpected Error"))
-//        }
-//        catch (e: IOException){
-//            emit(Resource.Error(e.localizedMessage ?: "Unexpected Error"))
-//        }
         emit(Resource.Loading())
         val response = getData(query)
         emit(Resource.Success(response))
     }.catch {
         emit(Resource.Error(it.localizedMessage ?: "Unexpected Error"))
     }
 
-    override fun videoDataFlow(url: String) = flow {
+    override fun mediaDataFlow(url: String) = flow {
         try {
             emit(Resource.Loading())
             val response = getVideoData(url)

diff --git a/...m/samm/space/features/nasa_media_library_page/domain/repository/MediaLibraryRepository.kt b/...m/samm/space/features/nasa_media_library_page/domain/repository/MediaLibraryRepository.kt
@@ -11,7 +11,7 @@ interface MediaLibraryRepository {
     suspend fun getVideoData(url: String): String?
     fun searchImageVideoLibrary(query: String): Flow<Resource<NasaLibraryResponse?>>
     fun savedQueryFlow(): Flow<String?>
-    fun videoDataFlow(url: String): Flow<Resource<String?>>
+    fun mediaDataFlow(url: String): Flow<Resource<String?>>
     suspend fun insertFavorite(item: Item)
     suspend fun deleteFavorite(item: Item)
     suspend fun updateFavorite(itemId: Int, isFavorite: Boolean)

diff --git a/...e/features/nasa_media_library_page/presentation/details_screen/components/DetailsImage.kt b/...e/features/nasa_media_library_page/presentation/details_screen/components/DetailsImage.kt
@@ -3,6 +3,7 @@ package com.samm.space.features.nasa_media_library_page.presentation.details_scr
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
+import android.util.Log
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
@@ -29,6 +30,7 @@ fun DetailsImage(
     scale: ContentScale
 ) {
 
+    Log.d("Image Link", imageLink.toString())
 
     val context = LocalContext.current