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 map #292

Merged
merged 1 commit into from
Oct 28, 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 @@ -89,7 +89,6 @@ dependencies {
implementation projects.feature.detail
implementation projects.feature.search
implementation projects.feature.theater
implementation projects.feature.theatermap
implementation projects.feature.settings
implementation projects.feature.theme.api
runtimeOnly projects.feature.theme.impl
Expand Down
16 changes: 2 additions & 14 deletions app/dependencies/releaseRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ androidx.navigation:navigation-runtime-ktx:2.8.2
androidx.navigation:navigation-runtime:2.8.2
androidx.print:print:1.0.0
androidx.profileinstaller:profileinstaller:1.3.1
androidx.recyclerview:recyclerview:1.3.2
androidx.resourceinspection:resourceinspection-annotation:1.0.1
androidx.room:room-common:2.6.1
androidx.room:room-ktx:2.6.1
Expand All @@ -117,7 +116,6 @@ androidx.savedstate:savedstate:1.2.1
androidx.sqlite:sqlite-framework:2.4.0
androidx.sqlite:sqlite:2.4.0
androidx.startup:startup-runtime:1.2.0
androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
androidx.tracing:tracing:1.0.0
androidx.vectordrawable:vectordrawable-animated:1.1.0
androidx.vectordrawable:vectordrawable:1.1.0
Expand All @@ -127,20 +125,16 @@ androidx.window.extensions.core:core:1.0.0
androidx.window:window:1.3.0
androidx.work:work-runtime-ktx:2.9.1
androidx.work:work-runtime:2.9.1
com.getkeepsafe.relinker:relinker:1.4.4
com.google.accompanist:accompanist-drawablepainter:0.36.0
com.google.accompanist:accompanist-permissions:0.34.0
com.google.accompanist:accompanist-drawablepainter:0.32.0
com.google.android.datatransport:transport-api:3.1.0
com.google.android.datatransport:transport-backend-cct:3.1.9
com.google.android.datatransport:transport-runtime:3.1.9
com.google.android.gms:play-services-base:18.1.0
com.google.android.gms:play-services-base:18.0.1
com.google.android.gms:play-services-basement:18.3.0
com.google.android.gms:play-services-cloud-messaging:17.2.0
com.google.android.gms:play-services-location:21.0.1
com.google.android.gms:play-services-stats:17.0.2
com.google.android.gms:play-services-tasks:18.1.0
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.6
com.google.dagger:dagger-lint-aar:2.52
com.google.dagger:dagger:2.52
com.google.dagger:hilt-android:2.52
Expand Down Expand Up @@ -170,9 +164,6 @@ com.google.firebase:protolite-well-known-types:18.0.0
com.google.guava:listenablefuture:1.0
com.google.protobuf:protobuf-javalite:3.21.11
com.jakewharton.timber:timber:5.0.1
com.naver.maps:geometry:1.3.0
com.naver.maps:map-sdk:3.18.0
com.squareup.okhttp3:okhttp-brotli:4.10.0
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.8.0
com.squareup.okio:okio:3.8.0
Expand All @@ -185,12 +176,9 @@ io.coil-kt:coil-compose-base:2.6.0
io.coil-kt:coil-compose:2.6.0
io.coil-kt:coil:2.6.0
io.github.fornewid:material-motion-compose-core:1.1.3
io.github.fornewid:naver-map-compose:1.5.7
io.github.fornewid:naver-map-location:21.0.1
io.github.fornewid:photo-compose:1.0.1
jakarta.inject:jakarta.inject-api:2.0.1
javax.inject:javax.inject:1
org.brotli:dec:0.1.2
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
Expand Down
10 changes: 0 additions & 10 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />

<queries>
Expand All @@ -13,11 +11,6 @@

<data android:scheme="mailto" />
</intent>

<package android:name="com.kakao.talk" />
<package android:name="com.google.android.apps.maps" />
<package android:name="com.nhn.android.nmap" />
<package android:name="net.daum.android.map" />
</queries>

<application
Expand All @@ -38,9 +31,6 @@
<meta-data
android:name="firebase_crashlytics_collection_enabled"
android:value="${crashlytics_enabled}" />
<meta-data
android:name="com.naver.maps.map.CLIENT_ID"
android:value="@string/naver_map_sdk_client_id" />

<activity
android:name=".ui.main.MainActivity"
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/res/values/credentials.xml

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/values/dfm_theatermap.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ 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.Map
import androidx.compose.material.icons.rounded.Palette
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material.icons.rounded.Settings
Expand All @@ -45,7 +44,6 @@ object MovieIcons {
val Edit = Icons.Rounded.Edit
val FilterList = Icons.Rounded.FilterList
val Info = Icons.Rounded.Info
val Map = Icons.Rounded.Map
val Palette = Icons.Rounded.Palette
val PrivacyTip = Icons.Outlined.PrivacyTip
val Search = Icons.Rounded.Search
Expand All @@ -61,9 +59,6 @@ object MovieIcons {
val Imdb = R.drawable.ic_imdb
val LoadingLogo = R.drawable.ic_loading_logo
val YouTube = R.drawable.ic_logo_youtube
val MarkerCgv = R.drawable.ic_marker_cgv
val MarkerLotte = R.drawable.ic_marker_lotte
val MarkerMegabox = R.drawable.ic_marker_megabox
val Metacritic = R.drawable.ic_metacritic
val NoTheaters = R.drawable.ic_round_no_theaters
val RottenTomatoes = R.drawable.ic_rt
Expand Down
76 changes: 0 additions & 76 deletions core/designsystem/src/main/res/drawable/ic_marker_cgv.xml

This file was deleted.

42 changes: 0 additions & 42 deletions core/designsystem/src/main/res/drawable/ic_marker_lotte.xml

This file was deleted.

39 changes: 0 additions & 39 deletions core/designsystem/src/main/res/drawable/ic_marker_megabox.xml

This file was deleted.

1 change: 0 additions & 1 deletion core/resources/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<string name="menu_now">현재상영</string>
<string name="menu_plan">개봉예정</string>
<string name="menu_favorite">즐겨찾기</string>
<string name="menu_map">지도</string>
<string name="menu_filter">영화 필터</string>
<string name="filter_category_theater">극장 필터</string>
<string name="filter_category_age">연령 필터</string>
Expand Down
1 change: 0 additions & 1 deletion core/resources/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<string name="menu_now">Now</string>
<string name="menu_plan">Plan</string>
<string name="menu_favorite">Favorite</string>
<string name="menu_map">Map</string>
<string name="menu_filter">Movie Filter</string>
<string name="filter_category_theater">Theater Filter</string>
<string name="filter_category_age">Age Filter</string>
Expand Down
1 change: 0 additions & 1 deletion feature/home/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ dependencies {
implementation projects.data.repository.api
implementation projects.data.model
implementation projects.domain
implementation projects.feature.theatermap
implementation projects.feature.settings

implementation libs.kotlin.stdlib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package soup.movie.feature.home

enum class MainTabUiModel {
Home, Favorite, TheaterMap, Settings
Home, Favorite, Settings
}

enum class HomeTabUiModel {
Expand Down
20 changes: 0 additions & 20 deletions feature/home/src/main/java/soup/movie/feature/home/MainScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ import soup.movie.core.designsystem.theme.MovieTheme
import soup.movie.core.designsystem.windowsizeclass.WindowWidthSizeClass
import soup.movie.feature.home.favorite.HomeFavoriteList
import soup.movie.feature.settings.SettingsNavGraph
import soup.movie.feature.theatermap.TheaterMapScreen
import soup.movie.model.MovieModel
import soup.movie.resources.R

Expand Down Expand Up @@ -94,11 +93,6 @@ fun MainScreen(
},
)
}
MainTabUiModel.TheaterMap -> {
TheaterMapScreen(
viewModel = hiltViewModel(),
)
}
MainTabUiModel.Settings -> {
SettingsNavGraph()
}
Expand Down Expand Up @@ -180,12 +174,6 @@ private fun CompactScreen(
contentDescription = null,
)
}
MainTabUiModel.TheaterMap -> {
Icon(
rememberVectorPainter(MovieIcons.Map),
contentDescription = null,
)
}
MainTabUiModel.Settings -> {
Icon(
rememberVectorPainter(MovieIcons.Settings),
Expand All @@ -199,7 +187,6 @@ private fun CompactScreen(
text = when (tab) {
MainTabUiModel.Home -> stringResource(R.string.menu_home)
MainTabUiModel.Favorite -> stringResource(R.string.menu_favorite)
MainTabUiModel.TheaterMap -> stringResource(R.string.menu_map)
MainTabUiModel.Settings -> stringResource(R.string.menu_settings)
},
)
Expand Down Expand Up @@ -261,12 +248,6 @@ private fun MediumScreen(
contentDescription = null,
)
}
MainTabUiModel.TheaterMap -> {
Icon(
rememberVectorPainter(MovieIcons.Map),
contentDescription = null,
)
}
MainTabUiModel.Settings -> {
Icon(
rememberVectorPainter(MovieIcons.Settings),
Expand All @@ -280,7 +261,6 @@ private fun MediumScreen(
text = when (tab) {
MainTabUiModel.Home -> stringResource(R.string.menu_home)
MainTabUiModel.Favorite -> stringResource(R.string.menu_favorite)
MainTabUiModel.TheaterMap -> stringResource(R.string.menu_map)
MainTabUiModel.Settings -> stringResource(R.string.menu_settings)
},
)
Expand Down
Loading
Loading