Skip to content

1.0.2 재배포 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpcks0509 merged 19 commits into from
May 13, 2025
Merged

1.0.2 재배포 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ebc3b9d
_
jinuemong Mar 23, 2025
f993789
_
jinuemong Mar 23, 2025
77c6a00
test: ci/cd
jinuemong Mar 23, 2025
1c0aecd
[feat] KaKao 장소 검색 API 연결 (#9)
dpcks0509 Mar 25, 2025
c4eb8ab
[feat] DefaultButtonSheet 생성 & Point 수집 UI 적용 (#10)
jinuemong Mar 26, 2025
b7c01c4
[feat] 썸네일 UI & 로직 구현 (#16)
jinuemong Mar 27, 2025
c87dc40
[feat] 코스 등록 네비게이션 구현 & 디자인 요구사항 적용 (#18)
jinuemong Mar 29, 2025
d7f55d5
[feat] 장소 검색 바텀시트 UI 구현 및 데이터 연결 (#19)
dpcks0509 Mar 30, 2025
1b18925
[feat] 장소에 도로명 주소 추가 (#21)
dpcks0509 Mar 31, 2025
eca607e
[feat] 시청형 광고 구현 (#26)
jinuemong Apr 3, 2025
c97a126
[feat] 장소검색 Paging 무한스크롤 & Debounce 적용 (#28)
dpcks0509 Apr 5, 2025
932087c
[feat] 포인트 로깅 추가 (#31)
jinuemong Apr 7, 2025
41ee075
[refactor] 장소 검색 LazyPaging 로직 개선 (#34)
jinuemong Apr 7, 2025
e22d248
[feat] 장소 검색 바텀시트 UI 구현 및 데이터 연결 (#19)
dpcks0509 Mar 30, 2025
d471d96
[feat] 장소검색 Paging 무한스크롤 & Debounce 적용 (#28)
dpcks0509 Apr 5, 2025
880ccc8
[refactor] 장소 검색 LazyPaging 로직 개선 (#34)
jinuemong Apr 7, 2025
6debd11
1차 QA 반영 (#42)
jinuemong Apr 29, 2025
325ed28
1차 QA 반영-3 (#48)
dpcks0509 May 8, 2025
b186597
fix: 광고 로직 오류 수정 (#53)
jinuemong May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" />

<application
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.sopt.teamdateroad.presentation.ui.coursedetail

import android.app.Activity
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Spacer
Expand Down Expand Up @@ -80,6 +81,7 @@ fun CourseDetailRoute(
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val lifecycleOwner = LocalLifecycleOwner.current
val context = LocalContext.current
val activity = context as? Activity
val adRequest = remember { AdRequest.Builder().build() }

LaunchedEffect(viewModel.sideEffect, lifecycleOwner) {
Expand All @@ -95,7 +97,11 @@ fun CourseDetailRoute(
adRequest,
object : RewardedAdLoadCallback() {
override fun onAdLoaded(ad: RewardedAd) {
viewModel.postAdsPoint()
activity?.let {
ad.show(it) { rewardItem ->
viewModel.postAdsPoint()
}
}
}

override fun onAdFailedToLoad(error: LoadAdError) {
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.sopt.teamdateroad.presentation.ui.pointhistory

import android.app.Activity
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -71,6 +72,7 @@ fun PointHistoryRoute(
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val lifecycleOwner = LocalLifecycleOwner.current
val context = LocalContext.current
val activity = context as? Activity
val adRequest = remember { AdRequest.Builder().build() }

LaunchedEffect(Unit) {
Expand All @@ -97,7 +99,11 @@ fun PointHistoryRoute(
adRequest,
object : RewardedAdLoadCallback() {
override fun onAdLoaded(ad: RewardedAd) {
viewModel.postAdsPoint()
activity?.let {
ad.show(it) { rewardItem ->
viewModel.postAdsPoint()
}
}
}

override fun onAdFailedToLoad(error: LoadAdError) {
Expand Down