Compare commits
169
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
941dcc6fb4 | ||
|
|
7e72d410a6 | ||
|
|
3205a94c9d | ||
|
|
8fad834a79 | ||
|
|
fcb42446a7 | ||
|
|
5fc32432c2 | ||
|
|
6cc7aa0d1b | ||
|
|
854ca56ba4 | ||
|
|
dfae18fbec | ||
|
|
992a71ac3c | ||
|
|
300e1c6a01 | ||
|
|
918d6d9cca | ||
|
|
4a6d6446e4 | ||
|
|
79ed1069f7 | ||
|
|
fb914bb6ab | ||
|
|
95e5c2e11f | ||
|
|
b36b9a9419 | ||
|
|
a7d376175d | ||
|
|
6b11cf516f | ||
|
|
c61a6f8a9e | ||
|
|
3a66488f1e | ||
|
|
c89d83f57e | ||
|
|
86f6f85009 | ||
|
|
4c58d7593c | ||
|
|
a4c69bfb36 | ||
|
|
650c61bb1d | ||
|
|
8879b38e1f | ||
|
|
b5c49c22c5 | ||
|
|
6f231c2b2c | ||
|
|
392e260648 | ||
|
|
1ec610c9d4 | ||
|
|
33904eea3e | ||
|
|
fe28b0ce59 | ||
|
|
51a8d092a5 | ||
|
|
157787c6b6 | ||
|
|
f59f00f686 | ||
|
|
2947b30cbd | ||
|
|
d4b5e44d1f | ||
|
|
b56c15d518 | ||
|
|
68e5ac740a | ||
|
|
f18e08b4f5 | ||
|
|
ed29250597 | ||
|
|
a35a038720 | ||
|
|
99c5002991 | ||
|
|
705ee72b5d | ||
|
|
d4a468027d | ||
|
|
6eb0afb587 | ||
|
|
66e066cac7 | ||
|
|
302096630f | ||
|
|
3a77333357 | ||
|
|
b2affa66d2 | ||
|
|
5637a0acba | ||
|
|
ad6e7b978f | ||
|
|
d506672b74 | ||
|
|
1baf09afd3 | ||
|
|
83719d75fb | ||
|
|
dffedf6ec1 | ||
|
|
3a5e37c58e | ||
|
|
0f8f474481 | ||
|
|
16096b9bd0 | ||
|
|
079a806d91 | ||
|
|
5daf1ef310 | ||
|
|
8830f364f5 | ||
|
|
fef491ea93 | ||
|
|
f419b12da0 | ||
|
|
739f57e5df | ||
|
|
248cd9dcb2 | ||
|
|
4fe75d495d | ||
|
|
31861721f4 | ||
|
|
de220019cc | ||
|
|
e7c7e2cb4a | ||
|
|
28247fc3bd | ||
|
|
bccb08532f | ||
|
|
9e2619efd3 | ||
|
|
f768fbdad6 | ||
|
|
28647ec606 | ||
|
|
eae01e41f0 | ||
|
|
af4e40a0c5 | ||
|
|
4b8d27cefc | ||
|
|
1e45f6b89d | ||
|
|
87c788c5dd | ||
|
|
7f7f36c328 | ||
|
|
944b3f5175 | ||
|
|
2294706d43 | ||
|
|
ce7c8def16 | ||
|
|
65da3657b7 | ||
|
|
f7015432d1 | ||
|
|
1982e02be8 | ||
|
|
f2e991fc9c | ||
|
|
e2968b35b5 | ||
|
|
55d30decf9 | ||
|
|
27e94dcdbe | ||
|
|
e67f9f960a | ||
|
|
daab03788a | ||
|
|
56583af7ea | ||
|
|
eb1653710b | ||
|
|
91bfea320b | ||
|
|
b8cf3b52f9 | ||
|
|
4f36286580 | ||
|
|
e5e41af4c4 | ||
|
|
8161c2afc7 | ||
|
|
1b3206fedc | ||
|
|
f322c55724 | ||
|
|
33078f83c2 | ||
|
|
61f4ffc209 | ||
|
|
cb2e075e0c | ||
|
|
40e864ae02 | ||
|
|
c37b424929 | ||
|
|
a0fdf0441e | ||
|
|
5609b77eba | ||
|
|
3ab69a50c8 | ||
|
|
66837ebefb | ||
|
|
fe13dcf2bb | ||
|
|
5eef1e1cc4 | ||
|
|
1009f2f6c4 | ||
|
|
68867cf8c8 | ||
|
|
5f2965b915 | ||
|
|
8ef6fdc7a6 | ||
|
|
8d7a632d64 | ||
|
|
05c88b3628 | ||
|
|
22e16a2aee | ||
|
|
8a25a297f1 | ||
|
|
bf3ba3a1b8 | ||
|
|
ee76011d9e | ||
|
|
688921d4d1 | ||
|
|
4767d3fdc8 | ||
|
|
7c7a0a368b | ||
|
|
c72e451372 | ||
|
|
6f5894d5f5 | ||
|
|
63b598b521 | ||
|
|
851adc5541 | ||
|
|
a3228f0d27 | ||
|
|
4e4aca06a9 | ||
|
|
fd15916081 | ||
|
|
51bd12fab9 | ||
|
|
cd9c53c99a | ||
|
|
81435e2cb2 | ||
|
|
07e2882a6d | ||
|
|
3c46b78fa1 | ||
|
|
1fee9deac9 | ||
|
|
a1cfff458b | ||
|
|
d3be7263d7 | ||
|
|
1931e6fda3 | ||
|
|
d907d2cdc2 | ||
|
|
503a126033 | ||
|
|
59e76174de | ||
|
|
84aff9f6ec | ||
|
|
73b332467f | ||
|
|
e05861ff36 | ||
|
|
bf17f8b99d | ||
|
|
35ce9a79ae | ||
|
|
70582b5ed2 | ||
|
|
9b03d71e1b | ||
|
|
aa314822b4 | ||
|
|
4bb922b1f9 | ||
|
|
1e51a83ebf | ||
|
|
352f385dd6 | ||
|
|
1211a1d6a1 | ||
|
|
7a33586fe6 | ||
|
|
ceb800a908 | ||
|
|
23e8d5ce7a | ||
|
|
6857511670 | ||
|
|
b4774f4919 | ||
|
|
57c708e398 | ||
|
|
6ae865a7b6 | ||
|
|
5090150ab1 | ||
|
|
24071b75a3 | ||
|
|
0b82f14181 | ||
|
|
79f47c25ab |
@@ -7,7 +7,7 @@
|
|||||||
- 코드 식별자, 경로, 명령어는 원문(영문) 그대로 유지한다.
|
- 코드 식별자, 경로, 명령어는 원문(영문) 그대로 유지한다.
|
||||||
|
|
||||||
## CORE EXECUTION PRINCIPLES (andrej-karpathy-skills)
|
## CORE EXECUTION PRINCIPLES (andrej-karpathy-skills)
|
||||||
These principles override plugin behavior, skill behavior, workflow behavior, and default model behavior unless the user's direct instruction explicitly says otherwise.
|
These principles guide project work alongside the applicable harness instructions. System/platform instructions, explicit user requests, and actual permissions take precedence; skill routing below selects workflow roles, not instruction-loading hierarchy.
|
||||||
|
|
||||||
Behavioral guidelines to reduce common LLM coding mistakes. Merge with project-specific instructions as needed.
|
Behavioral guidelines to reduce common LLM coding mistakes. Merge with project-specific instructions as needed.
|
||||||
|
|
||||||
@@ -83,7 +83,8 @@ Strong success criteria let you loop independently. Weak criteria ("make it work
|
|||||||
|
|
||||||
### 확장 모드
|
### 확장 모드
|
||||||
- 사용자가 명시적으로 요청한 경우에만 사용한다.
|
- 사용자가 명시적으로 요청한 경우에만 사용한다.
|
||||||
- 대규모 리팩토링, 브레인스토밍, 다중 에이전트 실행, 병렬 workflow를 허용한다.
|
- 대규모 리팩토링, 다중 에이전트 실행, 병렬 workflow는 사용자의 명시적 범위·실행 방식 승인이 있을 때만 허용한다.
|
||||||
|
- 일반적인 신규 기능·동작 설계의 brainstorming과, 실행을 바꿀 중요한 요구사항이 실제로 모호할 때 필요한 deep-interview는 기본 모드에서 허용한다. 이를 이유로 대규모 변경이나 병렬 작업까지 승인된 것으로 보지 않는다.
|
||||||
|
|
||||||
### 에이전트 동작 원칙
|
### 에이전트 동작 원칙
|
||||||
- 추측하지 말고 근거 파일을 읽고 결정한다.
|
- 추측하지 말고 근거 파일을 읽고 결정한다.
|
||||||
@@ -104,8 +105,8 @@ Strong success criteria let you loop independently. Weak criteria ("make it work
|
|||||||
|
|
||||||
## 작업 절차 핵심 규칙
|
## 작업 절차 핵심 규칙
|
||||||
- 모든 구현 작업은 PRD 문서와 구현 계획/TASK 문서가 모두 준비된 뒤에 시작한다.
|
- 모든 구현 작업은 PRD 문서와 구현 계획/TASK 문서가 모두 준비된 뒤에 시작한다.
|
||||||
- 사용자의 프롬프트를 받으면 먼저 PRD 문서를 작성한다.
|
- 구현 작업 요청을 받으면 먼저 PRD 문서를 작성한다. 일반 질문·읽기 전용 조사는 불필요한 PRD·구현 계획을 새로 만들지 않는다.
|
||||||
- PRD 작성 중 애매하거나 더 필요한 내용, 결정해야 하는 사항이 있으면 애매한 사항이 없어질 때까지 사용자와 인터뷰한다.
|
- 실행 방향을 바꿀 목표·범위·제약·완료 기준의 중요한 불확실성이 있을 때만 사용자와 인터뷰한다. 코드베이스에서 확인할 수 있는 사실은 직접 조사하고, 이미 명확하거나 승인된 결정은 다시 열지 않는다.
|
||||||
- 인터뷰 내용을 PRD에 반영한 뒤, PRD를 기준으로 계획/TASK 문서를 작성하고 그 문서에 따라 필요한 내용만 최소 구현한다.
|
- 인터뷰 내용을 PRD에 반영한 뒤, PRD를 기준으로 계획/TASK 문서를 작성하고 그 문서에 따라 필요한 내용만 최소 구현한다.
|
||||||
- 문서는 `docs/[날짜]_구현할내용한글/` 아래에 `prd.md`, `plan-task.md`로 만든다.
|
- 문서는 `docs/[날짜]_구현할내용한글/` 아래에 `prd.md`, `plan-task.md`로 만든다.
|
||||||
- `docs/[날짜]_구현할내용한글/prd.md`
|
- `docs/[날짜]_구현할내용한글/prd.md`
|
||||||
@@ -138,6 +139,28 @@ Strong success criteria let you loop independently. Weak criteria ("make it work
|
|||||||
- 커밋 메시지 규칙은 `docs/agent-guides/commit-message-rules.md`를 참고한다.
|
- 커밋 메시지 규칙은 `docs/agent-guides/commit-message-rules.md`를 참고한다.
|
||||||
- 저장소 세부 규칙/보안/Git 안전 수칙은 `docs/agent-guides/safety-repo-rules.md`를 참고한다.
|
- 저장소 세부 규칙/보안/Git 안전 수칙은 `docs/agent-guides/safety-repo-rules.md`를 참고한다.
|
||||||
|
|
||||||
|
## Agent skills
|
||||||
|
|
||||||
|
### 스킬 선택과 작업 단계
|
||||||
|
- Superpowers가 사용 가능하면 기본 개발 프로세스로 사용한다. 스킬은 작업 유형을 분류한 뒤 프로세스 담당을 먼저 정하고, 필요한 도메인 전문 스킬만 해당 단계에 보완한다. 매 단계 담당은 하나로 유지한다.
|
||||||
|
- 하네스가 지침을 어떻게 불러오는지는 플랫폼이 정한다. 이 순서는 작업 단계의 역할 순서이며, 자동 선택이나 호출을 보장하지 않는다. 현재 설치된 스킬 정의·메타데이터·권한·호출 가능성을 확인하고, 사용할 스킬의 실제 지침을 읽는다.
|
||||||
|
- using-superpowers의 진입 지침이 이미 로드되었다면 다시 로드하지 않는다. 명확한 질문·조사는 읽기 전용으로 답한다. 신규 설계는 brainstorming, 구현 전 계획은 writing-plans, 버그는 systematic-debugging 후 test-driven-development(TDD), 구현 단계 테스트는 TDD, 완료 판정은 verification-before-completion, 요청된 코드 리뷰는 requesting-code-review가 담당한다.
|
||||||
|
- 요구사항 인터뷰는 목표·범위·제약·완료 기준의 중요한 불확실성이 남을 때만 deep-interview로 분리한다. 코드베이스에서 확인할 수 있는 사실은 직접 조사한다. 설계가 승인되었거나 이미 명확하면 다시 열지 않는다.
|
||||||
|
- 도메인 용어·용어집·ADR 변경은 domain-modeling이 담당한다. 신규 모듈 설계에는 codebase-design, 공개 API 계약에는 api-and-interface-design, 보안 설계·구현·리뷰에는 security-and-hardening을 해당 Superpowers 단계에서 보완한다.
|
||||||
|
- 기존 의존성 설계 검토는 requesting-code-review와 codebase-design, 개선 후보 탐색은 읽기 전용 조사와 codebase-design으로 한다. grilling은 사용자가 구체적 결정의 스트레스 테스트를 요청하거나 승인된 개선 흐름의 후보를 선택한 경우에만 연결한다.
|
||||||
|
- improve-codebase-architecture와 setup-matt-pocock-skills는 사용자가 해당 스킬을 명시 선택한 경우에만 실행한다. 일반 아키텍처·설정 요청이나 접근 권한 승인을 명시 호출로 간주하지 않는다.
|
||||||
|
- 계획 실행은 executing-plans와 subagent-driven-development 중 실제 전제와 승인된 실행 방식에 맞는 하나만 선택한다. 격리·도구·권한·스크립트 전제를 먼저 확인하고 승인 없는 다중 에이전트·커밋·게시를 실행하지 않는다.
|
||||||
|
- 비구현 작업은 필요한 문서·검증만 적용한다. 후속 작업은 기존 PRD와 계획을 읽고 첫 미완료 Task부터 재개한다.
|
||||||
|
- 작업 분류, 기본 경로, 스킬 중복, 플랫폼별 호출 제약은 [docs/agents/skill-routing.md](docs/agents/skill-routing.md)를 읽는다. 이 Markdown 링크는 자동 지침 확장이 아니므로 비단순 작업 분류나 역할 중복 해소 시 직접 읽는다.
|
||||||
|
|
||||||
|
### Issue tracker
|
||||||
|
이슈는 `.scratch/<feature-slug>/`의 로컬 Markdown으로 관리한다.
|
||||||
|
상세 규칙은 `docs/agents/issue-tracker.md`를 참고한다.
|
||||||
|
|
||||||
|
### Domain docs
|
||||||
|
single-context 구조를 사용한다.
|
||||||
|
상세 규칙은 `docs/agents/domain.md`를 참고한다.
|
||||||
|
|
||||||
## 핵심 금지사항
|
## 핵심 금지사항
|
||||||
- `local.properties`, 키스토어, Google Services 파일, 비밀값은 커밋하거나 외부에 노출하지 않는다.
|
- `local.properties`, 키스토어, Google Services 파일, 비밀값은 커밋하거나 외부에 노출하지 않는다.
|
||||||
- `BuildConfig` 값(키/토큰/URL)을 로그, Toast, 크래시 메시지에 직접 노출하지 않는다.
|
- `BuildConfig` 값(키/토큰/URL)을 로그, Toast, 크래시 메시지에 직접 노출하지 않는다.
|
||||||
|
|||||||
+4
-34
@@ -38,7 +38,7 @@ def missingReleaseSigningProperties = {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'kr.co.vividnext.sodalive'
|
namespace 'kr.co.vividnext.sodalive'
|
||||||
compileSdk = 35
|
compileSdk = 36
|
||||||
|
|
||||||
viewBinding {
|
viewBinding {
|
||||||
enabled true
|
enabled true
|
||||||
@@ -85,9 +85,9 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "kr.co.vividnext.sodalive"
|
applicationId "kr.co.vividnext.sodalive"
|
||||||
minSdk 23
|
minSdk 23
|
||||||
targetSdk 35
|
targetSdk 36
|
||||||
versionCode 254
|
versionCode 263
|
||||||
versionName "1.56.3"
|
versionName "1.58.0"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,19 +113,6 @@ android {
|
|||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
|
||||||
// release용 ad unit id는 배포 전 실제 값으로 교체한다.
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_TAB_AD_UNIT_ID', '"R-M-19140295-3"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_ROOM_DETAIL_AD_UNIT_ID', '"R-M-19140295-4"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CREATOR_COMMUNITY_ALL_AD_UNIT_ID', '"R-M-19140295-7"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_HOME_AD_UNIT_ID', '"R-M-19140295-8"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_DAY_OF_WEEK_AD_UNIT_ID', '"R-M-19140295-9"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_BY_GENRE_AD_UNIT_ID', '"R-M-19140295-10"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_PUSH_NOTIFICATION_LIST_AD_UNIT_ID', '"R-M-19140295-11"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_NOTIFICATION_RECEIVE_SETTINGS_AD_UNIT_ID', '"R-M-19140295-12"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CHARACTER_TAB_AD_UNIT_ID', '"R-M-19140295-13"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_ORIGINAL_TAB_AD_UNIT_ID', '"R-M-19140295-14"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_TALK_TAB_AD_UNIT_ID', '"R-M-19140295-15"'
|
|
||||||
buildConfigField 'String', 'YANDEX_REWARDED_CHAT_QUOTA_AD_UNIT_ID', '"R-M-19140295-16"'
|
|
||||||
buildConfigField 'String', 'BASE_URL', '"https://api.sodalive.net"'
|
buildConfigField 'String', 'BASE_URL', '"https://api.sodalive.net"'
|
||||||
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
||||||
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
||||||
@@ -133,7 +120,6 @@ android {
|
|||||||
buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"'
|
buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"'
|
||||||
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"664c1707b18b225deca4b429"'
|
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"664c1707b18b225deca4b429"'
|
||||||
buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"'
|
buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"'
|
||||||
buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"15cadeea4ba94ff7b091c9a10f4bf4a6"'
|
|
||||||
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"765102ec85855aa680da35f1b0f55712"'
|
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"765102ec85855aa680da35f1b0f55712"'
|
||||||
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
||||||
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
||||||
@@ -156,18 +142,6 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
applicationIdSuffix '.debug'
|
applicationIdSuffix '.debug'
|
||||||
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_TAB_AD_UNIT_ID', '"R-M-19140297-3"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_ROOM_DETAIL_AD_UNIT_ID', '"R-M-19140297-4"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CREATOR_COMMUNITY_ALL_AD_UNIT_ID', '"R-M-19140297-7"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_HOME_AD_UNIT_ID', '"R-M-19140297-8"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_DAY_OF_WEEK_AD_UNIT_ID', '"R-M-19140297-9"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_BY_GENRE_AD_UNIT_ID', '"R-M-19140297-10"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_PUSH_NOTIFICATION_LIST_AD_UNIT_ID', '"R-M-19140297-11"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_NOTIFICATION_RECEIVE_SETTINGS_AD_UNIT_ID', '"R-M-19140297-12"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CHARACTER_TAB_AD_UNIT_ID', '"R-M-19140297-13"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_ORIGINAL_TAB_AD_UNIT_ID', '"R-M-19140297-14"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_TALK_TAB_AD_UNIT_ID', '"R-M-19140297-15"'
|
|
||||||
buildConfigField 'String', 'YANDEX_REWARDED_CHAT_QUOTA_AD_UNIT_ID', '"R-M-19140297-16"'
|
|
||||||
buildConfigField 'String', 'BASE_URL', '"https://test-api.sodalive.net"'
|
buildConfigField 'String', 'BASE_URL', '"https://test-api.sodalive.net"'
|
||||||
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
||||||
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
||||||
@@ -175,7 +149,6 @@ android {
|
|||||||
buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"'
|
buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"'
|
||||||
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"667fca5d3bab7404f831c3e4"'
|
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"667fca5d3bab7404f831c3e4"'
|
||||||
buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"'
|
buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"'
|
||||||
buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"ae18ade3afcf4086bd4397726eb0654c"'
|
|
||||||
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"5f7ebe90d1ce5f0392164b8a53a662bc"'
|
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"5f7ebe90d1ce5f0392164b8a53a662bc"'
|
||||||
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
||||||
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
||||||
@@ -333,9 +306,6 @@ dependencies {
|
|||||||
// Appsflyer
|
// Appsflyer
|
||||||
implementation 'com.appsflyer:af-android-sdk:6.17.4'
|
implementation 'com.appsflyer:af-android-sdk:6.17.4'
|
||||||
|
|
||||||
// Yandex Mobile Ads
|
|
||||||
implementation 'com.yandex.android:mobileads:7.18.5'
|
|
||||||
|
|
||||||
// 노티플라이
|
// 노티플라이
|
||||||
implementation 'com.github.team-michael:notifly-android-sdk:1.12.0'
|
implementation 'com.github.team-michael:notifly-android-sdk:1.12.0'
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,10 @@
|
|||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
tools:replace="android:allowBackup"
|
tools:replace="android:allowBackup"
|
||||||
tools:targetApi="31">
|
tools:targetApi="31">
|
||||||
|
<property
|
||||||
|
android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY"
|
||||||
|
android:value="true" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="kr.co.vividnext.sodalive.v2.main.chat.recipient.DmRecipientPickerActivity"
|
android:name="kr.co.vividnext.sodalive.v2.main.chat.recipient.DmRecipientPickerActivity"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
@@ -95,6 +99,16 @@
|
|||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.VIEW" />
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
|
||||||
|
<data
|
||||||
|
android:host="gift-detail"
|
||||||
|
android:scheme="${URISCHEME}" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
<!-- PayVerse 리다이렉트에 등록할 커스텀 스킴/호스트 -->
|
<!-- PayVerse 리다이렉트에 등록할 커스텀 스킴/호스트 -->
|
||||||
@@ -115,6 +129,23 @@
|
|||||||
</activity>
|
</activity>
|
||||||
<activity android:name=".main.MainActivity" />
|
<activity android:name=".main.MainActivity" />
|
||||||
<activity android:name=".v2.main.MainV2Activity" />
|
<activity android:name=".v2.main.MainV2Activity" />
|
||||||
|
<activity
|
||||||
|
android:name=".v2.gift.GiftInboxActivity"
|
||||||
|
android:exported="false" />
|
||||||
|
<activity
|
||||||
|
android:name=".v2.gift.GiftDetailActivity"
|
||||||
|
android:exported="false" />
|
||||||
|
<activity
|
||||||
|
android:name=".v2.gift.GiftTrackingActivity"
|
||||||
|
android:exported="false"
|
||||||
|
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
|
||||||
|
<activity
|
||||||
|
android:name=".v2.gift.GiftSendRequestActivity"
|
||||||
|
android:exported="false"
|
||||||
|
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
|
||||||
|
<activity
|
||||||
|
android:name=".v2.gift.KakaoPostcodeSearchActivity"
|
||||||
|
android:exported="false" />
|
||||||
<activity android:name=".v2.main.content.overview.ContentOverviewActivity" />
|
<activity android:name=".v2.main.content.overview.ContentOverviewActivity" />
|
||||||
<activity android:name=".v2.creator.channel.CreatorChannelActivity" />
|
<activity android:name=".v2.creator.channel.CreatorChannelActivity" />
|
||||||
<activity
|
<activity
|
||||||
@@ -174,6 +205,9 @@
|
|||||||
<activity android:name=".settings.notice.NoticeDetailActivity" />
|
<activity android:name=".settings.notice.NoticeDetailActivity" />
|
||||||
<activity android:name=".settings.event.EventActivity" />
|
<activity android:name=".settings.event.EventActivity" />
|
||||||
<activity android:name=".settings.event.EventDetailActivity" />
|
<activity android:name=".settings.event.EventDetailActivity" />
|
||||||
|
<activity
|
||||||
|
android:name=".v2.event.EventDetailActivity"
|
||||||
|
android:exported="false" />
|
||||||
<activity android:name=".settings.notification.NotificationSettingsActivity" />
|
<activity android:name=".settings.notification.NotificationSettingsActivity" />
|
||||||
<activity android:name=".settings.notification.NotificationReceiveSettingsActivity" />
|
<activity android:name=".settings.notification.NotificationReceiveSettingsActivity" />
|
||||||
<activity android:name=".settings.ContentSettingsActivity" />
|
<activity android:name=".settings.ContentSettingsActivity" />
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import com.facebook.FacebookSdk
|
|||||||
import com.kakao.sdk.common.KakaoSdk
|
import com.kakao.sdk.common.KakaoSdk
|
||||||
import com.orhanobut.logger.AndroidLogAdapter
|
import com.orhanobut.logger.AndroidLogAdapter
|
||||||
import com.orhanobut.logger.Logger
|
import com.orhanobut.logger.Logger
|
||||||
import com.yandex.mobile.ads.common.MobileAds
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
import kr.co.vividnext.sodalive.BuildConfig
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomPreferenceManager
|
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomPreferenceManager
|
||||||
@@ -23,9 +22,13 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
|||||||
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
|
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
|
||||||
import kr.co.vividnext.sodalive.di.AppDI
|
import kr.co.vividnext.sodalive.di.AppDI
|
||||||
import kr.co.vividnext.sodalive.tracking.FirebaseTracking
|
import kr.co.vividnext.sodalive.tracking.FirebaseTracking
|
||||||
|
import kr.co.vividnext.sodalive.v2.event.EventDeepLinkDelivery
|
||||||
|
import kr.co.vividnext.sodalive.v2.event.EventDeepLinkContract
|
||||||
import tech.notifly.Notifly
|
import tech.notifly.Notifly
|
||||||
|
|
||||||
class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
||||||
|
val eventDeepLinkDelivery by lazy { EventDeepLinkDelivery(this) }
|
||||||
|
|
||||||
override fun onCreate() {
|
override fun onCreate() {
|
||||||
super<Application>.onCreate()
|
super<Application>.onCreate()
|
||||||
ProcessLifecycleOwner.get().lifecycle.addObserver(this)
|
ProcessLifecycleOwner.get().lifecycle.addObserver(this)
|
||||||
@@ -54,7 +57,6 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
|
|
||||||
setupNotifly()
|
setupNotifly()
|
||||||
|
|
||||||
setupYandexAd()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun isDebuggable(): Boolean {
|
private fun isDebuggable(): Boolean {
|
||||||
@@ -79,9 +81,9 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
private fun setupAppsFlyer() {
|
private fun setupAppsFlyer() {
|
||||||
// Appsflyer SDK 초기화
|
// Appsflyer SDK 초기화
|
||||||
AppsFlyerLib.getInstance().init("tWF2wbJ5nSkya5Ru9mGcPU", null, this)
|
AppsFlyerLib.getInstance().init("tWF2wbJ5nSkya5Ru9mGcPU", null, this)
|
||||||
AppsFlyerLib.getInstance().start(this)
|
|
||||||
|
|
||||||
// 딥링크 및 디퍼드 딥링크 처리
|
// 딥링크 및 디퍼드 딥링크 처리
|
||||||
|
val eventDelivery = eventDeepLinkDelivery
|
||||||
AppsFlyerLib.getInstance().subscribeForDeepLink { deepLinkResult ->
|
AppsFlyerLib.getInstance().subscribeForDeepLink { deepLinkResult ->
|
||||||
when (deepLinkResult.status) {
|
when (deepLinkResult.status) {
|
||||||
DeepLinkResult.Status.FOUND -> {
|
DeepLinkResult.Status.FOUND -> {
|
||||||
@@ -114,6 +116,10 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
)?.toLongOrNull() ?: 0L
|
)?.toLongOrNull() ?: 0L
|
||||||
|
|
||||||
logUtmInFirebase()
|
logUtmInFirebase()
|
||||||
|
EventDeepLinkContract.parseUdl(
|
||||||
|
deepLink?.getStringValue("deep_link_value"),
|
||||||
|
deepLink?.getStringValue("deep_link_sub5")
|
||||||
|
)?.let(eventDelivery::offer)
|
||||||
}
|
}
|
||||||
|
|
||||||
DeepLinkResult.Status.NOT_FOUND -> Logger.d(
|
DeepLinkResult.Status.NOT_FOUND -> Logger.d(
|
||||||
@@ -125,6 +131,7 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
AppsFlyerLib.getInstance().start(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun logUtmInFirebase() {
|
private fun logUtmInFirebase() {
|
||||||
@@ -140,10 +147,6 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupYandexAd() {
|
|
||||||
MobileAds.enableDebugErrorIndicator(BuildConfig.DEBUG && isDebuggable())
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onStart(owner: LifecycleOwner) {
|
override fun onStart(owner: LifecycleOwner) {
|
||||||
super.onStart(owner)
|
super.onStart(owner)
|
||||||
isAppInForeground = true
|
isAppInForeground = true
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ class AudioContentAdapter(
|
|||||||
|
|
||||||
binding.ivCover.load(item.coverImageUrl) {
|
binding.ivCover.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -56,7 +56,6 @@ class AudioContentNewAllAdapter(
|
|||||||
|
|
||||||
binding.ivAudioContentCreator.load(item.creatorProfileImageUrl) {
|
binding.ivAudioContentCreator.load(item.creatorProfileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -26,7 +26,6 @@ class AudioContentRankingAllAdapter(
|
|||||||
binding.root.setOnClickListener { onItemClick(item.contentId) }
|
binding.root.setOnClickListener { onItemClick(item.contentId) }
|
||||||
binding.ivCover.load(item.coverImageUrl) {
|
binding.ivCover.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -41,7 +41,6 @@ class AudioContentCommentAdapter(
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(item.profileUrl) {
|
binding.ivCommentProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -69,7 +69,6 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -112,7 +112,6 @@ class AudioContentCommentReplyHeaderViewHolder(
|
|||||||
override fun bind(item: GetAudioContentCommentListItem) {
|
override fun bind(item: GetAudioContentCommentListItem) {
|
||||||
binding.ivCommentProfile.load(item.profileUrl) {
|
binding.ivCommentProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +180,6 @@ class AudioContentCommentReplyItemViewHolder(
|
|||||||
binding.tvComment.visibility = View.VISIBLE
|
binding.tvComment.visibility = View.VISIBLE
|
||||||
binding.ivCommentProfile.load(item.profileUrl) {
|
binding.ivCommentProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -87,7 +87,6 @@ class AudioContentCommentReplyFragment : BaseFragment<FragmentAudioContentCommen
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemLiveRoomDetailUserBinding
|
import kr.co.vividnext.sodalive.databinding.ItemLiveRoomDetailUserBinding
|
||||||
|
|
||||||
class AudioContentBuyerAdapter : RecyclerView.Adapter<AudioContentBuyerAdapter.ViewHolder>() {
|
class AudioContentBuyerAdapter : RecyclerView.Adapter<AudioContentBuyerAdapter.ViewHolder>() {
|
||||||
@@ -20,7 +19,6 @@ class AudioContentBuyerAdapter : RecyclerView.Adapter<AudioContentBuyerAdapter.V
|
|||||||
binding.tvNickname.text = item.nickname
|
binding.tvNickname.text = item.nickname
|
||||||
binding.ivProfile.load(item.profileImageUrl) {
|
binding.ivProfile.load(item.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-17
@@ -30,7 +30,6 @@ import coil.transform.CircleCropTransformation
|
|||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.request.RequestOptions
|
import com.bumptech.glide.request.RequestOptions
|
||||||
import com.google.gson.Gson
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
||||||
import kr.co.vividnext.sodalive.audio_content.PurchaseOption
|
import kr.co.vividnext.sodalive.audio_content.PurchaseOption
|
||||||
@@ -52,9 +51,7 @@ import kr.co.vividnext.sodalive.explorer.profile.CreatorFollowNotifyFragment
|
|||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||||
import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog
|
import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentTempActivity
|
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentTempActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.recent.RecentContentViewModel
|
import kr.co.vividnext.sodalive.mypage.recent.RecentContentViewModel
|
||||||
@@ -118,6 +115,10 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
audioContentId = intent.getLongExtra(Constants.EXTRA_AUDIO_CONTENT_ID, 0)
|
audioContentId = intent.getLongExtra(Constants.EXTRA_AUDIO_CONTENT_ID, 0)
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
supportFragmentManager.setFragmentResultListener(V2AuthFlow.AUDIO_AUTH_COMPLETED, this) { _, _ ->
|
||||||
|
viewModel.getAudioContentDetail(audioContentId = audioContentId)
|
||||||
|
}
|
||||||
|
|
||||||
imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
||||||
|
|
||||||
if (audioContentId <= 0) {
|
if (audioContentId <= 0) {
|
||||||
@@ -569,7 +570,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
|
|
||||||
binding.ivPreviousCover.load(previousContent.coverUrl) {
|
binding.ivPreviousCover.load(previousContent.coverUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -598,7 +598,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
|
|
||||||
binding.ivNextCover.load(nextContent.coverUrl) {
|
binding.ivNextCover.load(nextContent.coverUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -635,7 +634,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
if (response.commentCount > 0) {
|
if (response.commentCount > 0) {
|
||||||
binding.ivCommentProfile.load(response.commentList[0].profileUrl) {
|
binding.ivCommentProfile.load(response.commentList[0].profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
binding.tvCommentText.text = response.commentList[0].comment
|
binding.tvCommentText.text = response.commentList[0].comment
|
||||||
@@ -653,7 +651,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
binding.rlInputComment.visibility = View.VISIBLE
|
binding.rlInputComment.visibility = View.VISIBLE
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -799,7 +796,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
.with(this)
|
.with(this)
|
||||||
.load(response.coverImageUrl)
|
.load(response.coverImageUrl)
|
||||||
.centerCrop()
|
.centerCrop()
|
||||||
.placeholder(R.drawable.bg_black)
|
|
||||||
.apply(RequestOptions().override((screenWidth - 13.3f.dpToPx()).toInt()))
|
.apply(RequestOptions().override((screenWidth - 13.3f.dpToPx()).toInt()))
|
||||||
.into(binding.ivCover)
|
.into(binding.ivCover)
|
||||||
|
|
||||||
@@ -1056,13 +1052,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
binding.llAlert19.visibility = View.VISIBLE
|
binding.llAlert19.visibility = View.VISIBLE
|
||||||
|
|
||||||
binding.tvAuth.setOnClickListener {
|
binding.tvAuth.setOnClickListener {
|
||||||
Auth.auth(this, applicationContext) { data ->
|
V2AuthFlow.start(this, syncMemberInfo = true)
|
||||||
val bootpayResponse = Gson().fromJson(data, BootpayResponse::class.java)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
runOnUiThread {
|
|
||||||
viewModel.authVerify(audioContentId = audioContentId, request = request)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.alert19Bg.visibility = View.GONE
|
binding.alert19Bg.visibility = View.GONE
|
||||||
@@ -1081,7 +1071,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
|
|
||||||
binding.ivProfile.load(creator.profileImageUrl) {
|
binding.ivProfile.load(creator.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-37
@@ -15,8 +15,6 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
|||||||
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
|
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
|
||||||
import kr.co.vividnext.sodalive.common.Utils
|
import kr.co.vividnext.sodalive.common.Utils
|
||||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.report.ReportRepository
|
import kr.co.vividnext.sodalive.report.ReportRepository
|
||||||
import kr.co.vividnext.sodalive.report.ReportRequest
|
import kr.co.vividnext.sodalive.report.ReportRequest
|
||||||
import kr.co.vividnext.sodalive.report.ReportType
|
import kr.co.vividnext.sodalive.report.ReportType
|
||||||
@@ -25,7 +23,6 @@ import kr.co.vividnext.sodalive.user.UserRepository
|
|||||||
class AudioContentDetailViewModel(
|
class AudioContentDetailViewModel(
|
||||||
private val repository: AudioContentRepository,
|
private val repository: AudioContentRepository,
|
||||||
private val userRepository: UserRepository,
|
private val userRepository: UserRepository,
|
||||||
private val authRepository: AuthRepository,
|
|
||||||
private val reportRepository: ReportRepository,
|
private val reportRepository: ReportRepository,
|
||||||
private val commentRepository: AudioContentCommentRepository
|
private val commentRepository: AudioContentCommentRepository
|
||||||
) : BaseViewModel() {
|
) : BaseViewModel() {
|
||||||
@@ -196,40 +193,6 @@ class AudioContentDetailViewModel(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun authVerify(audioContentId: Long, request: AuthVerifyRequest) {
|
|
||||||
if (!isLoading.value!!) {
|
|
||||||
isLoading.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
compositeDisposable.add(
|
|
||||||
authRepository.verify(request, "Bearer ${SharedPreferenceManager.token}")
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(
|
|
||||||
{
|
|
||||||
if (it.success) {
|
|
||||||
getAudioContentDetail(audioContentId)
|
|
||||||
} else {
|
|
||||||
if (it.message != null) {
|
|
||||||
_toastLiveData.postValue(it.message)
|
|
||||||
} else {
|
|
||||||
_toastLiveData.postValue(
|
|
||||||
getString(R.string.common_error_unknown)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
isLoading.value = false
|
|
||||||
it.message?.let { message -> Logger.e(message) }
|
|
||||||
_toastLiveData.postValue(getString(R.string.common_error_unknown))
|
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun registerComment(audioContentId: Long, comment: String, isSecret: Boolean) {
|
fun registerComment(audioContentId: Long, comment: String, isSecret: Boolean) {
|
||||||
if (!isLoading.value!!) {
|
if (!isLoading.value!!) {
|
||||||
isLoading.value = true
|
isLoading.value = true
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemAudioOtherContentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemAudioOtherContentBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -21,7 +20,6 @@ class OtherContentAdapter(
|
|||||||
fun bind(item: OtherContentResponse) {
|
fun bind(item: OtherContentResponse) {
|
||||||
binding.ivCover.load(item.coverUrl) {
|
binding.ivCover.load(item.coverUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(2.7f.dpToPx()))
|
transformations(RoundedCornersTransformation(2.7f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -86,7 +86,6 @@ class AudioContentModifyActivity : BaseActivity<ActivityAudioContentModifyBindin
|
|||||||
binding.ivCover.background = null
|
binding.ivCover.background = null
|
||||||
Glide.with(this)
|
Glide.with(this)
|
||||||
.load(uri)
|
.load(uri)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
@@ -299,7 +298,6 @@ class AudioContentModifyActivity : BaseActivity<ActivityAudioContentModifyBindin
|
|||||||
binding.ivCover.background = null
|
binding.ivCover.background = null
|
||||||
binding.ivCover.load(it) {
|
binding.ivCover.load(it) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-2
@@ -50,13 +50,11 @@ class AudioContentOrderConfirmDialog(
|
|||||||
|
|
||||||
dialogView.ivCover.load(coverImageUrl) {
|
dialogView.ivCover.load(coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(4f))
|
transformations(RoundedCornersTransformation(4f))
|
||||||
}
|
}
|
||||||
|
|
||||||
dialogView.ivProfile.load(profileImageUrl) {
|
dialogView.ivProfile.load(profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemAudioContentOrderListBinding
|
import kr.co.vividnext.sodalive.databinding.ItemAudioContentOrderListBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||||
@@ -23,7 +22,6 @@ class AudioContentOrderListAdapter(
|
|||||||
fun bind(item: GetAudioContentOrderListItem) {
|
fun bind(item: GetAudioContentOrderListItem) {
|
||||||
binding.ivCover.load(item.coverImageUrl) {
|
binding.ivCover.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -444,13 +444,11 @@ class AudioContentPlayerFragment(
|
|||||||
it.extras?.getString(Constants.EXTRA_AUDIO_CONTENT_CREATOR_PROFILE_IMAGE)
|
it.extras?.getString(Constants.EXTRA_AUDIO_CONTENT_CREATOR_PROFILE_IMAGE)
|
||||||
) {
|
) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.ivCover.load(it.artworkUri) {
|
binding.ivCover.load(it.artworkUri) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(8f.dpToPx()))
|
transformations(RoundedCornersTransformation(8f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -23,7 +23,6 @@ class AudioContentPlaylistListAdapter(
|
|||||||
fun bind(item: GetPlaylistsItem) {
|
fun bind(item: GetPlaylistsItem) {
|
||||||
binding.ivCover.load(item.coverImageUrl) {
|
binding.ivCover.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemPlaylistCreateContentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemPlaylistCreateContentBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -21,7 +20,6 @@ class AudioContentPlaylistCreateContentAdapter :
|
|||||||
fun bind(item: AudioContentPlaylistContent) {
|
fun bind(item: AudioContentPlaylistContent) {
|
||||||
binding.ivCover.load(item.coverUrl) {
|
binding.ivCover.load(item.coverUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -141,7 +141,6 @@ class AudioContentPlaylistDetailActivity : BaseActivity<ActivityAudioContentPlay
|
|||||||
|
|
||||||
binding.ivPlayerCover.load(it.artworkUri) {
|
binding.ivPlayerCover.load(it.artworkUri) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(4f))
|
transformations(RoundedCornersTransformation(4f))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -23,7 +23,6 @@ class AudioContentPlaylistDetailAdapter(
|
|||||||
fun bind(item: AudioContentPlaylistContent) {
|
fun bind(item: AudioContentPlaylistContent) {
|
||||||
binding.ivCover.load(item.coverUrl) {
|
binding.ivCover.load(item.coverUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemPlaylistCreateContentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemPlaylistCreateContentBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -21,7 +20,6 @@ class AudioContentPlaylistModifyContentAdapter :
|
|||||||
fun bind(item: AudioContentPlaylistContent) {
|
fun bind(item: AudioContentPlaylistContent) {
|
||||||
binding.ivCover.load(item.coverUrl) {
|
binding.ivCover.load(item.coverUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class SeriesListAdapter(
|
|||||||
binding.clCover.layoutParams = lp
|
binding.clCover.layoutParams = lp
|
||||||
|
|
||||||
binding.ivCover.load(item.coverImage) {
|
binding.ivCover.load(item.coverImage) {
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5f.dpToPx()))
|
transformations(RoundedCornersTransformation(5f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,7 +67,6 @@ class SeriesListAdapter(
|
|||||||
binding.tvCreator.text = item.creator.nickname
|
binding.tvCreator.text = item.creator.nickname
|
||||||
binding.ivCreator.load(item.creator.profileImage) {
|
binding.ivCreator.load(item.creator.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
binding.llCreator.setOnClickListener { onClickCreator(item.creator.creatorId) }
|
binding.llCreator.setOnClickListener { onClickCreator(item.creator.creatorId) }
|
||||||
|
|||||||
-2
@@ -7,7 +7,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.GetSeriesContentListItem
|
import kr.co.vividnext.sodalive.audio_content.series.detail.GetSeriesContentListItem
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemSeriesContentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemSeriesContentBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -24,7 +23,6 @@ class SeriesContentAdapter(
|
|||||||
fun bind(item: GetSeriesContentListItem) {
|
fun bind(item: GetSeriesContentListItem) {
|
||||||
binding.ivCover.load(item.coverImage) {
|
binding.ivCover.load(item.coverImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -158,7 +158,6 @@ class SeriesDetailActivity : BaseActivity<ActivitySeriesDetailBinding>(
|
|||||||
private fun setSeriesInfo(seriesDetail: GetSeriesDetailResponse) {
|
private fun setSeriesInfo(seriesDetail: GetSeriesDetailResponse) {
|
||||||
binding.ivCover.load(seriesDetail.coverImage) {
|
binding.ivCover.load(seriesDetail.coverImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5f.dpToPx()))
|
transformations(RoundedCornersTransformation(5f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,7 +197,6 @@ class SeriesDetailActivity : BaseActivity<ActivitySeriesDetailBinding>(
|
|||||||
binding.tvNickname.text = creator.nickname
|
binding.tvNickname.text = creator.nickname
|
||||||
binding.ivProfile.load(creator.profileImage) {
|
binding.ivProfile.load(creator.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-30
@@ -8,9 +8,6 @@ import android.widget.Toast
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
@@ -41,36 +38,9 @@ class SeriesMainByGenreFragment : BaseFragment<FragmentSeriesMainByGenreBinding>
|
|||||||
private fun setupView() {
|
private fun setupView() {
|
||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
setupGenreView()
|
setupGenreView()
|
||||||
setupInlineBanner()
|
|
||||||
setupSeriesView()
|
setupSeriesView()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_SERIES_MAIN_BY_GENRE_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupGenreView() {
|
private fun setupGenreView() {
|
||||||
genreAdapter = GenreAdapter { genre ->
|
genreAdapter = GenreAdapter { genre ->
|
||||||
seriesAdapter.clear()
|
seriesAdapter.clear()
|
||||||
|
|||||||
-30
@@ -8,9 +8,6 @@ import android.widget.Toast
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
@@ -43,7 +40,6 @@ class SeriesMainDayOfWeekFragment : BaseFragment<FragmentSeriesMainDayOfWeekBind
|
|||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
|
|
||||||
setupDayOfWeekDay()
|
setupDayOfWeekDay()
|
||||||
setupInlineBanner()
|
|
||||||
setupSeriesView()
|
setupSeriesView()
|
||||||
|
|
||||||
val dayOfWeeks = listOf(
|
val dayOfWeeks = listOf(
|
||||||
@@ -63,32 +59,6 @@ class SeriesMainDayOfWeekFragment : BaseFragment<FragmentSeriesMainDayOfWeekBind
|
|||||||
viewModel.dayOfWeek = dayOfWeeks[dayIndex]
|
viewModel.dayOfWeek = dayOfWeeks[dayIndex]
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_SERIES_MAIN_DAY_OF_WEEK_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupDayOfWeekDay() {
|
private fun setupDayOfWeekDay() {
|
||||||
val dayOfWeekAdapter = DayOfWeekAdapter(requireContext()) {
|
val dayOfWeekAdapter = DayOfWeekAdapter(requireContext()) {
|
||||||
adapter.clear()
|
adapter.clear()
|
||||||
|
|||||||
-30
@@ -12,12 +12,9 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.SeriesListAllActivity
|
import kr.co.vividnext.sodalive.audio_content.series.SeriesListAllActivity
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
||||||
@@ -57,36 +54,9 @@ class SeriesMainHomeFragment : BaseFragment<FragmentSeriesMainHomeBinding>(
|
|||||||
|
|
||||||
setupBanner()
|
setupBanner()
|
||||||
setupCompletedSeriesView()
|
setupCompletedSeriesView()
|
||||||
setupInlineBanner()
|
|
||||||
setupRecommendSeriesView()
|
setupRecommendSeriesView()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_SERIES_MAIN_HOME_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupBanner() {
|
private fun setupBanner() {
|
||||||
val layoutParams = binding
|
val layoutParams = binding
|
||||||
.bannerSlider
|
.bannerSlider
|
||||||
|
|||||||
-2
@@ -60,7 +60,6 @@ class AudioContentUploadActivity : BaseActivity<ActivityAudioContentUploadBindin
|
|||||||
onItemClick = {
|
onItemClick = {
|
||||||
binding.ivTheme.load(it.image) {
|
binding.ivTheme.load(it.image) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
|
|
||||||
binding.ivTheme.visibility = View.VISIBLE
|
binding.ivTheme.visibility = View.VISIBLE
|
||||||
@@ -161,7 +160,6 @@ class AudioContentUploadActivity : BaseActivity<ActivityAudioContentUploadBindin
|
|||||||
binding.ivCover.background = null
|
binding.ivCover.background = null
|
||||||
Glide.with(this)
|
Glide.with(this)
|
||||||
.load(uri)
|
.load(uri)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
|
|||||||
-1
@@ -35,7 +35,6 @@ class AudioContentThemeAdapter(
|
|||||||
|
|
||||||
binding.ivTheme.load(item.image) {
|
binding.ivTheme.load(item.image) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -77,7 +77,6 @@ class AuditionListAdapter(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.placeholder(R.drawable.bg_black)
|
|
||||||
.into(binding.ivCover)
|
.into(binding.ivCover)
|
||||||
|
|
||||||
binding.tvTitle.text = data.item.title
|
binding.tvTitle.text = data.item.title
|
||||||
|
|||||||
-1
@@ -60,7 +60,6 @@ class AuditionApplicantListAdapter(
|
|||||||
binding.tvCountVote.text = item.voteCount.toString()
|
binding.tvCountVote.text = item.voteCount.toString()
|
||||||
binding.ivProfile.load(item.profileImageUrl) {
|
binding.ivProfile.load(item.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -152,7 +152,6 @@ class AuditionDetailActivity : BaseActivity<ActivityAuditionDetailBinding>(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.placeholder(R.drawable.bg_black)
|
|
||||||
.into(binding.ivCover)
|
.into(binding.ivCover)
|
||||||
|
|
||||||
binding.toolbar.tvBack.text = it.title
|
binding.toolbar.tvBack.text = it.title
|
||||||
|
|||||||
-1
@@ -53,7 +53,6 @@ class AuditionDetailRoleAdapter(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.placeholder(R.drawable.bg_black)
|
|
||||||
.into(binding.ivCover)
|
.into(binding.ivCover)
|
||||||
|
|
||||||
binding.tvName.text = item.name
|
binding.tvName.text = item.name
|
||||||
|
|||||||
@@ -385,7 +385,6 @@ class AuditionRoleDetailActivity :
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.placeholder(R.drawable.bg_black)
|
|
||||||
.into(binding.ivCover)
|
.into(binding.ivCover)
|
||||||
|
|
||||||
if (roleDetail.isAlreadyApplicant) {
|
if (roleDetail.isAlreadyApplicant) {
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import android.view.ViewTreeObserver
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemCharacterBinding
|
import kr.co.vividnext.sodalive.databinding.ItemCharacterBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -58,7 +57,6 @@ class CharacterAdapter(
|
|||||||
|
|
||||||
binding.ivCharacter.load(character.imageUrl) {
|
binding.ivCharacter.load(character.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_logo_service_center)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,13 +13,9 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -34,13 +30,9 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
|||||||
import kr.co.vividnext.sodalive.databinding.FragmentCharacterTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentCharacterTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
// 캐릭터 탭 프래그먼트
|
// 캐릭터 탭 프래그먼트
|
||||||
@OptIn(UnstableApi::class)
|
@OptIn(UnstableApi::class)
|
||||||
@@ -48,7 +40,6 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
|
|||||||
FragmentCharacterTabBinding::inflate
|
FragmentCharacterTabBinding::inflate
|
||||||
) {
|
) {
|
||||||
private val viewModel: CharacterTabViewModel by inject()
|
private val viewModel: CharacterTabViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var contentBannerAdapter: CharacterBannerAdapter
|
private lateinit var contentBannerAdapter: CharacterBannerAdapter
|
||||||
private lateinit var recentCharacterAdapter: RecentCharacterAdapter
|
private lateinit var recentCharacterAdapter: RecentCharacterAdapter
|
||||||
@@ -65,43 +56,16 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
|
|||||||
viewModel.fetchData()
|
viewModel.fetchData()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupView() {
|
private fun setupView() {
|
||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
|
|
||||||
setupBanner()
|
setupBanner()
|
||||||
setupRecentCharactersRecyclerView()
|
setupRecentCharactersRecyclerView()
|
||||||
setupCharacterTabInlineBanner()
|
|
||||||
setupPopularCharactersRecyclerView()
|
setupPopularCharactersRecyclerView()
|
||||||
setupNewCharactersRecyclerView()
|
setupNewCharactersRecyclerView()
|
||||||
setupRecommendCharactersRecyclerView()
|
setupRecommendCharactersRecyclerView()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupCharacterTabInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_CHARACTER_TAB_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupBanner() {
|
private fun setupBanner() {
|
||||||
val layoutParams = binding
|
val layoutParams = binding
|
||||||
.bannerSlider
|
.bannerSlider
|
||||||
@@ -437,29 +401,7 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
kr.co.vividnext.sodalive.mypage.auth.BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun observeViewModel() {
|
private fun observeViewModel() {
|
||||||
|
|||||||
-2
@@ -64,8 +64,6 @@ class CharacterCommentListFragment : BaseFragment<FragmentCharacterCommentListBi
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
-7
@@ -6,8 +6,8 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import androidx.viewbinding.ViewBinding
|
import androidx.viewbinding.ViewBinding
|
||||||
import coil.load
|
import coil.load
|
||||||
|
import coil.dispose
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemCharacterCommentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemCharacterCommentBinding
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemCharacterCommentReplyBinding
|
import kr.co.vividnext.sodalive.databinding.ItemCharacterCommentReplyBinding
|
||||||
|
|
||||||
@@ -64,12 +64,11 @@ class CharacterReplyHeaderVH(
|
|||||||
if (data.memberProfileImage.isNotBlank()) {
|
if (data.memberProfileImage.isNotBlank()) {
|
||||||
binding.ivCommentProfile.load(data.memberProfileImage) {
|
binding.ivCommentProfile.load(data.memberProfileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivCommentProfile.setImageResource(R.drawable.ic_placeholder_profile)
|
binding.ivCommentProfile.dispose()
|
||||||
|
binding.ivCommentProfile.setImageDrawable(null)
|
||||||
}
|
}
|
||||||
binding.tvCommentNickname.text = data.memberNickname
|
binding.tvCommentNickname.text = data.memberNickname
|
||||||
binding.tvCommentDate.text = formatCommentTime(context, data.createdAt)
|
binding.tvCommentDate.text = formatCommentTime(context, data.createdAt)
|
||||||
@@ -91,12 +90,11 @@ class CharacterReplyItemVH(
|
|||||||
if (data.memberProfileImage.isNotBlank()) {
|
if (data.memberProfileImage.isNotBlank()) {
|
||||||
binding.ivCommentProfile.load(data.memberProfileImage) {
|
binding.ivCommentProfile.load(data.memberProfileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivCommentProfile.setImageResource(R.drawable.ic_placeholder_profile)
|
binding.ivCommentProfile.dispose()
|
||||||
|
binding.ivCommentProfile.setImageDrawable(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.tvCommentNickname.text = data.memberNickname
|
binding.tvCommentNickname.text = data.memberNickname
|
||||||
|
|||||||
-2
@@ -86,8 +86,6 @@ class CharacterCommentReplyFragment : BaseFragment<FragmentCharacterCommentReply
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -5,6 +5,7 @@ import android.view.View
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
|
import coil.dispose
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemCharacterCommentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemCharacterCommentBinding
|
||||||
@@ -24,12 +25,11 @@ class CharacterCommentsAdapter(
|
|||||||
if (item.memberProfileImage.isNotBlank()) {
|
if (item.memberProfileImage.isNotBlank()) {
|
||||||
binding.ivCommentProfile.load(item.memberProfileImage) {
|
binding.ivCommentProfile.load(item.memberProfileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivCommentProfile.setImageResource(R.drawable.ic_placeholder_profile)
|
binding.ivCommentProfile.dispose()
|
||||||
|
binding.ivCommentProfile.setImageDrawable(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.tvCommentNickname.text = item.memberNickname
|
binding.tvCommentNickname.text = item.memberNickname
|
||||||
|
|||||||
+6
-17
@@ -11,6 +11,7 @@ import androidx.core.net.toUri
|
|||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
|
import coil.dispose
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxjava3.schedulers.Schedulers
|
import io.reactivex.rxjava3.schedulers.Schedulers
|
||||||
@@ -257,17 +258,11 @@ class CharacterDetailFragment : BaseFragment<FragmentCharacterDetailBinding>(
|
|||||||
if (profileUrl.isNotBlank()) {
|
if (profileUrl.isNotBlank()) {
|
||||||
binding.ivCommentProfile.load(profileUrl) {
|
binding.ivCommentProfile.load(profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivMyProfile.load(R.drawable.ic_placeholder_profile) {
|
binding.ivCommentProfile.dispose()
|
||||||
crossfade(true)
|
binding.ivCommentProfile.setImageDrawable(null)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.tvLatestComment.text = latest.comment.ifBlank {
|
binding.tvLatestComment.text = latest.comment.ifBlank {
|
||||||
@@ -277,22 +272,16 @@ class CharacterDetailFragment : BaseFragment<FragmentCharacterDetailBinding>(
|
|||||||
binding.llLatestComment.visibility = View.GONE
|
binding.llLatestComment.visibility = View.GONE
|
||||||
binding.llNoComment.visibility = View.VISIBLE
|
binding.llNoComment.visibility = View.VISIBLE
|
||||||
|
|
||||||
// 내 프로필 이미지는 SharedPreference의 profileImage 사용 (fallback: placeholder)
|
// 내 프로필 이미지는 SharedPreference의 profileImage 사용
|
||||||
val myProfileUrl = SharedPreferenceManager.profileImage
|
val myProfileUrl = SharedPreferenceManager.profileImage
|
||||||
if (myProfileUrl.isNotBlank()) {
|
if (myProfileUrl.isNotBlank()) {
|
||||||
binding.ivMyProfile.load(myProfileUrl) {
|
binding.ivMyProfile.load(myProfileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivMyProfile.load(R.drawable.ic_placeholder_profile) {
|
binding.ivMyProfile.dispose()
|
||||||
crossfade(true)
|
binding.ivMyProfile.setImageDrawable(null)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
transformations(CircleCropTransformation())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.ivSendComment.setOnClickListener {
|
binding.ivSendComment.setOnClickListener {
|
||||||
|
|||||||
-2
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemOtherCharacterBinding
|
import kr.co.vividnext.sodalive.databinding.ItemOtherCharacterBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -45,7 +44,6 @@ class OtherCharacterAdapter(
|
|||||||
binding.tvTags.text = item.tags
|
binding.tvTags.text = item.tags
|
||||||
binding.ivThumb.load(item.imageUrl) {
|
binding.ivThumb.load(item.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -7,7 +7,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.chat.character.Character
|
import kr.co.vividnext.sodalive.chat.character.Character
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemNewCharacterAllBinding
|
import kr.co.vividnext.sodalive.databinding.ItemNewCharacterAllBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -24,7 +23,6 @@ class NewCharactersAllAdapter(
|
|||||||
binding.tvCharacterDescription.text = item.description
|
binding.tvCharacterDescription.text = item.description
|
||||||
binding.ivCharacter.load(item.imageUrl) {
|
binding.ivCharacter.load(item.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_logo_service_center)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
binding.tvNew.visibility = if (item.isNew) {
|
binding.tvNew.visibility = if (item.isNew) {
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import androidx.recyclerview.widget.ConcatAdapter
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -20,15 +17,10 @@ import kr.co.vividnext.sodalive.chat.original.detail.OriginalWorkDetailActivity
|
|||||||
import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
|
import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||||
import kr.co.vividnext.sodalive.common.YandexInlineBannerHeaderAdapter
|
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
|
|
||||||
@OptIn(UnstableApi::class)
|
@OptIn(UnstableApi::class)
|
||||||
@@ -36,10 +28,8 @@ class OriginalTabFragment :
|
|||||||
BaseFragment<FragmentOriginalTabBinding>(FragmentOriginalTabBinding::inflate) {
|
BaseFragment<FragmentOriginalTabBinding>(FragmentOriginalTabBinding::inflate) {
|
||||||
|
|
||||||
private val viewModel: OriginalWorkViewModel by inject()
|
private val viewModel: OriginalWorkViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var adapter: OriginalWorkListAdapter
|
private lateinit var adapter: OriginalWorkListAdapter
|
||||||
private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter
|
|
||||||
|
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
|
|
||||||
@@ -53,19 +43,9 @@ class OriginalTabFragment :
|
|||||||
viewModel.loadMore()
|
viewModel.loadMore()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
bannerAdapter.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupRecycler() {
|
private fun setupRecycler() {
|
||||||
val spanCount = 3
|
val spanCount = 3
|
||||||
val spacingPx = 16f.dpToPx().toInt()
|
val spacingPx = 16f.dpToPx().toInt()
|
||||||
val headerCount = 1
|
|
||||||
bannerAdapter = YandexInlineBannerHeaderAdapter(
|
|
||||||
adUnitId = BuildConfig.YANDEX_INLINE_BANNER_ORIGINAL_TAB_AD_UNIT_ID,
|
|
||||||
screenWidth = screenWidth
|
|
||||||
)
|
|
||||||
adapter = OriginalWorkListAdapter { id ->
|
adapter = OriginalWorkListAdapter { id ->
|
||||||
ensureLoginAndAuth {
|
ensureLoginAndAuth {
|
||||||
startActivity(
|
startActivity(
|
||||||
@@ -79,19 +59,12 @@ class OriginalTabFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
binding.rvOriginal.setPadding(0, 0, 0, 8f.dpToPx().toInt())
|
binding.rvOriginal.setPadding(0, 0, 0, 8f.dpToPx().toInt())
|
||||||
binding.rvOriginal.layoutManager = GridLayoutManager(requireContext(), spanCount).apply {
|
binding.rvOriginal.layoutManager = GridLayoutManager(requireContext(), spanCount)
|
||||||
spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
|
|
||||||
override fun getSpanSize(position: Int): Int {
|
|
||||||
return if (position < headerCount) spanCount else 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
binding.rvOriginal.addItemDecoration(
|
binding.rvOriginal.addItemDecoration(
|
||||||
GridSpacingItemDecoration(
|
GridSpacingItemDecoration(
|
||||||
spanCount,
|
spanCount,
|
||||||
spacingPx,
|
spacingPx,
|
||||||
true,
|
true
|
||||||
headerCount
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
binding.rvOriginal.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
binding.rvOriginal.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||||
@@ -105,7 +78,7 @@ class OriginalTabFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
binding.rvOriginal.adapter = ConcatAdapter(bannerAdapter, adapter)
|
binding.rvOriginal.adapter = adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun bind() {
|
private fun bind() {
|
||||||
@@ -158,28 +131,6 @@ class OriginalTabFragment :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemOriginalWorkBinding
|
import kr.co.vividnext.sodalive.databinding.ItemOriginalWorkBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -21,7 +20,6 @@ class OriginalWorkListAdapter(
|
|||||||
binding.tvTitle.text = item.title
|
binding.tvTitle.text = item.title
|
||||||
binding.tvContentType.text = item.contentType
|
binding.tvContentType.text = item.contentType
|
||||||
binding.ivCover.load(item.imageUrl) {
|
binding.ivCover.load(item.imageUrl) {
|
||||||
placeholder(R.drawable.ic_logo_service_center)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
binding.root.setOnClickListener { onClick(item.id) }
|
binding.root.setOnClickListener { onClick(item.id) }
|
||||||
|
|||||||
+3
-2
@@ -4,6 +4,7 @@ import android.os.Bundle
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import coil.load
|
import coil.load
|
||||||
|
import coil.dispose
|
||||||
import coil.size.Scale
|
import coil.size.Scale
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import com.google.android.material.tabs.TabLayout
|
import com.google.android.material.tabs.TabLayout
|
||||||
@@ -142,12 +143,12 @@ class OriginalWorkDetailActivity : BaseActivity<ActivityOriginalWorkDetailBindin
|
|||||||
scale(Scale.FILL)
|
scale(Scale.FILL)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivBg.setImageResource(R.drawable.bg_placeholder)
|
binding.ivBg.dispose()
|
||||||
|
binding.ivBg.setImageDrawable(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.ivCover.load(data.imageUrl) {
|
binding.ivCover.load(data.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -8,7 +8,6 @@ import androidx.recyclerview.widget.RecyclerView
|
|||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import com.orhanobut.logger.Logger
|
import com.orhanobut.logger.Logger
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.chat.character.Character
|
import kr.co.vividnext.sodalive.chat.character.Character
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemOriginalDetailCharacterBinding
|
import kr.co.vividnext.sodalive.databinding.ItemOriginalDetailCharacterBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -25,7 +24,6 @@ class OriginalWorkDetailAdapter(
|
|||||||
binding.tvCharacterDescription.text = item.description
|
binding.tvCharacterDescription.text = item.description
|
||||||
binding.ivCharacter.load(item.imageUrl) {
|
binding.ivCharacter.load(item.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_logo_service_center)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
binding.tvNew.visibility = if (item.isNew) {
|
binding.tvNew.visibility = if (item.isNew) {
|
||||||
|
|||||||
@@ -4,15 +4,12 @@ import android.graphics.Rect
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.recyclerview.widget.ConcatAdapter
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomActivity
|
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomActivity
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.YandexInlineBannerHeaderAdapter
|
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentTalkTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentTalkTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
@@ -23,7 +20,6 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
private val viewModel: TalkTabViewModel by inject()
|
private val viewModel: TalkTabViewModel by inject()
|
||||||
|
|
||||||
private lateinit var adapter: TalkTabAdapter
|
private lateinit var adapter: TalkTabAdapter
|
||||||
private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter
|
|
||||||
|
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
|
|
||||||
@@ -38,17 +34,7 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
viewModel.refreshTalkRooms()
|
viewModel.refreshTalkRooms()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
bannerAdapter.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupRecyclerView() {
|
private fun setupRecyclerView() {
|
||||||
val headerCount = 1
|
|
||||||
bannerAdapter = YandexInlineBannerHeaderAdapter(
|
|
||||||
adUnitId = BuildConfig.YANDEX_INLINE_BANNER_TALK_TAB_AD_UNIT_ID,
|
|
||||||
screenWidth = screenWidth
|
|
||||||
)
|
|
||||||
adapter = TalkTabAdapter {
|
adapter = TalkTabAdapter {
|
||||||
startActivity(
|
startActivity(
|
||||||
ChatRoomActivity.newIntent(
|
ChatRoomActivity.newIntent(
|
||||||
@@ -71,20 +57,19 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
super.getItemOffsets(outRect, view, parent, state)
|
super.getItemOffsets(outRect, view, parent, state)
|
||||||
|
|
||||||
val position = parent.getChildAdapterPosition(view)
|
val position = parent.getChildAdapterPosition(view)
|
||||||
if (position < headerCount) {
|
if (position == RecyclerView.NO_POSITION) {
|
||||||
outRect.set(0, 0, 0, 0)
|
outRect.set(0, 0, 0, 0)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val adjustedPosition = position - headerCount
|
|
||||||
val lastItemPosition = adapter.itemCount - 1
|
val lastItemPosition = adapter.itemCount - 1
|
||||||
|
|
||||||
outRect.left = 24f.dpToPx().toInt()
|
outRect.left = 24f.dpToPx().toInt()
|
||||||
outRect.right = 24f.dpToPx().toInt()
|
outRect.right = 24f.dpToPx().toInt()
|
||||||
|
|
||||||
when (adjustedPosition) {
|
when (position) {
|
||||||
0 -> {
|
0 -> {
|
||||||
outRect.bottom = if (adjustedPosition == lastItemPosition) {
|
outRect.bottom = if (position == lastItemPosition) {
|
||||||
24f.dpToPx().toInt()
|
24f.dpToPx().toInt()
|
||||||
} else {
|
} else {
|
||||||
12f.dpToPx().toInt()
|
12f.dpToPx().toInt()
|
||||||
@@ -107,7 +92,7 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
recyclerView.apply {
|
recyclerView.apply {
|
||||||
val lm = LinearLayoutManager(requireContext())
|
val lm = LinearLayoutManager(requireContext())
|
||||||
layoutManager = lm
|
layoutManager = lm
|
||||||
adapter = ConcatAdapter(bannerAdapter, this@TalkTabFragment.adapter)
|
adapter = this@TalkTabFragment.adapter
|
||||||
|
|
||||||
// 스크롤 로딩 리스너: 끝에 도달하면 다음 페이지 로드
|
// 스크롤 로딩 리스너: 끝에 도달하면 다음 페이지 로드
|
||||||
addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||||
|
|||||||
+1
-4
@@ -176,10 +176,7 @@ class ChatBackgroundPickerDialogFragment : DialogFragment() {
|
|||||||
private val onClick: (BgItem) -> Unit
|
private val onClick: (BgItem) -> Unit
|
||||||
) : RecyclerView.ViewHolder(binding.root) {
|
) : RecyclerView.ViewHolder(binding.root) {
|
||||||
fun bind(item: BgItem, selectedId: Long?) {
|
fun bind(item: BgItem, selectedId: Long?) {
|
||||||
binding.ivImage.load(item.url) {
|
binding.ivImage.load(item.url)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
}
|
|
||||||
val selected = when {
|
val selected = when {
|
||||||
selectedId != null -> item.id == selectedId
|
selectedId != null -> item.id == selectedId
|
||||||
else -> item.id == 0L // 저장된 ID가 없으면 프로필(id=0)을 선택으로 간주
|
else -> item.id == 0L // 저장된 ID가 없으면 프로필(id=0)을 선택으로 간주
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ sealed class ChatListItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
enum class ChatQuotaNoticeAction {
|
enum class ChatQuotaNoticeAction {
|
||||||
REWARDED_AD,
|
|
||||||
PURCHASE_10_CAN,
|
PURCHASE_10_CAN,
|
||||||
PURCHASE_20_CAN
|
PURCHASE_20_CAN
|
||||||
}
|
}
|
||||||
@@ -69,10 +68,7 @@ class ChatMessageAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
|
|||||||
fun onRetrySend(localId: String)
|
fun onRetrySend(localId: String)
|
||||||
fun onPurchaseMessage(message: ChatMessage)
|
fun onPurchaseMessage(message: ChatMessage)
|
||||||
fun onOpenPurchasedImage(message: ChatMessage)
|
fun onOpenPurchasedImage(message: ChatMessage)
|
||||||
fun onPurchaseQuota()
|
fun onQuotaNoticeAction(action: ChatQuotaNoticeAction)
|
||||||
fun onQuotaNoticeAction(action: ChatQuotaNoticeAction) {
|
|
||||||
onPurchaseQuota()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private var callback: Callback? = null
|
private var callback: Callback? = null
|
||||||
|
|||||||
@@ -14,18 +14,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import androidx.recyclerview.widget.SimpleItemAnimator
|
import androidx.recyclerview.widget.SimpleItemAnimator
|
||||||
import coil.load
|
import coil.load
|
||||||
import com.yandex.mobile.ads.common.AdError
|
import coil.dispose
|
||||||
import com.yandex.mobile.ads.common.AdRequestConfiguration
|
|
||||||
import com.yandex.mobile.ads.common.AdRequestError
|
|
||||||
import com.yandex.mobile.ads.common.ImpressionData
|
|
||||||
import com.yandex.mobile.ads.rewarded.Reward
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAd
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAdEventListener
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAdLoadListener
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAdLoader
|
|
||||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxjava3.schedulers.Schedulers
|
import io.reactivex.rxjava3.schedulers.Schedulers
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -58,13 +49,7 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
private var hasMoreMessages: Boolean = true // Repository 연동 시 서버 값으로 갱신 예정
|
private var hasMoreMessages: Boolean = true // Repository 연동 시 서버 값으로 갱신 예정
|
||||||
private var nextCursor: Long? = null // 가장 오래된 메시지의 timestamp 등
|
private var nextCursor: Long? = null // 가장 오래된 메시지의 timestamp 등
|
||||||
|
|
||||||
// 쿼터/광고 상태
|
|
||||||
private var currentTotalRemaining: Int = Int.MAX_VALUE
|
|
||||||
private var chatQuotaRewardedAdLoader: RewardedAdLoader? = null
|
|
||||||
private var chatQuotaRewardedAd: RewardedAd? = null
|
|
||||||
private var hasRewardHandledForCurrentAd: Boolean = false
|
|
||||||
private var isQuotaPurchaseInFlight: Boolean = false
|
private var isQuotaPurchaseInFlight: Boolean = false
|
||||||
private var isChatQuotaRewardedAdShowing: Boolean = false
|
|
||||||
|
|
||||||
// 5.3 헤더 데이터 (7.x 연동 전까지는 nullable 보관)
|
// 5.3 헤더 데이터 (7.x 연동 전까지는 nullable 보관)
|
||||||
private var characterInfo: CharacterInfo? = null
|
private var characterInfo: CharacterInfo? = null
|
||||||
@@ -109,13 +94,8 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
.show(supportFragmentManager, "ChatRoomMoreDialog")
|
.show(supportFragmentManager, "ChatRoomMoreDialog")
|
||||||
}
|
}
|
||||||
|
|
||||||
// 5.3: characterInfo가 있으면 헤더 바인딩, 없으면 기본 플레이스홀더 유지
|
|
||||||
characterInfo?.let { bindHeader(it) } ?: run {
|
characterInfo?.let { bindHeader(it) } ?: run {
|
||||||
// 기본값: 이름 숨김 또는 플레이스 홀더 표시
|
|
||||||
binding.tvName.text = ""
|
binding.tvName.text = ""
|
||||||
binding.ivProfile.setImageResource(R.drawable.ic_placeholder_profile)
|
|
||||||
binding.ivBackgroundProfile.setImageResource(R.drawable.ic_placeholder_profile)
|
|
||||||
// 배경은 서버 응답 수신 시 적용 (기본은 플레이스홀더 유지)
|
|
||||||
// 배지는 기본 Clone으로 둔다가 실제 값으로 갱신 (디자인 기본 배경도 clone)
|
// 배지는 기본 Clone으로 둔다가 실제 값으로 갱신 (디자인 기본 배경도 clone)
|
||||||
val badge = getString(R.string.chat_character_type_clone)
|
val badge = getString(R.string.chat_character_type_clone)
|
||||||
binding.tvCharacterTypeBadge.text = badge
|
binding.tvCharacterTypeBadge.text = badge
|
||||||
@@ -214,10 +194,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
openPurchasedImageCarousel(message)
|
openPurchasedImageCarousel(message)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPurchaseQuota() {
|
|
||||||
onQuotaNoticeAction(ChatQuotaNoticeAction.REWARDED_AD)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onQuotaNoticeAction(action: ChatQuotaNoticeAction) {
|
override fun onQuotaNoticeAction(action: ChatQuotaNoticeAction) {
|
||||||
this@ChatRoomActivity.onQuotaNoticeAction(action)
|
this@ChatRoomActivity.onQuotaNoticeAction(action)
|
||||||
}
|
}
|
||||||
@@ -486,7 +462,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
if (isQuotaPurchaseInFlight) return
|
if (isQuotaPurchaseInFlight) return
|
||||||
|
|
||||||
when (action) {
|
when (action) {
|
||||||
ChatQuotaNoticeAction.REWARDED_AD -> showChatQuotaRewardedAd()
|
|
||||||
ChatQuotaNoticeAction.PURCHASE_10_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_10)
|
ChatQuotaNoticeAction.PURCHASE_10_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_10)
|
||||||
ChatQuotaNoticeAction.PURCHASE_20_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_20)
|
ChatQuotaNoticeAction.PURCHASE_20_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_20)
|
||||||
}
|
}
|
||||||
@@ -518,30 +493,7 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun purchaseRewardedChatQuota() {
|
|
||||||
if (isQuotaPurchaseInFlight) return
|
|
||||||
|
|
||||||
val token = "Bearer ${SharedPreferenceManager.token}"
|
|
||||||
isQuotaPurchaseInFlight = true
|
|
||||||
compositeDisposable.add(
|
|
||||||
chatRepository.purchaseChatQuota(
|
|
||||||
roomId = roomId,
|
|
||||||
token = token,
|
|
||||||
chargeType = ChatRoomQuotaChargeType.AD
|
|
||||||
)
|
|
||||||
.doFinally { isQuotaPurchaseInFlight = false }
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe({ resp ->
|
|
||||||
updateQuotaUi(resp.totalRemaining)
|
|
||||||
}, { err ->
|
|
||||||
showToast(err.message ?: getString(R.string.chat_quota_purchase_failed))
|
|
||||||
})
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updateQuotaUi(totalRemaining: Int) {
|
private fun updateQuotaUi(totalRemaining: Int) {
|
||||||
currentTotalRemaining = totalRemaining
|
|
||||||
|
|
||||||
if (totalRemaining <= 0) {
|
if (totalRemaining <= 0) {
|
||||||
binding.inputContainer.isVisible = false
|
binding.inputContainer.isVisible = false
|
||||||
ensureQuotaNoticeShown()
|
ensureQuotaNoticeShown()
|
||||||
@@ -549,10 +501,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
binding.inputContainer.isVisible = true
|
binding.inputContainer.isVisible = true
|
||||||
ensureQuotaNoticeRemoved()
|
ensureQuotaNoticeRemoved()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (totalRemaining <= 1) {
|
|
||||||
preloadChatQuotaRewardedAd()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun ensureQuotaNoticeShown() {
|
private fun ensureQuotaNoticeShown() {
|
||||||
@@ -569,105 +517,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val chatQuotaRewardedAdLoadListener = object : RewardedAdLoadListener {
|
|
||||||
override fun onAdLoaded(rewardedAd: RewardedAd) {
|
|
||||||
chatQuotaRewardedAdLoader = null
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
chatQuotaRewardedAd = rewardedAd
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdFailedToLoad(adRequestError: AdRequestError) {
|
|
||||||
chatQuotaRewardedAdLoader = null
|
|
||||||
chatQuotaRewardedAd = null
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val chatQuotaRewardedAdEventListener = object : RewardedAdEventListener {
|
|
||||||
override fun onAdShown() {
|
|
||||||
isChatQuotaRewardedAdShowing = true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdFailedToShow(adError: AdError) {
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
showToast(getString(R.string.chat_quota_rewarded_ad_unavailable))
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdDismissed() {
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
val rewardHandled = hasRewardHandledForCurrentAd
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
if (!rewardHandled && currentTotalRemaining <= 1) {
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdClicked() = Unit
|
|
||||||
|
|
||||||
override fun onAdImpression(impressionData: ImpressionData?) = Unit
|
|
||||||
|
|
||||||
override fun onRewarded(reward: Reward) {
|
|
||||||
if (hasRewardHandledForCurrentAd) return
|
|
||||||
hasRewardHandledForCurrentAd = true
|
|
||||||
purchaseRewardedChatQuota()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun preloadChatQuotaRewardedAd(force: Boolean = false) {
|
|
||||||
if (!force && (chatQuotaRewardedAd != null || chatQuotaRewardedAdLoader != null)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val adUnitId = BuildConfig.YANDEX_REWARDED_CHAT_QUOTA_AD_UNIT_ID
|
|
||||||
if (adUnitId.isBlank()) return
|
|
||||||
|
|
||||||
chatQuotaRewardedAdLoader?.setAdLoadListener(null)
|
|
||||||
chatQuotaRewardedAdLoader = RewardedAdLoader(this).apply {
|
|
||||||
setAdLoadListener(chatQuotaRewardedAdLoadListener)
|
|
||||||
}
|
|
||||||
chatQuotaRewardedAdLoader?.loadAd(
|
|
||||||
AdRequestConfiguration.Builder(adUnitId).build()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun showChatQuotaRewardedAd() {
|
|
||||||
if (isQuotaPurchaseInFlight || isChatQuotaRewardedAdShowing) return
|
|
||||||
|
|
||||||
val rewardedAd = chatQuotaRewardedAd
|
|
||||||
if (rewardedAd == null) {
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
showToast(getString(R.string.chat_quota_rewarded_ad_unavailable))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
isChatQuotaRewardedAdShowing = true
|
|
||||||
rewardedAd.setAdEventListener(chatQuotaRewardedAdEventListener)
|
|
||||||
runCatching {
|
|
||||||
rewardedAd.show(this)
|
|
||||||
}.onFailure {
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
showToast(getString(R.string.chat_quota_rewarded_ad_unavailable))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun clearChatQuotaRewardedAd() {
|
|
||||||
chatQuotaRewardedAd?.setAdEventListener(null)
|
|
||||||
chatQuotaRewardedAd = null
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun releaseChatQuotaRewardedAd() {
|
|
||||||
chatQuotaRewardedAdLoader?.setAdLoadListener(null)
|
|
||||||
chatQuotaRewardedAdLoader = null
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
}
|
|
||||||
// endregion Quota handling
|
// endregion Quota handling
|
||||||
|
|
||||||
private fun loadInitialMessages() {
|
private fun loadInitialMessages() {
|
||||||
@@ -718,7 +567,8 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
if (bgUrl.isNotBlank()) {
|
if (bgUrl.isNotBlank()) {
|
||||||
setChatBackground(bgUrl)
|
setChatBackground(bgUrl)
|
||||||
} else {
|
} else {
|
||||||
binding.ivBackgroundProfile.setImageResource(R.drawable.ic_placeholder_profile)
|
binding.ivBackgroundProfile.dispose()
|
||||||
|
binding.ivBackgroundProfile.setImageDrawable(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 메시지 정렬(오래된 -> 최신) + 동시간대는 messageId 오름차순으로 안정화
|
// 메시지 정렬(오래된 -> 최신) + 동시간대는 messageId 오름차순으로 안정화
|
||||||
@@ -953,10 +803,7 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun setChatBackground(url: String) {
|
fun setChatBackground(url: String) {
|
||||||
binding.ivBackgroundProfile.load(url) {
|
binding.ivBackgroundProfile.load(url)
|
||||||
placeholder(R.drawable.ic_placeholder_profile)
|
|
||||||
error(R.drawable.ic_placeholder_profile)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getCharacterId(): Long = characterInfo?.characterId ?: 0L
|
fun getCharacterId(): Long = characterInfo?.characterId ?: 0L
|
||||||
@@ -1039,11 +886,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
).show(resources.displayMetrics.widthPixels)
|
).show(resources.displayMetrics.widthPixels)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
|
||||||
releaseChatQuotaRewardedAd()
|
|
||||||
super.onDestroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val EXTRA_ROOM_ID: String = "extra_room_id"
|
const val EXTRA_ROOM_ID: String = "extra_room_id"
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +1,35 @@
|
|||||||
/*
|
/*
|
||||||
* 이미지 로딩 유틸리티
|
* 이미지 로딩 유틸리티
|
||||||
* - Coil을 사용하여 프로필 이미지를 로딩한다.
|
* - Coil을 사용하여 프로필 이미지를 로딩한다.
|
||||||
* - 플레이스홀더/에러 이미지는 ic_placeholder_profile을 사용한다.
|
* - URL이 없으면 이전 요청과 이미지를 비운다.
|
||||||
* - 둥근 모서리 변환을 기본 적용한다.
|
* - 둥근 모서리 변환을 기본 적용한다.
|
||||||
*/
|
*/
|
||||||
package kr.co.vividnext.sodalive.chat.talk.room
|
package kr.co.vividnext.sodalive.chat.talk.room
|
||||||
|
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import androidx.annotation.DrawableRes
|
import coil.dispose
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 프로필 이미지 로딩 공용 함수
|
* 프로필 이미지 로딩 공용 함수
|
||||||
*
|
*
|
||||||
* @param url 이미지 URL (null 또는 빈 값이면 플레이스홀더로 대체)
|
* @param url 이미지 URL (null 또는 빈 값이면 이미지 제거)
|
||||||
* @param placeholderRes 플레이스홀더/에러 리소스
|
|
||||||
*/
|
*/
|
||||||
fun loadProfileImage(
|
fun loadProfileImage(
|
||||||
imageView: ImageView,
|
imageView: ImageView,
|
||||||
url: String?,
|
url: String?
|
||||||
@DrawableRes placeholderRes: Int = R.drawable.ic_placeholder_profile
|
|
||||||
) {
|
) {
|
||||||
val targetUrl = url?.takeIf { it.isNotBlank() }
|
val targetUrl = url?.takeIf { it.isNotBlank() }
|
||||||
|
|
||||||
if (targetUrl != null) {
|
if (targetUrl != null) {
|
||||||
imageView.load(targetUrl) {
|
imageView.load(targetUrl) {
|
||||||
placeholder(placeholderRes)
|
|
||||||
error(placeholderRes)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
imageView.load(placeholderRes) {
|
imageView.dispose()
|
||||||
placeholder(placeholderRes)
|
imageView.setImageDrawable(null)
|
||||||
error(placeholderRes)
|
|
||||||
transformations(CircleCropTransformation())
|
|
||||||
crossfade(true)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,25 +40,18 @@ fun loadProfileImage(
|
|||||||
fun loadRoundedImage(
|
fun loadRoundedImage(
|
||||||
imageView: ImageView,
|
imageView: ImageView,
|
||||||
url: String?,
|
url: String?,
|
||||||
radiusDp: Float = 10f,
|
radiusDp: Float = 10f
|
||||||
@DrawableRes placeholderRes: Int = R.drawable.ic_placeholder_profile
|
|
||||||
) {
|
) {
|
||||||
val density = imageView.resources.displayMetrics.density
|
val density = imageView.resources.displayMetrics.density
|
||||||
val radiusPx = radiusDp * density
|
val radiusPx = radiusDp * density
|
||||||
val targetUrl = url?.takeIf { it.isNotBlank() }
|
val targetUrl = url?.takeIf { it.isNotBlank() }
|
||||||
if (targetUrl != null) {
|
if (targetUrl != null) {
|
||||||
imageView.load(targetUrl) {
|
imageView.load(targetUrl) {
|
||||||
placeholder(placeholderRes)
|
|
||||||
error(placeholderRes)
|
|
||||||
transformations(coil.transform.RoundedCornersTransformation(radiusPx))
|
transformations(coil.transform.RoundedCornersTransformation(radiusPx))
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
imageView.load(placeholderRes) {
|
imageView.dispose()
|
||||||
placeholder(placeholderRes)
|
imageView.setImageDrawable(null)
|
||||||
error(placeholderRes)
|
|
||||||
transformations(coil.transform.RoundedCornersTransformation(radiusPx))
|
|
||||||
crossfade(true)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -12,8 +12,7 @@ data class ChatQuotaPurchaseRequest(
|
|||||||
|
|
||||||
@Keep
|
@Keep
|
||||||
enum class ChatRoomQuotaChargeType {
|
enum class ChatRoomQuotaChargeType {
|
||||||
CAN,
|
CAN
|
||||||
AD
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Keep
|
@Keep
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
package kr.co.vividnext.sodalive.common
|
|
||||||
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import android.widget.FrameLayout
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class YandexInlineBannerHeaderAdapter(
|
|
||||||
private val adUnitId: String,
|
|
||||||
private val screenWidth: Int
|
|
||||||
) : RecyclerView.Adapter<YandexInlineBannerHeaderAdapter.BannerViewHolder>() {
|
|
||||||
|
|
||||||
private var bannerAdView: BannerAdView? = null
|
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BannerViewHolder {
|
|
||||||
val horizontalPadding = 24f.dpToPx().toInt()
|
|
||||||
val verticalPadding = 24f.dpToPx().toInt()
|
|
||||||
val container = FrameLayout(parent.context).apply {
|
|
||||||
layoutParams = ViewGroup.LayoutParams(
|
|
||||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
|
||||||
ViewGroup.LayoutParams.WRAP_CONTENT
|
|
||||||
)
|
|
||||||
setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding)
|
|
||||||
}
|
|
||||||
val bannerView = BannerAdView(parent.context).apply {
|
|
||||||
layoutParams = FrameLayout.LayoutParams(
|
|
||||||
FrameLayout.LayoutParams.MATCH_PARENT,
|
|
||||||
FrameLayout.LayoutParams.WRAP_CONTENT
|
|
||||||
)
|
|
||||||
}
|
|
||||||
container.addView(bannerView)
|
|
||||||
return BannerViewHolder(container, bannerView).apply {
|
|
||||||
setIsRecyclable(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getItemCount(): Int = 1
|
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: BannerViewHolder, position: Int) {
|
|
||||||
bannerAdView = holder.bannerView
|
|
||||||
holder.bannerView.post {
|
|
||||||
val density = holder.bannerView.resources.displayMetrics.density
|
|
||||||
val adWidthPixels = holder.bannerView.width.takeIf { it > 0 }
|
|
||||||
?: (screenWidth - 48f.dpToPx().toInt())
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt().coerceAtLeast(1)
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
holder.bannerView.apply {
|
|
||||||
setAdUnitId(adUnitId)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
context,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun destroy() {
|
|
||||||
bannerAdView?.destroy()
|
|
||||||
bannerAdView = null
|
|
||||||
}
|
|
||||||
|
|
||||||
class BannerViewHolder(
|
|
||||||
container: FrameLayout,
|
|
||||||
val bannerView: BannerAdView
|
|
||||||
) : RecyclerView.ViewHolder(container)
|
|
||||||
}
|
|
||||||
@@ -91,6 +91,17 @@ import kr.co.vividnext.sodalive.home.HomeApi
|
|||||||
import kr.co.vividnext.sodalive.home.HomeRepository
|
import kr.co.vividnext.sodalive.home.HomeRepository
|
||||||
import kr.co.vividnext.sodalive.home.HomeViewModel
|
import kr.co.vividnext.sodalive.home.HomeViewModel
|
||||||
import kr.co.vividnext.sodalive.home.pushnotification.PushNotificationListViewModel
|
import kr.co.vividnext.sodalive.home.pushnotification.PushNotificationListViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.event.EventDetailViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.event.data.EventDetailApi
|
||||||
|
import kr.co.vividnext.sodalive.v2.event.data.EventDetailRepository
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.GiftSendRequestViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.GiftInboxViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.GiftDetailViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.GiftRecipientAddressViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.GiftTrackingViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.GiftCancelViewModel
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.data.GiftApi
|
||||||
|
import kr.co.vividnext.sodalive.v2.gift.data.GiftRepository
|
||||||
import kr.co.vividnext.sodalive.live.LiveApi
|
import kr.co.vividnext.sodalive.live.LiveApi
|
||||||
import kr.co.vividnext.sodalive.live.LiveRepository
|
import kr.co.vividnext.sodalive.live.LiveRepository
|
||||||
import kr.co.vividnext.sodalive.live.LiveViewModel
|
import kr.co.vividnext.sodalive.live.LiveViewModel
|
||||||
@@ -123,8 +134,6 @@ import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
|||||||
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListApi
|
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListApi
|
||||||
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListRepository
|
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListRepository
|
||||||
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListViewModel
|
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListViewModel
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthApi
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
|
|
||||||
import kr.co.vividnext.sodalive.mypage.block.BlockMemberViewModel
|
import kr.co.vividnext.sodalive.mypage.block.BlockMemberViewModel
|
||||||
import kr.co.vividnext.sodalive.mypage.can.CanApi
|
import kr.co.vividnext.sodalive.mypage.can.CanApi
|
||||||
import kr.co.vividnext.sodalive.mypage.can.CanRepository
|
import kr.co.vividnext.sodalive.mypage.can.CanRepository
|
||||||
@@ -268,6 +277,13 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
single<OkHttpClient>(named("giftHttpClient")) {
|
||||||
|
get<OkHttpClient>().newBuilder()
|
||||||
|
.apply { interceptors().removeAll { it is HttpLoggingInterceptor } }
|
||||||
|
.addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.NONE))
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
single<OkHttpClient>(named("agoraHttpClient")) {
|
single<OkHttpClient>(named("agoraHttpClient")) {
|
||||||
val logging = HttpLoggingInterceptor()
|
val logging = HttpLoggingInterceptor()
|
||||||
|
|
||||||
@@ -296,6 +312,12 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
single<Retrofit>(named("giftRetrofit")) {
|
||||||
|
get<Retrofit>().newBuilder()
|
||||||
|
.client(get<OkHttpClient>(named("giftHttpClient")))
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
single<Retrofit>(named("agoraRetrofit")) {
|
single<Retrofit>(named("agoraRetrofit")) {
|
||||||
Retrofit.Builder()
|
Retrofit.Builder()
|
||||||
.baseUrl(agoraBaseUrl)
|
.baseUrl(agoraBaseUrl)
|
||||||
@@ -308,13 +330,13 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
single { ApiBuilder().build(get(), AlarmListApi::class.java) }
|
single { ApiBuilder().build(get(), AlarmListApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), CanApi::class.java) }
|
single { ApiBuilder().build(get(), CanApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), CanTempApi::class.java) }
|
single { ApiBuilder().build(get(), CanTempApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), AuthApi::class.java) }
|
|
||||||
single { ApiBuilder().build(get(), UserApi::class.java) }
|
single { ApiBuilder().build(get(), UserApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), UserEventApi::class.java) }
|
single { ApiBuilder().build(get(), UserEventApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), MenuApi::class.java) }
|
single { ApiBuilder().build(get(), MenuApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), LiveApi::class.java) }
|
single { ApiBuilder().build(get(), LiveApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), TermsApi::class.java) }
|
single { ApiBuilder().build(get(), TermsApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), EventApi::class.java) }
|
single { ApiBuilder().build(get(), EventApi::class.java) }
|
||||||
|
single { ApiBuilder().build(get(), EventDetailApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), SeriesApi::class.java) }
|
single { ApiBuilder().build(get(), SeriesApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), SeriesMainApi::class.java) }
|
single { ApiBuilder().build(get(), SeriesMainApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), ReportApi::class.java) }
|
single { ApiBuilder().build(get(), ReportApi::class.java) }
|
||||||
@@ -343,6 +365,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
single { ApiBuilder().build(get(), HomeCreatorRankingApi::class.java) }
|
single { ApiBuilder().build(get(), HomeCreatorRankingApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), HomeFollowingApi::class.java) }
|
single { ApiBuilder().build(get(), HomeFollowingApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), HomeRecommendationApi::class.java) }
|
single { ApiBuilder().build(get(), HomeRecommendationApi::class.java) }
|
||||||
|
single { ApiBuilder().build(get<Retrofit>(named("giftRetrofit")), GiftApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), CreatorChannelApi::class.java) }
|
single { ApiBuilder().build(get(), CreatorChannelApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), HomeOnAirLiveApi::class.java) }
|
single { ApiBuilder().build(get(), HomeOnAirLiveApi::class.java) }
|
||||||
single { ApiBuilder().build(get(), CharacterApi::class.java) }
|
single { ApiBuilder().build(get(), CharacterApi::class.java) }
|
||||||
@@ -368,7 +391,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
viewModel { MainViewModel(get(), get(), get(), get(), get()) }
|
viewModel { MainViewModel(get(), get(), get(), get(), get()) }
|
||||||
viewModel { MainV2ViewModel(get(), get(), get(), get(), get()) }
|
viewModel { MainV2ViewModel(get(), get(), get(), get(), get()) }
|
||||||
viewModel { LiveViewModel(get(), get(), get(), get(), get()) }
|
viewModel { LiveViewModel(get(), get(), get(), get(), get()) }
|
||||||
viewModel { MyPageViewModel(get(), get(), get()) }
|
viewModel { MyPageViewModel(get(), get()) }
|
||||||
viewModel { CanStatusViewModel(get()) }
|
viewModel { CanStatusViewModel(get()) }
|
||||||
viewModel { CanChargePgViewModel(get()) }
|
viewModel { CanChargePgViewModel(get()) }
|
||||||
viewModel { CanPaymentViewModel(get()) }
|
viewModel { CanPaymentViewModel(get()) }
|
||||||
@@ -414,7 +437,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
viewModel { AudioContentUploadViewModel(get()) }
|
viewModel { AudioContentUploadViewModel(get()) }
|
||||||
viewModel { AudioContentModifyViewModel(get()) }
|
viewModel { AudioContentModifyViewModel(get()) }
|
||||||
viewModel { AudioContentThemeViewModel(get()) }
|
viewModel { AudioContentThemeViewModel(get()) }
|
||||||
viewModel { AudioContentDetailViewModel(get(), get(), get(), get(), get()) }
|
viewModel { AudioContentDetailViewModel(get(), get(), get(), get()) }
|
||||||
viewModel { AudioContentCommentListViewModel(get()) }
|
viewModel { AudioContentCommentListViewModel(get()) }
|
||||||
viewModel { AudioContentCommentReplyViewModel(get()) }
|
viewModel { AudioContentCommentReplyViewModel(get()) }
|
||||||
viewModel { FollowingCreatorViewModel(get(), get()) }
|
viewModel { FollowingCreatorViewModel(get(), get()) }
|
||||||
@@ -458,6 +481,13 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
viewModel { HomeCreatorRankingViewModel(get()) }
|
viewModel { HomeCreatorRankingViewModel(get()) }
|
||||||
viewModel { HomeFollowingViewModel(get(), get()) }
|
viewModel { HomeFollowingViewModel(get(), get()) }
|
||||||
viewModel { HomeRecommendationViewModel(get()) }
|
viewModel { HomeRecommendationViewModel(get()) }
|
||||||
|
viewModel { GiftSendRequestViewModel(get()) }
|
||||||
|
viewModel { GiftInboxViewModel(get()) }
|
||||||
|
viewModel { GiftDetailViewModel(get()) }
|
||||||
|
viewModel { EventDetailViewModel(get()) }
|
||||||
|
viewModel { GiftRecipientAddressViewModel(get()) }
|
||||||
|
viewModel { GiftTrackingViewModel(get()) }
|
||||||
|
viewModel { GiftCancelViewModel(get()) }
|
||||||
viewModel { HomeOnAirLiveViewModel(get()) }
|
viewModel { HomeOnAirLiveViewModel(get()) }
|
||||||
viewModel { CreatorChannelHomeViewModel(get()) }
|
viewModel { CreatorChannelHomeViewModel(get()) }
|
||||||
viewModel { CreatorChannelLiveViewModel(get()) }
|
viewModel { CreatorChannelLiveViewModel(get()) }
|
||||||
@@ -492,8 +522,8 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
factory { LiveRepository(get(), get(), get()) }
|
factory { LiveRepository(get(), get(), get()) }
|
||||||
factory { V2vRepository(get()) }
|
factory { V2vRepository(get()) }
|
||||||
factory { EventRepository(get()) }
|
factory { EventRepository(get()) }
|
||||||
|
factory { EventDetailRepository(get()) }
|
||||||
factory { LiveRecommendRepository(get()) }
|
factory { LiveRecommendRepository(get()) }
|
||||||
factory { AuthRepository(get()) }
|
|
||||||
factory { CanRepository(get()) }
|
factory { CanRepository(get()) }
|
||||||
factory { CanPaymentTempRepository(get()) }
|
factory { CanPaymentTempRepository(get()) }
|
||||||
factory { LiveTagRepository(get()) }
|
factory { LiveTagRepository(get()) }
|
||||||
@@ -529,6 +559,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
|
|||||||
factory { HomeCreatorRankingRepository(get()) }
|
factory { HomeCreatorRankingRepository(get()) }
|
||||||
factory { HomeFollowingRepository(get()) }
|
factory { HomeFollowingRepository(get()) }
|
||||||
factory { HomeRecommendationRepository(get()) }
|
factory { HomeRecommendationRepository(get()) }
|
||||||
|
factory { GiftRepository(get()) }
|
||||||
factory { HomeOnAirLiveRepository(get()) }
|
factory { HomeOnAirLiveRepository(get()) }
|
||||||
factory {
|
factory {
|
||||||
CreatorChannelRepository(
|
CreatorChannelRepository(
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ class MemberProfileDialog(
|
|||||||
viewModel.memberProfile.observe(activity) {
|
viewModel.memberProfile.observe(activity) {
|
||||||
dialogView.ivProfile.load(it.profileImageUrl) {
|
dialogView.ivProfile.load(it.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(8.dpToPx()))
|
transformations(RoundedCornersTransformation(8.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ class ExplorerSectionAdapter(
|
|||||||
|
|
||||||
binding.ivProfile.load(item.profileImageUrl) {
|
binding.ivProfile.load(item.profileImageUrl) {
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -727,7 +727,6 @@ class UserProfileActivity : BaseActivity<ActivityUserProfileBinding>(
|
|||||||
|
|
||||||
Glide.with(this)
|
Glide.with(this)
|
||||||
.load(latestContent.coverImageUrl)
|
.load(latestContent.coverImageUrl)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.transform(
|
.transform(
|
||||||
MultiTransformation(
|
MultiTransformation(
|
||||||
CenterCrop(),
|
CenterCrop(),
|
||||||
@@ -1091,7 +1090,6 @@ class UserProfileActivity : BaseActivity<ActivityUserProfileBinding>(
|
|||||||
|
|
||||||
layout.ivCreatorProfile.loadUrl(item.creatorProfileUrl) {
|
layout.ivCreatorProfile.loadUrl(item.creatorProfileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
layout.tvCreatorNickname.text = item.creatorNickname
|
layout.tvCreatorNickname.text = item.creatorNickname
|
||||||
@@ -1100,7 +1098,6 @@ class UserProfileActivity : BaseActivity<ActivityUserProfileBinding>(
|
|||||||
layout.tvContent.text = item.content
|
layout.tvContent.text = item.content
|
||||||
layout.ivPostImage.loadUrl(item.imageUrl) {
|
layout.ivPostImage.loadUrl(item.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
|
|
||||||
val transformationList = mutableListOf<Transformation>(
|
val transformationList = mutableListOf<Transformation>(
|
||||||
RoundedCornersTransformation(12f.dpToPx())
|
RoundedCornersTransformation(12f.dpToPx())
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ class UserProfileLiveAdapter(
|
|||||||
|
|
||||||
Glide.with(context)
|
Glide.with(context)
|
||||||
.load(item.coverImageUrl)
|
.load(item.coverImageUrl)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.transform(
|
.transform(
|
||||||
MultiTransformation(
|
MultiTransformation(
|
||||||
CenterCrop(),
|
CenterCrop(),
|
||||||
|
|||||||
-2
@@ -5,7 +5,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemUserProfileChannelDonationBinding
|
import kr.co.vividnext.sodalive.databinding.ItemUserProfileChannelDonationBinding
|
||||||
|
|
||||||
class UserProfileChannelDonationAdapter : RecyclerView.Adapter<UserProfileChannelDonationAdapter.ViewHolder>() {
|
class UserProfileChannelDonationAdapter : RecyclerView.Adapter<UserProfileChannelDonationAdapter.ViewHolder>() {
|
||||||
@@ -18,7 +17,6 @@ class UserProfileChannelDonationAdapter : RecyclerView.Adapter<UserProfileChanne
|
|||||||
fun bind(item: GetChannelDonationListItem) {
|
fun bind(item: GetChannelDonationListItem) {
|
||||||
binding.ivProfile.load(item.profileUrl) {
|
binding.ivProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -5,7 +5,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemUserProfileChannelDonationAllBinding
|
import kr.co.vividnext.sodalive.databinding.ItemUserProfileChannelDonationAllBinding
|
||||||
|
|
||||||
class UserProfileChannelDonationAllAdapter : RecyclerView.Adapter<UserProfileChannelDonationAllAdapter.ViewHolder>() {
|
class UserProfileChannelDonationAllAdapter : RecyclerView.Adapter<UserProfileChannelDonationAllAdapter.ViewHolder>() {
|
||||||
@@ -19,7 +18,6 @@ class UserProfileChannelDonationAllAdapter : RecyclerView.Adapter<UserProfileCha
|
|||||||
fun bind(item: GetChannelDonationListItem) {
|
fun bind(item: GetChannelDonationListItem) {
|
||||||
binding.ivProfile.load(item.profileUrl) {
|
binding.ivProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -46,7 +46,6 @@ class UserProfileCheersAdapter(
|
|||||||
|
|
||||||
binding.ivProfile.load(cheers.profileUrl) {
|
binding.ivProfile.load(cheers.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(16.7f.dpToPx()))
|
transformations(RoundedCornersTransformation(16.7f.dpToPx()))
|
||||||
}
|
}
|
||||||
binding.tvContent.text = cheers.content
|
binding.tvContent.text = cheers.content
|
||||||
|
|||||||
-3
@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView
|
|||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import coil.transform.Transformation
|
import coil.transform.Transformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.common.image.BlurTransformation
|
import kr.co.vividnext.sodalive.common.image.BlurTransformation
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorCommunityBinding
|
import kr.co.vividnext.sodalive.databinding.ItemCreatorCommunityBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -27,7 +26,6 @@ class CreatorCommunityAdapter(
|
|||||||
fun bind(item: GetCommunityPostListResponse) {
|
fun bind(item: GetCommunityPostListResponse) {
|
||||||
binding.ivCreatorProfile.loadUrl(item.creatorProfileUrl) {
|
binding.ivCreatorProfile.loadUrl(item.creatorProfileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
binding.tvCreatorNickname.text = item.creatorNickname
|
binding.tvCreatorNickname.text = item.creatorNickname
|
||||||
@@ -36,7 +34,6 @@ class CreatorCommunityAdapter(
|
|||||||
binding.tvContent.text = item.content
|
binding.tvContent.text = item.content
|
||||||
binding.ivPostImage.loadUrl(item.imageUrl) {
|
binding.ivPostImage.loadUrl(item.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
val transformationList = mutableListOf<Transformation>(
|
val transformationList = mutableListOf<Transformation>(
|
||||||
RoundedCornersTransformation(12f.dpToPx())
|
RoundedCornersTransformation(12f.dpToPx())
|
||||||
)
|
)
|
||||||
|
|||||||
-27
@@ -14,9 +14,6 @@ import androidx.activity.result.contract.ActivityResultContracts
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -31,7 +28,6 @@ import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.player.Cr
|
|||||||
import kr.co.vividnext.sodalive.explorer.profile.creator_community.modify.CreatorCommunityModifyActivity
|
import kr.co.vividnext.sodalive.explorer.profile.creator_community.modify.CreatorCommunityModifyActivity
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBinding>(
|
class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBinding>(
|
||||||
ActivityCreatorCommunityAllBinding::inflate
|
ActivityCreatorCommunityAllBinding::inflate
|
||||||
@@ -146,7 +142,6 @@ class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBind
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
mediaPlayerManager.stopContent()
|
mediaPlayerManager.stopContent()
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
}
|
}
|
||||||
@@ -262,32 +257,10 @@ class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBind
|
|||||||
)
|
)
|
||||||
|
|
||||||
setupRecyclerViews()
|
setupRecyclerViews()
|
||||||
setupInlineBanner()
|
|
||||||
|
|
||||||
switchToListMode(0, fromGridItemClick = false)
|
switchToListMode(0, fromGridItemClick = false)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_CREATOR_COMMUNITY_ALL_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
this@CreatorCommunityAllActivity,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressLint("NotifyDataSetChanged")
|
@SuppressLint("NotifyDataSetChanged")
|
||||||
private fun bindData() {
|
private fun bindData() {
|
||||||
viewModel.toastLiveData.observe(this) {
|
viewModel.toastLiveData.observe(this) {
|
||||||
|
|||||||
-4
@@ -63,7 +63,6 @@ class CreatorCommunityAllAdapter(
|
|||||||
binding.tvNickname.text = item.creatorNickname
|
binding.tvNickname.text = item.creatorNickname
|
||||||
binding.ivCreatorProfile.loadUrl(item.creatorProfileUrl) {
|
binding.ivCreatorProfile.loadUrl(item.creatorProfileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,7 +157,6 @@ class CreatorCommunityAllAdapter(
|
|||||||
ivContent.visibility = View.VISIBLE
|
ivContent.visibility = View.VISIBLE
|
||||||
Glide.with(context)
|
Glide.with(context)
|
||||||
.load(imageUrl)
|
.load(imageUrl)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
@@ -189,7 +187,6 @@ class CreatorCommunityAllAdapter(
|
|||||||
if (commentCount > 0 && comment != null) {
|
if (commentCount > 0 && comment != null) {
|
||||||
binding.ivCommentProfile.load(comment.profileUrl) {
|
binding.ivCommentProfile.load(comment.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
binding.tvCommentText.text = comment.comment
|
binding.tvCommentText.text = comment.comment
|
||||||
@@ -208,7 +205,6 @@ class CreatorCommunityAllAdapter(
|
|||||||
binding.rlInputComment.visibility = View.VISIBLE
|
binding.rlInputComment.visibility = View.VISIBLE
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemCreatorCommunityAllGridBinding
|
import kr.co.vividnext.sodalive.databinding.ItemCreatorCommunityAllGridBinding
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.creator_community.GetCommunityPostListResponse
|
import kr.co.vividnext.sodalive.explorer.profile.creator_community.GetCommunityPostListResponse
|
||||||
import kr.co.vividnext.sodalive.extensions.loadUrl
|
import kr.co.vividnext.sodalive.extensions.loadUrl
|
||||||
@@ -49,7 +48,6 @@ class CreatorCommunityAllGridAdapter(
|
|||||||
binding.ivGridLock.visibility = View.GONE
|
binding.ivGridLock.visibility = View.GONE
|
||||||
binding.ivGridImage.loadUrl(item.imageUrl) {
|
binding.ivGridImage.loadUrl(item.imageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -30,7 +30,6 @@ class CreatorCommunityCommentAdapter(
|
|||||||
fun bind(item: GetCommunityPostCommentListItem) {
|
fun bind(item: GetCommunityPostCommentListItem) {
|
||||||
binding.ivCommentProfile.load(item.profileUrl) {
|
binding.ivCommentProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -68,7 +68,6 @@ class CreatorCommunityCommentListFragment : BaseFragment<FragmentAudioContentCom
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -110,7 +110,6 @@ class CreatorCommunityCommentReplyHeaderViewHolder(
|
|||||||
override fun bind(item: GetCommunityPostCommentListItem) {
|
override fun bind(item: GetCommunityPostCommentListItem) {
|
||||||
binding.ivCommentProfile.loadUrl(item.profileUrl) {
|
binding.ivCommentProfile.loadUrl(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,7 +139,6 @@ class CreatorCommunityCommentReplyItemViewHolder(
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(item.profileUrl) {
|
binding.ivCommentProfile.load(item.profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -87,7 +87,6 @@ class CreatorCommunityCommentReplyFragment : BaseFragment<FragmentAudioContentCo
|
|||||||
|
|
||||||
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
binding.ivCommentProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -84,7 +84,6 @@ class CreatorCommunityModifyActivity : BaseActivity<ActivityCreatorCommunityModi
|
|||||||
binding.ivContent.background = null
|
binding.ivContent.background = null
|
||||||
Glide.with(this)
|
Glide.with(this)
|
||||||
.load(uri)
|
.load(uri)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
@@ -180,7 +179,6 @@ class CreatorCommunityModifyActivity : BaseActivity<ActivityCreatorCommunityModi
|
|||||||
binding.ivContent.background = null
|
binding.ivContent.background = null
|
||||||
Glide.with(this)
|
Glide.with(this)
|
||||||
.load(it)
|
.load(it)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
|
|||||||
-1
@@ -75,7 +75,6 @@ class CreatorCommunityWriteActivity :
|
|||||||
binding.ivContent.background = null
|
binding.ivContent.background = null
|
||||||
Glide.with(this)
|
Glide.with(this)
|
||||||
.load(uri)
|
.load(uri)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
|
|||||||
-1
@@ -55,7 +55,6 @@ class CreatorDetailDialog(
|
|||||||
private fun bindData() {
|
private fun bindData() {
|
||||||
dialogView.ivProfile.load(detail.profileImageUrl) {
|
dialogView.ivProfile.load(detail.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
dialogView.tvNickname.text = detail.nickname
|
dialogView.tvNickname.text = detail.nickname
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ class UserProfileDonationAdapter : RecyclerView.Adapter<UserProfileDonationAdapt
|
|||||||
|
|
||||||
binding.ivProfile.load(item.profileImage) {
|
binding.ivProfile.load(item.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -33,7 +33,6 @@ class UserProfileDonationAllAdapter(private val userId: Long) :
|
|||||||
|
|
||||||
binding.ivProfile.load(item.profileImage) {
|
binding.ivProfile.load(item.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -24,7 +24,6 @@ class UserFollowerListAdapter(
|
|||||||
binding.tvNickname.text = item.nickname
|
binding.tvNickname.text = item.nickname
|
||||||
binding.ivProfile.load(item.profileImage) {
|
binding.ivProfile.load(item.profileImage) {
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -27,7 +27,6 @@ class UserProfileSeriesListAdapter(
|
|||||||
fun bind(item: GetSeriesListResponse.SeriesListItem) {
|
fun bind(item: GetSeriesListResponse.SeriesListItem) {
|
||||||
binding.ivCover.load(item.coverImage) {
|
binding.ivCover.load(item.coverImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(5f.dpToPx()))
|
transformations(RoundedCornersTransformation(5f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +61,6 @@ class UserProfileSeriesListAdapter(
|
|||||||
binding.tvCreator.text = item.creator.nickname
|
binding.tvCreator.text = item.creator.nickname
|
||||||
binding.ivCreator.load(item.creator.profileImage) {
|
binding.ivCreator.load(item.creator.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
binding.llCreator.setOnClickListener { onClickCreator(item.creator.creatorId) }
|
binding.llCreator.setOnClickListener { onClickCreator(item.creator.creatorId) }
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ class FollowingCreatorAdapter(
|
|||||||
binding.tvNickname.text = item.nickname
|
binding.tvNickname.text = item.nickname
|
||||||
binding.ivProfile.load(item.profileImageUrl) {
|
binding.ivProfile.load(item.profileImageUrl) {
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemHomeContentBinding
|
import kr.co.vividnext.sodalive.databinding.ItemHomeContentBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -61,7 +60,6 @@ class HomeContentAdapter(
|
|||||||
|
|
||||||
binding.ivContentCoverImage.load(item.coverImageUrl) {
|
binding.ivContentCoverImage.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
@@ -53,10 +52,7 @@ import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment
|
|||||||
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
||||||
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.search.SearchActivity
|
import kr.co.vividnext.sodalive.search.SearchActivity
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
@@ -64,7 +60,6 @@ import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
|||||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -78,7 +73,6 @@ import kotlinx.coroutines.launch
|
|||||||
class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::inflate) {
|
class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::inflate) {
|
||||||
private val viewModel: HomeViewModel by inject()
|
private val viewModel: HomeViewModel by inject()
|
||||||
private val liveViewModel: LiveViewModel by inject()
|
private val liveViewModel: LiveViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
|
|
||||||
@@ -1368,29 +1362,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onCharacterClick(characterId: Long) {
|
private fun onCharacterClick(characterId: Long) {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ class HomeRecommendChannelAdapter(
|
|||||||
fun bind(item: RecommendChannelResponse) {
|
fun bind(item: RecommendChannelResponse) {
|
||||||
binding.ivCreatorProfile.load(item.creatorProfileImageUrl) {
|
binding.ivCreatorProfile.load(item.creatorProfileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(android.R.drawable.ic_menu_gallery)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,7 +38,6 @@ class HomeRecommendChannelAdapter(
|
|||||||
0 -> {
|
0 -> {
|
||||||
binding.ivCover1.load(content.thumbnailImageUrl) {
|
binding.ivCover1.load(content.thumbnailImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(android.R.drawable.ic_menu_gallery)
|
|
||||||
transformations(RoundedCornersTransformation(12f))
|
transformations(RoundedCornersTransformation(12f))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,7 +51,6 @@ class HomeRecommendChannelAdapter(
|
|||||||
1 -> {
|
1 -> {
|
||||||
binding.ivCover2.load(content.thumbnailImageUrl) {
|
binding.ivCover2.load(content.thumbnailImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(android.R.drawable.ic_menu_gallery)
|
|
||||||
transformations(RoundedCornersTransformation(12f))
|
transformations(RoundedCornersTransformation(12f))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,7 +64,6 @@ class HomeRecommendChannelAdapter(
|
|||||||
2 -> {
|
2 -> {
|
||||||
binding.ivCover3.load(content.thumbnailImageUrl) {
|
binding.ivCover3.load(content.thumbnailImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(android.R.drawable.ic_menu_gallery)
|
|
||||||
transformations(RoundedCornersTransformation(12f))
|
transformations(RoundedCornersTransformation(12f))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ class HomeSeriesAdapter(
|
|||||||
@SuppressLint("SetTextI18n")
|
@SuppressLint("SetTextI18n")
|
||||||
fun bind(item: GetSeriesListResponse.SeriesListItem) {
|
fun bind(item: GetSeriesListResponse.SeriesListItem) {
|
||||||
binding.ivCover.load(item.coverImage) {
|
binding.ivCover.load(item.coverImage) {
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
transformations(RoundedCornersTransformation(16f.dpToPx()))
|
||||||
|
|
||||||
if (itemWidth != null) {
|
if (itemWidth != null) {
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentRankingItem
|
import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentRankingItem
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemHomeContentRankingBinding
|
import kr.co.vividnext.sodalive.databinding.ItemHomeContentRankingBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
@@ -35,7 +34,6 @@ class HomeWeeklyChartAdapter(
|
|||||||
|
|
||||||
binding.ivCover.load(item.coverImageUrl) {
|
binding.ivCover.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(12f.dpToPx()))
|
transformations(RoundedCornersTransformation(12f.dpToPx()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-31
@@ -8,9 +8,6 @@ import android.view.View
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
@@ -19,7 +16,6 @@ import kr.co.vividnext.sodalive.extensions.dpToPx
|
|||||||
import kr.co.vividnext.sodalive.home.HomeContentThemeAdapter
|
import kr.co.vividnext.sodalive.home.HomeContentThemeAdapter
|
||||||
import kr.co.vividnext.sodalive.settings.notification.NotificationReceiveSettingsActivity
|
import kr.co.vividnext.sodalive.settings.notification.NotificationReceiveSettingsActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class PushNotificationListActivity : BaseActivity<ActivityPushNotificationListBinding>(
|
class PushNotificationListActivity : BaseActivity<ActivityPushNotificationListBinding>(
|
||||||
ActivityPushNotificationListBinding::inflate
|
ActivityPushNotificationListBinding::inflate
|
||||||
@@ -47,36 +43,9 @@ class PushNotificationListActivity : BaseActivity<ActivityPushNotificationListBi
|
|||||||
}
|
}
|
||||||
|
|
||||||
setupCategoryList()
|
setupCategoryList()
|
||||||
setupInlineBanner()
|
|
||||||
setupNotificationList()
|
setupNotificationList()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_PUSH_NOTIFICATION_LIST_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
this@PushNotificationListActivity,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupCategoryList() {
|
private fun setupCategoryList() {
|
||||||
categoryAdapter = HomeContentThemeAdapter("") { selectedCategory ->
|
categoryAdapter = HomeContentThemeAdapter("") { selectedCategory ->
|
||||||
viewModel.selectCategory(selectedCategory)
|
viewModel.selectCategory(selectedCategory)
|
||||||
|
|||||||
-3
@@ -6,7 +6,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemPushNotificationListBinding
|
import kr.co.vividnext.sodalive.databinding.ItemPushNotificationListBinding
|
||||||
|
|
||||||
class PushNotificationListAdapter(
|
class PushNotificationListAdapter(
|
||||||
@@ -21,8 +20,6 @@ class PushNotificationListAdapter(
|
|||||||
fun bind(item: PushNotificationListItem) {
|
fun bind(item: PushNotificationListItem) {
|
||||||
binding.ivProfile.load(item.senderProfileImage) {
|
binding.ivProfile.load(item.senderProfileImage) {
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
error(R.drawable.ic_place_holder)
|
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
}
|
}
|
||||||
binding.tvNickname.text = item.senderNickname
|
binding.tvNickname.text = item.senderNickname
|
||||||
|
|||||||
@@ -21,13 +21,9 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
||||||
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
||||||
@@ -61,17 +57,13 @@ import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
|||||||
import kr.co.vividnext.sodalive.live.room.update.LiveRoomEditActivity
|
import kr.co.vividnext.sodalive.live.room.update.LiveRoomEditActivity
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.message.MessageActivity
|
import kr.co.vividnext.sodalive.message.MessageActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.search.SearchActivity
|
import kr.co.vividnext.sodalive.search.SearchActivity
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -85,7 +77,6 @@ import kotlin.math.roundToInt
|
|||||||
@UnstableApi
|
@UnstableApi
|
||||||
class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::inflate) {
|
class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::inflate) {
|
||||||
private val viewModel: LiveViewModel by inject()
|
private val viewModel: LiveViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var liveNowAdapter: LiveNowAdapter
|
private lateinit var liveNowAdapter: LiveNowAdapter
|
||||||
private lateinit var liveReservationAdapter: LiveReservationAdapter
|
private lateinit var liveReservationAdapter: LiveReservationAdapter
|
||||||
@@ -133,11 +124,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
viewModel.getLiveMain()
|
viewModel.getLiveMain()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupView() {
|
private fun setupView() {
|
||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
|
|
||||||
@@ -162,31 +148,9 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
setupRecommendChannel()
|
setupRecommendChannel()
|
||||||
setupLatestFinishedLiveChannel()
|
setupLatestFinishedLiveChannel()
|
||||||
setupLiveReplay()
|
setupLiveReplay()
|
||||||
setupLiveTabInlineBanner()
|
|
||||||
setupLiveReservation()
|
setupLiveReservation()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupLiveTabInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_LIVE_TAB_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun renderMakeLiveByRole(role: String) {
|
private fun renderMakeLiveByRole(role: String) {
|
||||||
if (role == MemberRole.CREATOR.name) {
|
if (role == MemberRole.CREATOR.name) {
|
||||||
binding.llMakeLive.visibility = View.VISIBLE
|
binding.llMakeLive.visibility = View.VISIBLE
|
||||||
@@ -911,29 +875,7 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@UnstableApi
|
@UnstableApi
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
||||||
import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService
|
import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService
|
||||||
@@ -27,14 +26,10 @@ import kr.co.vividnext.sodalive.live.room.LiveRoomActivity
|
|||||||
import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment
|
import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment
|
||||||
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
||||||
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -47,7 +42,6 @@ class LiveNowAllActivity : BaseActivity<ActivityLiveNowAllBinding>(
|
|||||||
ActivityLiveNowAllBinding::inflate
|
ActivityLiveNowAllBinding::inflate
|
||||||
) {
|
) {
|
||||||
private val viewModel: LiveViewModel by inject()
|
private val viewModel: LiveViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var adapter: LiveNowAllAdapter
|
private lateinit var adapter: LiveNowAllAdapter
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
@@ -163,29 +157,7 @@ class LiveNowAllActivity : BaseActivity<ActivityLiveNowAllBinding>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(this, applicationContext) { json ->
|
V2AuthFlow.start(this)
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
applicationContext,
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun enterLiveRoom(roomId: Long) {
|
private fun enterLiveRoom(roomId: Long) {
|
||||||
|
|||||||
-1
@@ -54,7 +54,6 @@ class LiveRecommendChannelAdapter(
|
|||||||
fun bind(item: GetRecommendChannelResponse) {
|
fun bind(item: GetRecommendChannelResponse) {
|
||||||
binding.ivRecommendChannel.load(item.profileImageUrl) {
|
binding.ivRecommendChannel.load(item.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(30f.dpToPx()))
|
transformations(RoundedCornersTransformation(30f.dpToPx()))
|
||||||
}
|
}
|
||||||
binding.tvRecommendChannelNickname.text = item.nickname
|
binding.tvRecommendChannelNickname.text = item.nickname
|
||||||
|
|||||||
-1
@@ -162,7 +162,6 @@ class LiveReservationCancelActivity : BaseActivity<ActivityLiveReservationCancel
|
|||||||
binding.tvTitle.text = response.title
|
binding.tvTitle.text = response.title
|
||||||
binding.ivProfile.load(response.coverImageUrl) {
|
binding.ivProfile.load(response.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
|
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -40,7 +40,6 @@ class LiveReservationStatusAdapter(
|
|||||||
binding.tvTitle.text = item.title
|
binding.tvTitle.text = item.title
|
||||||
binding.ivProfile.load(item.coverImageUrl) {
|
binding.ivProfile.load(item.coverImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
|
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1290,7 +1290,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
|||||||
binding.tvCreatorNickname.text = response.creatorNickname
|
binding.tvCreatorNickname.text = response.creatorNickname
|
||||||
binding.ivCreatorProfile.loadUrl(response.creatorProfileUrl) {
|
binding.ivCreatorProfile.loadUrl(response.creatorProfileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import androidx.appcompat.app.AlertDialog
|
|||||||
import androidx.core.graphics.drawable.toDrawable
|
import androidx.core.graphics.drawable.toDrawable
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.DialogLiveNoChattingBinding
|
import kr.co.vividnext.sodalive.databinding.DialogLiveNoChattingBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -44,7 +43,6 @@ class LiveRoomNoChattingDialog(
|
|||||||
dialogView.tvNickname.text = nickname
|
dialogView.tvNickname.text = nickname
|
||||||
dialogView.ivProfile.load(profileUrl) {
|
dialogView.ivProfile.load(profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.bg_placeholder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -127,7 +127,6 @@ data class LiveRoomNormalChat(
|
|||||||
val itemBinding = binding as ItemLiveRoomChatBinding
|
val itemBinding = binding as ItemLiveRoomChatBinding
|
||||||
itemBinding.ivProfile.load(profileUrl) {
|
itemBinding.ivProfile.load(profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -331,7 +330,6 @@ data class LiveRoomDonationChat(
|
|||||||
|
|
||||||
itemBinding.ivProfile.load(profileUrl) {
|
itemBinding.ivProfile.load(profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
itemBinding.tvChat.text = spChat
|
itemBinding.tvChat.text = spChat
|
||||||
@@ -455,7 +453,6 @@ data class LiveRoomRouletteDonationChat(
|
|||||||
|
|
||||||
itemBinding.ivProfile.load(profileUrl) {
|
itemBinding.ivProfile.load(profileUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
|
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
|
||||||
}
|
}
|
||||||
itemBinding.tvChat.text = spChat
|
itemBinding.tvChat.text = spChat
|
||||||
|
|||||||
@@ -147,7 +147,6 @@ class LiveRoomCreateActivity : BaseActivity<ActivityLiveRoomCreateBinding>(
|
|||||||
binding.ivCover.background = null
|
binding.ivCover.background = null
|
||||||
Glide.with(binding.ivCover.context)
|
Glide.with(binding.ivCover.context)
|
||||||
.load(uri)
|
.load(uri)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
@@ -321,7 +320,6 @@ class LiveRoomCreateActivity : BaseActivity<ActivityLiveRoomCreateBinding>(
|
|||||||
binding.ivCover.background = null
|
binding.ivCover.background = null
|
||||||
Glide.with(binding.ivCover.context)
|
Glide.with(binding.ivCover.context)
|
||||||
.load(it.coverImageUrl)
|
.load(it.coverImageUrl)
|
||||||
.placeholder(R.drawable.ic_place_holder)
|
|
||||||
.apply(
|
.apply(
|
||||||
RequestOptions().transform(
|
RequestOptions().transform(
|
||||||
RoundedCorners(
|
RoundedCorners(
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import kr.co.vividnext.sodalive.R
|
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemLiveRoomDetailUserBinding
|
import kr.co.vividnext.sodalive.databinding.ItemLiveRoomDetailUserBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
|
|
||||||
@@ -22,7 +21,6 @@ class LiveRoomDetailAdapter(
|
|||||||
binding.tvNickname.text = item.nickname
|
binding.tvNickname.text = item.nickname
|
||||||
binding.ivProfile.load(item.profileImageUrl) {
|
binding.ivProfile.load(item.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
|
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
|
||||||
}
|
}
|
||||||
binding.root.setOnClickListener { onClick(item) }
|
binding.root.setOnClickListener { onClick(item) }
|
||||||
|
|||||||
@@ -19,9 +19,6 @@ import coil.transform.CircleCropTransformation
|
|||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
||||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||||
@@ -36,7 +33,6 @@ import org.koin.android.ext.android.inject
|
|||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import java.util.TimeZone
|
import java.util.TimeZone
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class LiveRoomDetailFragment(
|
class LiveRoomDetailFragment(
|
||||||
private val roomId: Long,
|
private val roomId: Long,
|
||||||
@@ -81,39 +77,11 @@ class LiveRoomDetailFragment(
|
|||||||
behavior.state = BottomSheetBehavior.STATE_EXPANDED
|
behavior.state = BottomSheetBehavior.STATE_EXPANDED
|
||||||
|
|
||||||
setupAdapter()
|
setupAdapter()
|
||||||
setupLiveRoomDetailInlineBanner()
|
|
||||||
bindData()
|
bindData()
|
||||||
binding.ivClose.setOnClickListener { dismiss() }
|
binding.ivClose.setOnClickListener { dismiss() }
|
||||||
viewModel.getDetail(roomId) { dismiss() }
|
viewModel.getDetail(roomId) { dismiss() }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupLiveRoomDetailInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val screenWidth = resources.displayMetrics.widthPixels
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_LIVE_ROOM_DETAIL_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupAdapter() {
|
private fun setupAdapter() {
|
||||||
val recyclerView = binding.rvParticipate
|
val recyclerView = binding.rvParticipate
|
||||||
adapter = LiveRoomDetailAdapter {}
|
adapter = LiveRoomDetailAdapter {}
|
||||||
@@ -305,7 +273,6 @@ class LiveRoomDetailFragment(
|
|||||||
binding.tvManagerIntroduce.text = manager.introduce
|
binding.tvManagerIntroduce.text = manager.introduce
|
||||||
binding.ivManagerProfile.load(manager.profileImageUrl) {
|
binding.ivManagerProfile.load(manager.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -393,7 +360,6 @@ class LiveRoomDetailFragment(
|
|||||||
val itemView = ItemLiveDetailUserSummaryBinding.inflate(layoutInflater)
|
val itemView = ItemLiveDetailUserSummaryBinding.inflate(layoutInflater)
|
||||||
itemView.ivProfile.load(user.profileImageUrl) {
|
itemView.ivProfile.load(user.profileImageUrl) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(RoundedCornersTransformation(16.7f.dpToPx()))
|
transformations(RoundedCornersTransformation(16.7f.dpToPx()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -161,7 +161,6 @@ class LiveRoomDonationDialog(
|
|||||||
|
|
||||||
dialogView.ivProfile.load(SharedPreferenceManager.profileImage) {
|
dialogView.ivProfile.load(SharedPreferenceManager.profileImage) {
|
||||||
crossfade(true)
|
crossfade(true)
|
||||||
placeholder(R.drawable.ic_place_holder)
|
|
||||||
transformations(CircleCropTransformation())
|
transformations(CircleCropTransformation())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user