Merge pull request #113 from teamCA-PIN/feature/refactoring

Feature/refactoring

app/build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 }
 
 val properties = Properties()
-properties.load(FileInputStream(rootProject.file("./local.properties")))
+properties.load(FileInputStream(rootProject.file("local.properties")))
 
 android {
  defaultConfig {
@@ -43,7 +43,6 @@ android {
 
  buildTypes {
  getByName("release") {
- isDebuggable = true
  signingConfig = signingConfigs.getByName("release")
  isMinifyEnabled = true
  isShrinkResources = true
@@ -111,14 +110,14 @@ android {
  kapt(Dependencies.HILT_COMPILER)
 
  implementation(Dependencies.NAVER_MAP)
-
  implementation(Dependencies.CRYPTO)
 
+ implementation(Dependencies.SHIMMER)
+ implementation(Dependencies.GMS_LOCATION)
+ implementation(Dependencies.FLEX_BOX)
+
  testImplementation(TestDependencies.JUNIT)
  androidTestImplementation(TestDependencies.EXT)
  androidTestImplementation(TestDependencies.ESPRESSO)
- implementation("com.facebook.shimmer:shimmer:0.5.0")
- implementation("com.google.android.gms:play-services-location:16.0.0")
- implementation("com.google.android.flexbox:flexbox:3.0.0")
  }
 }

app/proguard-rules.pro

@@ -22,6 +22,7 @@
 
 # gson
 -keep class * extends com.google.gson.TypeAdapter
+-keepclassmembers enum * { *; }
 
 # firebase
 -keep class com.firebase.** { *; }
@@ -83,5 +84,4 @@
 -dontwarn retrofit2.KotlinExtensions
 
 # dto
--keep class com.caffeine.capin.data.dto.** { *; }
-
+-keep class com.caffeine.capin.data.dto.** { *; }

app/src/main/AndroidManifest.xml

@@ -48,7 +48,7 @@
  <activity android:name=".presentation.cafeti.CafeColorActivity" />
  <activity android:name=".presentation.cafeti.CafeStyleActivity" />
  <activity android:name=".presentation.cafeti.CoffeeMenuActivity" />
- <activity android:name=".presentation.cafeti.CafetiActivity"/>
+ <activity android:name=".presentation.cafeti.ui.CafetiActivity"/>
  <activity android:name=".presentation.cafeti.CafetiResultActivity" />
  <activity android:name=".presentation.cafeti.CoffeeMostActivity" />
  <activity android:name=".presentation.login.FindPasswordActivity" />

app/src/main/java/com/caffeine/capin/data/controller/cafeti/CafetiController.kt

@@ -0,0 +1,9 @@
+package com.caffeine.capin.data.controller.cafeti
+
+import com.caffeine.capin.data.dto.cafeti.RequestCafetiData
+import com.caffeine.capin.data.dto.cafeti.ResponseCafetiData
+import io.reactivex.rxjava3.core.Single
+
+interface CafetiController {
+ fun fetchCafetiResult(answers: RequestCafetiData): Single<ResponseCafetiData>
+}

app/src/main/java/com/caffeine/capin/data/controller/cafeti/CafetiControllerImpl.kt

@@ -0,0 +1,14 @@
+package com.caffeine.capin.data.controller.cafeti
+
+import com.caffeine.capin.data.dto.cafeti.RequestCafetiData
+import com.caffeine.capin.data.dto.cafeti.ResponseCafetiData
+import com.caffeine.capin.data.network.CapinApiService
+import io.reactivex.rxjava3.core.Single
+import javax.inject.Inject
+
+class CafetiControllerImpl @Inject constructor(
+ private val capinApiService: CapinApiService
+): CafetiController {
+ override fun fetchCafetiResult(answers: RequestCafetiData): Single<ResponseCafetiData> =
+ capinApiService.postCafeti(answers)
+}

app/src/main/java/com/caffeine/capin/data/dto/cafeti/ResponseCafetiData.kt

@@ -1,11 +1,15 @@
 package com.caffeine.capin.data.dto.cafeti
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 import java.io.Serializable
 
+@Parcelize
 data class ResponseCafetiData(
  val message: String,
  val result: Result
-){
+): Parcelable {
+ @Parcelize
  data class Result (
  val cafetiIdx: String,
  val type: String,
@@ -14,5 +18,5 @@ data class ResponseCafetiData(
  val introduction : String,
  val img: String,
  val plainImg: String
- ): Serializable
+ ): Parcelable
 }

app/src/main/java/com/caffeine/capin/data/network/CapinApiService.kt

@@ -131,9 +131,8 @@ interface CapinApiService {
 
  @POST("/cafeti")
  fun postCafeti(
- @Header("token") token: String,
  @Body body: RequestCafetiData
- ): Call<ResponseCafetiData>
+ ): Single<ResponseCafetiData>
 
  @POST("/user/emailAuth")
  fun postLoginPw(

app/src/main/java/com/caffeine/capin/di/ControllerModule.kt

@@ -4,6 +4,8 @@ import com.caffeine.capin.data.controller.archive.ArchiveCafeController
 import com.caffeine.capin.data.controller.archive.ArchiveCafeControllerImpl
 import com.caffeine.capin.data.controller.archive.UnArchiveCafeController
 import com.caffeine.capin.data.controller.archive.UnArchiveControllerImpl
+import com.caffeine.capin.data.controller.cafeti.CafetiController
+import com.caffeine.capin.data.controller.cafeti.CafetiControllerImpl
 import com.caffeine.capin.data.controller.review.*
 import com.caffeine.capin.data.network.CapinApiService
 import com.caffeine.capin.data.network.TokenController
@@ -48,4 +50,9 @@ object ControllerModule {
  @Singleton
  fun provideUnArchiveCafeController(capinApiService: CapinApiService): UnArchiveCafeController =
  UnArchiveControllerImpl(capinApiService)
+
+ @Provides
+ @Singleton
+ fun provideCafetiController(capinApiService: CapinApiService): CafetiController =
+ CafetiControllerImpl(capinApiService)
 }

app/src/main/java/com/caffeine/capin/di/UseCaseModule.kt

@@ -2,9 +2,11 @@ package com.caffeine.capin.di
 
 import com.caffeine.capin.data.controller.archive.UnArchiveCafeController
 import com.caffeine.capin.data.controller.archive.UnArchiveControllerImpl
+import com.caffeine.capin.data.controller.cafeti.CafetiController
 import com.caffeine.capin.data.controller.review.EditReviewController
 import com.caffeine.capin.data.controller.review.ReportReviewController
 import com.caffeine.capin.domain.usecase.DeleteReviewUseCase
+import com.caffeine.capin.domain.usecase.GetCafetiResultUseCase
 import com.caffeine.capin.domain.usecase.ReportReviewUseCase
 import com.caffeine.capin.domain.usecase.UnArchiveCafeUseCase
 import dagger.Module
@@ -31,4 +33,9 @@ object UseCaseModule {
  @Singleton
  fun provideUnArchiveCafeUseCase(unArchiveCafeController: UnArchiveCafeController): UnArchiveCafeUseCase =
  UnArchiveCafeUseCase(unArchiveCafeController)
+
+ @Provides
+ @Singleton
+ fun provideGetCafetiResultUseCase(cafetiController: CafetiController): GetCafetiResultUseCase =
+ GetCafetiResultUseCase(cafetiController)
 }

app/src/main/java/com/caffeine/capin/domain/usecase/GetCafetiResultUseCase.kt

@@ -0,0 +1,17 @@
+package com.caffeine.capin.domain.usecase
+
+import com.caffeine.capin.data.controller.cafeti.CafetiController
+import com.caffeine.capin.data.dto.cafeti.RequestCafetiData
+import com.caffeine.capin.data.dto.cafeti.ResponseCafetiData
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.internal.schedulers.IoScheduler
+import io.reactivex.rxjava3.schedulers.Schedulers
+import javax.inject.Inject
+
+class GetCafetiResultUseCase @Inject constructor(
+ private val cafetiController: CafetiController
+){
+ operator fun invoke(answers: RequestCafetiData): Single<ResponseCafetiData> {
+ return cafetiController.fetchCafetiResult(answers)
+ }
+}

app/src/main/java/com/caffeine/capin/presentation/cafedetail/ui/CafeDetailsActivity.kt

@@ -2,6 +2,7 @@ package com.caffeine.capin.presentation.cafedetail.ui
 
 import android.content.Intent
 import android.os.Bundle
+import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -48,6 +49,7 @@ class CafeDetailsActivity: AppCompatActivity() {
  copyInstagramId()
  checkIsReviewWritten()
  showResultToast()
+ copyAddress()
 
  binding.buttonMenus.setOnClickListener { deployMenusActivity() }
  binding.imageviewBack.setOnClickListener { finish() }
@@ -210,7 +212,19 @@ class CafeDetailsActivity: AppCompatActivity() {
  this@CafeDetailsActivity.copyToClipBoard(text.toString())
  CustomToastBuilder(this@CafeDetailsActivity, "아이디가 복사되었습니다.", binding.constraintlayoutRoot)
  .setBackgroundDrawable(R.drawable.background_capin_toast)
- .setIcon(R.drawable.ic_checkbox_active_toast)
+ .setYLocation(0.87)
+ .build()
+ }
+ }
+ }
+
+ private fun copyAddress() {
+ binding.textCafeAddress.run {
+ setOnClickListener {
+ this@CafeDetailsActivity.copyToClipBoard(text.toString())
+ CustomToastBuilder(this@CafeDetailsActivity, "주소가 복사되었습니다.", binding.constraintlayoutRoot)
+ .setBackgroundDrawable(R.drawable.background_capin_toast)
+ .setYLocation(0.87)
  .build()
  }
  }