Merge pull request #314 from SPOTeam/SPOT-231-FEAT-신청승인UI수정

마이페이지 中 모집중, 대기중, 신청한 스터디 세부 페이지 구현

Author: starshape7

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt

@@ -18,9 +18,16 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-class AttendanceContentDialog(private val context: Context) {
+class AttendanceContentDialog(
+    private val context: Context
+) {
 
     private val dlg = android.app.Dialog(context)
+    private var callback: fetchData? = null // ✅ 콜백 필드 추가
+
+    fun setCallback(cb: fetchData) {
+        callback = cb
+    }
 
     fun start() {
         // 타이틀바 제거
@@ -33,11 +40,13 @@ class AttendanceContentDialog(private val context: Context) {
 
         val btnMove1 = dlg.findViewById<ImageView>(R.id.accept_close)
         btnMove1.setOnClickListener {
+            callback?.fetchAttendedData()
             dlg.dismiss()
         }
 
         val btnMove2 = dlg.findViewById<TextView>(R.id.accept_tv)
         btnMove2.setOnClickListener {
+            callback?.fetchAttendedData()
             dlg.dismiss()
         }
 

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt

@@ -18,11 +18,19 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-class AttendanceDenyDialog(private val context: Context) {
+class AttendanceDenyDialog(
+    private val context: Context
+) {
 
     private val dlg = android.app.Dialog(context)
     private var memberId : Int? = null
     private var studyId : Int? = null
+    private var callback: fetchData? = null // ✅ 콜백 필드 추가
+
+
+    fun setCallback(cb: fetchData) {
+        callback = cb
+    }
 
     fun setStudyId(studyId : Int) {
         this.studyId = studyId
@@ -45,16 +53,17 @@ class AttendanceDenyDialog(private val context: Context) {
         val btnMove1 = dlg.findViewById<TextView>(R.id.reject_tv)
         btnMove1.setOnClickListener {
             denyMemberAttendance()
-            dlg.dismiss()
         }
 
         val btnMove2 = dlg.findViewById<TextView>(R.id.cancel_tv)
         btnMove2.setOnClickListener {
+            callback?.fetchAttendedData()
             dlg.dismiss()
         }
 
         val btnMove3 = dlg.findViewById<ImageView>(R.id.close_button)
         btnMove3.setOnClickListener {
+            callback?.fetchAttendedData()
             dlg.dismiss()
         }
 
@@ -74,7 +83,8 @@ class AttendanceDenyDialog(private val context: Context) {
                         val memberAttendanceResponse = response.body()
                         Log.d("MyStudyAttendance", "responseBody: ${memberAttendanceResponse?.isSuccess}")
                         if (memberAttendanceResponse?.isSuccess == "true") {
-                            Log.d("MyStudyAttendance", "deny")
+                            callback?.fetchAttendedData()
+                            dlg.dismiss()
                         } else {
                             showError(memberAttendanceResponse?.message)
                         }

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt

@@ -32,7 +32,8 @@ class BoardAdapter(
     private val itemList: ArrayList<BoardItem>,
     private val onItemClick: (BoardItem) -> Unit,
     private val onLikeClick: (BoardItem, ImageView) -> Unit, // onLikeClick 추가
-    private val listener: fetchProgressStudy? = null // 🔹추가
+    private val listener: fetchProgressStudy? = null, // 🔹추가
+
 ) : RecyclerView.Adapter<BoardAdapter.BoardViewHolder>() {
 
     private lateinit var context : Context
@@ -95,6 +96,8 @@ class BoardAdapter(
                 if (hostResult != null) {
                     val isHost = hostResult.isOwned  // ✅ 호스트 여부 확인
 
+                    Log.d("BoardAdapter", "StudyId : ${studyId}")
+
                     val popupView = LayoutInflater.from(view.context)
                         .inflate(R.layout.modify_study_popup_menu, null)
 
@@ -169,25 +172,21 @@ class BoardAdapter(
                     leaveStudy.setOnClickListener {
                         // 스터디 탈퇴 다이얼로그 띄우기
                         if (isHost) { // 호스트 탈퇴
-                            val hostLeaveDialog = HostLeaveStudyDialog(view.context, studyId)
+                            val hostLeaveDialog = HostLeaveStudyDialog(view.context, studyId, onComplete = {
+                                listener?.fetchProgress() // ✅ 여기서 호출
+                            })
                             hostLeaveDialog.start()
                             popupWindow.dismiss()
                         } else { //
                             // 스터디 탈퇴 다이얼로그 띄우기
                             val hostLeaveDialog = MemberLeaveStudyDialog(
                                 context = view.context,
-                                studyID = studyId,
-                                listener = object :
-                                    MemberLeaveStudyDialog.OnWithdrawSuccessListener {
-                                    override fun onWithdrawSuccess() {
-                                        // ✅ 여기서 원하는 동작 수행
-                                        // 예: 로그, 토스트, FragmentResult 등
-                                        (view.context as? FragmentActivity)?.supportFragmentManager?.setFragmentResult(
-                                            "study_withdraw_success", Bundle()
-                                        )
-                                    }
+                                studyID = studyId
+                                , onComplete = {
+                                    listener?.fetchProgress() // ✅ 여기서 호출
                                 }
                             )
+
                             hostLeaveDialog.start()
                             popupWindow.dismiss()
                         }

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt

@@ -19,7 +19,11 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-class ConsiderAttendanceMemberFragment : Fragment() {
+interface fetchData {
+    fun fetchAttendedData()
+}
+
+class ConsiderAttendanceMemberFragment : Fragment(), fetchData {
 
     private lateinit var binding: FragmentConsiderAttendanceMemberBinding
     private var studyId: Int = -1
@@ -33,7 +37,7 @@ class ConsiderAttendanceMemberFragment : Fragment() {
     ): View {
         binding = FragmentConsiderAttendanceMemberBinding.inflate(inflater, container, false)
         studyId = arguments?.getInt("recruitingStudyId")!!
-        Log.d("ConsiderAttendanceMemberFragment", "$studyId")
+//        Log.d("ConsiderAttendanceMemberFragment", "$studyId")
 
         attendanceMemberList = ArrayList() // ✅ 리스트 초기화
 
@@ -150,6 +154,7 @@ class ConsiderAttendanceMemberFragment : Fragment() {
                 val dlg = AttendanceDenyDialog(requireContext())
                 dlg.setMemberId(data.memberId)
                 dlg.setStudyId(studyId)
+                dlg.setCallback(this@ConsiderAttendanceMemberFragment) // ✅ 콜백 넘기기
                 dlg.start()
             }
 
@@ -173,6 +178,7 @@ class ConsiderAttendanceMemberFragment : Fragment() {
                         Log.d("MyStudyAttendance", "responseBody: ${memberAttendanceResponse?.isSuccess}")
                         if (memberAttendanceResponse?.isSuccess == "true") {
                             val dlg = AttendanceContentDialog(requireContext())
+                            dlg.setCallback(this@ConsiderAttendanceMemberFragment)
                             dlg.start()
                         } else {
                             showError(memberAttendanceResponse?.message)
@@ -190,4 +196,8 @@ class ConsiderAttendanceMemberFragment : Fragment() {
     private fun showError(message: String?) {
         Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
     }
+
+    override fun fetchAttendedData() {
+        fetchStudyAttendanceMembers()
+    }
 }

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt

@@ -24,10 +24,6 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-interface fetchProgressStudy {
-    fun fetchProgress()
-}
-
 class EndStudyFinishDialog(
     val context: Context,
     val onComplete: (() -> Unit)? = null // 🔹 콜백 추가

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt

@@ -12,8 +12,11 @@ import androidx.fragment.app.FragmentManager
 import com.example.spoteam_android.R
 
 
-class HostLeaveStudyDialog(private val context: Context,
-                           private val studyID: Int, ){
+class HostLeaveStudyDialog (
+    private val context: Context,
+    private val studyID: Int,
+    private val onComplete: (() -> Unit)? = null // 🔹 콜백 추가
+){
 
     private val dlg = Dialog(context)
 
@@ -52,8 +55,8 @@ class HostLeaveStudyDialog(private val context: Context,
     private fun showMandateFragment(studyId: Int) {
         val fragmentManager: FragmentManager? = (context as? FragmentActivity)?.supportFragmentManager
         if (fragmentManager != null) {
-            val mandateFragment = MandateStudyOwnerFragment(studyId)
-            mandateFragment.show(fragmentManager, "DelegateHostFragment")
+            val mandateFragment = MandateStudyOwnerFragment(context, studyId, onComplete)
+            mandateFragment.start()
         } else {
             throw IllegalStateException("FragmentManager를 가져올 수 없습니다.")
         }

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt

@@ -12,7 +12,11 @@ import androidx.fragment.app.FragmentManager
 import com.example.spoteam_android.R
 
 
-class HostLeaveStudySuccessDialog(private val context: Context){
+class HostLeaveStudySuccessDialog(
+    private val context: Context,
+    private val onComplete: (() -> Unit)? = null // 🔹 콜백 추가
+
+){
 
     private val dlg = Dialog(context)
 
@@ -30,11 +34,13 @@ class HostLeaveStudySuccessDialog(private val context: Context){
         // X 버튼 클릭 시 다이얼로그 닫기
         val ivClose: ImageView = dlg.findViewById(R.id.iv_close)
         ivClose.setOnClickListener {
+            onComplete?.invoke()
             dlg.dismiss() // 다이얼로그 닫기
         }
 
         val btnTakeCharge: Button = dlg.findViewById(R.id.btn_take_charge)
         btnTakeCharge.setOnClickListener {
+            onComplete?.invoke()
             dlg.dismiss() // 다이얼로그 닫기
         }