부산대 Android_김현민 5주차 과제 Step2

app/build.gradle.kts

@@ -18,6 +18,10 @@ android {
     namespace = "campus.tech.kakao.map"
     compileSdk = 34
 
+    dataBinding {
+        enable = true
+    }
+
     defaultConfig {
         applicationId = "campus.tech.kakao.map"
         minSdk = 26
@@ -70,6 +74,7 @@ android {
 
 dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.3")
     implementation("androidx.room:room-runtime:2.6.1")
     implementation("androidx.activity:activity-ktx:1.9.0")
     implementation("androidx.room:room-ktx:2.6.1")

app/src/main/java/campus/tech/kakao/map/adapter/Adapter.kt

@@ -1,31 +1,24 @@
 package campus.tech.kakao.map.adapter
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import campus.tech.kakao.map.R
 import campus.tech.kakao.map.data.Profile
+import campus.tech.kakao.map.databinding.ActivityItemViewBinding
 
 class Adapter(private val profiles: MutableList<Profile>) : RecyclerView.Adapter<Adapter.ProfileViewHolder>() {
 
-
     interface OnItemClickListener {
         fun onItemClick(name: String, address: String, latitude: String, longitude: String)
     }
 
     var listener: OnItemClickListener? = null
+
     fun setOnItemClickListener(listener: OnItemClickListener) {
         this.listener = listener
     }
 
-    inner class ProfileViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val tvName: TextView = itemView.findViewById(R.id.tvName)
-        val tvAddress: TextView = itemView.findViewById(R.id.tvAddress)
-        val tvType: TextView = itemView.findViewById(R.id.tvType)
-
-
+    inner class ProfileViewHolder(val binding: ActivityItemViewBinding) : RecyclerView.ViewHolder(binding.root) {
         init {
             itemView.setOnClickListener {
                 bindingAdapterPosition.takeIf { it != RecyclerView.NO_POSITION }?.let { position ->
@@ -37,20 +30,18 @@ class Adapter(private val profiles: MutableList<Profile>) : RecyclerView.Adapter
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProfileViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.activity_item_view, parent, false)
-        return ProfileViewHolder(view)
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = ActivityItemViewBinding.inflate(inflater, parent, false)
+        return ProfileViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: ProfileViewHolder, position: Int) {
         val profile = profiles[position]
-        holder.tvName.text = profile.name
-        holder.tvAddress.text = profile.address
-        holder.tvType.text = profile.type
+        holder.binding.profile = profile
+        holder.binding.executePendingBindings()
     }
 
-    override fun getItemCount(): Int {
-        return profiles.size
-    }
+    override fun getItemCount(): Int = profiles.size
 
     fun updateProfiles(newProfiles: List<Profile>) {
         profiles.clear()

app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt

@@ -8,20 +8,5 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 @Database(entities = [Profile::class], version = 2)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun profileDao(): ProfileDao
-
-    companion object {
-        val MIGRATION_1_2 = object : Migration(1, 2) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("DROP TABLE IF EXISTS Profiles")
-                database.execSQL(
-                    "CREATE TABLE IF NOT EXISTS Profiles (" +
-                            "uid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
-                            "name TEXT NOT NULL, address TEXT NOT NULL, " +
-                            "type TEXT NOT NULL, latitude TEXT NOT NULL, " +
-                            "longitude TEXT NOT NULL)"
-                )
-            }
-        }
-    }
 }
 

app/src/main/java/campus/tech/kakao/map/di/BottomSheetModule.kt

@@ -7,11 +7,13 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.qualifiers.ActivityContext
+import dagger.hilt.android.scopes.ActivityScoped
 
 @Module
 @InstallIn(ActivityComponent::class)
 object BottomSheetModule {
     @Provides
+    @ActivityScoped
     fun singletonBottomSheet(@ActivityContext context: Context): BottomSheetHelper {
         return BottomSheetHelper(context)
     }

app/src/main/java/campus/tech/kakao/map/di/DatabaseModule.kt

@@ -0,0 +1,26 @@
+package campus.tech.kakao.map.di
+
+import android.content.Context
+import androidx.room.Room
+import campus.tech.kakao.map.data.AppDatabase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext appContext: Context): AppDatabase {
+        return Room.databaseBuilder(
+            appContext,
+            AppDatabase::class.java,
+            "profiles"
+        ).fallbackToDestructiveMigration().build()
+    }
+}

app/src/main/java/campus/tech/kakao/map/network/Network.kt

@@ -9,11 +9,21 @@ import javax.inject.Inject
 class Network @Inject constructor(private val retrofitService: RetrofitService) {
     val API_KEY = "KakaoAK ${BuildConfig.KAKAO_REST_API_KEY}"
 
-    fun searchCategory(categoryGroupCode: String, callback: Callback<KakaoResponse>) {
-        retrofitService.getSearchCategory(API_KEY, categoryGroupCode).enqueue(callback)
+    suspend fun searchCategory(categoryGroupCode: String): KakaoResponse? {
+        val response = retrofitService.getSearchCategory(API_KEY, categoryGroupCode)
+        if (response.isSuccessful) {
+            return response.body()
+        } else {
+            throw Exception("응답 실패: ${response.errorBody()?.string()}")
+        }
     }
 
-    fun searchKeyword(query: String, callback: Callback<KakaoResponse>) {
-        retrofitService.getSearchKeyword(API_KEY, query).enqueue(callback)
+    suspend fun searchKeyword(query: String): KakaoResponse? {
+        val response = retrofitService.getSearchKeyword(API_KEY, query)
+        if (response.isSuccessful) {
+            return response.body()
+        } else {
+            throw Exception("응답 실패: ${response.errorBody()?.string()}")
+        }
     }
 }

app/src/main/java/campus/tech/kakao/map/network/RetrofitService.kt

@@ -1,13 +1,14 @@
 package campus.tech.kakao.map.network
 
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Query
 
 interface RetrofitService {
     @GET("/v2/local/search/category.json")
-    fun getSearchCategory(
+    suspend fun getSearchCategory(
         @Header("Authorization") apiKey: String,
         @Query("category_group_code") categoryGroupCode: String,
 //        @Query("x") x: String,
@@ -16,14 +17,14 @@ interface RetrofitService {
         @Query("page") page: Int = 1,
         @Query("size") size: Int = 15,
         @Query("sort") sort: String = "accuracy"
-    ): Call<KakaoResponse>
+    ): Response<KakaoResponse>
 
     @GET("/v2/local/search/keyword.json")
-    fun getSearchKeyword(
+    suspend fun getSearchKeyword(
         @Header("Authorization") apiKey: String,
         @Query("query") query: String,
         @Query("page") page: Int = 1,
         @Query("size") size: Int = 15,
         @Query("sort") sort: String = "accuracy"
-    ): Call<KakaoResponse>
+    ): Response<KakaoResponse>
 }

app/src/main/java/campus/tech/kakao/map/network/SearchService.kt

@@ -9,46 +9,23 @@ import retrofit2.Response
 import javax.inject.Inject
 import javax.inject.Singleton
 
-@Singleton
 class SearchService @Inject constructor(private val network: Network, private val context: Context) {
 
-    fun searchKeyword(query: String, callback: (KakaoResponse?) -> Unit) {
-        network.searchKeyword(query, object : Callback<KakaoResponse> {
-            override fun onResponse(call: Call<KakaoResponse>, response: Response<KakaoResponse>) {
-                if (response.isSuccessful) {
-                    callback(response.body())
-                } else {
-                    Toast.makeText(context, "응답 실패", Toast.LENGTH_SHORT).show()
-                    Log.e("SearchService", "응답 실패")
-                    callback(null)
-                }
-            }
-
-            override fun onFailure(call: Call<KakaoResponse>, t: Throwable) {
-                Toast.makeText(context, "요청 실패: ${t.message}", Toast.LENGTH_SHORT).show()
-                Log.e("SearchService", "요청 실패", t)
-                callback(null)
-            }
-        })
+    suspend fun searchKeyword(query: String): KakaoResponse? {
+        return try {
+            network.searchKeyword(query)
+        } catch (error: Throwable) {
+            Log.e("SearchService", "요청 실패", error)
+            throw error
+        }
     }
 
-    fun searchCategory(categoryGroupCode: String, callback: (KakaoResponse?) -> Unit) {
-        network.searchCategory(categoryGroupCode, object : Callback<KakaoResponse> {
-            override fun onResponse(call: Call<KakaoResponse>, response: Response<KakaoResponse>) {
-                if (response.isSuccessful) {
-                    callback(response.body())
-                } else {
-                    Toast.makeText(context, "응답 실패", Toast.LENGTH_SHORT).show()
-                    Log.e("SearchService", "응답 실패")
-                    callback(null)
-                }
-            }
-
-            override fun onFailure(call: Call<KakaoResponse>, t: Throwable) {
-                Toast.makeText(context, "요청 실패: ${t.message}", Toast.LENGTH_SHORT).show()
-                Log.e("SearchService", "요청 실패", t)
-                callback(null)
-            }
-        })
+    suspend fun searchCategory(categoryGroupCode: String): KakaoResponse? {
+        return try {
+            network.searchCategory(categoryGroupCode)
+        } catch (error: Throwable) {
+            Log.e("SearchService", "요청 실패", error)
+            throw error
+        }
     }
-}
+}

app/src/main/java/campus/tech/kakao/map/ui/ErrorActivity.kt

@@ -2,17 +2,23 @@ package campus.tech.kakao.map.ui
 
 import android.os.Bundle
 import android.widget.TextView
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import campus.tech.kakao.map.R
+import campus.tech.kakao.map.databinding.ActivityErrorBinding
 
 class ErrorActivity : AppCompatActivity() {
+    val errorViewModel: ErrorViewModel by viewModels()
+    lateinit var errorBinding: ActivityErrorBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_error)
+        errorBinding = DataBindingUtil.setContentView(this, R.layout.activity_error)
+        errorBinding.lifecycleOwner = this
+        errorBinding.error = errorViewModel
 
         val errorMessage = intent.getStringExtra("errorMessage")
-        val tvError = findViewById<TextView>(R.id.tvError)
-        tvError.text = errorMessage
+        errorViewModel.setErrorMessage(errorMessage?:"Unknown")
 
     }
 }

app/src/main/java/campus/tech/kakao/map/ui/ErrorViewModel.kt

@@ -0,0 +1,13 @@
+package campus.tech.kakao.map.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class ErrorViewModel: ViewModel() {
+    val _errorMessage = MutableLiveData<String>()
+    val errorMessage: LiveData<String> get() = _errorMessage
+    fun setErrorMessage(message: String) {
+        _errorMessage.value = message
+    }
+}