Skip to content

Commit ccf61d5

Browse files
committed
[FIX] merge 오류 디버깅
1 parent 3658db7 commit ccf61d5

File tree

3 files changed

+7
-25
lines changed

3 files changed

+7
-25
lines changed

SPOTeam_android/.idea/deploymentTargetSelector.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ data class BoardItem (
171171
val regions: List<String>,
172172
val imageUrl: String,
173173
var liked: Boolean,
174-
val isOwned: Boolean = false
174+
val isOwned: Boolean = false,
175175
val isHost : Boolean
176176
)
177177

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ class BoardAdapter(
130130

131131
reportMember.setOnClickListener {
132132
// 스터디원 신고 다이얼로그 띄우기
133-
val reportDialog = ReportStudyCrewDialog(view.context, studyId)
134-
reportDialog.start()
135-
popupWindow.dismiss()
133+
// val reportDialog = ReportStudyCrewDialog(view.context, studyId)
134+
// reportDialog.start()
135+
// popupWindow.dismiss()
136136
}
137137

138138
leaveStudy.setOnClickListener {
@@ -158,9 +158,9 @@ class BoardAdapter(
158158

159159
reportMember.setOnClickListener {
160160
// 스터디원 신고 다이얼로그 띄우기
161-
val reportDialog = ReportStudyCrewDialog(view.context, studyId)
162-
reportDialog.start()
163-
popupWindow.dismiss()
161+
// val reportDialog = ReportStudyCrewDialog(view.context, studyId)
162+
// reportDialog.start()
163+
// popupWindow.dismiss()
164164
}
165165

166166
leaveStudy.setOnClickListener {

0 commit comments

Comments
 (0)