[둘리] 1, 2단계 영화 극장 선택 제출합니다.

README.md

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 # android-movie-theater
-=======
-# android-movie-ticket
 
 ## domain
 

app/build.gradle.kts

@@ -45,6 +45,8 @@ dependencies {
  implementation("androidx.appcompat:appcompat:1.6.0")
  implementation("com.google.android.material:material:1.7.0")
  implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+ implementation("androidx.fragment:fragment-ktx:1.4.0")
+ implementation("androidx.preference:preference:1.2.0")
  testImplementation("junit:junit:4.13.2")
  androidTestImplementation("androidx.test.ext:junit:1.1.5")
  androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

app/src/androidTest/java/woowacourse/movie/view/MovieMainActivityTest.kt

@@ -0,0 +1,38 @@
+package woowacourse.movie.view
+
+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.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import woowacourse.movie.R
+import woowacourse.movie.view.moviemain.MovieMainActivity
+
+@RunWith(AndroidJUnit4::class)
+class MovieMainActivityTest {
+ @get:Rule
+ val mActivityTestRule = ActivityScenarioRule(MovieMainActivity::class.java)
+
+ @Test
+ fun 예매내역_버튼을_누르면_예매내역_Fragment로_바뀐다() {
+ onView(withId(R.id.action_reservation_list)).perform(click())
+ onView(withId(R.id.recyclerview)).check(matches(isDisplayed()))
+ }
+
+ @Test
+ fun 홈_버튼을_누르면_홈_Fragment로_바뀐다() {
+ onView(withId(R.id.action_home)).perform(click())
+ onView(withId(R.id.movie_recyclerview)).check(matches(isDisplayed()))
+ }
+
+ @Test
+ fun 설정_버튼을_누르면_설정_Fragment로_바뀐다() {
+ onView(withId(R.id.action_setting)).perform(click())
+ onView(withId(R.id.setting_toggle)).check(matches(isDisplayed()))
+ }
+}

app/src/androidTest/java/woowacourse/movie/view/SeatSelectionActivityTest.kt

@@ -21,6 +21,7 @@ import woowacourse.movie.domain.Minute
 import woowacourse.movie.domain.Movie
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.model.ReservationOptions
+import woowacourse.movie.view.seatselection.SeatSelectionActivity
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime

app/src/androidTest/java/woowacourse/movie/view/SettingFragmentTest.kt

@@ -0,0 +1,61 @@
+package woowacourse.movie.view
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.fragment.app.commit
+import androidx.preference.PreferenceManager
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import woowacourse.movie.R
+import woowacourse.movie.view.moviemain.MovieMainActivity
+import woowacourse.movie.view.moviemain.setting.SettingFragment
+
+@RunWith(AndroidJUnit4::class)
+class SettingFragmentTest {
+ @get:Rule
+ val mActivityTestRule = ActivityScenarioRule(MovieMainActivity::class.java)
+
+ @Before
+ fun setup() {
+ ActivityScenario.launch(MovieMainActivity::class.java).onActivity {
+ it.supportFragmentManager.commit {
+ replace(R.id.fragment_container_view, SettingFragment())
+ }
+ }
+ }
+
+ @Test
+ fun 설정_Fragment에서_저장된_세팅값이_false면_토글도_꺼져있다() {
+ setSharedPreferences(false)
+ onView(ViewMatchers.withId(R.id.action_setting)).perform(ViewActions.click())
+ onView(ViewMatchers.withId(R.id.setting_toggle))
+ .check(ViewAssertions.matches(ViewMatchers.isNotChecked()))
+ }
+
+ @Test
+ fun 설정_Fragment에서_저장된_세팅값이_true면_토글도_켜져있다() {
+ setSharedPreferences(true)
+ onView(ViewMatchers.withId(R.id.action_setting)).perform(ViewActions.click())
+ onView(ViewMatchers.withId(R.id.setting_toggle))
+ .check(ViewAssertions.matches(ViewMatchers.isChecked()))
+ }
+
+ private fun setSharedPreferences(isAlarmOn: Boolean) {
+ val targetContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
+
+ val preferencesEditor: SharedPreferences.Editor = PreferenceManager.getDefaultSharedPreferences(targetContext).edit()
+ preferencesEditor.clear()
+ preferencesEditor.putBoolean(SettingFragment.IS_ALARM_ON, isAlarmOn)
+ preferencesEditor.commit()
+ }
+}

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="https://schemas.android.com/apk/res/android"
- xmlns:tools="https://schemas.android.com/tools">
+ xmlns:tools="https://schemas.android.com/tools" >
 
- <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
  <application
  android:allowBackup="true"
@@ -12,9 +12,15 @@
  android:label="@string/app_name"
  android:supportsRtl="true"
  android:theme="@style/Theme.Movie"
- tools:targetApi="31">
+ tools:targetApi="31" >
+ <receiver
+ android:name=".view.seatselection.AlarmReceiver"
+ android:enabled="true"
+ android:exported="true" >
+ </receiver>
+
  <activity
- android:name=".view.SeatSelectionActivity"
+ android:name=".view.seatselection.SeatSelectionActivity"
  android:exported="false" />
  <activity
  android:name=".view.ReservationCompletedActivity"
@@ -23,8 +29,8 @@
  android:name=".view.ReservationActivity"
  android:exported="false" />
  <activity
- android:name=".view.MovieListActivity"
- android:exported="true">
+ android:name=".view.moviemain.MovieMainActivity"
+ android:exported="true" >
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/woowacourse/movie/repository/MovieMockRepository.kt → app/src/main/java/woowacourse/movie/data/MovieMockRepository.kt

@@ -1,8 +1,9 @@
-package woowacourse.movie.repository
+package woowacourse.movie.data
 
 import woowacourse.movie.R
 import woowacourse.movie.domain.Minute
 import woowacourse.movie.domain.Movie
+import woowacourse.movie.domain.repository.MovieRepository
 import java.time.LocalDate
 
 object MovieMockRepository : MovieRepository {
@@ -45,6 +46,6 @@ object MovieMockRepository : MovieRepository {
  }.flatten()
 
  override fun findAll(): List<Movie> {
- return movies
+ return movies.toList()
  }
 }

app/src/main/java/woowacourse/movie/data/ReservationMockRepository.kt

@@ -0,0 +1,16 @@
+package woowacourse.movie.data
+
+import woowacourse.movie.domain.Reservation
+import woowacourse.movie.domain.repository.ReservationRepository
+
+object ReservationMockRepository : ReservationRepository {
+
+ private val reservations = mutableListOf<Reservation>()
+ override fun add(reservation: Reservation) {
+ reservations.add(reservation)
+ }
+
+ override fun findAll(): List<Reservation> {
+ return reservations.toList()
+ }
+}

app/src/main/java/woowacourse/movie/util/DateTimeFormatter.kt

@@ -3,4 +3,4 @@ package woowacourse.movie.util
 import java.time.format.DateTimeFormatter
 
 val DATE_FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy.MM.dd")
-val DATE_TIME_FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm")
+val TIME_FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm")

app/src/main/java/woowacourse/movie/view/AlarmController.kt

@@ -0,0 +1,60 @@
+package woowacourse.movie.view
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import woowacourse.movie.view.model.ReservationUiModel
+import woowacourse.movie.view.seatselection.AlarmReceiver
+import java.time.ZoneId
+
+class AlarmController(
+ private val context: Context
+) {
+
+ fun registerAlarms(reservations: List<ReservationUiModel>, minuteInterval: Long) {
+ reservations.forEach {
+ registerAlarm(it, minuteInterval)
+ }
+ }
+
+ fun registerAlarm(reservation: ReservationUiModel, minuteInterval: Long) {
+ val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+ val pendingIntent = getPendingIntent(reservation)
+
+ alarmManager.set(
+ AlarmManager.RTC_WAKEUP,
+ reservation.screeningDateTime.minusMinutes(minuteInterval)
+ .atZone(ZoneId.systemDefault())
+ .toEpochSecond() * 1000L,
+ pendingIntent,
+ )
+ }
+
+ private fun getPendingIntent(reservation: ReservationUiModel): PendingIntent {
+ return Intent(context, AlarmReceiver::class.java).let {
+ it.putExtra(AlarmReceiver.RESERVATION, reservation)
+ PendingIntent.getBroadcast(
+ context,
+ ALARM_REQUEST_CODE,
+ it,
+ PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+ )
+ }
+ }
+
+ fun cancelAlarms() {
+ val pendingIntent = PendingIntent.getBroadcast(
+ context,
+ ALARM_REQUEST_CODE,
+ Intent(context, AlarmReceiver::class.java),
+ PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+ )
+ val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+ alarmManager.cancel(pendingIntent)
+ }
+
+ companion object {
+ private const val ALARM_REQUEST_CODE = 100
+ }
+}

app/src/main/java/woowacourse/movie/view/ReservationActivity.kt

@@ -17,6 +17,7 @@ import woowacourse.movie.util.getParcelableCompat
 import woowacourse.movie.util.getSerializableCompat
 import woowacourse.movie.view.model.MovieListModel.MovieUiModel
 import woowacourse.movie.view.model.ReservationOptions
+import woowacourse.movie.view.seatselection.SeatSelectionActivity
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
@@ -60,7 +61,7 @@ class ReservationActivity : AppCompatActivity() {
  movieTitle.text = movie.title
  movieScreeningDate.text = getString(R.string.screening_date_format).format(
  movie.screeningStartDate.format(DATE_FORMATTER),
- movie.screeningEndDate.format(DATE_FORMATTER)
+ movie.screeningEndDate.format(DATE_FORMATTER),
  )
  movieRunningTime.text =
  getString(R.string.running_time_format).format(movie.runningTime)
@@ -77,7 +78,7 @@ class ReservationActivity : AppCompatActivity() {
  val dateSpinnerAdapter = ArrayAdapter(
  this,
  android.R.layout.simple_spinner_item,
- screeningDates
+ screeningDates,
  )
 
  binding.dateSpinner.apply {
@@ -87,7 +88,7 @@ class ReservationActivity : AppCompatActivity() {
  parent: AdapterView<*>?,
  view: View?,
  position: Int,
- id: Long
+ id: Long,
  ) {
  selectedScreeningDate = screeningDates[position]
  initTimeSpinner(timeSpinnerPosition)
@@ -104,7 +105,7 @@ class ReservationActivity : AppCompatActivity() {
  val timeSpinnerAdapter = ArrayAdapter(
  this,
  android.R.layout.simple_spinner_item,
- screeningTimes
+ screeningTimes,
  )
  binding.timeSpinner.apply {
  adapter = timeSpinnerAdapter
@@ -117,7 +118,7 @@ class ReservationActivity : AppCompatActivity() {
  parent: AdapterView<*>?,
  view: View?,
  position: Int,
- id: Long
+ id: Long,
  ) {
  selectedScreeningTime = screeningTimes[position]
  }
@@ -157,7 +158,7 @@ class ReservationActivity : AppCompatActivity() {
  val reservationOptions = ReservationOptions(
  movie.title,
  LocalDateTime.of(selectedScreeningDate, selectedScreeningTime),
- peopleCountSaved
+ peopleCountSaved,
  )
  startActivity(SeatSelectionActivity.newIntent(this, reservationOptions, movie))
  }