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단계 영화 티켓 예매 제출합니다. #7

Merged
merged 71 commits into from
Apr 19, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
81ab027
docs: 클래스와 액티비티 설계도 작성
whk06061 Apr 11, 2023
545de51
feat: Movie 데이터 클래스 작성
whk06061 Apr 11, 2023
766d546
docs: 설계도 수정
whk06061 Apr 11, 2023
4c79b1a
feat: Price 클래스 구현
whk06061 Apr 11, 2023
4396e2c
feat: TicketingInfo 클래스 구현
whk06061 Apr 11, 2023
282882b
refactor: TicketingInfo name->title로 수정
whk06061 Apr 11, 2023
4690eae
feat: ListView, ListAdapter 구현
whk06061 Apr 11, 2023
2bc5a77
feat: 문자열 상수 @string으로 분할
whk06061 Apr 11, 2023
15cf193
feat: MovieListActivity 구현
whk06061 Apr 11, 2023
c75d5a7
feat: activity_ticketing xml 구현
whk06061 Apr 11, 2023
e38faa0
refactor: xml 더미데이터 삭제
whk06061 Apr 11, 2023
2616c9a
refactor: Price 클래스 value class 로 변경
whk06061 Apr 11, 2023
7c5e91f
feat: TicketingActivity 구현
whk06061 Apr 11, 2023
761850e
feat: activity_movie_ticket xml 구현
whk06061 Apr 11, 2023
013a294
feat: MovieTicketActivity 구현
whk06061 Apr 11, 2023
adf25b7
refactor: activity_movie_ticket.xml 글자 볼드 처리 수정
whk06061 Apr 11, 2023
f50a2ce
refactor: ViewHolder 적용
whk06061 Apr 11, 2023
48a66c5
refactor: 불필요한 MainActivity 삭제
whk06061 Apr 11, 2023
47f12c8
refactor: 상영일, 러닝타임 문자 출력 수정
whk06061 Apr 11, 2023
443e903
refactor: activity_ticketing.xml 본문 스크롤 되도록 수정
whk06061 Apr 12, 2023
e7db664
docs: 클래스 설계도 수정
whk06061 Apr 12, 2023
aa74fa9
feat: PlayingTimes 구현
whk06061 Apr 12, 2023
c05ff0e
refactor: PlayintDate, PlayingTime 따로 받도록 수정
whk06061 Apr 12, 2023
fc093c7
refactor: 직렬화되도록 수정
whk06061 Apr 12, 2023
3f5cc8f
feat: 날짜 시간 선택 spinner 구현
whk06061 Apr 12, 2023
b512714
feat: 할인 정책 구현
whk06061 Apr 12, 2023
6d2199c
feat: 화면 회전 시 데이터 유지 구현
whk06061 Apr 12, 2023
520d74b
refactor: 영화 더미 데이터 가져오는 함수 분리
whk06061 Apr 13, 2023
3ddf00b
refactor: 로직 함수로 분리
whk06061 Apr 13, 2023
fe47ef3
feat: Formatter 구현
whk06061 Apr 13, 2023
5525f7b
feat: Intent getSerializable 확장함수 구현
whk06061 Apr 13, 2023
7dce42c
refactor: MovieListAdapter, MovieTicketActivity 리팩터링
whk06061 Apr 13, 2023
70e7f6b
test: FormatterTest 구현
whk06061 Apr 13, 2023
6b3843c
refactor: TicketingActivity.kt 코드 리팩토링
whk06061 Apr 13, 2023
c881fba
refactor: 패키지 구조 분리 및 액티비티 명 수정
whk06061 Apr 13, 2023
4d17d10
refactor: SpinnerListener, Keys 분리
hyemdooly Apr 14, 2023
10f416c
refactor: DummyData 분리
hyemdooly Apr 14, 2023
303b877
refactor: getString 필요없는 format 함수 사용 삭제
hyemdooly Apr 14, 2023
ed85463
refactor: require 수정
hyemdooly Apr 14, 2023
452126c
refactor: ViewHolder 필드들 nullable인 것 수정
hyemdooly Apr 14, 2023
77afa95
refactor: PlayingTimes 리팩터링
hyemdooly Apr 14, 2023
54b5c30
fix: Exception 발생 버그 수정
hyemdooly Apr 14, 2023
8609c35
refactor: Policies 따로 분할, 범용적으로 사용할 수 있도록 수정
hyemdooly Apr 14, 2023
2e67294
test: DiscountPolicy 클래스 변경으로 인한 테스트 수정 및 추가
hyemdooly Apr 14, 2023
187af84
refactor: Formatter 삭제
hyemdooly Apr 14, 2023
6fc6324
refactor: 모든 layout Linear에서 Constraint로 변경
hyemdooly Apr 14, 2023
a5e2e98
refactor: ktlintFormat 적용
hyemdooly Apr 14, 2023
37cf719
refactor: FormatterTest 삭제
hyemdooly Apr 14, 2023
b8c06a2
refactor: null일시 토스트 띄운 후 뒤로가도록 수정
hyemdooly Apr 15, 2023
e2c4c55
refactor: 확장함수명 변경
hyemdooly Apr 15, 2023
0fe291d
refactor: 패키지 변경 및 뷰 값 세팅 클래스 분리
hyemdooly Apr 15, 2023
dc6ad79
refactor: 패키지 변경
hyemdooly Apr 15, 2023
e062f6f
refactor: MovieDetailActivity, TicketResultActivity 함수 분리
hyemdooly Apr 15, 2023
9864e56
refactor: DummyData 추가, 변수명 변경
hyemdooly Apr 15, 2023
5cca9a1
refactor: MovieDTO 추가
hyemdooly Apr 15, 2023
a45c442
refactor: Key들 위치 변경, Keys object 삭제
hyemdooly Apr 16, 2023
9f8e452
refactor: 확장함수명 변경
hyemdooly Apr 16, 2023
d04bd6c
refactor: else문 삭제
hyemdooly Apr 16, 2023
5336de6
refactor: scope function run 대신 with 사용
hyemdooly Apr 17, 2023
77cd778
refactor: package 이동, MovieDTO 및 Mapper 수정
hyemdooly Apr 17, 2023
1c36e77
refactor: view를 객체 내부에서 찾도록 변경
hyemdooly Apr 17, 2023
186d6f6
refactor: key가 없으면 빈 리스트를 반환하는 Map 확장함수 구현
hyemdooly Apr 17, 2023
b1bffce
refactor: 모듈 분리
hyemdooly Apr 18, 2023
b13a913
refactor: ViewHolders Map 생성, set 함수 이동
hyemdooly Apr 18, 2023
f8c3245
refactor: MovieListItemListener 생성 후 Listener 분할
hyemdooly Apr 18, 2023
ae36175
refactor: getKeyFromIndex Map 확장함수 생성
hyemdooly Apr 18, 2023
f2bfce9
refactor: MovieDTO -> MovieModel 네이밍 변경
hyemdooly Apr 18, 2023
1dc76f1
refactor: View Setting 함수 하나로 합치기
hyemdooly Apr 18, 2023
ac7b7e6
refactor: SpinnerAdapter 함수 분리
hyemdooly Apr 18, 2023
39215c6
refactor: TicketingInfo -> Ticket으로 변경, payment 삭제
hyemdooly Apr 18, 2023
b89051c
refactor: TicketModel 생성, 도메인 객체 의존성 제거
hyemdooly Apr 18, 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
feat: activity_movie_ticket xml 구현
  • Loading branch information
whk06061 committed Apr 11, 2023
commit 761850e87c965703654922180dc145a12e8a43b2
53 changes: 50 additions & 3 deletions app/src/main/res/layout/activity_movie_ticket.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
xmlns:tools="http:https://schemas.android.com/tools"
xmlns:app="http:https://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MovieTicketActivity">

</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="114dp"
android:text="@string/cancel_notice"
android:textSize="15sp"
android:textColor="@color/white"
android:paddingBottom="10dp"
android:gravity="bottom|center"
android:background="#9160F9" />

<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textStyle="bold"
android:textSize="25sp"
android:textColor="@color/black"
android:layout_marginTop="31dp" />
<TextView
android:id="@+id/text_playing_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="25sp"
android:textColor="@color/black"
android:layout_marginTop="9dp" />

<TextView
android:id="@+id/text_person_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/normal_count"
android:textSize="20sp"
android:textColor="@color/black"
android:layout_marginTop="69dp" />

<TextView
android:id="@+id/text_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/price_payment"
android:textSize="20sp"
android:textColor="@color/black"
android:layout_marginTop="19dp" />
</LinearLayout>
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@
<string name="minus">-</string>
<string name="plus">+</string>
<string name="complete_ticketing">예매 완료</string>
<string name="cancel_notice">영화 상영 시작 시간 15분 전까지\n취소가 가능합니다.</string>
<string name="normal_count">일반 %d명</string>
<string name="price_payment">%s원 (%s 결제)</string>
</resources>