From 30792c4ab4fec48aabd55ecc1b72cb4a3bdb4e9f Mon Sep 17 00:00:00 2001 From: kkh Date: Thu, 22 Aug 2024 10:36:50 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20Onboarding=20skip=20=EC=98=A8?= =?UTF-8?q?=EB=B3=B4=EB=94=A9=EC=9D=84=20=ED=95=9C=EB=B2=88=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=ED=96=88=EB=8B=A4=EB=A9=B4=20=EC=8A=A4=ED=82=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- .../java/com/echoist/linkedout/page/myLog/MyLogDetailPage.kt | 1 - .../java/com/echoist/linkedout/viewModels/MyLogViewModel.kt | 2 +- .../java/com/echoist/linkedout/viewModels/SettingsViewModel.kt | 3 ++- .../java/com/echoist/linkedout/viewModels/WritingViewModel.kt | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 16266aff..0a8f63e9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,7 +23,7 @@ android { minSdk = 26 targetSdk = 34 versionCode = 4 //todo 릴리즈 생성마다 +1 - versionName = "1.0.0" + versionName = "1.0.1" //1번수정 //git ignore 용입니다. //구글 네이티브 앱 키 buildConfigField( diff --git a/app/src/main/java/com/echoist/linkedout/page/myLog/MyLogDetailPage.kt b/app/src/main/java/com/echoist/linkedout/page/myLog/MyLogDetailPage.kt index 1af39383..96c3d431 100644 --- a/app/src/main/java/com/echoist/linkedout/page/myLog/MyLogDetailPage.kt +++ b/app/src/main/java/com/echoist/linkedout/page/myLog/MyLogDetailPage.kt @@ -846,7 +846,6 @@ fun WriteCompleteBox(type: String) { GlideImage( model = imageUrl, contentDescription = "", modifier = Modifier .weight(2f) - .height(210.dp) ) Column( horizontalAlignment = Alignment.CenterHorizontally, diff --git a/app/src/main/java/com/echoist/linkedout/viewModels/MyLogViewModel.kt b/app/src/main/java/com/echoist/linkedout/viewModels/MyLogViewModel.kt index b4dd09fe..aec61192 100644 --- a/app/src/main/java/com/echoist/linkedout/viewModels/MyLogViewModel.kt +++ b/app/src/main/java/com/echoist/linkedout/viewModels/MyLogViewModel.kt @@ -142,7 +142,7 @@ class MyLogViewModel @Inject constructor( Log.d("essaylist data", response.body()!!.path + response.body()!!.data) if (response.isSuccessful) { - Token.accessToken = response.headers()["authorization"]?.takeIf { it.isNotEmpty() } ?: Token.accessToken + Token.accessToken = response.headers()["authorization"]?.takeIf { it.isNotEmpty() } ?: Token.accessToken response.body()!!.data.essays.forEach { essay -> // publishedEssayList에 이미 해당 essay가 존재하는지 확인 diff --git a/app/src/main/java/com/echoist/linkedout/viewModels/SettingsViewModel.kt b/app/src/main/java/com/echoist/linkedout/viewModels/SettingsViewModel.kt index 12edadfb..d91f4ab6 100644 --- a/app/src/main/java/com/echoist/linkedout/viewModels/SettingsViewModel.kt +++ b/app/src/main/java/com/echoist/linkedout/viewModels/SettingsViewModel.kt @@ -194,7 +194,8 @@ class SettingsViewModel @Inject constructor( val response = userApi.requestBadgeLevelUp(bearerAccessToken,Token.refreshToken, badgeId) Log.d(TAG, "requestBadgeLevelUp: ${Token.accessToken}") - Token.accessToken = response.headers()["authorization"]?.takeIf { it.isNotEmpty() } ?: Token.accessToken + Token.accessToken = response.headers()["authorization"]?.takeIf { it.isNotEmpty() } ?: Token.accessToken + if (response.body()!!.success){ isLevelUpSuccess = true delay(1000) diff --git a/app/src/main/java/com/echoist/linkedout/viewModels/WritingViewModel.kt b/app/src/main/java/com/echoist/linkedout/viewModels/WritingViewModel.kt index 3aa643ea..a6bbbae5 100644 --- a/app/src/main/java/com/echoist/linkedout/viewModels/WritingViewModel.kt +++ b/app/src/main/java/com/echoist/linkedout/viewModels/WritingViewModel.kt @@ -204,6 +204,8 @@ class WritingViewModel @Inject constructor( tags = hashTagList ) val response = essayApi.writeEssay(bearerAccessToken, Token.refreshToken,essayData = essayData) + Token.accessToken = response.headers()["authorization"]?.takeIf { it.isNotEmpty() } ?: Token.accessToken + if (response.isSuccessful) { exampleItems.detailEssay = response.body()!!.data!! exampleItems.detailEssayBackStack.push(exampleItems.detailEssay)