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

starshape7 · web-flow · commit e87cd7ec12d3 · 2025-05-25T18:06:55.000+09:00
FIX: popupWindow font 수정 및 위치 수정
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt
@@ -6,6 +6,8 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
+import android.util.TypedValue
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -273,7 +275,7 @@ class CommunityContentActivity : AppCompatActivity()  {
             anonymous = false,
             parentCommentId = if (parentCommentId == 0) null else parentCommentId
         )
-        Log.d("WriteComment", commentContent)
+//        Log.d("WriteComment", commentContent)
         // 서버에 댓글 전송
 
         sendCommentToServer(requestBody)
@@ -402,7 +404,18 @@ class CommunityContentActivity : AppCompatActivity()  {
         popupWindow.isFocusable = true
         popupWindow.setBackgroundDrawable(view.context.getDrawable(R.drawable.custom_popup_background))
 
-        popupWindow.showAsDropDown(view, 0,0)
+        val location = IntArray(2)
+        view.getLocationOnScreen(location)
+        val x = location[0]
+        val y = location[1]
+
+        val offsetX = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            75f,
+            view.resources.displayMetrics
+        ).toInt()
+
+        popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, x - offsetX, y + 50)
 
     }
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt
@@ -4,6 +4,7 @@ import StudyFormMode
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -12,7 +13,6 @@ import android.widget.ImageView
 import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.BoardItem
@@ -28,6 +28,7 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
+
 class BoardAdapter(
     private val itemList: ArrayList<BoardItem>,
     private val onItemClick: (BoardItem) -> Unit,
@@ -96,7 +97,7 @@ class BoardAdapter(
                 if (hostResult != null) {
                     val isHost = hostResult.isOwned  // ✅ 호스트 여부 확인
 
-                    Log.d("BoardAdapter", "StudyId : ${studyId}")
+//                    Log.d("BoardAdapter", "StudyId : ${studyId}")
 
                     val popupView = LayoutInflater.from(view.context)
                         .inflate(R.layout.modify_study_popup_menu, null)
@@ -198,10 +199,17 @@ class BoardAdapter(
                     popupWindow.setBackgroundDrawable(view.context.getDrawable(R.drawable.custom_popup_background))
 
                     val location = IntArray(2)
-                    view.getLocationOnScreen(location) // 화면 전체 기준 좌표 가져오기
+                    view.getLocationOnScreen(location)
                     val x = location[0]
                     val y = location[1]
-                    popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, x-100, y + 100)
+
+                    val offsetX = TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_DIP,
+                        75f,
+                        view.resources.displayMetrics
+                    ).toInt()
+
+                    popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, x - offsetX, y + 50)
                 }
             }
         }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -377,7 +378,18 @@ class MyStudyPostContentActivity : AppCompatActivity() {
         popupWindow.isFocusable = true
         popupWindow.setBackgroundDrawable(view.context.getDrawable(R.drawable.custom_popup_background))
 
-        popupWindow.showAsDropDown(view, 0,0)
+        val location = IntArray(2)
+        view.getLocationOnScreen(location)
+        val x = location[0]
+        val y = location[1]
+
+        val offsetX = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            75f,
+            view.resources.displayMetrics
+        ).toInt()
+
+        popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, x - offsetX, y + 50)
     }
 
     private fun deleteStudyPostContent(view: View, fragmentManager: FragmentManager) {
diff --git a/SPOTeam_android/app/src/main/res/layout/fragment_permission_wait.xml b/SPOTeam_android/app/src/main/res/layout/fragment_permission_wait.xml
@@ -83,8 +83,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="15dp"
+        android:layout_marginHorizontal="18dp"
         tools:itemCount="5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/SPOTeam_android/app/src/main/res/layout/modify_study_community_menu.xml b/SPOTeam_android/app/src/main/res/layout/modify_study_community_menu.xml
@@ -12,9 +12,11 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center"
+        android:gravity="start"
         android:textColor="@color/black"
         android:padding="6dp"
+        android:fontFamily="@font/suit_variable_font"
+        android:textFontWeight="500"
         android:text="편집하기"
         android:textSize="14dp" />
     <View
@@ -29,8 +31,10 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center"
+        android:gravity="start"
         android:padding="6dp"
+        android:fontFamily="@font/suit_variable_font"
+        android:textFontWeight="500"
         android:textColor="@color/r500"
         android:text="신고하기"
         android:textSize="14dp" />
@@ -46,7 +50,9 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center"
+        android:gravity="start"
+        android:fontFamily="@font/suit_variable_font"
+        android:textFontWeight="500"
         android:padding="6dp"
         android:text="삭제하기"
         android:textColor="@color/r500"
diff --git a/SPOTeam_android/app/src/main/res/layout/modify_study_popup_studyone_menu.xml b/SPOTeam_android/app/src/main/res/layout/modify_study_popup_studyone_menu.xml
@@ -12,8 +12,10 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center"
+        android:gravity="start"
         android:textColor="@color/black"
+        android:fontFamily="@font/suit_variable_font"
+        android:textFontWeight="500"
         android:padding="6dp"
         android:text="스터디원 신고"
         android:textSize="14dp" />
@@ -29,9 +31,11 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center"
+        android:gravity="start"
         android:padding="6dp"
         android:text="스터디 탈퇴"
+        android:fontFamily="@font/suit_variable_font"
+        android:textFontWeight="500"
         android:textColor="@color/r500"
         android:textSize="14dp" />
 </LinearLayout>
