Update v3.4.3

build-logic/convention/src/main/java/in/koreatech/convention/AndoriodHilt.kt

@@ -8,6 +8,7 @@ internal fun Project.configureAndroidHilt(
     commonExtension: CommonExtension<*, *, *, *>,
 ){
     dependencies {
+
         implementation(libs.findBundle("hilt").get())
         kapt(libs.findLibrary("hilt-compiler").get())
     }

build-logic/convention/src/main/java/in/koreatech/convention/AndroidProject.kt

@@ -1,5 +1,6 @@
 package `in`.koreatech.convention
 
+import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.plugins.ExtensionAware
@@ -9,12 +10,17 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 internal fun configureAndroidProject(
     commonExtension: CommonExtension<*, *, *, *>,
 ) {
+    (commonExtension as? ApplicationExtension)?.let {
+        it.defaultConfig.targetSdk = 34
+    }
+
     commonExtension.apply {
         compileSdk = 34
-
+        (this as? ApplicationExtension)?.let {
+            it.defaultConfig.targetSdk = 34
+        }
         defaultConfig {
             minSdk = 23
-
             testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
             vectorDrawables.useSupportLibrary = true
         }
@@ -28,6 +34,7 @@ internal fun configureAndroidProject(
             jvmTarget = JavaVersion.VERSION_11.toString()
         }
     }
+
 }
 
 fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {

business/build.gradle.kts

@@ -11,8 +11,10 @@ plugins {
 android {
     namespace = "in.koreatech.business"
 
-    packagingOptions {
-        resources.pickFirsts.add("META-INF/gradle/incremental.annotation.processors")
+    androidComponents {
+        onVariants(selector().withBuildType("release")) {
+            it.packaging.resources.excludes.add("META-INF/**")
+        }
     }
     //  2 files found with path 'META-INF/gradle/incremental.annotation.processors' from inputs: 오류 해결
 
@@ -34,6 +36,10 @@ dependencies {
     implementation(libs.bundles.compose)
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.compose.navigation)
+    implementation(libs.androidx.security.crypto)
+    implementation(libs.coil)
+    implementation(libs.coil.compose)
+    implementation(libs.androidx.security.crypto)
     implementation(project(mapOf("path" to ":domain")))
     implementation(project(mapOf("path" to ":data")))
     implementation(project(mapOf("path" to ":core")))

business/src/main/java/in/koreatech/business/BusinessMainActivity.kt

@@ -12,8 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import dagger.hilt.android.AndroidEntryPoint
-import `in`.koreatech.business.feature.signup.navigator.SignupNavigator
-import `in`.koreatech.business.feature_changepassword.navigator.ChangePassword
+import `in`.koreatech.business.feature.insertstore.navigator.InsertStoreNavigator
 import `in`.koreatech.business.ui.theme.KOIN_ANDROIDTheme
 
 @AndroidEntryPoint
@@ -27,8 +26,7 @@ class BusinessMainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colors.background
                 ) {
-                    ChangePassword()
-                    //SignupNavigator(modifier = Modifier.fillMaxSize())
+                    InsertStoreNavigator()
                 }
             }
         }

business/src/main/java/in/koreatech/business/di/network/AuthNetworkModule.kt

@@ -6,10 +6,15 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import `in`.koreatech.business.util.OwnerTokenAuthenticator
 import `in`.koreatech.business.util.RefreshTokenInterceptor
 import `in`.koreatech.koin.core.qualifier.Auth
+import `in`.koreatech.koin.core.qualifier.OwnerAuth
+import `in`.koreatech.koin.core.qualifier.PreSignedUrl
 import `in`.koreatech.koin.core.qualifier.Refresh
 import `in`.koreatech.koin.core.qualifier.ServerUrl
+import `in`.koreatech.koin.data.api.PreSignedUrlApi
+import `in`.koreatech.koin.data.api.UploadUrlApi
 import `in`.koreatech.koin.data.api.UserApi
 import `in`.koreatech.koin.data.api.auth.UserAuthApi
 import `in`.koreatech.koin.data.source.local.TokenLocalDataSource
@@ -90,7 +95,122 @@ object AuthNetworkModule {
     @Singleton
     fun provideUserAuthApi(
         @Auth retrofit: Retrofit
-    ) : UserAuthApi {
+    ): UserAuthApi {
         return retrofit.create(UserAuthApi::class.java)
     }
+
+}
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+object BusinessAuthNetworkModule {
+    @OwnerAuth
+    @Provides
+    @Singleton
+    fun provideOwnerAuthInterceptor(
+        tokenLocalDataSource: TokenLocalDataSource
+    ): Interceptor {
+        return Interceptor { chain: Interceptor.Chain ->
+            runBlocking {
+                val ownerAccessToken = tokenLocalDataSource.getOwnerAccessToken() ?: ""
+                val newRequest: Request = chain.request().newBuilder()
+                    .addHeader("Authorization", "Bearer $ownerAccessToken")
+                    .build()
+                chain.proceed(newRequest)
+            }
+        }
+    }
+
+    @OwnerAuth
+    @Provides
+    @Singleton
+    fun provideTokenAuthenticator(
+        @ApplicationContext applicationContext: Context,
+        tokenLocalDataSource: TokenLocalDataSource
+    ) = OwnerTokenAuthenticator(applicationContext, tokenLocalDataSource)
+
+    @OwnerAuth
+    @Provides
+    @Singleton
+    fun provideOwnerAuthOkHttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor,
+        @OwnerAuth ownerAuthInterceptor: Interceptor,
+        @OwnerAuth tokenAuthenticator: OwnerTokenAuthenticator
+    ): OkHttpClient {
+        return OkHttpClient.Builder().apply {
+            connectTimeout(10, TimeUnit.SECONDS)
+            readTimeout(30, TimeUnit.SECONDS)
+            writeTimeout(15, TimeUnit.SECONDS)
+            addInterceptor(httpLoggingInterceptor)
+            addInterceptor(ownerAuthInterceptor)
+            authenticator(tokenAuthenticator)
+        }.build()
+    }
+
+    @OwnerAuth
+    @Provides
+    @Singleton
+    fun provideOwnerAuthRetrofit(
+        @ServerUrl baseUrl: String,
+        @OwnerAuth ownerOkHttpClient: OkHttpClient
+    ): Retrofit {
+        return Retrofit.Builder()
+            .client(ownerOkHttpClient)
+            .baseUrl(baseUrl)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideUploadUrlApi(
+        @OwnerAuth retrofit: Retrofit
+    ): UploadUrlApi {
+        return retrofit.create(UploadUrlApi::class.java)
+    }
+}
+
+
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+object PreSignedUrlNetworkModule {
+    @PreSignedUrl
+    @Provides
+    @Singleton
+    fun provideOwnerAuthOkHttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor
+    ): OkHttpClient {
+        return OkHttpClient.Builder().apply {
+            connectTimeout(10, TimeUnit.SECONDS)
+            readTimeout(30, TimeUnit.SECONDS)
+            writeTimeout(15, TimeUnit.SECONDS)
+            addInterceptor(httpLoggingInterceptor)
+        }.build()
+    }
+
+    @Provides
+    @Singleton
+    @PreSignedUrl
+    fun providePreSignedUrlRetrofit(): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl("https://kap-test.s3.ap-northeast-2.amazonaws.com/")
+            .client(
+                OkHttpClient.Builder().addInterceptor(
+                    HttpLoggingInterceptor().apply {
+                        level = HttpLoggingInterceptor.Level.HEADERS
+                    }
+                ).build()
+            ).build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideUploadUrlApi(
+        @PreSignedUrl retrofit: Retrofit
+    ): PreSignedUrlApi {
+        return retrofit.create(PreSignedUrlApi::class.java)
+    }
 }

business/src/main/java/in/koreatech/business/feature/insertstore/insertdetailinfo/InsertDetailInfoScreen.kt

@@ -0,0 +1,44 @@
+package `in`.koreatech.business.feature.insertstore.insertdetailinfo
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.hilt.navigation.compose.hiltViewModel
+import `in`.koreatech.koin.domain.model.owner.insertstore.StoreBasicInfo
+import org.orbitmvi.orbit.compose.collectAsState
+
+@Composable
+fun InsertDetailInfoScreen(
+    modifier: Modifier = Modifier,
+    onBackPress: () -> Unit,
+    stroeBasicInfo: StoreBasicInfo = StoreBasicInfo(),
+    viewModel: InsertDetailInfoScreenViewModel = hiltViewModel()
+) {
+    val state = viewModel.collectAsState().value
+    InsertDetailInfoScreenImpl(
+        storeNumber = state.storeAddress
+    )
+}
+
+
+@Composable
+fun InsertDetailInfoScreenImpl(
+    modifier: Modifier = Modifier,
+    storeNumber: String = ""
+) {
+    Column(
+        modifier = modifier
+    ) {
+        Text(
+            text = storeNumber
+        )
+    }
+}
+
+@Preview
+@Composable
+fun PreviewInsertDetailInfoScreen(){
+    InsertDetailInfoScreenImpl()
+}

business/src/main/java/in/koreatech/business/feature/insertstore/insertdetailinfo/InsertDetailInfoScreenSideEffect.kt

@@ -0,0 +1,16 @@
+package `in`.koreatech.business.feature.insertstore.insertdetailinfo
+
+import `in`.koreatech.business.feature.insertstore.insertmaininfo.InsertBasicInfoScreenSideEffect
+
+sealed class InsertDetailInfoScreenSideEffect {
+
+    data class ShowMessage(val type: DetailInfoErrorType): InsertDetailInfoScreenSideEffect()
+
+    data class NavigateToInsertDetailInfoScreen(val storeBasicInfo: InsertDetailInfoScreenSideEffect) :  InsertDetailInfoScreenSideEffect()
+}
+
+enum class DetailInfoErrorType {
+    NullStoreName,
+    NullStoreAddress,
+    NullStoreImage
+}

business/src/main/java/in/koreatech/business/feature/insertstore/insertdetailinfo/InsertDetailInfoScreenState.kt

@@ -0,0 +1,13 @@
+package `in`.koreatech.business.feature.insertstore.insertdetailinfo
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class InsertDetailInfoScreenState (
+    val storeCategory: Int = -1,
+    val storeName: String = "",
+    val storeAddress: String = "",
+    val storeImage: Uri = Uri.EMPTY
+): Parcelable

business/src/main/java/in/koreatech/business/feature/insertstore/insertdetailinfo/InsertDetailInfoScreenViewmodel.kt

@@ -0,0 +1,44 @@
+package `in`.koreatech.business.feature.insertstore.insertdetailinfo
+
+import android.net.Uri
+import android.util.Log
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import com.google.gson.Gson
+import dagger.hilt.android.lifecycle.HiltViewModel
+import `in`.koreatech.business.feature.insertstore.insertmaininfo.InsertBasicInfoScreenState
+import `in`.koreatech.koin.domain.model.owner.insertstore.StoreBasicInfo
+import kotlinx.android.parcel.Parcelize
+import org.orbitmvi.orbit.Container
+import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.syntax.simple.intent
+import org.orbitmvi.orbit.syntax.simple.reduce
+import org.orbitmvi.orbit.viewmodel.container
+import javax.inject.Inject
+
+@HiltViewModel
+class InsertDetailInfoScreenViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle
+): ViewModel(), ContainerHost<InsertDetailInfoScreenState, InsertDetailInfoScreenSideEffect> {
+    override val container: Container<InsertDetailInfoScreenState, InsertDetailInfoScreenSideEffect> =
+        container(InsertDetailInfoScreenState(), savedStateHandle = savedStateHandle) {
+
+            val storeBasicInfoJson: InsertBasicInfoScreenState? = savedStateHandle.get<InsertBasicInfoScreenState>("storeBasicInfo")
+            checkNotNull(storeBasicInfoJson)
+            getStoreBasicInfo(storeBasicInfoJson)
+        }
+
+
+    private fun getStoreBasicInfo(storeBasicInfo: InsertBasicInfoScreenState){
+        intent{
+            reduce {
+                state.copy(
+                    storeCategory = storeBasicInfo.storeCategory,
+                    storeName = storeBasicInfo.storeName,
+                    storeAddress = storeBasicInfo.storeAddress,
+                    storeImage = storeBasicInfo.storeImage
+                )
+            }
+        }
+    }
+}