[부나] 3, 4단계 영화 극장 선택 제출합니다.

README.md

@@ -86,3 +86,20 @@
 ### Data
 - [x] 사용자가 앱을 재실행해도 설정 데이터가 남아있어야 한다.
   - [x] SharedPreference를 사용한다.
+
+## step4
+
+### UI
+- [x] 영화 선택 후 극장을 선택할 수 있다.
+  - [x] 예매 완료 화면에서 극장 이름이 길 경우 말줄임표로 표시되어야 한다.
+
+### Data
+- [x] 극장별로 상영하는 영화와 상영시간은 달라질 수 있다.
+- 예시)
+- 선릉 극장
+  + 스타워즈(09시, 11시, 15시)
+  + 해리포터(13시, 15시, 17시, 19시)
+- 잠실 극장
+  + 스즈메의 문단속(09시)
+  + 해리포터(10시, 12시, 14시)
+  + 어벤져스(11시, 13시)

app/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("kotlin-parcelize")
+    id("kotlin-kapt")
 }
 
 android {
@@ -38,10 +39,24 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    packagingOptions {
+        resources {
+            excludes += "META-INF/LICENSE.md"
+            excludes += "META-INF/LICENSE-notice.md"
+        }
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+    dataBinding {
+        enable = true
+    }
 }
 
 dependencies {
+    testImplementation("junit:junit:4.12")
     val fragmentVersion = "1.5.5"
+    val mockkVersion = "1.13.5"
 
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.6.0")
@@ -59,4 +74,5 @@ dependencies {
     implementation(project(":data"))
     implementation("androidx.fragment:fragment-ktx:1.4.0")
     androidTestImplementation("androidx.fragment:fragment-testing:$fragmentVersion")
+    testImplementation("io.mockk:mockk-android:$mockkVersion")
 }

app/src/androidTest/java/woowacourse/movie/presentation/activities/main/fragments/setting/SettingFragmentTest.kt → app/src/androidTest/java/woowacourse/movie/presentation/ui/main/fragments/setting/SettingFragmentTest.kt

@@ -1,4 +1,4 @@
-package woowacourse.movie.presentation.activities.main.fragments.setting
+package woowacourse.movie.presentation.ui.main.fragments.setting
 
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -13,8 +13,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import woowacourse.movie.R
-import woowacourse.movie.presentation.activities.main.MainActivity
-import woowacourse.movie.presentation.activities.main.fragments.setting.SettingFragment.Companion.PUSH_ALLOW_KEY
+import woowacourse.movie.presentation.ui.main.MainActivity
 
 @RunWith(AndroidJUnit4::class)
 class SettingFragmentTest {
@@ -34,8 +33,6 @@ class SettingFragmentTest {
 
     @Test
     internal fun 푸시_동의_스위치가_활성화_상태일_때_누르면_비활성화한다() {
-        setPushState(true)
-
         onView(withId(R.id.setting))
             .check(matches(isDisplayed()))
             .perform(click())
@@ -47,8 +44,6 @@ class SettingFragmentTest {
 
     @Test
     internal fun 푸시_동의_스위치가_비활성화_상태일_때_누르면_활성화한다() {
-        setPushState(false)
-
         onView(withId(R.id.setting))
             .check(matches(isDisplayed()))
             .perform(click())
@@ -57,8 +52,4 @@ class SettingFragmentTest {
             .perform(click())
             .check(matches(isChecked()))
     }
-
-    private fun setPushState(value: Boolean) {
-        MovieApplication.dataStore.setBoolean(PUSH_ALLOW_KEY, value)
-    }
 }

app/src/androidTest/java/woowacourse/movie/presentation/activities/ticketing/SeatPickerActivityTest.kt → app/src/androidTest/java/woowacourse/movie/presentation/ui/ticketing/SeatPickerActivityTest.kt

@@ -1,26 +1,18 @@
-package woowacourse.movie.presentation.activities.ticketing
+package woowacourse.movie.presentation.ui.ticketing
 
-import android.content.Intent
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isSelected
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.hamcrest.CoreMatchers.not
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import woowacourse.movie.R
-import woowacourse.movie.presentation.activities.main.fragments.home.HomeFragment.Companion.MOVIE_KEY
-import woowacourse.movie.presentation.activities.ticketing.TicketingActivity.Companion.MOVIE_DATE_KEY
-import woowacourse.movie.presentation.activities.ticketing.TicketingActivity.Companion.MOVIE_TIME_KEY
-import woowacourse.movie.presentation.activities.ticketing.TicketingActivity.Companion.TICKET_KEY
 import woowacourse.movie.presentation.model.MovieDate
 import woowacourse.movie.presentation.model.MovieTime
 import woowacourse.movie.presentation.model.Ticket
@@ -31,6 +23,7 @@ import java.time.LocalDate
 @LargeTest
 internal class SeatPickerActivityTest {
     private val movie: Movie = Movie(
+        0,
         "테스트 영화",
         startDate = LocalDate.of(2023, 4, 1),
         endDate = LocalDate.of(2023, 4, 30),
@@ -52,16 +45,16 @@ internal class SeatPickerActivityTest {
         "E1", "E2", "E3", "E4",
     )
 
-    private val intent =
-        Intent(ApplicationProvider.getApplicationContext(), SeatPickerActivity::class.java).apply {
-            putExtra(MOVIE_KEY, movie)
-            putExtra(TICKET_KEY, movieTicket)
-            putExtra(MOVIE_DATE_KEY, selectedMovieDate)
-            putExtra(MOVIE_TIME_KEY, selectedMovieTime)
-        }
+    // private val intent =
+    //     Intent(ApplicationProvider.getApplicationContext(), SeatPickerActivity::class.java).apply {
+    //         putExtra(MOVIE_KEY, movie)
+    //         putExtra(TICKET_KEY, movieTicket)
+    //         putExtra(MOVIE_DATE_KEY, selectedMovieDate)
+    //         putExtra(MOVIE_TIME_KEY, selectedMovieTime)
+    //     }
 
-    @get:Rule
-    internal val activityRule = ActivityScenarioRule<SeatPickerActivity>(intent)
+    // @get:Rule
+    // internal val activityRule = ActivityScenarioRule<SeatPickerActivity>(intent)
 
     @Test
     internal fun 영화_제목이_보여진다() {

app/src/main/AndroidManifest.xml

@@ -15,16 +15,16 @@
         android:theme="@style/Theme.Movie"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.activities.main.MainActivity"
+            android:name=".presentation.ui.main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".presentation.activities.ticketing.TicketingActivity" />
-        <activity android:name=".presentation.activities.ticketing.SeatPickerActivity" />
-        <activity android:name=".presentation.activities.ticketingresult.TicketingResultActivity" />
+        <activity android:name=".presentation.ui.ticketing.TicketingActivity" />
+        <activity android:name=".presentation.ui.seatpicker.SeatPickerActivity" />
+        <activity android:name=".presentation.ui.ticketingresult.TicketingResultActivity" />
 
         <receiver
             android:name=".presentation.receiver.ReservationPushReceiver"