Skip to content
New issue

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

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

Jump to bottom

[fix] 위니 업로드 / 이미지 크기 5MB 이하로 압축 #180

Merged
merged 6 commits into from
Sep 2, 2023
Merged

[fix] 위니 업로드 / 이미지 크기 5MB 이하로 압축 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf4c123
[mod] 패키지 이름 변경
leeeha Sep 1, 2023
bb6b8e7
[feat] #179 이미지 회전 및 압축 기능 구현
leeeha Sep 1, 2023
6289a71
[del] #179 사용하지 않는 코드 삭제
leeeha Sep 1, 2023
03c6616
[chore] #179 회전 후 압축하는 코드에 주석 추가
leeeha Sep 1, 2023
7ea25ad
[mod] 버전 코드 최종적으로 수정
leeeha Sep 1, 2023
e6465cd
[del] 스플래시 화면에서 사용하지 않는 함수 삭제
leeeha Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/release/output-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.go.sopt.winey",
"applicationId": "org.go.sopt.winey",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 10100,
"versionCode": 2,
"versionName": "1.0.0",
"outputFile": "app-release.apk"
}
Expand Down
4 changes: 2 additions & 2 deletions .../go/sopt/winey/ExampleInstrumentedTest.kt → .../go/sopt/winey/ExampleInstrumentedTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey
package org.go.sopt.winey

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
Expand All @@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
Assert.assertEquals("com.go.sopt.com.go.sopt.winey", appContext.packageName)
Assert.assertEquals("org.go.sopt.winey", appContext.packageName)
}
}
63 changes: 0 additions & 63 deletions app/src/main/java/com/go/sopt/winey/util/multipart/BitmapRequestBody.kt
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions app/src/main/java/com/go/sopt/winey/util/multipart/ImageCompressor.kt
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions app/src/main/java/com/go/sopt/winey/util/multipart/UriToRequestBody.kt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ava/com/go/sopt/winey/WineyApplication.kt → ...ava/org/go/sopt/winey/WineyApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.go.sopt.winey
package org.go.sopt.winey

import android.app.Application
import com.go.sopt.winey.BuildConfig.KAKAO_NATIVE_KEY
import com.kakao.sdk.common.KakaoSdk
import dagger.hilt.android.HiltAndroidApp
import org.go.sopt.winey.BuildConfig.KAKAO_NATIVE_KEY
import timber.log.Timber

@HiltAndroidApp
Expand Down
18 changes: 9 additions & 9 deletions ...winey/data/interceptor/AuthInterceptor.kt → ...winey/data/interceptor/AuthInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package com.go.sopt.winey.data.interceptor
package org.go.sopt.winey.data.interceptor

import android.content.Context
import com.go.sopt.winey.BuildConfig.AUTH_BASE_URL
import com.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
import com.go.sopt.winey.data.model.remote.response.base.BaseResponse
import com.go.sopt.winey.domain.repository.DataStoreRepository
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.first
Expand All @@ -14,6 +10,10 @@ import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response
import org.go.sopt.winey.BuildConfig.AUTH_BASE_URL
import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
import org.go.sopt.winey.data.model.remote.response.base.BaseResponse
import org.go.sopt.winey.domain.repository.DataStoreRepository
import timber.log.Timber
import javax.inject.Inject

Expand All @@ -32,7 +32,7 @@ class AuthInterceptor @Inject constructor(
val response = chain.proceed(headerRequest)

when (response.code) {
com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.CODE_TOKEN_EXPIRED -> {
CODE_TOKEN_EXPIRED -> {
try {
Timber.e("액세스 토큰 만료, 토큰 재발급 합니다.")
response.close()
Expand All @@ -43,15 +43,15 @@ class AuthInterceptor @Inject constructor(
}
}

com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.CODE_INVALID_USER -> {
CODE_INVALID_USER -> {
saveAccessToken("", "")
}
}
return response
}

private fun Request.newAuthBuilder() =
this.newBuilder().addHeader(com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.HEADER_TOKEN, runBlocking(Dispatchers.IO) { getAccessToken() })
this.newBuilder().addHeader(HEADER_TOKEN, runBlocking(Dispatchers.IO) { getAccessToken() })

private suspend fun getAccessToken(): String {
return dataStoreRepository.getAccessToken().first() ?: ""
Expand All @@ -69,7 +69,7 @@ class AuthInterceptor @Inject constructor(
private fun handleTokenExpired(chain: Interceptor.Chain, originalRequest: Request, headerRequest: Request): Response {
val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody())
.url("$AUTH_BASE_URL/auth/token")
.addHeader(com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() })
.addHeader(REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() })
.build()
val refreshTokenResponse = chain.proceed(refreshTokenRequest)
Timber.e("리프레시 토큰 : $refreshTokenResponse")
Expand Down
2 changes: 1 addition & 1 deletion ...el/remote/request/RequestCreateGoalDto.kt → ...el/remote/request/RequestCreateGoalDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.request
package org.go.sopt.winey.data.model.remote.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
2 changes: 1 addition & 1 deletion ...a/model/remote/request/RequestLoginDto.kt → ...a/model/remote/request/RequestLoginDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.request
package org.go.sopt.winey.data.model.remote.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
2 changes: 1 addition & 1 deletion ...remote/request/RequestPatchNicknameDto.kt → ...remote/request/RequestPatchNicknameDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.request
package org.go.sopt.winey.data.model.remote.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
2 changes: 1 addition & 1 deletion ...l/remote/request/RequestPostCommentDto.kt → ...l/remote/request/RequestPostCommentDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.request
package org.go.sopt.winey.data.model.remote.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
2 changes: 1 addition & 1 deletion ...odel/remote/request/RequestPostLikeDto.kt → ...odel/remote/request/RequestPostLikeDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.request
package org.go.sopt.winey.data.model.remote.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
4 changes: 2 additions & 2 deletions .../remote/response/ResponseCreateGoalDto.kt → .../remote/response/ResponseCreateGoalDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.go.sopt.winey.data.model.remote.response
package org.go.sopt.winey.data.model.remote.response

import com.go.sopt.winey.domain.entity.Goal
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import org.go.sopt.winey.domain.entity.Goal

@Serializable
data class ResponseCreateGoalDto(
Expand Down
2 changes: 1 addition & 1 deletion ...mote/response/ResponseDeleteCommentDto.kt → ...mote/response/ResponseDeleteCommentDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.response
package org.go.sopt.winey.data.model.remote.response

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
6 changes: 3 additions & 3 deletions ...mote/response/ResponseGetFeedDetailDto.kt → ...mote/response/ResponseGetFeedDetailDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.go.sopt.winey.data.model.remote.response
package org.go.sopt.winey.data.model.remote.response

import com.go.sopt.winey.domain.entity.Comment
import com.go.sopt.winey.domain.entity.DetailFeed
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import org.go.sopt.winey.domain.entity.Comment
import org.go.sopt.winey.domain.entity.DetailFeed

@Serializable
data class ResponseGetFeedDetailDto(
Expand Down
2 changes: 1 addition & 1 deletion ...e/ResponseGetNicknameDuplicateCheckDto.kt → ...e/ResponseGetNicknameDuplicateCheckDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.go.sopt.winey.data.model.remote.response
package org.go.sopt.winey.data.model.remote.response

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
4 changes: 2 additions & 2 deletions ...te/response/ResponseGetNotificationDto.kt → ...te/response/ResponseGetNotificationDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.go.sopt.winey.data.model.remote.response
package org.go.sopt.winey.data.model.remote.response

import com.go.sopt.winey.domain.entity.Notification
import org.go.sopt.winey.domain.entity.Notification
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

Expand Down
Loading