Feat/#464 이미지 s3 도입

.github/workflows/android-ci-workflow.yml

@@ -34,15 +34,15 @@ jobs:
       env:
         BASE_URL: ${{ secrets.APP_BASE_URL }}
       run: |
-        echo APP_BASE_URL=\"BASE_URL\" >> ./local.properties
+        echo "APP_BASE_URL=\"BASE_URL\"" >> ./local.properties
 
     - name: Access KAKAO KEY
       env:
         APP_KEY: ${{ secrets.KAKAO_APP_KEY }}
         NATIVE_KEY: ${{ secrets.KAKAO_NATIVE_KEY }}
       run: |
-        echo KAKAO_APP_KEY=\"APP_KEY\" >> ./local.properties
-        echo KAKAO_NATIVE_KEY=\"NATIVE_KEY\" >> ./local.properties
+        echo "KAKAO_APP_KEY=\"APP_KEY\"" >> ./local.properties
+        echo "KAKAO_NATIVE_KEY=\"NATIVE_KEY\"" >> ./local.properties
 
     - name: set up Java JDK 17
       uses: actions/setup-java@v3

android/app/build.gradle.kts

@@ -24,7 +24,7 @@ android {
         applicationId = "app.edonymyeon"
         minSdk = 28
         targetSdk = 33
-        versionCode = 11
+        versionCode = 12
         versionName = "1.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -48,7 +48,8 @@ android {
         )
 
         val kakaoNativeKey = localProperties.getProperty("KAKAO_NATIVE_KEY")
-        manifestPlaceholders["KAKAO_NATIVE_KEY"] = kakaoNativeKey.substring(1, kakaoNativeKey.length - 1)
+        manifestPlaceholders["KAKAO_NATIVE_KEY"] =
+            kakaoNativeKey.substring(1, kakaoNativeKey.length - 1)
     }
 
     buildTypes {

android/app/src/main/AndroidManifest.xml

@@ -26,6 +26,9 @@
         <activity
             android:name="com.app.edonymyeon.presentation.ui.imagedetail.ImageDetailActivity"
             android:exported="false" />
+        <activity
+            android:name="com.app.edonymyeon.presentation.ui.profileupdate.ProfileUpdateActivity"
+            android:exported="false" />
         <activity
             android:name="com.app.edonymyeon.presentation.ui.alarmsetting.AlarmSettingActivity"
             android:exported="false" />
@@ -51,7 +54,8 @@
             android:exported="true" />
         <activity
             android:name="com.app.edonymyeon.presentation.ui.main.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -71,14 +75,6 @@
             android:name="com.app.edonymyeon.presentation.ui.post.PostActivity"
             android:exported="true" />
 
-        <service
-            android:name="com.app.edonymyeon.data.service.fcm.AlarmService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
@@ -93,6 +89,36 @@
                     android:scheme="${KAKAO_NATIVE_KEY}" />
             </intent-filter>
         </activity>
-    </application>
 
+        <service
+            android:name="com.app.edonymyeon.data.service.fcm.AlarmService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name="com.google.android.gms.metadata.ModuleDependencies"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+            <meta-data
+                android:name="photopicker_activity:0:required"
+                android:value="" />
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 </manifest>

android/app/src/main/java/com/app/edonymyeon/data/common/CustomThrowableUtils.kt

@@ -3,7 +3,7 @@ package com.app.edonymyeon.data.common
 import org.json.JSONObject
 import retrofit2.Response
 
-fun <T : Any> createCustomThrowableFromResponse(result: Response<T>): CustomThrowable {
+fun <T> createCustomThrowableFromResponse(result: Response<T>): CustomThrowable {
     val errorResponse = result.errorBody()?.string()
     val json = errorResponse?.let { JSONObject(it) }
     val errorMessage = json?.getString("errorMessage") ?: ""

android/app/src/main/java/com/app/edonymyeon/data/common/FetchState.kt

@@ -1,9 +1,15 @@
 package com.app.edonymyeon.data.common
 
-sealed class FetchState {
-    object BadInternet : FetchState()
-    object ParseError : FetchState()
-    object WrongConnection : FetchState()
+sealed interface FetchState {
+    object BadInternet : FetchState
+    object ParseError : FetchState
+    object WrongConnection : FetchState
 
-    object Fail : FetchState()
+    class NoAuthorization(
+        val customThrowable: CustomThrowable,
+    ) : FetchState
+
+    class Fail(
+        val customThrowable: CustomThrowable,
+    ) : FetchState
 }

android/app/src/main/java/com/app/edonymyeon/data/common/Result.kt

@@ -0,0 +1,14 @@
+package com.app.edonymyeon.data.common
+
+sealed class Result<T> {
+
+    class Success<T>(val data: T, val code: Int) : Result<T>()
+
+    class ApiError<T>(val customThrowable: CustomThrowable) : Result<T>()
+
+    class UnKnownApiError<T>(val code: Int) : Result<T>()
+
+    class NetworkError<T>(val fetchState: FetchState) : Result<T>()
+
+    class NullResult<T> : Result<T>()
+}

android/app/src/main/java/com/app/edonymyeon/data/datasource/auth/AuthRemoteDataSource.kt

@@ -1,6 +1,5 @@
 package com.app.edonymyeon.data.datasource.auth
 
-import android.util.Log
 import com.app.edonymyeon.data.dto.LoginDataModel
 import com.app.edonymyeon.data.dto.request.LogoutRequest
 import com.app.edonymyeon.data.dto.request.TokenRequest
@@ -30,7 +29,6 @@ class AuthRemoteDataSource @Inject constructor(
     }
 
     override suspend fun logout(logoutRequest: LogoutRequest): Response<Unit> {
-        Log.d("testLog", logoutRequest.deviceToken)
         return authService.logout(logoutRequest)
     }
 

android/app/src/main/java/com/app/edonymyeon/data/repository/AuthRepositoryImpl.kt

@@ -1,6 +1,5 @@
 package com.app.edonymyeon.data.repository
 
-import com.app.edonymyeon.data.common.CustomThrowable
 import com.app.edonymyeon.data.common.createCustomThrowableFromResponse
 import com.app.edonymyeon.data.datasource.auth.AuthDataSource
 import com.app.edonymyeon.data.dto.LoginDataModel
@@ -10,7 +9,6 @@ import com.app.edonymyeon.data.dto.response.AuthDuplicateResponse
 import com.app.edonymyeon.mapper.toDataModel
 import com.domain.edonymyeon.model.UserRegistration
 import com.domain.edonymyeon.repository.AuthRepository
-import org.json.JSONObject
 import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
@@ -33,7 +31,8 @@ class AuthRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success(Unit)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -46,7 +45,8 @@ class AuthRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success((result.body() ?: AuthDuplicateResponse(false)).isUnique)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -69,10 +69,8 @@ class AuthRepositoryImpl @Inject constructor(
             authLocalDataSource.setAuthToken(result.headers()["Set-Cookie"] as String)
             Result.success(result.body() ?: Unit)
         } else {
-            val errorResponse = result.errorBody()?.string()
-            val json = errorResponse?.let { JSONObject(it) }
-            val errorMessage = json?.getString("errorMessage") ?: ""
-            Result.failure(CustomThrowable(result.code(), errorMessage))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -82,7 +80,8 @@ class AuthRepositoryImpl @Inject constructor(
             authLocalDataSource.setAuthToken(null)
             Result.success(Unit)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 }

android/app/src/main/java/com/app/edonymyeon/data/repository/ConsumptionsRepositoryImpl.kt

@@ -1,11 +1,10 @@
 package com.app.edonymyeon.data.repository
 
-import com.app.edonymyeon.data.common.CustomThrowable
+import com.app.edonymyeon.data.common.createCustomThrowableFromResponse
 import com.app.edonymyeon.data.datasource.consumptions.ConsumptionsDataSource
 import com.app.edonymyeon.data.dto.response.ConsumptionsResponse
 import com.app.edonymyeon.mapper.toDomain
 import com.domain.edonymyeon.repository.ConsumptionsRepository
-import org.json.JSONObject
 import javax.inject.Inject
 
 class ConsumptionsRepositoryImpl @Inject constructor(
@@ -17,10 +16,8 @@ class ConsumptionsRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success((result.body() as ConsumptionsResponse).toDomain())
         } else {
-            val errorResponse = result.errorBody()?.string()
-            val json = errorResponse?.let { JSONObject(it) }
-            val errorMessage = json?.getString("errorMessage") ?: ""
-            Result.failure(CustomThrowable(result.code(), errorMessage))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 }

android/app/src/main/java/com/app/edonymyeon/data/repository/NotificationRepositoryImpl.kt

@@ -1,6 +1,6 @@
 package com.app.edonymyeon.data.repository
 
-import com.app.edonymyeon.data.common.CustomThrowable
+import com.app.edonymyeon.data.common.createCustomThrowableFromResponse
 import com.app.edonymyeon.data.datasource.notification.NotificationDataSource
 import com.app.edonymyeon.mapper.toDomain
 import com.domain.edonymyeon.model.Notifications
@@ -14,7 +14,8 @@ class NotificationRepositoryImpl @Inject constructor(private val notificationDat
         return if (result.isSuccessful && result.body() != null) {
             Result.success(result.body()!!.toDomain())
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 }

android/app/src/main/java/com/app/edonymyeon/data/repository/PostRepositoryImpl.kt

@@ -1,6 +1,5 @@
 package com.app.edonymyeon.data.repository
 
-import com.app.edonymyeon.data.common.CustomThrowable
 import com.app.edonymyeon.data.common.createCustomThrowableFromResponse
 import com.app.edonymyeon.data.datasource.post.PostDataSource
 import com.app.edonymyeon.data.dto.response.CommentsResponse
@@ -33,7 +32,8 @@ class PostRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success(Unit)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -49,7 +49,8 @@ class PostRepositoryImpl @Inject constructor(
                 ),
             )
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -61,7 +62,8 @@ class PostRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success(result.body() as PostEditorResponse)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -76,7 +78,8 @@ class PostRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success(result.body() as PostEditorResponse)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -92,7 +95,8 @@ class PostRepositoryImpl @Inject constructor(
                 ),
             )
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -109,7 +113,8 @@ class PostRepositoryImpl @Inject constructor(
                 ),
             )
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -118,7 +123,8 @@ class PostRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success(Unit)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -127,7 +133,8 @@ class PostRepositoryImpl @Inject constructor(
         return if (result.isSuccessful) {
             Result.success(Unit)
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 }

android/app/src/main/java/com/app/edonymyeon/data/repository/PreferenceRepositoryImpl.kt

@@ -1,6 +1,6 @@
 package com.app.edonymyeon.data.repository
 
-import com.app.edonymyeon.data.common.CustomThrowable
+import com.app.edonymyeon.data.common.createCustomThrowableFromResponse
 import com.app.edonymyeon.data.datasource.preference.PreferenceDataSource
 import com.app.edonymyeon.data.dto.request.NotificationPreferenceRequest
 import com.app.edonymyeon.mapper.toDomain
@@ -20,7 +20,8 @@ class PreferenceRepositoryImpl @Inject constructor(
                 },
             )
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 
@@ -35,7 +36,8 @@ class PreferenceRepositoryImpl @Inject constructor(
                 },
             )
         } else {
-            Result.failure(CustomThrowable(result.code(), result.message()))
+            val customThrowable = createCustomThrowableFromResponse(result)
+            Result.failure(customThrowable)
         }
     }
 }