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

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

Merged
merged 32 commits into from
Apr 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e0afc94
영화 티켓 예매 미션
woowahan-pjs Apr 5, 2023
7026a40
feat(MovieListFragment): 영화 목록 화면 fragment로 변경
EmilyCh0 Apr 25, 2023
74deaf3
feat(MovieMainActivity): BottomNavigationView 구현
hyemdooly Apr 25, 2023
b2ef721
feat(ReservationListFragment): 예매 내역 레이아웃 구현
EmilyCh0 Apr 25, 2023
8135b14
feat(ReservationListFragment): RecyclerView 구현
hyemdooly Apr 25, 2023
4f8255a
feat(ReservationListFragment): 클릭 시 예매 내역 상세 화면으로 이동 구현
EmilyCh0 Apr 25, 2023
add9dd3
feat(ReservationListFragment): Data 저장 구현
hyemdooly Apr 25, 2023
40fcc29
refactor(MovieListAdapter): 클릭 이벤트 콜백 하나로 합치기
EmilyCh0 Apr 25, 2023
44bf562
feat(AlarmReceiver): 예매 후 상영 전 시간 푸시 알림 구현
hyemdooly Apr 26, 2023
cca69f7
feat(SettingFragment, AlarmController): 푸시 알림 수신 설정 구현
EmilyCh0 Apr 26, 2023
a508eaa
refactor(AlarmController): 알림 받을 시간 수정
EmilyCh0 Apr 26, 2023
1592c3d
refactor(AlarmController, AlarmReceiver): 코드 정리 및 메서드 분리
EmilyCh0 Apr 27, 2023
f5a9ef9
test(MovieMainActivityTest): 설정 프래그먼트 테스트
hyemdooly Apr 27, 2023
9737d18
refactor(AndroidManifest): 필요없는 권한 삭제
hyemdooly Apr 28, 2023
939d84a
refactor(layout): xml formatting
hyemdooly Apr 28, 2023
76e9b00
test(SettingFragmentTest): 설정 프래그먼트 테스트
hyemdooly Apr 28, 2023
beb0b3a
test(MovieMainActivityTest): Fragment 선택 테스트
hyemdooly Apr 28, 2023
b71eb97
refactor(reservation_item.xml): isFocusable, isClickable 설정 삭제
hyemdooly Apr 28, 2023
7a8b6b9
refactor(SettingFragment): property formatting
hyemdooly Apr 28, 2023
070cce4
refactor(SettingFragment): if문 depth 수정
hyemdooly Apr 28, 2023
8497d53
refactor(Adapter, ViewHolder): click listener 파라미터 고차함수 -> OnItemClic…
hyemdooly Apr 28, 2023
b2ce59d
refactor(MovieListFragment): click listener 분리
hyemdooly Apr 28, 2023
fcd527f
refactor(ReservationListFragment): 변수 분리 가독성 수정
hyemdooly Apr 28, 2023
c9df85d
refactor(ReservationCompletedActivity): 권한 유도 코드 이동
hyemdooly Apr 28, 2023
8eba6d0
refactor(AlarmController): context private 수정
hyemdooly Apr 28, 2023
085e9dd
refactor(AlarmReceiver, AlarmController): ALARM_REQUEST_CODE 상수 이동
hyemdooly Apr 28, 2023
fd3e4d3
refactor(ReservationCompletedActivity): pendingIntent를 리턴하는 함수 생성
hyemdooly Apr 28, 2023
17cafbc
refactor(SeatSelectionActivity): repositoryMock에 직접 접근이 아닌 interface …
hyemdooly Apr 28, 2023
b634aa8
refactor(SettingFragment): defaultSharedPreferences로 변경
hyemdooly Apr 28, 2023
72e7a58
refactor(Fragments): 레이아웃 id 생성자 사용
hyemdooly Apr 28, 2023
00f4a8f
refactor(MovieMainActivity): Fragment 재활용
hyemdooly Apr 28, 2023
923eedd
refactor(ReservationCompletedActivity): 권한 요청 코드 이동
hyemdooly Apr 29, 2023
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
Prev Previous commit
Next Next commit
refactor(Fragments): 레이아웃 id 생성자 사용
  • Loading branch information
hyemdooly committed Apr 28, 2023
commit 72e7a584d1f5af42462bc80f55d2dc5fefde5720
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ package woowacourse.movie.view.moviemain.movielist
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import woowacourse.movie.R
Expand All @@ -15,16 +13,7 @@ import woowacourse.movie.view.ReservationActivity
import woowacourse.movie.view.mapper.toUiModel
import woowacourse.movie.view.model.MovieListModel

class MovieListFragment : Fragment() {

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
return inflater.inflate(R.layout.fragment_movie_list, container, false)
}

class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val movies = MovieMockRepository.findAll()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MockRepository 다른 곳도 동일하게 변경 해주세요~

Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
package woowacourse.movie.view.moviemain.reservationlist

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import woowacourse.movie.R
import woowacourse.movie.data.ReservationMockRepository
import woowacourse.movie.view.ReservationCompletedActivity
import woowacourse.movie.view.mapper.toUiModel

class ReservationListFragment : Fragment() {

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
return inflater.inflate(R.layout.fragment_reservation_list, container, false)
}

class ReservationListFragment : Fragment(R.layout.fragment_reservation_list) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val recyclerView = view.findViewById<RecyclerView>(R.id.recyclerview)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import android.content.SharedPreferences
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.content.ContextCompat
Expand All @@ -19,7 +17,7 @@ import woowacourse.movie.data.ReservationMockRepository
import woowacourse.movie.view.AlarmController
import woowacourse.movie.view.mapper.toUiModel

class SettingFragment : Fragment() {
class SettingFragment : Fragment(R.layout.fragment_setting) {

private lateinit var alarmController: AlarmController
private lateinit var sharedPreferences: SharedPreferences
Expand All @@ -38,14 +36,6 @@ class SettingFragment : Fragment() {
alarmController = AlarmController(requireContext())
}

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
return inflater.inflate(R.layout.fragment_setting, container, false)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

Expand Down