Merge branch 'develop' into feature/fix-wineyfeed-refresh-scroll-posi…

…tion # Conflicts: # app/src/main/java/org/go/sopt/winey/data/interceptor/AuthInterceptor.kt
team-winey · Sep 2, 2023 · 2f8143a · 2f8143a
2 parents 2cb211e + 0daeae5
commit 2f8143a
Show file tree

Hide file tree

Showing 157 changed files with 770 additions and 874 deletions.
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -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"
     }

diff --git a/.../go/sopt/winey/ExampleInstrumentedTest.kt → .../go/sopt/winey/ExampleInstrumentedTest.kt b/.../go/sopt/winey/ExampleInstrumentedTest.kt → .../go/sopt/winey/ExampleInstrumentedTest.kt
@@ -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
@@ -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)
     }
 }
diff --git a/app/src/main/java/com/go/sopt/winey/util/multipart/BitmapRequestBody.kt b/app/src/main/java/com/go/sopt/winey/util/multipart/BitmapRequestBody.kt
diff --git a/app/src/main/java/com/go/sopt/winey/util/multipart/ImageCompressor.kt b/app/src/main/java/com/go/sopt/winey/util/multipart/ImageCompressor.kt
diff --git a/app/src/main/java/com/go/sopt/winey/util/multipart/UriToRequestBody.kt b/app/src/main/java/com/go/sopt/winey/util/multipart/UriToRequestBody.kt
diff --git a/...ava/com/go/sopt/winey/WineyApplication.kt → ...ava/org/go/sopt/winey/WineyApplication.kt b/...ava/com/go/sopt/winey/WineyApplication.kt → ...ava/org/go/sopt/winey/WineyApplication.kt
@@ -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

diff --git a/...winey/data/interceptor/AuthInterceptor.kt → ...winey/data/interceptor/AuthInterceptor.kt b/...winey/data/interceptor/AuthInterceptor.kt → ...winey/data/interceptor/AuthInterceptor.kt
@@ -1,9 +1,7 @@
-package com.go.sopt.winey.data.interceptor
+package org.go.sopt.winey.data.interceptor
 
-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 android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
@@ -12,10 +10,15 @@ 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
 
 class AuthInterceptor @Inject constructor(
+    @ApplicationContext context: Context,
     private val json: Json,
     private val dataStoreRepository: DataStoreRepository
 ) : Interceptor {

diff --git a/...el/remote/request/RequestCreateGoalDto.kt → ...el/remote/request/RequestCreateGoalDto.kt b/...el/remote/request/RequestCreateGoalDto.kt → ...el/remote/request/RequestCreateGoalDto.kt
@@ -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

diff --git a/...a/model/remote/request/RequestLoginDto.kt → ...a/model/remote/request/RequestLoginDto.kt b/...a/model/remote/request/RequestLoginDto.kt → ...a/model/remote/request/RequestLoginDto.kt
@@ -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

diff --git a/...remote/request/RequestPatchNicknameDto.kt → ...remote/request/RequestPatchNicknameDto.kt b/...remote/request/RequestPatchNicknameDto.kt → ...remote/request/RequestPatchNicknameDto.kt
@@ -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

diff --git a/...l/remote/request/RequestPostCommentDto.kt → ...l/remote/request/RequestPostCommentDto.kt b/...l/remote/request/RequestPostCommentDto.kt → ...l/remote/request/RequestPostCommentDto.kt
@@ -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

diff --git a/...odel/remote/request/RequestPostLikeDto.kt → ...odel/remote/request/RequestPostLikeDto.kt b/...odel/remote/request/RequestPostLikeDto.kt → ...odel/remote/request/RequestPostLikeDto.kt
@@ -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

diff --git a/.../remote/response/ResponseCreateGoalDto.kt → .../remote/response/ResponseCreateGoalDto.kt b/.../remote/response/ResponseCreateGoalDto.kt → .../remote/response/ResponseCreateGoalDto.kt
@@ -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(

diff --git a/...mote/response/ResponseDeleteCommentDto.kt → ...mote/response/ResponseDeleteCommentDto.kt b/...mote/response/ResponseDeleteCommentDto.kt → ...mote/response/ResponseDeleteCommentDto.kt
@@ -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

diff --git a/...mote/response/ResponseGetFeedDetailDto.kt → ...mote/response/ResponseGetFeedDetailDto.kt b/...mote/response/ResponseGetFeedDetailDto.kt → ...mote/response/ResponseGetFeedDetailDto.kt
@@ -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(

diff --git a/...e/ResponseGetNicknameDuplicateCheckDto.kt → ...e/ResponseGetNicknameDuplicateCheckDto.kt b/...e/ResponseGetNicknameDuplicateCheckDto.kt → ...e/ResponseGetNicknameDuplicateCheckDto.kt
@@ -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

diff --git a/...te/response/ResponseGetNotificationDto.kt → ...te/response/ResponseGetNotificationDto.kt b/...te/response/ResponseGetNotificationDto.kt → ...te/response/ResponseGetNotificationDto.kt
@@ -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
 

diff --git a/...e/response/ResponseGetRecommendListDto.kt → ...e/response/ResponseGetRecommendListDto.kt b/...e/response/ResponseGetRecommendListDto.kt → ...e/response/ResponseGetRecommendListDto.kt
@@ -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.Recommend
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.go.sopt.winey.domain.entity.Recommend
 
 @Serializable
 data class ResponseGetRecommendListDto(

diff --git a/...del/remote/response/ResponseGetUserDto.kt → ...del/remote/response/ResponseGetUserDto.kt b/...del/remote/response/ResponseGetUserDto.kt → ...del/remote/response/ResponseGetUserDto.kt
@@ -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.User
+import org.go.sopt.winey.domain.entity.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...e/response/ResponseGetWineyFeedListDto.kt → ...e/response/ResponseGetWineyFeedListDto.kt b/...e/response/ResponseGetWineyFeedListDto.kt → ...e/response/ResponseGetWineyFeedListDto.kt
@@ -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.WineyFeed
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.go.sopt.winey.domain.entity.WineyFeed
 
 @Serializable
 data class ResponseGetWineyFeedListDto(

diff --git a/...response/ResponseHasNewNotificationDto.kt → ...response/ResponseHasNewNotificationDto.kt b/...response/ResponseHasNewNotificationDto.kt → ...response/ResponseHasNewNotificationDto.kt
@@ -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