diff --git a/app/src/main/java/com/patch4code/logline/MainActivity.kt b/app/src/main/java/com/patch4code/logline/MainActivity.kt index d3d3843..f177262 100644 --- a/app/src/main/java/com/patch4code/logline/MainActivity.kt +++ b/app/src/main/java/com/patch4code/logline/MainActivity.kt @@ -29,7 +29,9 @@ class MainActivity : ComponentActivity() { context = applicationContext, klass = LoglineDatabase::class.java, name = "loglineData.db" - ).build() + ) + .addMigrations(LoglineDatabase.MIGRATION_1_2) + .build() } override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/patch4code/logline/features/core/domain/model/SortOption.kt b/app/src/main/java/com/patch4code/logline/features/core/domain/model/SortOption.kt index 6299623..d0d822a 100644 --- a/app/src/main/java/com/patch4code/logline/features/core/domain/model/SortOption.kt +++ b/app/src/main/java/com/patch4code/logline/features/core/domain/model/SortOption.kt @@ -16,6 +16,8 @@ sealed class SortOption(val label: UiText) { data object ByAddedAsc : SortOption(UiText.StringResource(R.string.sort_by_added_asc)) data object ByTitleAsc : SortOption(UiText.StringResource(R.string.sort_by_title_asc)) data object ByTitleDesc : SortOption(UiText.StringResource(R.string.sort_by_title_desc)) + data object ByNameAsc : SortOption(UiText.StringResource(R.string.sort_by_name_asc)) + data object ByNameDesc : SortOption(UiText.StringResource(R.string.sort_by_name_desc)) data object ByReleaseDateDesc : SortOption(UiText.StringResource(R.string.sort_by_release_date_desc)) data object ByReleaseDateAsc : SortOption(UiText.StringResource(R.string.sort_by_release_date_asc)) data object ByRatingDesc : SortOption(UiText.StringResource(R.string.sort_by_rating_desc)) @@ -28,4 +30,4 @@ sealed class SortOption(val label: UiText) { data object ByTimeUpdated : SortOption(UiText.StringResource(R.string.sort_by_time_updated)) data object ByListNameAsc : SortOption(UiText.StringResource(R.string.sort_by_list_name_asc)) data object ByListNameDesc : SortOption(UiText.StringResource(R.string.sort_by_list_name_desc)) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/DrawerNavigationItem.kt b/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/DrawerNavigationItem.kt index e758215..b935854 100644 --- a/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/DrawerNavigationItem.kt +++ b/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/DrawerNavigationItem.kt @@ -22,6 +22,8 @@ import androidx.compose.material.icons.outlined.Reviews import androidx.compose.material.icons.outlined.Search import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.WatchLater +import androidx.compose.material.icons.filled.Star +import androidx.compose.material.icons.outlined.Star import androidx.compose.ui.graphics.vector.ImageVector import com.patch4code.logline.R import com.patch4code.logline.features.core.presentation.utils.UiText @@ -72,6 +74,12 @@ data class DrawerNavigationItem( unselectedIcon = Icons.Outlined.Movie, route = Screen.MyMoviesScreen.route, ), + DrawerNavigationItem( + title = "Persons", + selectedIcon = Icons.Filled.Star, + unselectedIcon = Icons.Outlined.Star, + route = Screen.FavoritePersonsScreen.route, + ), DrawerNavigationItem( title = UiText.StringResource(R.string.diary_text).asString(context), selectedIcon = Icons.Filled.DateRange, @@ -104,4 +112,4 @@ data class DrawerNavigationItem( ) ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/Screen.kt b/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/Screen.kt index bf427a3..dc45af0 100644 --- a/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/Screen.kt +++ b/app/src/main/java/com/patch4code/logline/features/navigation/domain/model/Screen.kt @@ -20,6 +20,7 @@ sealed class Screen(val route: String, var title: UiText) { data object AboutScreen : Screen("about_screen", UiText.StringResource(R.string.about_text)) data object MovieScreen : Screen("movie_screen", UiText.StringResource(R.string.empty_text)) data object PersonDetailsScreen : Screen("person_details_screen",UiText.StringResource(R.string.empty_text)) + data object FavoritePersonsScreen : Screen("favorite_persons_screen", UiText.DynamicString("Favorite Persons")) data object MovieLogScreen: Screen("movie_log_screen", UiText.StringResource(R.string.movie_log_text)) data object MyMoviesScreen : Screen("my_movies_screen", UiText.StringResource(R.string.my_movies_text)) data object MoviePublicReviewsScreen: Screen("movie_public_reviews_screen", UiText.StringResource(R.string.empty_text)) diff --git a/app/src/main/java/com/patch4code/logline/features/navigation/presentation/screen_navigation/Navigation.kt b/app/src/main/java/com/patch4code/logline/features/navigation/presentation/screen_navigation/Navigation.kt index 156b5cd..d7303c7 100644 --- a/app/src/main/java/com/patch4code/logline/features/navigation/presentation/screen_navigation/Navigation.kt +++ b/app/src/main/java/com/patch4code/logline/features/navigation/presentation/screen_navigation/Navigation.kt @@ -145,10 +145,18 @@ fun Navigation(db: LoglineDatabase){ ){ PersonDetailsView( navController = navController, + db = db, id = it.arguments?.getInt("person_id") ) } + composable(route = Screen.FavoritePersonsScreen.route) { + com.patch4code.logline.features.person_details.presentation.screen_favorite_persons.FavoritePersonsView( + navController = navController, + db = db + ) + } + composable( route = Screen.MovieLogScreen.route + "/{movie}", arguments = listOf( @@ -254,4 +262,4 @@ fun Navigation(db: LoglineDatabase){ } } ) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/domain/model/FavoritePerson.kt b/app/src/main/java/com/patch4code/logline/features/person_details/domain/model/FavoritePerson.kt new file mode 100644 index 0000000..26ee753 --- /dev/null +++ b/app/src/main/java/com/patch4code/logline/features/person_details/domain/model/FavoritePerson.kt @@ -0,0 +1,12 @@ +package com.patch4code.logline.features.person_details.domain.model + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "favorite_persons") +data class FavoritePerson( + @PrimaryKey val id: Int, + val name: String, + val profilePath: String?, + val knownForDepartment: String +) diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/domain/model/FavoritePersonsSortFilterOptions.kt b/app/src/main/java/com/patch4code/logline/features/person_details/domain/model/FavoritePersonsSortFilterOptions.kt new file mode 100644 index 0000000..2f255d4 --- /dev/null +++ b/app/src/main/java/com/patch4code/logline/features/person_details/domain/model/FavoritePersonsSortFilterOptions.kt @@ -0,0 +1,10 @@ +package com.patch4code.logline.features.person_details.domain.model + +import com.patch4code.logline.features.core.domain.model.SortOption + +object FavoritePersonsSortFilterOptions { + val sortOptions = listOf( + SortOption.ByNameAsc, + SortOption.ByNameDesc + ) +} diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/components/FavoritePersonsSortFilterDialog.kt b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/components/FavoritePersonsSortFilterDialog.kt new file mode 100644 index 0000000..3c207d5 --- /dev/null +++ b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/components/FavoritePersonsSortFilterDialog.kt @@ -0,0 +1,95 @@ +package com.patch4code.logline.features.person_details.presentation.components + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import com.patch4code.logline.R +import com.patch4code.logline.features.core.domain.model.SortOption +import com.patch4code.logline.features.core.presentation.components.base_elements.BaseDropdown +import com.patch4code.logline.features.core.presentation.components.filter_dialog.FilterApplyButton +import com.patch4code.logline.features.core.presentation.components.filter_dialog.FilterSortDropdown +import com.patch4code.logline.features.core.presentation.components.filter_dialog.FilterTopBarSection +import com.patch4code.logline.features.person_details.domain.model.FavoritePersonsSortFilterOptions + +@Composable +fun FavoritePersonsSortFilterDialog( + showFilterDialog: MutableState, + selectedSortOption: SortOption, + selectedFilterDepartment: String?, + availableDepartments: List, + onApply: (SortOption, String?) -> Unit +) { + if (!showFilterDialog.value) return + + val tempSelectedSortOption = remember { mutableStateOf(selectedSortOption) } + val tempSelectedFilterDepartment = remember { mutableStateOf(selectedFilterDepartment) } + + val sortOptions = FavoritePersonsSortFilterOptions.sortOptions + + // Add "All" to the list of departments for the dropdown + val departmentOptions = listOf("All") + availableDepartments + + Dialog(onDismissRequest = { showFilterDialog.value = false }, + properties = DialogProperties(usePlatformDefaultWidth = false) + ) { + Surface( + modifier = Modifier.fillMaxSize(), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.background, + ) { + Column { + FilterTopBarSection( + onCloseDialog = { showFilterDialog.value = false }, + onResetClick = { + tempSelectedSortOption.value = sortOptions.first() + tempSelectedFilterDepartment.value = null + } + ) + + LazyColumn(modifier = Modifier.fillMaxSize().padding(16.dp).weight(1f)) { + item { + Text(stringResource(id = R.string.sort_by_text)) + FilterSortDropdown(tempSelectedSortOption, sortOptions) + + Spacer(modifier = Modifier.padding(8.dp)) + + if (availableDepartments.isNotEmpty()) { + Text("Filter by Department") + BaseDropdown( + selectedItem = tempSelectedFilterDepartment.value ?: "All", + items = departmentOptions, + labelProvider = { it }, + onItemSelected = { + if (it == "All") { + tempSelectedFilterDepartment.value = null + } else { + tempSelectedFilterDepartment.value = it + } + } + ) + } + } + } + + FilterApplyButton { + onApply(tempSelectedSortOption.value, tempSelectedFilterDepartment.value) + showFilterDialog.value = false + } + } + } + } +} diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_favorite_persons/FavoritePersonsView.kt b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_favorite_persons/FavoritePersonsView.kt new file mode 100644 index 0000000..f5b078d --- /dev/null +++ b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_favorite_persons/FavoritePersonsView.kt @@ -0,0 +1,111 @@ +package com.patch4code.logline.features.person_details.presentation.screen_favorite_persons + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +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.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +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.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation.NavController +import coil.compose.AsyncImage +import com.patch4code.logline.R +import com.patch4code.logline.features.core.presentation.utils.MovieHelper +import com.patch4code.logline.features.navigation.domain.model.Screen +import com.patch4code.logline.features.navigation.presentation.components.topbar_providers.ProvideTopBarTitle +import com.patch4code.logline.features.person_details.domain.model.FavoritePerson +import com.patch4code.logline.room_database.LoglineDatabase + +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import com.patch4code.logline.features.navigation.presentation.components.topbar_providers.ProvideTopBarSortFilterActions +import com.patch4code.logline.features.person_details.presentation.components.FavoritePersonsSortFilterDialog + +@Composable +fun FavoritePersonsView( + navController: NavController, + db: LoglineDatabase, + viewModel: FavoritePersonsViewModel = viewModel( + factory = FavoritePersonsViewModelFactory(db.favoritePersonDao) + ) +) { + val showBottomSheet = remember { mutableStateOf(false) } + + ProvideTopBarTitle(title = Screen.FavoritePersonsScreen.title.asString()) + ProvideTopBarSortFilterActions(sortFilterOnClickAction = { showBottomSheet.value = true }) + + val favoritePersons by viewModel.favoritePersons.collectAsState(initial = emptyList()) + val selectedSortOption by viewModel.sortOption.collectAsState() + val selectedFilterDepartment by viewModel.filterDepartment.collectAsState() + val availableDepartments by viewModel.availableDepartments.collectAsState() + + LazyColumn(modifier = Modifier.fillMaxSize().padding(16.dp)) { + items(favoritePersons) { person -> + FavoritePersonItem(person) { + navController.navigate(Screen.PersonDetailsScreen.route + "/${person.id}") + } + Spacer(modifier = Modifier.height(8.dp)) + } + } + + FavoritePersonsSortFilterDialog( + showFilterDialog = showBottomSheet, + selectedSortOption = selectedSortOption, + selectedFilterDepartment = selectedFilterDepartment, + availableDepartments = availableDepartments, + onApply = { sortOption, filterDepartment -> + viewModel.setSortOption(sortOption) + viewModel.setFilterDepartment(filterDepartment) + } + ) +} + +@Composable +fun FavoritePersonItem(person: FavoritePerson, onClick: () -> Unit) { + Card( + modifier = Modifier + .fillMaxWidth() + .clickable { onClick() }, + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp) + ) { + Row( + modifier = Modifier.padding(8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Card( + modifier = Modifier + .height(100.dp) + .width(66.dp), + colors = CardDefaults.cardColors(containerColor = Color.Transparent) + ) { + AsyncImage( + model = MovieHelper.processPosterUrl(person.profilePath), + contentDescription = person.name, + error = painterResource(id = R.drawable.movie_poster_placeholder) + ) + } + Spacer(modifier = Modifier.width(16.dp)) + Column { + Text(text = person.name, style = MaterialTheme.typography.titleLarge) + Text(text = person.knownForDepartment, style = MaterialTheme.typography.bodyMedium) + } + } + } +} diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_favorite_persons/FavoritePersonsViewModel.kt b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_favorite_persons/FavoritePersonsViewModel.kt new file mode 100644 index 0000000..cd42d0f --- /dev/null +++ b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_favorite_persons/FavoritePersonsViewModel.kt @@ -0,0 +1,65 @@ +package com.patch4code.logline.features.person_details.presentation.screen_favorite_persons + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewModelScope +import com.patch4code.logline.features.core.domain.model.SortOption +import com.patch4code.logline.features.person_details.domain.model.FavoritePerson +import com.patch4code.logline.room_database.FavoritePersonDao +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn + +class FavoritePersonsViewModel( + private val favoritePersonDao: FavoritePersonDao +) : ViewModel() { + + private val _sortOption = MutableStateFlow(SortOption.ByNameAsc) + val sortOption: StateFlow = _sortOption + + private val _filterDepartment = MutableStateFlow(null) + val filterDepartment: StateFlow = _filterDepartment + + val favoritePersons: StateFlow> = combine( + favoritePersonDao.getAllFavoritePersons(), + _sortOption, + _filterDepartment + ) { persons, sort, department -> + val filtered = if (department != null) { + persons.filter { it.knownForDepartment == department } + } else { + persons + } + + when (sort) { + SortOption.ByNameAsc -> filtered.sortedBy { it.name } + SortOption.ByNameDesc -> filtered.sortedByDescending { it.name } + else -> filtered.sortedBy { it.name } + } + }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList()) + + val availableDepartments: StateFlow> = favoritePersonDao.getAllFavoritePersons() + .map { persons -> persons.map { it.knownForDepartment }.distinct().sorted() } + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList()) + + fun setSortOption(option: SortOption) { + _sortOption.value = option + } + + fun setFilterDepartment(department: String?) { + _filterDepartment.value = department + } +} + +class FavoritePersonsViewModelFactory(private val favoritePersonDao: FavoritePersonDao) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(FavoritePersonsViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return FavoritePersonsViewModel(favoritePersonDao) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsView.kt b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsView.kt index 9452d1b..e9e631d 100644 --- a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsView.kt +++ b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsView.kt @@ -48,6 +48,14 @@ import com.patch4code.logline.features.navigation.presentation.components.topbar import com.patch4code.logline.features.navigation.presentation.components.topbar_providers.ProvideTopBarTitle import com.patch4code.logline.features.person_details.presentation.components.PersonDetailsSortBottomSheet +import com.patch4code.logline.room_database.LoglineDatabase +import androidx.compose.runtime.collectAsState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Star +import androidx.compose.material.icons.outlined.Star +import androidx.compose.material3.IconButton +import androidx.compose.material3.Icon + /** * GNU GENERAL PUBLIC LICENSE, VERSION 3.0 (https://www.gnu.org/licenses/gpl-3.0.html) * @@ -60,8 +68,11 @@ import com.patch4code.logline.features.person_details.presentation.components.Pe @Composable fun PersonDetailsView( navController: NavController, - personDetailsViewModel: PersonDetailsViewModel = viewModel(), - id: Int? + db: LoglineDatabase, + id: Int?, + personDetailsViewModel: PersonDetailsViewModel = viewModel( + factory = PersonDetailsViewModelFactory(db.favoritePersonDao) + ) ){ val personId = id?: -1 @@ -118,8 +129,17 @@ fun PersonDetailsView( } Column (modifier = Modifier.height(200.dp).padding(8.dp)){ - // person name and main department - Text(text = personDetails?.name ?: "N/A", style = MaterialTheme.typography.headlineMedium) + val isFavorite by personDetailsViewModel.isFavorite.collectAsState(initial = false) + Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) { + Text(text = personDetails?.name ?: "N/A", style = MaterialTheme.typography.headlineMedium, modifier = Modifier.weight(1f)) + IconButton(onClick = { personDetailsViewModel.toggleFavorite(personId) }) { + Icon( + imageVector = if (isFavorite) Icons.Filled.Star else Icons.Outlined.Star, + contentDescription = "Toggle Favorite", + tint = if (isFavorite) Color.Yellow else MaterialTheme.colorScheme.onSurface + ) + } + } Text(text = "${stringResource(id = R.string.known_for_title)} ${personDetails?.knownForDepartment}") } } @@ -149,4 +169,4 @@ fun PersonDetailsView( PersonDetailsSortBottomSheet(showBottomSheet, selectedSortOption, personDetails.knownForDepartment, personDetailsViewModel) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsViewModel.kt b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsViewModel.kt index aa4d3fd..74ff7e5 100644 --- a/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsViewModel.kt +++ b/app/src/main/java/com/patch4code/logline/features/person_details/presentation/screen_person/PersonDetailsViewModel.kt @@ -15,6 +15,13 @@ import com.patch4code.logline.features.person_details.domain.model.PersonDetails import com.patch4code.logline.features.person_details.domain.model.PersonMovieCredits import kotlinx.coroutines.launch +import androidx.lifecycle.ViewModelProvider +import com.patch4code.logline.room_database.FavoritePersonDao +import com.patch4code.logline.features.person_details.domain.model.FavoritePerson +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + /** * GNU GENERAL PUBLIC LICENSE, VERSION 3.0 (https://www.gnu.org/licenses/gpl-3.0.html) * @@ -23,7 +30,9 @@ import kotlinx.coroutines.launch * * @author Patch4Code */ -class PersonDetailsViewModel: ViewModel() { +class PersonDetailsViewModel( + private val favoritePersonDao: FavoritePersonDao? = null +): ViewModel() { private val tmdbApiService: TmdbApiService by lazy { RetrofitHelper.getInstance(TmdbCredentials.BASE_URL).create(TmdbApiService::class.java) @@ -44,6 +53,8 @@ class PersonDetailsViewModel: ViewModel() { private val _personCreditsMap = MutableLiveData>>() val personCreditsMap: LiveData>> get() = _personCreditsMap + private val _isFavorite = MutableStateFlow(false) + val isFavorite: StateFlow = _isFavorite.asStateFlow() // Loads the details of the person with the given id from TMDB api fun loadPersonDetails(personId: Int){ @@ -56,6 +67,11 @@ class PersonDetailsViewModel: ViewModel() { if(personDetailsResponse.isSuccessful){ _personDetails.value = personDetailsResponse.body() } + favoritePersonDao?.getFavoritePersonById(personId)?.let { + _isFavorite.value = true + } ?: run { + _isFavorite.value = false + } } catch (e: Exception) { _isLoading.value = false _hasLoadError.value = true @@ -175,4 +191,34 @@ class PersonDetailsViewModel: ViewModel() { fun updateSortingForPersonMovieCredits(mainDepartment: String, sortOption: SortOption) { _personCreditsMap.value = createSortedPersonCreditsMap(mainDepartment, sortOption) } -} \ No newline at end of file + + fun toggleFavorite(personId: Int) { + viewModelScope.launch { + val details = _personDetails.value ?: return@launch + if (_isFavorite.value) { + favoritePersonDao?.deleteFavoritePersonById(personId) + _isFavorite.value = false + } else { + favoritePersonDao?.insertFavoritePerson( + FavoritePerson( + id = personId, + name = details.name, + profilePath = details.profilePath, + knownForDepartment = details.knownForDepartment + ) + ) + _isFavorite.value = true + } + } + } +} + +class PersonDetailsViewModelFactory(private val favoritePersonDao: FavoritePersonDao) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(PersonDetailsViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return PersonDetailsViewModel(favoritePersonDao) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} diff --git a/app/src/main/java/com/patch4code/logline/room_database/FavoritePersonDao.kt b/app/src/main/java/com/patch4code/logline/room_database/FavoritePersonDao.kt new file mode 100644 index 0000000..da21f1b --- /dev/null +++ b/app/src/main/java/com/patch4code/logline/room_database/FavoritePersonDao.kt @@ -0,0 +1,27 @@ +package com.patch4code.logline.room_database + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import com.patch4code.logline.features.person_details.domain.model.FavoritePerson +import kotlinx.coroutines.flow.Flow + +@Dao +interface FavoritePersonDao { + @Query("SELECT * FROM favorite_persons") + fun getAllFavoritePersons(): Flow> + + @Query("SELECT * FROM favorite_persons WHERE id = :personId") + suspend fun getFavoritePersonById(personId: Int): FavoritePerson? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertFavoritePerson(person: FavoritePerson) + + @Delete + suspend fun deleteFavoritePerson(person: FavoritePerson) + + @Query("DELETE FROM favorite_persons WHERE id = :personId") + suspend fun deleteFavoritePersonById(personId: Int) +} diff --git a/app/src/main/java/com/patch4code/logline/room_database/LoglineDatabase.kt b/app/src/main/java/com/patch4code/logline/room_database/LoglineDatabase.kt index 73961e6..59c4de0 100644 --- a/app/src/main/java/com/patch4code/logline/room_database/LoglineDatabase.kt +++ b/app/src/main/java/com/patch4code/logline/room_database/LoglineDatabase.kt @@ -8,6 +8,7 @@ import com.patch4code.logline.features.core.domain.model.MovieUserData import com.patch4code.logline.features.diary.domain.model.LoggedMovie import com.patch4code.logline.features.list.domain.model.MovieInList import com.patch4code.logline.features.list.domain.model.MovieList +import com.patch4code.logline.features.person_details.domain.model.FavoritePerson import com.patch4code.logline.features.profile.domain.model.UserProfile import com.patch4code.logline.features.search.domain.model.SearchHistoryItem @@ -27,8 +28,9 @@ import com.patch4code.logline.features.search.domain.model.SearchHistoryItem MovieList::class, MovieInList::class, UserProfile::class, - SearchHistoryItem::class], - version = 1) + SearchHistoryItem::class, + FavoritePerson::class], + version = 2) @TypeConverters(RoomConverters::class) abstract class LoglineDatabase: RoomDatabase() { @@ -39,4 +41,15 @@ abstract class LoglineDatabase: RoomDatabase() { abstract val movieInListDao: MovieInListDao abstract val userProfileDao: UserProfileDao abstract val searchHistoryDao: SearchHistoryDao -} \ No newline at end of file + abstract val favoritePersonDao: FavoritePersonDao + + companion object { + val MIGRATION_1_2 = object : androidx.room.migration.Migration(1, 2) { + override fun migrate(db: androidx.sqlite.db.SupportSQLiteDatabase) { + db.execSQL( + "CREATE TABLE IF NOT EXISTS `favorite_persons` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `profilePath` TEXT, `knownForDepartment` TEXT NOT NULL, PRIMARY KEY(`id`))" + ) + } + } + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c3145a..0e0d236 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -736,6 +736,8 @@ Date Added (Oldest first) Title (A-Z) Title (Z-A) + Name (A-Z) + Name (Z-A) Release Date (Newest first) Release Date (Oldest first) Rating (10–1) @@ -752,4 +754,4 @@ //stringResource(id = R.string.) - \ No newline at end of file +