104 Commits

Author SHA1 Message Date
Yu Sung
115a30a7b6 채금 시간이 설정 되지 않던 버그 수정 2023-10-15 07:28:00 +09:00
Yu Sung
c78b804678 탐색 - 인기 크리에이터 설명 글 UI 수정 2023-10-15 06:53:47 +09:00
Yu Sung
1a01244d85 탐색 - 인기 크리에이터 설명 글 UI 수정 2023-10-15 06:40:09 +09:00
Yu Sung
fea557560c 인기콘텐츠 전체 보기 페이지 추가 2023-10-15 06:34:08 +09:00
Yu Sung
c440e8abd9 콘텐츠 메인 - 인기 콘텐츠 영역 추가 2023-10-15 05:50:54 +09:00
Yu Sung
41d5bad46f 탐색 - 크리에이터 랭킹 UI 추가 2023-10-14 18:34:10 +09:00
Yu Sung
6c8e19aed5 Admob 제거 2023-10-14 17:31:28 +09:00
Yu Sung
282ee73de1 채금 기능 추가 2023-10-11 19:25:12 +09:00
Yu Sung
91c43e679f 라이브 예약중 - 예약중 글자색, 내가 개설한 라이브 글자색 3bb9f1로 변경 2023-10-06 20:31:13 +09:00
Yu Sung
02835c4b2e 라이브 예약 중 전체보기 - 선택된 날짜 배경색 3bb9f1로 변경 2023-10-06 20:28:02 +09:00
Yu Sung
a4d15be57a 메시지 발송 버튼 색 변경, 입력창 커서 색 변경 2023-10-06 20:26:12 +09:00
Yu Sung
219128ea8d 라이브 방 - 팔로우 버튼 위치 수정 2023-10-06 20:19:16 +09:00
Yu Sung
47ae2ec8e1 유료 콘텐츠 미리 듣기 재생 버튼 추가 2023-10-06 01:22:56 +09:00
Yu Sung
962197d319 후원랭킹 전체보기 - 채널에 후원랭킹 활성화 스위치 추가 2023-10-06 01:02:32 +09:00
Yu Sung
c75f94722b 배경색 2b2635 -> 13181b 로 변경 2023-10-05 23:35:45 +09:00
Yu Sung
c00931761c 라이브 상세 - 공유 버튼 제거 2023-10-05 02:03:41 +09:00
Yu Sung
8255065bba 비공개 라이브 입장 - 비밀번호 입력창 나오지 않던 버그 수정 2023-10-04 20:25:19 +09:00
Yu Sung
1e1b97e2d4 새로운 콘텐츠 전체보기, 큐레이션 전체보기 - grid item alignment top으로 설정 2023-09-27 22:17:47 +09:00
Yu Sung
f653667df2 새로운 콘텐츠 전체보기, 콘텐츠 큐레이션 전체보기 - 스크롤 로딩 추가 2023-09-27 21:22:26 +09:00
Yu Sung
658cff20eb 큐레이션 전체보기 페이지 추가 2023-09-27 21:16:39 +09:00
Yu Sung
fd356451ae 새로운 콘텐츠 전체보기 페이지 추가 2023-09-27 19:25:00 +09:00
Yu Sung
91cd3fe995 콘텐츠 업로드 - 미리듣기 시간 설정 안내 문구 추가 2023-09-27 18:13:15 +09:00
Yu Sung
5f7924880e 콘텐츠 업로드 - 미리 듣기 시간 타입 옵셔널로 수정 2023-09-23 00:57:38 +09:00
Yu Sung
00a8f7e8ff 푸시토큰 잘못 불러오는 버그 수정 2023-09-23 00:29:26 +09:00
Yu Sung
d1b5ab31aa 콘텐츠 업로드 - 미리 듣기 시간 설정 기능 추가 2023-09-23 00:08:23 +09:00
Yu Sung
225efc34e4 라이브 방 후원 다이얼로그 - 캔 불러오는 방식 수정 2023-09-21 23:03:28 +09:00
Yu Sung
4e607ed624 라이브 상세 - 상단에 배너 광고 추가 2023-09-21 19:01:27 +09:00
Yu Sung
c7522aa7c9 .. 2023-09-19 15:37:28 +09:00
Yu Sung
b632a65a6f 캔 유효기간 설명 제거 2023-09-18 10:46:31 +09:00
Yu Sung
d3c5a5bfb9 콘텐츠 상세 - 배너 광고 간격 수정 2023-09-16 01:41:21 +09:00
Yu Sung
2449eb14d0 콘텐츠 상세 - 배너 광고 위치 수정 2023-09-16 01:31:11 +09:00
Yu Sung
4c9e78f960 탐색 - 배너 광고 추가 2023-09-16 01:11:50 +09:00
Yu Sung
6e9aaa0c8a 콘텐츠 메인 - 배너 광고 위치 수정 2023-09-16 00:53:59 +09:00
Yu Sung
0294bbf223 라이브 - 배너 광고 위치 변경 2023-09-16 00:10:58 +09:00
Yu Sung
36aa167e1d 라이브 방 - 배너 광고 제거 2023-09-15 23:36:21 +09:00
Yu Sung
8c20ce9c62 라이브 방 - 배너 광고 추가 2023-09-15 18:27:53 +09:00
Yu Sung
f44ef505cf 크리에이터 프로필 - 배너 광고 추가 2023-09-15 18:11:40 +09:00
Yu Sung
9a72e21fda 팔로잉 채널 리스트 - 배너 광고 추가 2023-09-15 18:03:46 +09:00
Yu Sung
1c4503bda1 콘텐츠 메인 - 배너 광고 추가 2023-09-15 17:59:23 +09:00
Yu Sung
b1773b117d 라이브, 지금 라이브 중 전체보기 - 배너 광고 추가 2023-09-15 17:03:16 +09:00
Yu Sung
a16c38f4ab 메시지 - 배너 광고 추가 2023-09-15 16:28:11 +09:00
Yu Sung
475882570a 구매목록 - 배너광고 추가 2023-09-15 16:04:21 +09:00
Yu Sung
5b0cb44645 contentShape 추가 2023-09-14 12:50:58 +09:00
Yu Sung
b2f0975ad1 콘텐츠 상세 - 배너 광고 추가 2023-09-14 12:16:01 +09:00
Yu Sung
48b1093dac 콘텐츠 답글 - 댓글이 랜덤으로 보이는 버그 수정 2023-09-13 16:54:24 +09:00
Yu Sung
3bcd2b7dba 메시지 추가 로딩 되지 않는 버그 수정 2023-09-13 14:39:35 +09:00
Yu Sung
9863fc66de 재생 수 업데이트 로직 추가 2023-09-13 12:14:03 +09:00
Yu Sung
58868f613a 푸시 터치 액션 수정 2023-09-13 11:45:41 +09:00
Yu Sung
1f992a11dc 응원글 전체보기 - 응원글 삭제기능 추가 2023-09-09 00:38:55 +09:00
Yu Sung
948b1fd2b3 응원글 수정 기능 추가 2023-09-09 00:10:22 +09:00
Yu Sung
5d95c0f1c9 응원글 삭제 기능 추가 2023-09-09 00:02:39 +09:00
Yu Sung
b31933715d 콘텐츠 댓글 - 수정/삭제 추가 2023-09-08 19:33:09 +09:00
Yu Sung
707b6f804c 구매목록 - 콘텐츠 크리에이터 표시 2023-09-04 23:10:34 +09:00
Yu Sung
05f5a4fe82 라이브 생성 푸시 - 예약중인 라이브의 경우 상세 페이지가 나오도록 수정 2023-09-04 19:03:02 +09:00
Yu Sung
f08d72745e 음성메시지 보관/삭제/답장 추가 2023-09-01 23:09:36 +09:00
Yu Sung
4611524f8f 라이브 예약이 되지 않던 버그 수정 2023-09-01 12:13:30 +09:00
Yu Sung
a41c423991 푸시, 딥링크 - 라이브 탭으로 이동하지 않아도 실행되도록 수정 2023-09-01 00:35:50 +09:00
Yu Sung
d76b1c7a59 라이브 - 상단 배너 터치 액션 추가 2023-08-30 22:05:23 +09:00
Yu Sung
6fa183b89a 코인 -> 캔 2023-08-29 23:38:01 +09:00
Yu Sung
371d6d538a 콘텐츠 대여가격 60%로 변경 2023-08-29 23:29:05 +09:00
Yu Sung
2aa3f944c8 응원 전체보기 추가 2023-08-29 15:30:21 +09:00
Yu Sung
e68961bd0d 후원랭킹 전체보기 추가 2023-08-29 14:10:16 +09:00
Yu Sung
88fcbc98f4 스피커 요청 버튼 제거 2023-08-28 23:13:43 +09:00
Yu Sung
3916a49e60 콘텐츠 등록 - 5캔(500원) 부터 등록되도록 수정, 대여가격 안내 60%로 수정 2023-08-28 18:20:58 +09:00
Yu Sung
594bcc27ca 빠진 아이콘 추가 2023-08-24 16:18:49 +09:00
Yu Sung
bcb934a155 마이페이지 구매목록 - 19표시 제거 2023-08-24 15:55:26 +09:00
Yu Sung
b31dcf901b 회원가입 - 프로필 이미지 정사각형 2023-08-24 14:42:07 +09:00
Yu Sung
2c8485a1cd 마이페이지 - 구매목록 추가 2023-08-24 14:30:09 +09:00
Yu Sung
f0d2bda024 내보내기, mute, noti_mute 파일 추가 2023-08-24 13:26:24 +09:00
Yu Sung
828c507742 콘텐츠 수정 request data 이름 변경 - audioContentId -> contentId 2023-08-24 13:12:31 +09:00
Yu Sung
65b43e4c0d 콘텐츠 후원 요청 데이터 이름 변경 - audioContentId -> contentId 2023-08-22 22:44:18 +09:00
Yu Sung
728510a72d 콘텐츠 리스트, 콘텐츠 구매 창에 캔 아이콘 변경 2023-08-22 00:41:27 +09:00
Yu Sung
89fd2f5f0d 콘텐츠 구매 - audioContentId -> contentId로 변경 2023-08-22 00:34:43 +09:00
Yu Sung
52921e78b6 pg 검증 API URL 변경 2023-08-21 23:56:29 +09:00
Yu Sung
f0f1cd39b6 크리에이터만 라이브를 개설할 수 있도록 변경 2023-08-21 06:07:53 +09:00
Yu Sung
c5fdfcafda 라이브 방 - 스피커 최대 10 -> 5명으로 수정 2023-08-21 05:38:53 +09:00
Yu Sung
5301aebe71 라이브 종료 - 방장이 라이브를 종료 했을 때 앱이 죽는 버그 수정 2023-08-21 05:23:27 +09:00
Yu Sung
fe046e8006 라이브 방 - SwiftUI 기본 애니메이션 제거 2023-08-21 05:12:29 +09:00
Yu Sung
0daf638b68 라이브 메인 - 메시지 탭 보이도록 수정 2023-08-21 04:41:54 +09:00
Yu Sung
8b7f3fbd07 본인인증을 한 유저만 메시지 탭이 보이도록 수정 2023-08-21 04:20:13 +09:00
Yu Sung
3ab5735fde 라이브 상세 - 제목 왼쪽에 19금 표시 추가 2023-08-21 04:08:12 +09:00
Yu Sung
550bf0c1c7 로딩 애니메이션 변경 2023-08-21 03:07:57 +09:00
Yu Sung
f018bd30e6 푸시토큰 업데이트 수정 2023-08-21 02:48:43 +09:00
Yu Sung
4e62d752f9 마이페이지 - 사용방법 배너 간격 수정 2023-08-21 02:28:25 +09:00
Yu Sung
d93c3e8836 라이브 메인 - 이벤트 클릭 이벤트 추가 2023-08-21 01:29:01 +09:00
Yu Sung
38df12872a 라이브 방 - 입장메시지 방장만 보이도록 수정 2023-08-21 00:45:46 +09:00
Yu Sung
8c3a9e25a0 라이브 방 - 19금 방인 경우 제목 왼쪽에 19 표시 2023-08-20 23:44:18 +09:00
Yu Sung
e8de5dd72b 라이브 상세 - 참여자 리스트 삭제 2023-08-20 23:24:03 +09:00
Yu Sung
30cceefbcf 소다라이브 이용방법 배너 - 라이브 탭에서 마이 탭으로 이동 2023-08-20 23:21:02 +09:00
Yu Sung
ce55449f2d 캔내역 - 충전하기 버튼색 변경 2023-08-20 23:18:23 +09:00
Yu Sung
792e029f0d 캔 아이콘 변경 2023-08-20 23:14:00 +09:00
Yu Sung
6bc5356ac1 메인 하단 탭 - 라이브, 콘텐츠 순서 변경 2023-08-20 20:42:14 +09:00
Yu Sung
a5b954ada2 크리에이터 채널 - 콘텐츠 영역 추가 2023-08-20 20:36:17 +09:00
Yu Sung
154b5826c6 인 앱 결제 상품 추가 2023-08-20 20:22:55 +09:00
Yu Sung
3dfe4f3b8a 19 표시 제거 2023-08-20 20:22:35 +09:00
Yu Sung
d75367c78b data parsing시 이름이 일치하지 않아 에러나던 버그 수정 2023-08-20 00:08:15 +09:00
Yu Sung
78f80cebd5 팔로잉 채널 전체 리스트 페이지 추가 2023-08-19 23:14:54 +09:00
Yu Sung
633e1bfd92 라이브 메인 - 추천 채널 아이템 터치시 크리에이터 채널로 이동하도록 수정 2023-08-19 23:00:46 +09:00
Yu Sung
5a771f14bd 푸시 혹은 공유링크를 타고 앱을 실행했을 때 처리되는 로직 수정 2023-08-19 22:57:10 +09:00
Yu Sung
8e23f65086 yozm -> sodalive 로 변경 2023-08-19 21:57:19 +09:00
Yu Sung
a22a3ebf6c 공유하기 url 수정 2023-08-19 21:27:39 +09:00
Yu Sung
00d49afec6 . 2023-08-19 18:08:59 +09:00
Yu Sung
80b487eab6 앱 아이콘 변경 2023-08-19 18:07:13 +09:00
Yu Sung
8461012e22 아이콘 삭제 2023-08-19 18:05:13 +09:00
235 changed files with 5325 additions and 1131 deletions

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "btn_audio_content_preview_play.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 978 B

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 845 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 927 B

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@@ -5,11 +5,11 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "loading_4.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "ic_alarm.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 781 B

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_alarm_selected.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 804 B

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_blog_purple.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_heart_777.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 830 B

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_instagram_purple.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_kick_out.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_message_send.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 787 B

View File

@@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "ic_headphones_purple.png", "filename" : "ic_message_square_777.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_mic_paint.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 694 B

View File

@@ -5,11 +5,11 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "loading_2.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "ic_mute.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_place_holder.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

View File

@@ -5,11 +5,11 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "loading_3.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "ic_record.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_record_pause.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_record_play.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_record_stop.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -5,11 +5,11 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "loading_1.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "ic_save.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_website_purple.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 926 B

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_youtube_play_purple.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 858 B

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "img_compleate_book.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "img_noti_mute.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "img_thumb_default.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -1,6 +0,0 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

View File

@@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "loading_5.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>FirebaseAppDelegateProxyEnabled</key> <key>FirebaseAppDelegateProxyEnabled</key>
<false/> <false/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
@@ -21,5 +21,206 @@
<string>fetch</string> <string>fetch</string>
<string>remote-notification</string> <string>remote-notification</string>
</array> </array>
</dict> <key>GADApplicationIdentifier</key>
<string>ca-app-pub-1299501215847962~3447556960</string>
<key>SKAdNetworkItems</key>
<array>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cstr6suwn9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4fzdc2evr5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4pfyvq9l8r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2fnua5tdw4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ydx93a7ass.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5a6flpkh64.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>p78axxw29g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v72qych5uu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ludvb6z3bs.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cp8zw746q7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3sh42y64q3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>c6k4g5qg8m.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>s39g8k73mm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3qy4746246.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>f38h382jlk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>hs6bdukanm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v4nxqhlyqp.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>wzmmz9fp6w.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yclnxrl5pm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>t38b2kh725.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7ug5zh24hu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gta9lk7p23.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>vutu7akeur.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>y5ghdn5j9k.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n6fk4nfna4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v9wttpbfk9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n38lu8286q.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>47vhws6wlr.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>kbd757ywx3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9t245vhmpl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>eh6m2bh4zr.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>a2p9lx4jpn.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>22mmun2rn5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4468km3ulz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2u9pt9hc89.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8s468mfl3y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>klf5c3l5u5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ppxm28t8ap.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ecpz2srf59.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>uw77j35x4d.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pwa73g5rt2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mlmmfzh3r3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>578prtvx9j.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4dzt52r2t5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>e5fvkxwrpn.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8c4e2ghe7u.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>zq492l623r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3rd42ekr43.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3qcr597p9d.skadnetwork</string>
</dict>
</array>
</dict>
</plist> </plist>

View File

@@ -21,5 +21,206 @@
<string>fetch</string> <string>fetch</string>
<string>remote-notification</string> <string>remote-notification</string>
</array> </array>
<key>GADApplicationIdentifier</key>
<string>ca-app-pub-1299501215847962~8852459715</string>
<key>SKAdNetworkItems</key>
<array>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cstr6suwn9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4fzdc2evr5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4pfyvq9l8r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2fnua5tdw4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ydx93a7ass.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5a6flpkh64.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>p78axxw29g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v72qych5uu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ludvb6z3bs.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cp8zw746q7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3sh42y64q3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>c6k4g5qg8m.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>s39g8k73mm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3qy4746246.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>f38h382jlk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>hs6bdukanm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v4nxqhlyqp.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>wzmmz9fp6w.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yclnxrl5pm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>t38b2kh725.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7ug5zh24hu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gta9lk7p23.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>vutu7akeur.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>y5ghdn5j9k.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n6fk4nfna4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v9wttpbfk9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>n38lu8286q.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>47vhws6wlr.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>kbd757ywx3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9t245vhmpl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>eh6m2bh4zr.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>a2p9lx4jpn.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>22mmun2rn5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4468km3ulz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2u9pt9hc89.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8s468mfl3y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>klf5c3l5u5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ppxm28t8ap.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ecpz2srf59.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>uw77j35x4d.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pwa73g5rt2.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mlmmfzh3r3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>578prtvx9j.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4dzt52r2t5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>e5fvkxwrpn.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8c4e2ghe7u.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>zq492l623r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3rd42ekr43.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3qcr597p9d.skadnetwork</string>
</dict>
</array>
</dict> </dict>
</plist> </plist>

View File

@@ -5,6 +5,8 @@
<key>aps-environment</key> <key>aps-environment</key>
<string>development</string> <string>development</string>
<key>com.apple.developer.associated-domains</key> <key>com.apple.developer.associated-domains</key>
<array/> <array>
<string>applinks:sodalive.page.link</string>
</array>
</dict> </dict>
</plist> </plist>

View File

@@ -16,7 +16,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
FirebaseApp.configure() FirebaseApp.configure()
Messaging.messaging().delegate = self Messaging.messaging().delegate = self
// For iOS 10 display notification (sent via APNS) // For iOS 10 display notification (sent via APNS)
@@ -94,17 +93,27 @@ extension AppDelegate : UNUserNotificationCenterDelegate {
// With swizzling disabled you must let Messaging know about the message, for Analytics // With swizzling disabled you must let Messaging know about the message, for Analytics
Messaging.messaging().appDidReceiveMessage(userInfo) Messaging.messaging().appDidReceiveMessage(userInfo)
let roomIdString = userInfo["suda_room_id"] as? String let roomIdString = userInfo["room_id"] as? String
let audioContentIdString = userInfo["audio_content_id"] as? String let contentIdString = userInfo["content_id"] as? String
let channelIdString = userInfo["channel_id"] as? String
let messageIdString = userInfo["message_id"] as? String
if let roomIdString = roomIdString, let roomId = Int(roomIdString), roomId > 0 { if let roomIdString = roomIdString, let roomId = Int(roomIdString), roomId > 0 {
AppState.shared.pushRoomId = roomId AppState.shared.pushRoomId = roomId
} }
if let audioContentIdString = audioContentIdString, let audioContentId = Int(audioContentIdString), audioContentId > 0 { if let contentIdString = contentIdString, let audioContentId = Int(contentIdString), audioContentId > 0 {
AppState.shared.pushAudioContentId = audioContentId AppState.shared.pushAudioContentId = audioContentId
} }
if let channelIdString = channelIdString, let channelId = Int(channelIdString), channelId > 0 {
AppState.shared.pushChannelId = channelId
}
if let messageIdString = messageIdString, let messageId = Int(messageIdString), messageId > 0 {
AppState.shared.pushMessageId = messageId
}
completionHandler() completionHandler()
} }
} }

View File

@@ -26,6 +26,7 @@ class AppState: ObservableObject {
@Published var pushRoomId = 0 @Published var pushRoomId = 0
@Published var pushChannelId = 0 @Published var pushChannelId = 0
@Published var pushMessageId = 0
@Published var pushAudioContentId = 0 @Published var pushAudioContentId = 0
@Published var roomId = 0 { @Published var roomId = 0 {
didSet { didSet {

View File

@@ -58,6 +58,8 @@ enum AppStep {
case modifyContent(contentId: Int) case modifyContent(contentId: Int)
case contentListAll(userId: Int)
case contentDetail(contentId: Int) case contentDetail(contentId: Int)
case liveReservationComplete(response: MakeLiveReservationResponse) case liveReservationComplete(response: MakeLiveReservationResponse)
@@ -101,4 +103,14 @@ enum AppStep {
case changeNickname case changeNickname
case profileUpdate(refresh: () -> Void) case profileUpdate(refresh: () -> Void)
case followingList
case orderListAll
case newContentAll
case curationAll(title: String, curationId: Int)
case contentRankingAll
} }

View File

@@ -13,7 +13,7 @@ class ObjectBoxService {
let playbackTrackingBox: Box<PlaybackTracking> let playbackTrackingBox: Box<PlaybackTracking>
init() { init() {
let databaseName = "yozmlive" let databaseName = "sodalive"
let appSupport = try! FileManager.default.url(for: .applicationSupportDirectory, let appSupport = try! FileManager.default.url(for: .applicationSupportDirectory,
in: .userDomainMask, in: .userDomainMask,
appropriateFor: nil, appropriateFor: nil,

View File

@@ -26,7 +26,8 @@ struct SodaLiveApp: App {
let queryItems = URLComponents(url: url, resolvingAgainstBaseURL: true)?.queryItems let queryItems = URLComponents(url: url, resolvingAgainstBaseURL: true)?.queryItems
let roomId = queryItems?.filter({$0.name == "room_id"}).first?.value let roomId = queryItems?.filter({$0.name == "room_id"}).first?.value
let channelId = queryItems?.filter({$0.name == "channel_id"}).first?.value let channelId = queryItems?.filter({$0.name == "channel_id"}).first?.value
let audioContentId = queryItems?.filter({$0.name == "audio_content_id"}).first?.value let messageId = queryItems?.filter({$0.name == "message_id"}).first?.value
let audioContentId = queryItems?.filter({$0.name == "content_id"}).first?.value
if let roomId = roomId { if let roomId = roomId {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
@@ -40,6 +41,12 @@ struct SodaLiveApp: App {
} }
} }
if let messageId = messageId {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
AppState.shared.pushMessageId = Int(messageId) ?? 0
}
}
if let audioContentId = audioContentId { if let audioContentId = audioContentId {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
AppState.shared.pushAudioContentId = Int(audioContentId) ?? 0 AppState.shared.pushAudioContentId = Int(audioContentId) ?? 0
@@ -58,7 +65,7 @@ struct SodaLiveApp: App {
.onOpenURL { url in .onOpenURL { url in
DEBUG_LOG("I have received a URL through a custom scheme! \(url.absoluteString)") DEBUG_LOG("I have received a URL through a custom scheme! \(url.absoluteString)")
if let scheme = url.scheme { if let scheme = url.scheme {
if scheme == "kr.co.vividnext.yozm" { if scheme == "kr.co.vividnext.sodalive" {
if let dynamicLink = DynamicLinks.dynamicLinks().dynamicLink(fromCustomSchemeURL: url) { if let dynamicLink = DynamicLinks.dynamicLinks().dynamicLink(fromCustomSchemeURL: url) {
self.handleIncomingDynamicLink(dynamicLink) self.handleIncomingDynamicLink(dynamicLink)
} else { } else {

View File

@@ -8,57 +8,18 @@
import SwiftUI import SwiftUI
struct LoadingView: View { struct LoadingView: View {
@State var index = 0
@State var timer = Timer.publish(every: 0.35, on: .current, in: .common).autoconnect()
var body: some View { var body: some View {
ZStack { ZStack {
Color.primary.opacity(0.2) Color.primary.opacity(0.2)
.ignoresSafeArea() .ignoresSafeArea()
ZStack { ZStack {
Image("loading_1") ActivityIndicatorView()
.resizable()
.frame(width: 100, height: 100) .frame(width: 100, height: 100)
.opacity(index == 0 ? 1.0 : 0.0)
Image("loading_2")
.resizable()
.frame(width: 100, height: 100)
.opacity(index == 1 ? 1.0 : 0.0)
Image("loading_3")
.resizable()
.frame(width: 100, height: 100)
.opacity(index == 2 ? 1.0 : 0.0)
Image("loading_4")
.resizable()
.frame(width: 100, height: 100)
.opacity(index == 3 ? 1.0 : 0.0)
Image("loading_5")
.resizable()
.frame(width: 100, height: 100)
.opacity(index == 4 ? 1.0 : 0.0)
} }
.frame(width: 150, height: 150) .frame(width: 150, height: 150)
.background(Color.white)
.cornerRadius(14)
.shadow(color: Color.primary.opacity(0.07), radius: 5, x: 5, y: 5)
.shadow(color: Color.primary.opacity(0.07), radius: 5, x: -5, y: -5)
} }
.frame(maxWidth: .infinity, maxHeight: .infinity) .frame(maxWidth: .infinity, maxHeight: .infinity)
.onReceive(timer) { _ in
DispatchQueue.main.async {
if index == 4 {
index = 0
} else {
index += 1
}
}
}
} }
} }
@@ -67,3 +28,16 @@ struct LoadingView_Previews: PreviewProvider {
LoadingView() LoadingView()
} }
} }
struct ActivityIndicatorView: UIViewRepresentable {
func makeUIView(context: Context) -> some UIActivityIndicatorView {
let activityIndicator = UIActivityIndicatorView(style: .large)
activityIndicator.color = UIColor(hex: "80D8FF")
return activityIndicator
}
func updateUIView(_ uiView: UIViewType, context: Context) {
uiView.startAnimating()
}
}

View File

@@ -13,7 +13,7 @@ struct AddAllPlaybackTrackingRequest: Encodable {
} }
struct PlaybackTrackingData: Encodable { struct PlaybackTrackingData: Encodable {
let audioContentId: Int let contentId: Int
let playDateTime: String let playDateTime: String
let isPreview: Bool let isPreview: Bool
} }

View File

@@ -0,0 +1,54 @@
//
// ContentNewAllItemView.swift
// SodaLive
//
// Created by klaus on 2023/09/27.
//
import SwiftUI
import Kingfisher
struct ContentNewAllItemView: View {
let item: GetAudioContentMainItem
@State var width: CGFloat = 0
var body: some View {
VStack(alignment: .leading, spacing: 8) {
KFImage(URL(string: item.coverImageUrl))
.resizable()
.scaledToFill()
.frame(width: width, height: width, alignment: .top)
.cornerRadius(2.7)
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "d2d2d2"))
.frame(width: width, alignment: .leading)
.multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true)
.lineLimit(2)
HStack(spacing: 5.3) {
KFImage(URL(string: item.creatorProfileImageUrl))
.resizable()
.scaledToFill()
.frame(width: 21.3, height: 21.3)
.clipShape(Circle())
.onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: item.creatorId)) }
Text(item.creatorNickname)
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "777777"))
.lineLimit(1)
}
.padding(.bottom, 10)
}
.frame(width: width)
.onTapGesture { AppState.shared.setAppStep(step: .contentDetail(contentId: item.contentId)) }
.onAppear {
width = (screenSize().width - 40) / 2
}
}
}

View File

@@ -0,0 +1,86 @@
//
// ContentNewAllView.swift
// SodaLive
//
// Created by klaus on 2023/09/27.
//
import SwiftUI
struct ContentNewAllView: View {
@StateObject var viewModel = ContentNewAllViewModel()
let columns = [
GridItem(.flexible(), alignment: .top),
GridItem(.flexible(), alignment: .top)
]
var body: some View {
BaseView(isLoading: $viewModel.isLoading) {
VStack(spacing: 0) {
DetailNavigationBar(title: "새로운 콘텐츠")
Text("※ 최근 2주간 등록된 새로운 콘텐츠 입니다.")
.font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color(hex: "bbbbbb"))
.padding(.horizontal, 13.3)
.padding(.vertical, 8)
.frame(width: screenSize().width, alignment: .leading)
.background(Color(hex: "222222"))
.padding(.top, 13.3)
ContentMainNewContentThemeView(
themes: viewModel.themeList,
selectTheme: {
viewModel.selectedTheme = $0
},
selectedTheme: $viewModel.selectedTheme
).padding(.top, 13.3)
HStack(spacing: 0) {
Text("전체")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "e2e2e2"))
Text("\(viewModel.totalCount)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "ff5c49"))
.padding(.leading, 8)
Text("")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "e2e2e2"))
.padding(.leading, 2)
Spacer()
}
.padding(.vertical, 13.3)
.padding(.horizontal, 20)
ScrollView(.vertical, showsIndicators: false) {
LazyVGrid(columns: columns, spacing: 13.3) {
ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
ContentNewAllItemView(item: viewModel.newContentList[index])
.onAppear {
if index == viewModel.newContentList.count - 1 {
viewModel.getNewContentList()
}
}
}
}
}
}
.onAppear {
viewModel.getThemeList()
viewModel.getNewContentList()
}
}
}
}
struct ContentNewAllView_Previews: PreviewProvider {
static var previews: some View {
ContentNewAllView()
}
}

View File

@@ -0,0 +1,130 @@
//
// ContentNewAllViewModel.swift
// SodaLive
//
// Created by klaus on 2023/09/27.
//
import Foundation
import Combine
final class ContentNewAllViewModel: ObservableObject {
private let repository = ContentRepository()
private var subscription = Set<AnyCancellable>()
@Published var errorMessage = ""
@Published var isShowPopup = false
@Published var isLoading = false
@Published var themeList = [String]()
@Published var newContentList = [GetAudioContentMainItem]()
@Published var selectedTheme = "전체" {
didSet {
page = 1
isLast = false
getNewContentList()
}
}
@Published var totalCount = 0
var page = 1
var isLast = false
private let pageSize = 10
func getNewContentList() {
if (!isLast && !isLoading) {
isLoading = true
repository.getNewContentAllOfTheme(
theme: selectedTheme == "전체" ? "" : selectedTheme,
page: page,
size: pageSize
)
.sink { result in
switch result {
case .finished:
DEBUG_LOG("finish")
case .failure(let error):
ERROR_LOG(error.localizedDescription)
}
} receiveValue: { [unowned self] response in
self.isLoading = false
let responseData = response.data
do {
let jsonDecoder = JSONDecoder()
let decoded = try jsonDecoder.decode(ApiResponse<GetNewContentAllResponse>.self, from: responseData)
self.isLoading = false
if let data = decoded.data, decoded.success {
if page == 1 {
newContentList.removeAll()
}
self.totalCount = data.totalCount
if !data.items.isEmpty {
page += 1
self.newContentList.append(contentsOf: data.items)
} else {
isLast = true
}
} else {
if let message = decoded.message {
self.errorMessage = message
} else {
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
}
self.isShowPopup = true
}
} catch {
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
self.isShowPopup = true
self.isLoading = false
}
}
.store(in: &subscription)
} else {
isLoading = false
}
}
func getThemeList() {
repository.getNewContentThemeList()
.sink { result in
switch result {
case .finished:
DEBUG_LOG("finish")
case .failure(let error):
ERROR_LOG(error.localizedDescription)
}
} receiveValue: { [unowned self] response in
let responseData = response.data
do {
let jsonDecoder = JSONDecoder()
let decoded = try jsonDecoder.decode(ApiResponse<[String]>.self, from: responseData)
if let data = decoded.data, decoded.success {
self.themeList.append("전체")
self.themeList.append(contentsOf: data)
} else {
if let message = decoded.message {
self.errorMessage = message
} else {
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
}
self.isShowPopup = true
}
} catch {
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
self.isShowPopup = true
}
}
.store(in: &subscription)
}
}

View File

@@ -0,0 +1,153 @@
//
// ContentRankingAllView.swift
// SodaLive
//
// Created by klaus on 2023/10/15.
//
import SwiftUI
import Kingfisher
struct ContentRankingAllView: View {
@StateObject var viewModel = ContentRankingAllViewModel()
var body: some View {
BaseView(isLoading: $viewModel.isLoading) {
VStack(spacing: 0) {
DetailNavigationBar(title: "인기 콘텐츠")
VStack(spacing: 8) {
Text("\(viewModel.dateString)")
.font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee"))
Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.")
.font(.custom(Font.light.rawValue, size: 13.3))
.foregroundColor(Color(hex: "bbbbbb"))
}
.padding(.vertical, 8)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.padding(.top, 13.3)
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 20) {
ForEach(0..<viewModel.contentRankingItemList.count, id: \.self) { index in
let item = viewModel.contentRankingItemList[index]
HStack(spacing: 0) {
KFImage(URL(string: item.coverImageUrl))
.resizable()
.scaledToFill()
.frame(width: 66.7, height: 66.7, alignment: .top)
.clipped()
.cornerRadius(5.3)
Text("\(index + 1)")
.font(.custom(Font.bold.rawValue, size: 16.7))
.foregroundColor(Color(hex: "3bb9f1"))
.padding(.horizontal, 12)
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 8) {
Text(item.themeStr)
.font(.custom(Font.medium.rawValue, size: 8))
.foregroundColor(Color(hex: "3bac6a"))
.padding(2.6)
.background(Color(hex: "28312b"))
.cornerRadius(2.6)
Text(item.duration)
.font(.custom(Font.medium.rawValue, size: 8))
.foregroundColor(Color(hex: "777777"))
.padding(2.6)
.background(Color(hex: "222222"))
.cornerRadius(2.6)
}
Text(item.creatorNickname)
.font(.custom(Font.medium.rawValue, size: 10.7))
.foregroundColor(Color(hex: "777777"))
.padding(.vertical, 8)
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "d2d2d2"))
.lineLimit(2)
.padding(.top, 2.7)
}
Spacer()
if item.price > 0 {
HStack(spacing: 8) {
Image("ic_can")
.resizable()
.frame(width: 17, height: 17)
Text("\(item.price)")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "909090"))
}
} else {
Text("무료")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "ffffff"))
.padding(.horizontal, 5.3)
.padding(.vertical, 2.7)
.background(Color(hex: "cf5c37"))
.cornerRadius(2.6)
}
}
.frame(height: 66.7)
.contentShape(Rectangle())
.onTapGesture {
AppState
.shared
.setAppStep(step: .contentDetail(contentId: item.contentId))
}
.onAppear {
if index == viewModel.contentRankingItemList.count - 1 {
viewModel.getContentRanking()
}
}
}
}
}
.padding(13.3)
}
if viewModel.isLoading {
LoadingView()
}
}
.popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .top, autohideIn: 2) {
GeometryReader { geo in
HStack {
Spacer()
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true)
.cornerRadius(20)
.padding(.top, 66.7)
Spacer()
}
}
}
.onAppear {
viewModel.getContentRanking()
}
}
}
struct ContentRankingAllView_Previews: PreviewProvider {
static var previews: some View {
ContentRankingAllView()
}
}

View File

@@ -0,0 +1,79 @@
//
// ContentRankingAllViewModel.swift
// SodaLive
//
// Created by klaus on 2023/10/15.
//
import Foundation
import Combine
final class ContentRankingAllViewModel: ObservableObject {
private let repository = ContentRepository()
private var subscription = Set<AnyCancellable>()
@Published var errorMessage = ""
@Published var isShowPopup = false
@Published var isLoading = false
@Published var dateString = ""
@Published var contentRankingItemList = [GetAudioContentRankingItem]()
var page = 1
var isLast = false
private let pageSize = 10
func getContentRanking() {
if (!isLast && !isLoading && page <= 5) {
isLoading = true
repository.getContentRanking(page: page, size: pageSize)
.sink { result in
switch result {
case .finished:
DEBUG_LOG("finish")
case .failure(let error):
ERROR_LOG(error.localizedDescription)
}
} receiveValue: { [unowned self] response in
self.isLoading = false
let responseData = response.data
do {
let jsonDecoder = JSONDecoder()
let decoded = try jsonDecoder.decode(ApiResponse<GetAudioContentRanking>.self, from: responseData)
self.isLoading = false
if let data = decoded.data, decoded.success {
if page == 1 {
contentRankingItemList.removeAll()
}
dateString = "\(data.startDate)~\(data.endDate)"
if !data.items.isEmpty {
page += 1
self.contentRankingItemList.append(contentsOf: data.items)
} else {
isLast = true
}
} else {
if let message = decoded.message {
self.errorMessage = message
} else {
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
}
self.isShowPopup = true
}
} catch {
self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
self.isShowPopup = true
self.isLoading = false
}
}
.store(in: &subscription)
}
}
}

View File

@@ -0,0 +1,11 @@
//
// GetNewContentAllResponse.swift
// SodaLive
//
// Created by klaus on 2023/09/27.
//
struct GetNewContentAllResponse: Decodable {
let totalCount: Int
let items: [GetAudioContentMainItem]
}

View File

@@ -25,6 +25,11 @@ enum ContentApi {
case getMain case getMain
case getNewContentOfTheme(theme: String) case getNewContentOfTheme(theme: String)
case donation(request: AudioContentDonationRequest) case donation(request: AudioContentDonationRequest)
case modifyComment(request: ModifyCommentRequest)
case getNewContentThemeList
case getNewContentAllOfTheme(theme: String, page: Int, size: Int)
case getAudioContentListByCurationId(curationId: Int, page: Int, size: Int, sort: ContentCurationViewModel.Sort)
case getContentRanking(page: Int, size: Int)
} }
extension ContentApi: TargetType { extension ContentApi: TargetType {
@@ -81,15 +86,32 @@ extension ContentApi: TargetType {
case .donation: case .donation:
return "/audio-content/donation" return "/audio-content/donation"
case .modifyComment:
return "/audio-content/comment"
case .getNewContentThemeList:
return "/audio-content/main/theme"
case .getNewContentAllOfTheme:
return "/audio-content/main/new/all"
case .getAudioContentListByCurationId(let curationId, _, _, _):
return "/audio-content/curation/\(curationId)"
case .getContentRanking:
return "/audio-content/ranking"
} }
} }
var method: Moya.Method { var method: Moya.Method {
switch self { switch self {
case .getAudioContentList, .getAudioContentDetail, .getOrderList, .getAudioContentThemeList, .getAudioContentCommentList, .getAudioContentCommentReplyList, .getMain, .getNewContentOfTheme: case .getAudioContentList, .getAudioContentDetail, .getOrderList, .getAudioContentThemeList,
.getAudioContentCommentList, .getAudioContentCommentReplyList, .getMain, .getNewContentOfTheme,
.getNewContentThemeList, .getNewContentAllOfTheme, .getAudioContentListByCurationId, .getContentRanking:
return .get return .get
case .likeContent, .modifyAudioContent: case .likeContent, .modifyAudioContent, .modifyComment:
return .put return .put
case .registerComment, .orderAudioContent, .addAllPlaybackTracking, .uploadAudioContent, .donation: case .registerComment, .orderAudioContent, .addAllPlaybackTracking, .uploadAudioContent, .donation:
@@ -173,6 +195,38 @@ extension ContentApi: TargetType {
case .donation(let request): case .donation(let request):
return .requestJSONEncodable(request) return .requestJSONEncodable(request)
case .modifyComment(let request):
return .requestJSONEncodable(request)
case .getNewContentThemeList:
return .requestPlain
case .getNewContentAllOfTheme(let theme, let page, let size):
let parameters = [
"theme": theme,
"page": page - 1,
"size": size
] as [String : Any]
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
case .getAudioContentListByCurationId(_, let page, let size, let sort):
let parameters = [
"page": page - 1,
"size": size,
"sort-type": sort
] as [String : Any]
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
case .getContentRanking(let page, let size):
let parameters = [
"page": page - 1,
"size": size,
] as [String : Any]
return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
} }
} }

View File

@@ -22,17 +22,6 @@ struct ContentListItemView: View {
.frame(width: 66.7, height: 66.7, alignment: .top) .frame(width: 66.7, height: 66.7, alignment: .top)
.clipped() .clipped()
.cornerRadius(5.3) .cornerRadius(5.3)
if item.isAdult {
Text("19")
.font(.custom(Font.bold.rawValue, size: 11.3))
.foregroundColor(Color.white)
.padding(4)
.background(Color(hex: "e53621"))
.clipShape(Circle())
.padding(.top, 4.3)
.padding(.leading, 4.3)
}
} }
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
@@ -60,7 +49,7 @@ struct ContentListItemView: View {
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
HStack(spacing: 6) { HStack(spacing: 6) {
Image("ic_heart") Image("ic_heart_777")
.resizable() .resizable()
.frame(width: 13.3, height: 13.3) .frame(width: 13.3, height: 13.3)
@@ -88,7 +77,7 @@ struct ContentListItemView: View {
if item.price > 0 { if item.price > 0 {
HStack(spacing: 8) { HStack(spacing: 8) {
Image("ic_coin_w") Image("ic_can")
.resizable() .resizable()
.frame(width: 17, height: 17) .frame(width: 17, height: 17)

View File

@@ -0,0 +1,177 @@
//
// ContentListView.swift
// SodaLive
//
// Created by klaus on 2023/08/20.
//
import SwiftUI
struct ContentListView: View {
let userId: Int
@StateObject var viewModel = ContentListViewModel()
var body: some View {
BaseView(isLoading: $viewModel.isLoading) {
VStack(spacing: 0) {
HStack(spacing: 0) {
Button {
AppState.shared.back()
} label: {
Image("ic_back")
.resizable()
.frame(width: 20, height: 20)
Text("콘텐츠 전체보기")
.font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color(hex: "eeeeee"))
}
Spacer()
}
.padding(.horizontal, 13.3)
.frame(height: 50)
.background(Color.black)
if userId == UserDefaults.int(forKey: .userId) {
Text("새로운 콘텐츠 등록하기")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "eeeeee"))
.padding(.vertical, 17)
.frame(maxWidth: .infinity)
.background(Color(hex: "9970ff"))
.cornerRadius(5.3)
.padding(.top, 13.3)
.padding(.horizontal, 13.3)
.onTapGesture { AppState.shared.setAppStep(step: .createContent) }
}
HStack(spacing: 13.3) {
Spacer()
Text("최신순")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(
Color(hex: "e2e2e2")
.opacity(viewModel.sort == .NEWEST ? 1 : 0.5)
)
.onTapGesture {
if viewModel.sort != .NEWEST {
viewModel.sort = .NEWEST
}
}
Text("높은 가격순")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(
Color(hex: "e2e2e2")
.opacity(viewModel.sort == .PRICE_HIGH ? 1 : 0.5)
)
.onTapGesture {
if viewModel.sort != .PRICE_HIGH {
viewModel.sort = .PRICE_HIGH
}
}
Text("낮은 가격순")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(
Color(hex: "e2e2e2")
.opacity(viewModel.sort == .PRICE_LOW ? 1 : 0.5)
)
.onTapGesture {
if viewModel.sort != .PRICE_LOW {
viewModel.sort = .PRICE_LOW
}
}
}
.padding(.vertical, 13.3)
.padding(.horizontal, 20)
.background(Color(hex: "161616"))
.padding(.top, 13.3)
HStack(spacing: 0) {
Text("전체")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "e2e2e2"))
Text("\(viewModel.totalCount)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "ff5c49"))
.padding(.leading, 8)
Text("")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "e2e2e2"))
.padding(.leading, 2)
Spacer()
}
.padding(.vertical, 13.3)
.padding(.horizontal, 20)
ScrollViewReader { reader in
ScrollView(.vertical, showsIndicators: false) {
LazyVStack(spacing: 10.7) {
ScrollerToTop(reader: reader, scrollOnChange: $viewModel.scrollToTop)
ForEach(0..<viewModel.audioContentList.count, id: \.self) { index in
let audioContent = viewModel.audioContentList[index]
ContentListItemView(item: audioContent)
.contentShape(Rectangle())
.onTapGesture {
AppState
.shared
.setAppStep(
step: .contentDetail(contentId: audioContent.contentId)
)
}
.onAppear {
if index == viewModel.audioContentList.count - 1 {
viewModel.getAudioContentList()
}
}
}
}
}
}
.padding(.top, 13.3)
}
.onAppear {
viewModel.userId = userId
viewModel.getAudioContentList()
}
.popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .bottom, autohideIn: 2) {
HStack {
Spacer()
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.cornerRadius(20)
.padding(.bottom, 66.7)
Spacer()
}
}
}
}
}
struct ScrollerToTop: View {
let reader: ScrollViewProxy
@Binding var scrollOnChange: Bool
var body: some View {
EmptyView()
.id("topScrollPoint")
.onChange(of: scrollOnChange) { _ in
withAnimation {
reader.scrollTo("topScrollPoint", anchor: .bottom)
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More