Merge pull request #64 from ttoklip/feat/#1_home_news_fragment

Feat/#1 home news fragment
ttoklip · Feb 19, 2024 · d7037d4 · d7037d4
2 parents 4cac561 + 0bca3c2
commit d7037d4
Show file tree

Hide file tree

Showing 50 changed files with 2,074 additions and 851 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,8 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".TtoklipApplication"
@@ -139,6 +141,9 @@
         <activity android:name=".presentation.signup.location.DirectLocationActivity"
             android:screenOrientation="portrait"
             android:exported="false"/>
+        <activity android:name=".presentation.mypage.MyInfoLocationActivity"
+            android:screenOrientation="portrait"
+            android:exported="false"/>
         <activity
             android:name=".presentation.hometown.PlaceActivity"
             android:screenOrientation="portrait"

diff --git a/app/src/main/java/com/umc/ttoklip/TtoklipApplication.kt b/app/src/main/java/com/umc/ttoklip/TtoklipApplication.kt
@@ -12,6 +12,7 @@ import com.umc.ttoklip.module.NetworkConnectionChecker
 import com.umc.ttoklip.util.PreferenceUtil
 import dagger.hilt.android.HiltAndroidApp
 
+
 @HiltAndroidApp
 class TtoklipApplication : Application(), DefaultLifecycleObserver {
     override fun onCreate() {
@@ -26,8 +27,10 @@ class TtoklipApplication : Application(), DefaultLifecycleObserver {
             BuildConfig.naverClientId,
             BuildConfig.naverClientSecret,
             "똑립")
+
     }
 
+
     override fun onStop(owner: LifecycleOwner) {
         networkConnectionChecker.unregister()
         super.onStop(owner)

diff --git a/app/src/main/java/com/umc/ttoklip/data/api/MyPage2Api.kt b/app/src/main/java/com/umc/ttoklip/data/api/MyPage2Api.kt
@@ -3,6 +3,7 @@ package com.umc.ttoklip.data.api
 import com.umc.ttoklip.data.model.ResponseBody
 import com.umc.ttoklip.data.model.honeytip.CreateHoneyTipResponse
 import com.umc.ttoklip.data.model.mypage.MyPageInfoResponse
+import com.umc.ttoklip.data.model.signup.SignupResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.Response
@@ -12,6 +13,7 @@ import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Part
 import retrofit2.http.PartMap
+import retrofit2.http.Query
 
 interface MyPage2Api {
     @GET("/api/v1/my-page")
@@ -21,7 +23,11 @@ interface MyPage2Api {
     @PATCH("/api/v1/my-page/edit")
     suspend fun editMyPageInfo(
         @Part profileImage: MultipartBody.Part?,
-        @Part categories:List<MultipartBody.Part>,
+        @Part categories:List<MultipartBody.Part>?,
         @PartMap params:MutableMap<String,RequestBody>
     ): Response<ResponseBody<CreateHoneyTipResponse>>
+
+    @GET("/api/v1/privacy/check-nickname")
+    suspend fun nickCheck(@Query("nickname") nickname:String)
+            : Response<ResponseBody<SignupResponse>>
 }
diff --git a/app/src/main/java/com/umc/ttoklip/data/model/home/CartResponse.kt b/app/src/main/java/com/umc/ttoklip/data/model/home/CartResponse.kt
@@ -0,0 +1,14 @@
+package com.umc.ttoklip.data.model.home
+
+data class CartResponse(
+    val commentCount: Int,
+    val currentPrice: Int,
+    val id: Int,
+    val location: String,
+    val partyCnt: Int,
+    val partyMax: Int,
+    val title: String,
+    val totalPrice: Int,
+    val tradeStatus: String,
+    val writer: String
+)
diff --git a/app/src/main/java/com/umc/ttoklip/data/model/home/HomeResponse.kt b/app/src/main/java/com/umc/ttoklip/data/model/home/HomeResponse.kt
@@ -8,8 +8,9 @@ data class HomeResponse(
     val currentMemberNickname: String,
     val honeyTips: List<HoneyTipMain>,
     val newsLetters: List<News>,
+    val carts: List<CartResponse>,
     val todayToDoList: String,
-    val carts: List<Togethers>
-) {
-    constructor() : this("", listOf(), listOf(), "", listOf())
+    val street : String
+){
+    constructor() : this("", listOf(), listOf(), listOf(),"", "")
 }
diff --git a/app/src/main/java/com/umc/ttoklip/data/model/honeytip/InquireQuestionResponse.kt b/app/src/main/java/com/umc/ttoklip/data/model/honeytip/InquireQuestionResponse.kt
@@ -9,6 +9,6 @@ data class InquireQuestionResponse(
     val category: String,
     val commentCount: Int,
     val imageUrls: List<ImageUrl>,
-    val commentResponses: List<CommentResponse>,
+    val questionCommentResponses: List<CommentResponse>,
     val likedByCurrentUser: Boolean
 )
diff --git a/app/src/main/java/com/umc/ttoklip/data/repository/mypage/MyPageRepository2.kt b/app/src/main/java/com/umc/ttoklip/data/repository/mypage/MyPageRepository2.kt
@@ -3,6 +3,7 @@ package com.umc.ttoklip.data.repository.mypage
 import com.umc.ttoklip.data.model.ResponseBody
 import com.umc.ttoklip.data.model.honeytip.CreateHoneyTipResponse
 import com.umc.ttoklip.data.model.mypage.MyPageInfoResponse
+import com.umc.ttoklip.data.model.signup.SignupResponse
 import com.umc.ttoklip.module.NetworkResult
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -12,7 +13,9 @@ import retrofit2.http.Part
 interface MyPageRepository2 {
     suspend fun getMyPageInfo(): NetworkResult<MyPageInfoResponse>
     suspend fun editMyPageInfo(
-        photo: MultipartBody.Part,
-        info: MutableMap<String, RequestBody>, cate: List<MultipartBody.Part>
+        photo: MultipartBody.Part?,
+        info: MutableMap<String, RequestBody>, cate: List<MultipartBody.Part>?
     ): NetworkResult<CreateHoneyTipResponse>
+
+    suspend fun checkNickname(nick:String): NetworkResult<SignupResponse>
 }
diff --git a/app/src/main/java/com/umc/ttoklip/data/repository/mypage/MyPageRepository2Impl.kt b/app/src/main/java/com/umc/ttoklip/data/repository/mypage/MyPageRepository2Impl.kt
@@ -4,6 +4,7 @@ import com.umc.ttoklip.data.api.MyPage2Api
 import com.umc.ttoklip.data.model.ResponseBody
 import com.umc.ttoklip.data.model.honeytip.CreateHoneyTipResponse
 import com.umc.ttoklip.data.model.mypage.MyPageInfoResponse
+import com.umc.ttoklip.data.model.signup.SignupResponse
 import com.umc.ttoklip.module.NetworkResult
 import com.umc.ttoklip.module.handleApi
 import okhttp3.MultipartBody
@@ -18,8 +19,8 @@ class MyPageRepository2Impl @Inject constructor(
     }
 
     override suspend fun editMyPageInfo(
-        photo: MultipartBody.Part,
-        info: MutableMap<String, RequestBody>, cate: List<MultipartBody.Part>
+        photo: MultipartBody.Part?,
+        info: MutableMap<String, RequestBody>, cate: List<MultipartBody.Part>?
     ): NetworkResult<CreateHoneyTipResponse> {
         return handleApi({
             api.editMyPageInfo(
@@ -29,4 +30,8 @@ class MyPageRepository2Impl @Inject constructor(
             )
         }) { response: ResponseBody<CreateHoneyTipResponse> -> response.result }
     }
+
+    override suspend fun checkNickname(nick: String): NetworkResult<SignupResponse> {
+        return handleApi({api.nickCheck(nick)}) {response: ResponseBody<SignupResponse> ->response.result}
+    }
 }
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
@@ -32,12 +32,11 @@ import kotlinx.coroutines.launch
 class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home),
     OnItemClickListener, OnTogetherItemClickListener {
 
+
     private val viewModel: HomeViewModel by viewModels<HomeViewModelImpl>()
     private val newsRVA by lazy {
-        NewsRVA(onClick = {
-            NewsRVA { news ->
-                startActivity(ArticleActivity.newIntent(requireContext(), news.newsletterId))
-            }
+        NewsRVA(onClick = { news ->
+            startActivity(ArticleActivity.newIntent(requireContext(), news.newsletterId))
         }
         )
     }
@@ -83,7 +82,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home),
                 viewModel.mainData.collect {
                     newsRVA.submitList(it.newsLetters)
                     tipRVA.submitList(it.honeyTips)
-                    townRVA.submitList(it.carts)
+                    //townRVA.submitList(it.carts)
                 }
             }
         }
@@ -103,8 +102,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home),
             startActivity(intent)
         }
         //테스트
-        binding.weatherImg.setImageResource(Weather.RAIN.resId)
-        binding.weatherTitle.text = Weather.RAIN.label
+        binding.weatherImg.setImageResource(Weather.CLOUD.resId)
+        binding.weatherTitle.text = Weather.CLOUD.label
 
         binding.newsRV.adapter = newsRVA
         binding.groupBuyRV.adapter = townRVA

diff --git a/app/src/main/java/com/umc/ttoklip/presentation/honeytip/HoneyTipFragment.kt b/app/src/main/java/com/umc/ttoklip/presentation/honeytip/HoneyTipFragment.kt
@@ -2,8 +2,6 @@ package com.umc.ttoklip.presentation.honeytip
 
 import android.content.Intent
 import android.util.Log
-import android.view.View
-import android.view.View.OnScrollChangeListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -53,26 +51,22 @@ class HoneyTipFragment: BaseFragment<FragmentShareHoneyTipBinding>(R.layout.frag
                 }
             }
         }
-
-        lifecycleScope.launch{
-            repeatOnLifecycle(Lifecycle.State.STARTED){
-                viewModel.isLast.collect{
-                    isLast = it
-                }
-            }
-        }
     }
 
     override fun initView() {
         initCategoryViewPager()
         initPopularHoneyTipsViewPager(65, 30)
-        /*binding.scrollV.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
+        binding.scrollV.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
             if ((!v.canScrollVertically(1))) {
-                if(!isLast) {
-                    viewModel.getHoneyTipByCategory(category, page++)
+                Log.d("end", "end")
+                when(category){
+                    WriteHoneyTipActivity.Category.HOUSEWORK.toString() -> viewModel.getHouseHoneyTipPage()
+                    WriteHoneyTipActivity.Category.RECIPE.toString() -> viewModel.getRecipeHoneyTipPage()
+                    WriteHoneyTipActivity.Category.SAFE_LIVING.toString() -> viewModel.getSafeLivingHoneyTipPage()
+                    WriteHoneyTipActivity.Category.WELFARE_POLICY.toString() -> viewModel.getWelFareHoneyTipPage()
                 }
             }
-        }*/
+        }
 
         binding.categoryTablayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener{
             override fun onTabSelected(tab: TabLayout.Tab?) {