Merge pull request #81 from ttoklip/70-feat-우리동네-댓글-좋아요-스크랩-구현

70 feat 우리동네 댓글 좋아요 스크랩 구현
ttoklip · Jul 2, 2024 · 23ae7a1 · 23ae7a1
2 parents 5febf23 + e66ac2e
commit 23ae7a1
Show file tree

Hide file tree

Showing 25 changed files with 1,300 additions and 567 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -117,7 +117,7 @@
         <activity
             android:name=".presentation.hometown.together.write.WriteTogetherActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan"
+            android:windowSoftInputMode="adjustResize"
             android:exported="false" />
         <activity
             android:name=".presentation.hometown.communication.write.WriteCommunicationActivity"
@@ -130,7 +130,7 @@
             android:windowSoftInputMode="adjustPan"
             android:exported="true" />
         <activity
-            android:name=".presentation.hometown.TradeLocationActivity"
+            android:name=".presentation.hometown.together.write.tradelocation.TradeLocationActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />

diff --git a/app/src/main/java/com/umc/ttoklip/data/model/naver/GeocodingResponse.kt b/app/src/main/java/com/umc/ttoklip/data/model/naver/GeocodingResponse.kt
@@ -3,6 +3,6 @@ package com.umc.ttoklip.data.model.naver
 data class GeocodingResponse(
     val status: String,
     val meta: Meta,
-    val addresses: Addresses,
+    val addresses: List<Addresses>,
     val errorMessage: String
 )
diff --git a/app/src/main/java/com/umc/ttoklip/presentation/home/HomeFragment.kt b/app/src/main/java/com/umc/ttoklip/presentation/home/HomeFragment.kt
@@ -96,7 +96,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home),
         binding.vm = viewModel
         binding.tipRV.adapter = tipRVA
         viewModel.getMain()
-        viewModel.fetchGeocoding("분당구 불정로 6")
         Log.d("엑세스", "${TtoklipApplication.prefs.getString("jwt", "")}")
 
         CoroutineScope(Dispatchers.IO).launch {

diff --git a/app/src/main/java/com/umc/ttoklip/presentation/home/HomeViewModel.kt b/app/src/main/java/com/umc/ttoklip/presentation/home/HomeViewModel.kt
@@ -20,7 +20,7 @@ interface HomeViewModel {
     fun getMain()
     fun patchFCM(token: String)
 
-    fun fetchGeocoding(query: String)
+
 
     enum class ActivityEventBus {
         SEARCH,

diff --git a/app/src/main/java/com/umc/ttoklip/presentation/home/HomeViewModelImpl.kt b/app/src/main/java/com/umc/ttoklip/presentation/home/HomeViewModelImpl.kt
@@ -28,8 +28,7 @@ import javax.inject.Inject
 @HiltViewModel
 class HomeViewModelImpl @Inject constructor(
     private val homeRepository: HomeRepository,
-    private val fcmRepository: FCMRepository,
-    private val naverRepository: NaverRepository
+    private val fcmRepository: FCMRepository
 ) : ViewModel(), HomeViewModel {
 
     private val _haveWork: MutableStateFlow<Boolean> = MutableStateFlow(true)
@@ -126,12 +125,4 @@ class HomeViewModelImpl @Inject constructor(
             }
         }
     }
-
-    override fun fetchGeocoding(query: String) {
-        viewModelScope.launch {
-            naverRepository.fetchGeocoding(query).onSuccess {
-                Log.d("naver", it.toString())
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/com/umc/ttoklip/presentation/hometown/AddressDetailActivity.kt b/app/src/main/java/com/umc/ttoklip/presentation/hometown/AddressDetailActivity.kt
diff --git a/app/src/main/java/com/umc/ttoklip/presentation/hometown/PlaceActivity.kt b/app/src/main/java/com/umc/ttoklip/presentation/hometown/PlaceActivity.kt
diff --git a/app/src/main/java/com/umc/ttoklip/presentation/hometown/TradeLocationActivity.kt b/app/src/main/java/com/umc/ttoklip/presentation/hometown/TradeLocationActivity.kt