Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all codes for theater #294

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ dependencies {
implementation projects.feature.home
implementation projects.feature.detail
implementation projects.feature.search
implementation projects.feature.theater
implementation projects.feature.settings
implementation projects.feature.theme.api
runtimeOnly projects.feature.theme.impl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.material.icons.automirrored.rounded.Subject
import androidx.compose.material.icons.outlined.PrivacyTip
import androidx.compose.material.icons.rounded.Add
import androidx.compose.material.icons.rounded.Check
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.DragHandle
import androidx.compose.material.icons.rounded.Edit
import androidx.compose.material.icons.rounded.FilterList
import androidx.compose.material.icons.rounded.Info
import androidx.compose.material.icons.rounded.Palette
Expand All @@ -34,12 +31,9 @@ import androidx.compose.material.icons.rounded.ViewModule
import soup.movie.core.designsystem.R

object MovieIcons {
val Add = Icons.Rounded.Add
val ArrowBack = Icons.AutoMirrored.Rounded.ArrowBack
val Check = Icons.Rounded.Check
val Close = Icons.Rounded.Close
val DragHandle = Icons.Rounded.DragHandle
val Edit = Icons.Rounded.Edit
val FilterList = Icons.Rounded.FilterList
val Info = Icons.Rounded.Info
val Palette = Icons.Rounded.Palette
Expand All @@ -58,7 +52,6 @@ object MovieIcons {
val LoadingLogo = R.drawable.ic_loading_logo
val YouTube = R.drawable.ic_logo_youtube
val Metacritic = R.drawable.ic_metacritic
val NoTheaters = R.drawable.ic_round_no_theaters
val RottenTomatoes = R.drawable.ic_rt
val RottenTomatoesFresh = R.drawable.ic_rt_fresh
val RottenTomatoesRotten = R.drawable.ic_rt_rotten
Expand Down
28 changes: 0 additions & 28 deletions core/designsystem/src/main/res/drawable/ic_round_no_theaters.xml

This file was deleted.

17 changes: 0 additions & 17 deletions core/resources/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,14 @@

<string name="menu_settings">설정</string>

<string name="settings_category_theater">자주가는 극장</string>
<string name="settings_theater_empty_description">선택된 극장이 없습니다</string>
<string name="settings_category_theme">테마</string>

<string name="theater_sort_title">극장 순서 설정</string>

<string name="theater_edit_title">선호하는 극장 편집</string>

<string name="theater_select_limit_description">%d개까지 선택할 수 있습니다.\n더 추가하려면 선택된 항목을 지워주세요.</string>

<string name="theater_select_title">극장 선택</string>
<string name="theater_select_description">선호하는 극장을 선택해주세요</string>
<string name="theater_select_action_confirm">완료</string>
<string name="theater_select_action_cancel">취소</string>

<string name="theater_empty_description">선택된 극장이 없습니다</string>

<string name="theme_option_title">테마 선택</string>
<string name="theme_option_dark">어둡게</string>
<string name="theme_option_light">밝게</string>
<string name="theme_option_system">기본 (시스템 설정)</string>
<string name="theme_option_battery_saver">기본 (절전모드 시 어둡게)</string>

<string name="theater_map_title">지도</string>

<string name="movie_age_19">청소년관람불가</string>
<string name="movie_age_15">15세관람가</string>
<string name="movie_age_12">12세관람가</string>
Expand Down
17 changes: 0 additions & 17 deletions core/resources/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,14 @@

<string name="menu_settings">Settings</string>

<string name="settings_category_theater">Favorite Theaters</string>
<string name="settings_theater_empty_description">There are no favorite theaters</string>
<string name="settings_category_theme">Theme</string>

<string name="theater_sort_title">Theater Order Setting</string>

<string name="theater_edit_title">Edit Favorite Theaters</string>

<string name="theater_select_limit_description">The favorite theaters\'s count is limited to %d.\nIf wants to add more, remove seleted items.</string>

<string name="theater_select_title">Select theater</string>
<string name="theater_select_description">Please select the favorite theaters</string>
<string name="theater_select_action_confirm">Confirm</string>
<string name="theater_select_action_cancel">Cancel</string>

<string name="theater_empty_description">There are no favorite theaters</string>

<string name="theme_option_title">Select theme</string>
<string name="theme_option_dark">Dark</string>
<string name="theme_option_light">Light</string>
<string name="theme_option_system">Default (Set system setting)</string>
<string name="theme_option_battery_saver">Default (Set by battery saver)</string>

<string name="theater_map_title">Map</string>

<string name="movie_age_19">PG 18</string>
<string name="movie_age_15">PG 15</string>
<string name="movie_age_12">PG 12</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.Flow
import soup.movie.model.MovieListModel
import soup.movie.model.MovieModel
import soup.movie.model.OpenDateAlarmModel
import soup.movie.model.TheaterAreaGroupModel

interface LocalDataSource {

Expand All @@ -32,9 +31,6 @@ interface LocalDataSource {
suspend fun getAllMovieList(): List<MovieModel>
suspend fun getNowMovieList(): List<MovieModel>

fun saveCodeList(response: TheaterAreaGroupModel)
fun getCodeList(): TheaterAreaGroupModel?

suspend fun addFavoriteMovie(movie: MovieModel)
suspend fun removeFavoriteMovie(movieId: String)
fun getFavoriteMovieList(): Flow<List<MovieModel>>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import soup.movie.log.Logger
import soup.movie.model.MovieListModel
import soup.movie.model.MovieModel
import soup.movie.model.OpenDateAlarmModel
import soup.movie.model.TheaterAreaGroupModel
import javax.inject.Inject

class LocalDataSourceImpl @Inject constructor(
Expand All @@ -44,8 +43,6 @@ class LocalDataSourceImpl @Inject constructor(
private val cacheDao: MovieCacheDao,
) : LocalDataSource {

private var codeResponse: TheaterAreaGroupModel? = null

override suspend fun saveNowMovieList(movieList: MovieListModel) {
saveMovieListAs(TYPE_NOW, movieList)
favoriteMovieDao.updateAll(movieList.list.map { it.toFavoriteMovieEntity() })
Expand Down Expand Up @@ -111,14 +108,6 @@ class LocalDataSourceImpl @Inject constructor(
}
}

override fun saveCodeList(response: TheaterAreaGroupModel) {
codeResponse = response
}

override fun getCodeList(): TheaterAreaGroupModel? {
return codeResponse
}

override suspend fun addFavoriteMovie(movie: MovieModel) {
favoriteMovieDao.insertFavoriteMovie(movie.toFavoriteMovieEntity())
}
Expand Down
21 changes: 0 additions & 21 deletions data/model/src/main/java/soup/movie/model/AreaModel.kt

This file was deleted.

22 changes: 0 additions & 22 deletions data/model/src/main/java/soup/movie/model/TheaterAreaGroupModel.kt

This file was deleted.

21 changes: 0 additions & 21 deletions data/model/src/main/java/soup/movie/model/TheaterAreaModel.kt

This file was deleted.

25 changes: 0 additions & 25 deletions data/model/src/main/java/soup/movie/model/TheaterModel.kt

This file was deleted.

22 changes: 0 additions & 22 deletions data/model/src/main/java/soup/movie/model/TheaterTypeModel.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package soup.movie.data.network

import soup.movie.data.network.response.MovieDetailResponse
import soup.movie.data.network.response.MovieListResponse
import soup.movie.data.network.response.TheaterAreaGroupResponse

interface RemoteDataSource {

Expand All @@ -31,7 +30,4 @@ interface RemoteDataSource {

// 영화 상세정보
suspend fun getMovieDetail(movieId: String): MovieDetailResponse

// 공통코드
suspend fun getCodeList(): TheaterAreaGroupResponse
}

This file was deleted.

This file was deleted.

Loading
Loading