Feature/온보딩 프로필신고및차단

app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt

@@ -0,0 +1,63 @@
+package umc.onairmate.ui.profile
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.PopupMenu
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import umc.onairmate.R
+import umc.onairmate.databinding.ItemBlockedUserBinding
+
+data class BlockedUser(val nickname: String, val reason: String, val date: String)
+
+class BlockListAdapter(
+    private val onUnblockClick: (BlockedUser) -> Unit
+) : ListAdapter<BlockedUser, BlockListAdapter.BlockViewHolder>(diffCallback) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BlockViewHolder {
+        val binding = ItemBlockedUserBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BlockViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: BlockViewHolder, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+    inner class BlockViewHolder(private val binding: ItemBlockedUserBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(user: BlockedUser) {
+            // 데이터 바인딩
+            binding.tvNickname.text = "[${user.nickname}]"
+            binding.tvReason.text = "[${user.reason}]"
+            binding.tvDate.text = "[${user.date}]"
+
+            // btnMore 클릭 시 팝업 메뉴 표시
+            binding.btnMore.setOnClickListener { view ->
+                val popup = PopupMenu(view.context, view)
+                popup.menuInflater.inflate(R.menu.menu_block_option, popup.menu)
+                popup.setOnMenuItemClickListener { item ->
+                    when (item.itemId) {
+                        R.id.menuUnblock -> {
+                            onUnblockClick(user) // 콜백 호출
+                            true
+                        }
+                        else -> false
+                    }
+                }
+                popup.show()
+            }
+        }
+    }
+
+    companion object {
+        val diffCallback = object : DiffUtil.ItemCallback<BlockedUser>() {
+            override fun areItemsTheSame(oldItem: BlockedUser, newItem: BlockedUser) =
+                oldItem.nickname == newItem.nickname
+
+            override fun areContentsTheSame(oldItem: BlockedUser, newItem: BlockedUser) =
+                oldItem == newItem
+        }
+    }
+}

app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt

@@ -0,0 +1,69 @@
+package umc.onairmate.ui.profile
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageButton
+import android.widget.PopupMenu
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import umc.onairmate.R
+import umc.onairmate.databinding.FragmentBlockListBinding
+
+class BlockListFragment : Fragment() {
+
+    private var _binding: FragmentBlockListBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var blockListAdapter: BlockListAdapter
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentBlockListBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        Log.d("BlockListFragment", "view created, binding.ivBack=${binding.ivBack}")
+        setupRecyclerView()
+        setupListeners()
+    }
+
+    private fun setupRecyclerView() {
+        blockListAdapter = BlockListAdapter { blockedUser ->
+            // 차단 해제 클릭 시 처리
+        }
+        binding.rvBlockList.apply {
+            layoutManager = LinearLayoutManager(requireContext())
+            adapter = blockListAdapter
+        }
+
+        // 테스트 데이터
+        blockListAdapter.submitList(
+            listOf(
+                BlockedUser("차단한 사용자 닉네임", "차단 사유", "0000년 00월 00일"),
+                BlockedUser("차단한 사용자 닉네임", "차단 사유", "0000년 00월 00일"),
+                BlockedUser("차단한 사용자 닉네임", "차단 사유", "0000년 00월 00일")
+            )
+        )
+
+    }
+
+    private fun setupListeners() {
+        binding.ivBack.setOnClickListener {
+            requireActivity().onBackPressed()
+        }
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}

app/src/main/java/umc/onairmate/data/api/NicknameService.kt

@@ -0,0 +1,16 @@
+package umc.onairmate.data.api
+
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import umc.onairmate.data.model.response.NicknameResponse
+import umc.onairmate.data.model.response.RawDefaultResponse
+
+interface NicknameService {
+    @GET("auth/check-nickname/{nickname}")
+    suspend fun checkNickname(
+        @Path("nickname") nickname: String
+    ): NicknameResponse
+}

app/src/main/java/umc/onairmate/data/model/entity/NicknameData.kt

@@ -0,0 +1,11 @@
+package umc.onairmate.data.model.entity
+
+import com.google.gson.annotations.SerializedName
+
+data class NicknameData(
+    @SerializedName("available")
+    val available: Boolean,
+
+    @SerializedName("message")
+    val message: String
+)

app/src/main/java/umc/onairmate/data/model/response/NicknameResponse.kt

@@ -0,0 +1,12 @@
+package umc.onairmate.data.model.response
+
+import com.google.gson.annotations.SerializedName
+import umc.onairmate.data.model.entity.NicknameData
+
+class NicknameResponse (
+    @SerializedName("success")
+    val success: Boolean,
+
+    @SerializedName("data")
+    val data: NicknameData
+)

app/src/main/java/umc/onairmate/data/repository/repository/NicknameRepository.kt

@@ -0,0 +1,5 @@
+package umc.onairmate.data.repository
+
+interface NicknameRepository {
+    suspend fun isNicknameDuplicated(nickname: String): Boolean
+}

app/src/main/java/umc/onairmate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt

@@ -0,0 +1,23 @@
+package umc.onairmate.data.repository.repositoryImpl
+
+import android.util.Log
+import umc.onairmate.data.api.NicknameService
+import umc.onairmate.data.repository.NicknameRepository
+import javax.inject.Inject
+
+class NicknameRepositoryImpl @Inject constructor(
+    private val api: NicknameService
+): NicknameRepository {
+
+    override suspend fun isNicknameDuplicated(nickname: String): Boolean {
+        return try {
+            val response = api.checkNickname(nickname)
+            // available == true 면 사용 가능한 닉네임, 중복 아님 → 따라서 중복 여부는 반대(!)
+            !response.data.available
+        } catch (e: Exception) {
+            Log.e("NicknameRepository", "닉네임 중복 검사 실패", e)
+            // 실패 시 기본값 false 또는 true 선택 가능 (보통 실패는 중복 아님 false로 처리)
+            false
+        }
+    }
+}

app/src/main/java/umc/onairmate/module/NetworkModule.kt

@@ -70,25 +70,6 @@ object NetworkModule {
     private inline fun <reified T> Retrofit.buildService(): T{
         return this.create(T::class.java)
     }
-
-    @Module
-    @InstallIn(SingletonComponent::class)
-    object NetworkModule {
-
-        @Provides
-        @Singleton
-        fun provideRetrofit(): Retrofit {
-            return Retrofit.Builder()
-                .baseUrl(OnAirMateApplication.getString(R.string.base_url))  // 수정 필요
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-        }
-
-        @Provides
-        @Singleton
-        fun provideJoinService(retrofit: Retrofit): JoinService {
-            return retrofit.create(JoinService::class.java)
-        }
-    }
+
 
 }

app/src/main/java/umc/onairmate/module/RepositoryModule.kt

@@ -13,6 +13,8 @@ import umc.onairmate.data.api.CollectionService
 import umc.onairmate.data.api.HomeService
 import umc.onairmate.data.api.JoinService
 import umc.onairmate.data.repository.repository.BookmarkRepository
+import umc.onairmate.data.api.NicknameService
+import umc.onairmate.data.repository.NicknameRepository
 import umc.onairmate.data.repository.repository.FriendRepository
 import umc.onairmate.data.repository.repository.ChatRoomRepository
 import umc.onairmate.data.repository.repository.CollectionRepository
@@ -26,6 +28,7 @@ import umc.onairmate.data.repository.repositoryImpl.CollectionRepositoryImpl
 import umc.onairmate.data.repository.repositoryImpl.HomeRepositoryImpl
 import umc.onairmate.data.repository.repositoryImpl.JoinRepositoryImpl
 import umc.onairmate.data.repository.repositoryImpl.AuthRepositoryImpl
+import umc.onairmate.data.repository.repositoryImpl.NicknameRepositoryImpl
 
 @Module
 @InstallIn(ViewModelComponent::class)
@@ -35,7 +38,7 @@ object RepositoryModule {
     @Provides
     fun providesHomeRepository(
         homeService: HomeService
-    ) : HomeRepository = HomeRepositoryImpl(homeService)
+    ): HomeRepository = HomeRepositoryImpl(homeService)
 
     @ViewModelScoped
     @Provides
@@ -47,13 +50,13 @@ object RepositoryModule {
     @Provides
     fun providesFriendRepository(
         friendService: FriendService
-    ) : FriendRepository = FriendRepositoryImpl(friendService)
+    ): FriendRepository = FriendRepositoryImpl(friendService)
 
     @ViewModelScoped
     @Provides
     fun providesChatRoomRepository(
         chatRoomService: ChatRoomService
-    ) : ChatRoomRepository = ChatRoomRepositoryImpl(chatRoomService)
+    ): ChatRoomRepository = ChatRoomRepositoryImpl(chatRoomService)
 
     @ViewModelScoped
     @Provides
@@ -67,16 +70,16 @@ object RepositoryModule {
         collectionService: CollectionService
     ) : CollectionRepository = CollectionRepositoryImpl(collectionService)
 
-    @Module
-    @InstallIn(ViewModelComponent::class)
-    object RepositoryModule {
+    @ViewModelScoped
+    @Provides
+    fun provideJoinRepository(
+    joinService: JoinService
+    ): JoinRepository = JoinRepositoryImpl(joinService)
+
+    @ViewModelScoped
+    @Provides
+    fun provideNicknameRepository(
+        nicknameService: NicknameService
+    ): NicknameRepository = NicknameRepositoryImpl(nicknameService)
 
-        @Provides
-        @ViewModelScoped
-        fun provideJoinRepository(
-            joinService: JoinService
-        ): JoinRepository {
-            return JoinRepositoryImpl(joinService)
-        }
-    }
-}
+}

app/src/main/java/umc/onairmate/module/ServiceModule.kt

@@ -11,6 +11,8 @@ import umc.onairmate.data.api.ChatRoomService
 import umc.onairmate.data.api.CollectionService
 import umc.onairmate.data.api.FriendService
 import umc.onairmate.data.api.HomeService
+import umc.onairmate.data.api.JoinService
+import umc.onairmate.data.api.NicknameService
 import javax.inject.Singleton
 
 
@@ -46,7 +48,6 @@ object ServiceModule {
     fun friendApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): FriendService{
         return retrofit.buildService()
     }
-
     @Provides
     @Singleton
     fun bookmarkApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): BookmarkService{
@@ -58,4 +59,15 @@ object ServiceModule {
     fun collectionApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): CollectionService{
         return retrofit.buildService()
     }
+
+    @Provides
+    @Singleton
+    fun nicknameApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): NicknameService {
+        return retrofit.buildService()
+    }
+    @Provides
+    @Singleton
+    fun joinApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): JoinService {
+        return retrofit.buildService()
+    }
 }