.github/workflows/android_build.yml

@@ -38,8 +38,11 @@ jobs:
       - name: Touch local properties
         run: touch local.properties
 
-      - name: Add EC2 url
-        run: echo "ec2.url=\"\"" >> local.properties
+      - name: Add dev base url
+        run: echo "DEV_BASE_URL=\"\"" >> local.properties
+
+      - name: Add prod base url
+        run: echo "PROD_BASE_URL=\"\"" >> local.properties
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

app/build.gradle

@@ -10,10 +10,9 @@ Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "30.0.3"
-
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -24,18 +23,26 @@ android {
 
     defaultConfig {
         applicationId "com.hyeeyoung.wishboard"
-        minSdkVersion 22
-        targetSdkVersion 32
-        versionCode 9
-        versionName "1.0.0.2"
+        minSdkVersion 24
+        targetSdkVersion 34
+        versionCode 40
+        versionName "1.2.7"
+        compileSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField "String", "BASE_URL", properties["ec2.url"]
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
 
     buildTypes {
+        debug {
+            buildConfigField "String", "BASE_URL", properties["DEV_BASE_URL"]
+            versionNameSuffix = "-dev"
+        }
         release {
             minifyEnabled true
+            buildConfigField "String", "BASE_URL", properties["PROD_BASE_URL"]
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -46,23 +53,35 @@ android {
 
     buildFeatures {
         dataBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.0-alpha01"
+    }
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
     }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.google.android.material:material:1.7.0'
 
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha04'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.5.4'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.4.0'
@@ -72,26 +91,21 @@ dependencies {
     implementation 'io.coil-kt:coil:2.1.0'
 
     // jsoup
-    implementation 'org.jsoup:jsoup:1.14.1'
+    implementation 'org.jsoup:jsoup:1.14.1' // TODO delete
 
-    // glide
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    kapt 'com.github.bumptech.glide:compiler:4.12.0'
-
-    // Retrofit
+    // Network
+    implementation platform('com.squareup.okhttp3:okhttp-bom:4.10.0')
+    implementation 'com.squareup.okhttp3:okhttp'
+    implementation 'com.squareup.okhttp3:logging-interceptor'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10'
 
     // Dagger Hilt
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
     implementation "androidx.hilt:hilt-navigation-fragment:1.0.0"
 
-    // AWS S3
-    implementation 'com.amplifyframework:aws-storage-s3:1.31.1'
-    implementation 'com.amplifyframework:aws-auth-cognito:1.31.1'
-    implementation 'com.amplifyframework:core-kotlin:0.15.1'
-
     // Firebase FCM
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
@@ -106,12 +120,37 @@ dependencies {
     implementation "com.airbnb.android:lottie:$lottie_version"
 
     // Calendar View
-    implementation 'joda-time:joda-time:2.10.14'
+    implementation 'joda-time:joda-time:2.10.14' // TODO delete
 
     // Timber
     implementation 'com.jakewharton.timber:timber:5.0.1'
 
+    // In App Update
+    implementation 'com.google.android.play:app-update:2.1.0'
+    implementation 'com.google.android.play:app-update-ktx:2.1.0'
+
+    // Compose
+    def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
+    implementation composeBom
+    androidTestImplementation composeBom
+
+    implementation 'androidx.activity:activity-compose'
+    implementation 'androidx.compose.runtime:runtime-livedata'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose'
+
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1'
+    implementation 'io.coil-kt:coil-compose:2.4.0'
+
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hyeeyoung.wishboard">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -10,6 +12,9 @@
     <uses-feature
         android:name="android.hardware.camera2"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <application
         android:name=".WishBoardApp"
@@ -41,23 +46,13 @@
             android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="wishboard.com"
-                    android:path="/main"
-                    android:scheme="https" />
-            </intent-filter>
         </activity>
 
         <activity
             android:name=".presentation.howtouse.screens.HowToUseActivity"
             android:exported="false"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/AppThemePopup" />
 
         <activity
             android:name=".presentation.wishitem.screens.WishLinkSharingActivity"
@@ -71,7 +66,10 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-
+        <activity
+            android:name=".presentation.calendar.screen.CalendarActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.common.screens.WebViewActivity"
             android:exported="true"

app/src/main/java/com/hyeeyoung/wishboard/WishBoardApp.kt

@@ -2,11 +2,6 @@ package com.hyeeyoung.wishboard
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
-import com.amplifyframework.AmplifyException
-import com.amplifyframework.auth.cognito.AWSCognitoAuthPlugin
-import com.amplifyframework.core.Amplify
-import com.amplifyframework.storage.s3.AWSS3StoragePlugin
-import com.hyeeyoung.wishboard.util.PreferenceUtil
 import com.hyeeyoung.wishboard.util.WishBoardDebugTree
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
@@ -15,31 +10,14 @@ import timber.log.Timber
 class WishBoardApp : Application() {
     override fun onCreate() {
         super.onCreate()
-        prefs = PreferenceUtil(applicationContext)
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
 
         setUpTimber()
-        setUpAmplify()
-    }
-
-    private fun setUpAmplify() {
-        try {
-            Amplify.addPlugin(AWSCognitoAuthPlugin())
-            Amplify.addPlugin(AWSS3StoragePlugin())
-            Amplify.configure(applicationContext)
-            Timber.d("Initialized Amplify")
-        } catch (error: AmplifyException) {
-            Timber.e("Could not initialize Amplify", error)
-        }
     }
 
     private fun setUpTimber() {
         if (BuildConfig.DEBUG) {
             Timber.plant(WishBoardDebugTree())
         }
     }
-
-    companion object {
-        lateinit var prefs: PreferenceUtil
-    }
 }

app/src/main/java/com/hyeeyoung/wishboard/data/datasources/GalleryPagingDataSource.kt

@@ -86,8 +86,4 @@ class GalleryPagingDataSource(context: Context) :
             cursor.close()
         }
     }
-
-    companion object {
-        private const val TAG = "GalleryPagingDataSource"
-    }
 }

app/src/main/java/com/hyeeyoung/wishboard/data/interceptor/AuthInterceptor.kt

@@ -0,0 +1,90 @@
+package com.hyeeyoung.wishboard.data.interceptor
+
+import android.app.Application
+import android.content.Intent
+import com.google.gson.Gson
+import com.hyeeyoung.wishboard.BuildConfig
+import com.hyeeyoung.wishboard.R
+import com.hyeeyoung.wishboard.data.local.WishBoardPreference
+import com.hyeeyoung.wishboard.data.model.auth.ResponseRefresh
+import com.hyeeyoung.wishboard.util.extension.showToast
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import okhttp3.FormBody
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import timber.log.Timber
+import javax.inject.Inject
+
+class AuthInterceptor @Inject constructor(
+    private val gson: Gson, // TODO json으로 변경
+    private val context: Application,
+    private val localStorage: WishBoardPreference,
+) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+        val authRequest = originalRequest.newAuthBuilder().build()
+        val response = chain.proceed(authRequest)
+
+        when (response.code) {
+            401 -> {
+                response.close()
+                val requestBody = FormBody.Builder()
+                    .add(REFRESH_TOKEN, localStorage.refreshToken).build()
+
+                val refreshTokenRequest = originalRequest.newBuilder().get()
+                    .url("${BuildConfig.BASE_URL}auth/refresh")
+                    .post(requestBody)
+                    .build()
+                val refreshTokenResponse = chain.proceed(refreshTokenRequest)
+
+                if (refreshTokenResponse.isSuccessful) {
+                    Timber.d("토큰 리프레시 성공")
+                    val responseRefresh = gson.fromJson(
+                        refreshTokenResponse.body?.string(),
+                        ResponseRefresh::class.java
+                    )
+
+                    responseRefresh.data?.token?.let {
+                        localStorage.updateToken(it.accessToken, it.refreshToken)
+                    }
+                    refreshTokenResponse.close()
+
+                    val newRequest = originalRequest.newAuthBuilder().build()
+                    return chain.proceed(newRequest)
+                } else {
+                    Timber.e("토큰 리프레시 실패(${refreshTokenResponse.message})")
+                    with(context) {
+                        CoroutineScope(Dispatchers.Main).launch {
+                            startActivity(
+                                Intent.makeRestartActivityTask(
+                                    packageManager.getLaunchIntentForPackage(packageName)?.component
+                                )
+                            )
+                            showToast(getString(R.string.sign_auto_login_failure))
+                            localStorage.clear()
+                            cancel()
+                        }
+                    }
+                }
+            }
+        }
+        return response
+    }
+
+    private fun Request.newAuthBuilder() =
+        this.newBuilder()
+            .addHeader(HEADER_KEY_AUTHORIZATION, "$TOKEN_PREF${localStorage.accessToken}")
+            .addHeader(HEADER_KEY_USER_AGENT, "$HEADER_VALUE_USER_AGENT_PREF${if (BuildConfig.DEBUG) "dev" else "prod"}")
+
+    companion object {
+        private const val HEADER_KEY_AUTHORIZATION = "Authorization"
+        private const val HEADER_KEY_USER_AGENT = "User-Agent"
+        private const val HEADER_VALUE_USER_AGENT_PREF = "wishboard-android/"
+        private const val TOKEN_PREF = "Bearer "
+        private const val REFRESH_TOKEN = "refreshToken"
+    }
+}