From 07799abedea79da4783521543a07970570bbc119 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Thu, 7 Aug 2025 20:34:24 +0900
Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=ED=95=84=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/btn_logout_outline.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 app/src/main/res/drawable/btn_logout_outline.xml

diff --git a/app/src/main/res/drawable/btn_logout_outline.xml b/app/src/main/res/drawable/btn_logout_outline.xml
new file mode 100644
index 00000000..a8b409b1
--- /dev/null
+++ b/app/src/main/res/drawable/btn_logout_outline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file

From 32fa6aebfdb572d70ee2c8dfe9beb74083a978bf Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Thu, 7 Aug 2025 22:05:06 +0900
Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=ED=95=84=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20RE=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onairmate/ui/profile/ProfileFragment.kt   |   3 +
 .../main/res/drawable/btn_logout_outline.xml  |  10 +-
 app/src/main/res/layout/fragment_profile.xml  | 361 ++++++++++--------
 3 files changed, 209 insertions(+), 165 deletions(-)

diff --git a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
index 83c7b985..5721c581 100644
--- a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
@@ -47,10 +47,13 @@ class ProfileFragment : Fragment() {
             Toast.makeText(requireContext(), "추천 및 제재에 따라 인기도가 조정됩니다.", Toast.LENGTH_LONG).show()
         }
 
+        /*
         binding.layoutMyRooms.setOnClickListener {
             // 참여한 방 이동
         }
 
+         */
+
         binding.tvNicknameValue.text = nickname
 
         // 다른 버튼들에 대한 clickListener도 동일하게 설정
diff --git a/app/src/main/res/drawable/btn_logout_outline.xml b/app/src/main/res/drawable/btn_logout_outline.xml
index a8b409b1..7ebd933d 100644
--- a/app/src/main/res/drawable/btn_logout_outline.xml
+++ b/app/src/main/res/drawable/btn_logout_outline.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
 
-</selector>
\ No newline at end of file
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/text5" />
+    <corners android:radius="6dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 2466bd1a..803fd278 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@color/white"
+    android:layout_marginTop="20dp">
 
     <!-- 상단 타이틀 -->
     <TextView
@@ -14,7 +15,7 @@
         android:text="ON AIR mate"
         android:textColor="@color/main"
         android:textSize="24sp"
-        android:textStyle="bold"
+        android:fontFamily="@font/pretendard_bold"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="30dp"
@@ -65,7 +66,7 @@
                 android:layout_height="96dp"
                 android:src="@drawable/profile"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="24dp" />
+                android:layout_marginTop="50dp" />
 
             <!-- 프로필 사진 변경 버튼 -->
             <Button
@@ -77,211 +78,245 @@
                 android:backgroundTint="@color/input"
                 android:textColor="@color/black"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="8dp"/>
+                android:layout_marginTop="20dp"/>
 
-            <!-- 개인정보 -->
-            <TextView
-                android:id="@+id/tv_personal_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="개인정보"
-                android:textStyle="bold"
-                android:textSize="16sp"
-                android:layout_marginTop="24dp"
-                android:layout_marginStart="20dp" />
-
-            <!-- 닉네임 -->
             <LinearLayout
-                android:id="@+id/layout_nickname"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="16dp">
+                android:id="@+id/layout_my_private_info"
+                android:layout_width="280dp"
+                android:layout_height="88dp"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:layout_marginTop="40dp">
 
-                <TextView
-                    android:id="@+id/tv_nickname_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="닉네임"
-                    android:textSize="14sp"
-                    android:layout_marginStart="20dp"/>
-
-                <TextView
-                    android:id="@+id/tv_nickname_value"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/layout_personal_info"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="[사용자 닉네임]"
-                    android:textSize="14sp"
-                    android:layout_marginStart="30dp"/>
-            </LinearLayout>
+                    android:orientation="horizontal">
 
-            <!-- 인기도 영역 -->
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/layout_popular"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp">
+                    <!-- 개인정보 텍스트 -->
+                    <TextView
+                        android:id="@+id/tv_personal_info"
+                        android:layout_width="wrap_content"
+                        android:layout_height="19dp"
+                        android:fontFamily="@font/pretendard_medium"
+                        android:text="개인정보"
+                        android:textSize="16sp" />
+                    
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:layout_marginLeft="214dp"
+                        android:src="@drawable/arrow"/>
+                    
+                </LinearLayout>
+                
 
-                <!-- 왼쪽 콘텐츠 -->
+                <!-- 닉네임 -->
                 <LinearLayout
-                    android:id="@+id/layout_popular_content"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginStart="12dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent">
+                    android:id="@+id/layout_nickname"
+                    android:layout_width="match_parent"
+                    android:layout_height="17dp"
+                    android:layout_marginTop="20dp"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/tv_popular"
+                        android:id="@+id/tv_nickname_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="인기도"
-                        android:textSize="14sp"
-                        android:layout_marginEnd="12dp" />
-
-                    <ImageView
-                        android:id="@+id/iv_popularity_icon"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:src="@drawable/ic_popular"
-                        android:layout_marginEnd="12dp" />
+                        android:fontFamily="@font/pretendard_regular"
+                        android:text="닉네임"
+                        android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/tv_popularity_score"
+                        android:id="@+id/tv_nickname_value"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="***점"
-                        android:textSize="14sp" />
+                        android:layout_marginLeft="38dp"
+                        android:text="[사용자 닉네임]" />
                 </LinearLayout>
 
-                <!-- 툴팁 -->
-                <ImageView
-                    android:id="@+id/iv_tooltip"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:src="@drawable/ic_question"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="@id/layout_popular_content"
-                    android:layout_marginEnd="12dp" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <!-- 나의 활동 -->
-            <TextView
-                android:id="@+id/tv_my_activity"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="나의 활동"
-                android:textStyle="bold"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="20dp"/>
+                <!-- 인기도 영역 -->
+                    <LinearLayout
+                        android:id="@+id/layout_popular_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="17dp"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp">
+
+                        <TextView
+                            android:id="@+id/tv_popular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/pretendard_regular"
+                            android:text="인기도"
+                            android:textSize="14sp" />
+
+                        <ImageView
+                            android:id="@+id/iv_popularity_icon"
+                            android:layout_width="14dp"
+                            android:layout_height="14dp"
+                            android:layout_marginLeft="38dp"
+                            android:src="@drawable/ic_popular" />
+
+                        <TextView
+                            android:id="@+id/tv_popularity_score"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="***점"
+                            android:textSize="14sp"
+                            android:layout_marginLeft="60dp"/>
+
+                        <!-- 툴팁 -->
+                        <ImageView
+                            android:id="@+id/iv_tooltip"
+                            android:layout_width="14dp"
+                            android:layout_height="14dp"
+                            android:layout_marginLeft="85dp"
+                            android:src="@drawable/ic_question" />
+                    </LinearLayout>
+            </LinearLayout>
 
-            <!-- 참여한 방 -->
             <LinearLayout
-                android:id="@+id/layout_my_rooms"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:padding="16dp">
-
+                android:id="@+id/layout_my_active"
+                android:layout_width="280dp"
+                android:layout_height="152dp"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:layout_marginTop="40dp">
+
+                <!-- 나의 활동 -->
                 <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="참여한 방"
-                    android:textSize="14sp"/>
+                    android:id="@+id/tv_my_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="19dp"
+                    android:text="나의 활동"
+                    android:fontFamily="@font/pretendard_medium"
+                    android:textSize="16sp"/>
+
+                <!-- 참여한 방 -->
+                <LinearLayout
+                    android:id="@+id/layout_my_rooms"
+                    android:layout_width="match_parent"
+                    android:layout_height="17dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="15dp">
 
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:src="@drawable/arrow"/>
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="52dp"
+                        android:layout_height="17dp"
+                        android:layout_weight="1"
+                        android:text="참여한 방"
+                        android:textSize="14sp"/>
 
-            <!-- 차단 리스트 -->
-            <LinearLayout
-                android:id="@+id/layout_block"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:padding="16dp">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="14dp"
+                        android:src="@drawable/arrow"/>
+                </LinearLayout>
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="차단 리스트"
-                    android:textSize="14sp"/>
+                <!-- 차단 리스트 -->
+                <LinearLayout
+                    android:id="@+id/layout_block"
+                    android:layout_width="match_parent"
+                    android:layout_height="17dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="15dp">
 
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:src="@drawable/arrow"/>
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="52dp"
+                        android:layout_height="17dp"
+                        android:layout_weight="1"
+                        android:text="차단 리스트"
+                        android:textSize="14sp"/>
 
-            <!-- 의견 보내기 -->
-            <LinearLayout
-                android:id="@+id/layout_opinion"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:padding="16dp">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="14dp"
+                        android:src="@drawable/arrow"/>
+                </LinearLayout>
 
-                <TextView
-                    android:layout_width="0dp"
+                <!-- 의견 보내기 -->
+                <LinearLayout
+                    android:id="@+id/layout_opinion"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="의견 보내기"
-                    android:textSize="14sp"/>
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="15dp">
 
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:src="@drawable/arrow"/>
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="52dp"
+                        android:layout_height="17dp"
+                        android:layout_weight="1"
+                        android:text="의견 보내기"
+                        android:textSize="14sp"/>
 
-            <!-- 좋아한 컬렉션 -->
-            <LinearLayout
-                android:id="@+id/layout_like_collection"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:padding="16dp">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="14dp"
+                        android:src="@drawable/arrow"/>
+                </LinearLayout>
 
-                <TextView
-                    android:layout_width="0dp"
+                <!-- 좋아한 컬렉션 -->
+                <LinearLayout
+                    android:id="@+id/layout_like_collection"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="좋아한 컬렉션"
-                    android:textSize="14sp"/>
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="15dp">
 
-                <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:src="@drawable/arrow"/>
+                    <TextView
+                        android:layout_width="52dp"
+                        android:layout_height="17dp"
+                        android:layout_weight="1"
+                        android:text="좋아한 컬렉션"
+                        android:textSize="14sp"/>
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="14dp"
+                        android:src="@drawable/arrow"/>
+                </LinearLayout>
             </LinearLayout>
 
+
             <!-- 하단 로고 -->
             <LinearLayout
                 android:id="@+id/layout_logo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:gravity="center"
-                android:padding="16dp">
+                android:padding="16dp"
+                android:layout_marginStart="@id/layout_my_active">
 
                 <ImageView
                     android:id="@+id/onairmate_bottom_logo"
+                    android:layout_width="470dp"
+                    android:layout_height="89.26dp"
+                    android:src="@drawable/logo_onairmate_profile"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="50dp"/>
+
+                <Button
+                    android:id="@+id/btn_logout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/logo_onairmate_profile" />
+                    android:layout_marginTop="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@drawable/btn_logout_outline"
+                    android:text="로그아웃"
+                    android:textColor="@color/text5"
+                    android:textSize="14sp"
+                    android:fontFamily="@font/pretendard_semi_bold"
+                    app:layout_constraintTop_toBottomOf="@id/onairmate_bottom_logo"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

From b89c89cbf500686c9aad4efde0dd9bef076e0f4c Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Fri, 8 Aug 2025 00:26:20 +0900
Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=EA=B0=9C=EC=9D=B8=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

백업용 입니다. 빌드 불가. 에러 투성이 입니다.
---
 app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt | 4 ++++
 .../umc/OnAirMate/data/model/response/NicknameResponse.kt   | 4 ++++
 .../data/repository/repository/NicknameRepository.kt        | 4 ++++
 .../repository/repositoryImpl/NicknameRepositoryImpl.kt     | 4 ++++
 .../java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt     | 4 ++++
 app/src/main/res/drawable/bg_btn_edit.xml                   | 4 ++++
 app/src/main/res/drawable/bg_input_edit_text.xml            | 4 ++++
 app/src/main/res/layout/popup_change_nickname.xml           | 6 ++++++
 8 files changed, 34 insertions(+)
 create mode 100644 app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
 create mode 100644 app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
 create mode 100644 app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
 create mode 100644 app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
 create mode 100644 app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
 create mode 100644 app/src/main/res/drawable/bg_btn_edit.xml
 create mode 100644 app/src/main/res/drawable/bg_input_edit_text.xml
 create mode 100644 app/src/main/res/layout/popup_change_nickname.xml

diff --git a/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt b/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
new file mode 100644
index 00000000..31cfd945
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
@@ -0,0 +1,4 @@
+package umc.onairmate.data.api
+
+interface NicknameService {
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt b/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
new file mode 100644
index 00000000..a350ae5e
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
@@ -0,0 +1,4 @@
+package umc.onairmate.data.model.response
+
+class NicknameResponse {
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt b/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
new file mode 100644
index 00000000..9488c2ff
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
@@ -0,0 +1,4 @@
+package umc.onairmate.data.repository.repository
+
+interface NicknameRepository {
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt b/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
new file mode 100644
index 00000000..f7c3083a
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
@@ -0,0 +1,4 @@
+package umc.onairmate.data.repository.repositoryImpl
+
+class NicknameRepositoryImpl {
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
new file mode 100644
index 00000000..0d56736d
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
@@ -0,0 +1,4 @@
+package umc.onairmate.ui.pop_up
+
+class ChangeNicknamePopup {
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_btn_edit.xml b/app/src/main/res/drawable/bg_btn_edit.xml
new file mode 100644
index 00000000..3ef89983
--- /dev/null
+++ b/app/src/main/res/drawable/bg_btn_edit.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_input_edit_text.xml b/app/src/main/res/drawable/bg_input_edit_text.xml
new file mode 100644
index 00000000..a8b409b1
--- /dev/null
+++ b/app/src/main/res/drawable/bg_input_edit_text.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_change_nickname.xml b/app/src/main/res/layout/popup_change_nickname.xml
new file mode 100644
index 00000000..cdc89f25
--- /dev/null
+++ b/app/src/main/res/layout/popup_change_nickname.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3ab683bfdb00d4ce2796f6ebb5119676976d9fd1 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Fri, 8 Aug 2025 00:34:32 +0900
Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=EA=B0=9C=EC=9D=B8=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

백업용 입니다. 빌드 불가. 에러 투성이 입니다.
---
 .../umc/OnAirMate/data/api/NicknameService.kt |  11 ++
 .../data/model/response/NicknameResponse.kt   |   6 +
 .../repository/NicknameRepository.kt          |  14 ++-
 .../repositoryImpl/NicknameRepositoryImpl.kt  |   9 +-
 .../ui/pop_up/ChangeNicknamePopup.kt          |  84 +++++++++++++-
 .../umc/onairmate/module/RepositoryModule.kt  |   9 ++
 .../umc/onairmate/module/ServiceModule.kt     |   7 ++
 app/src/main/res/drawable/bg_btn_edit.xml     |   8 +-
 .../main/res/drawable/bg_input_edit_text.xml  |   9 +-
 .../main/res/layout/popup_change_nickname.xml | 109 +++++++++++++++++-
 10 files changed, 248 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt b/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
index 31cfd945..3d937bca 100644
--- a/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
+++ b/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
@@ -1,4 +1,15 @@
 package umc.onairmate.data.api
 
+import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.PUT
+import umc.onairmate.data.model.response.NicknameResponse
+import umc.onairmate.data.model.response.RawDefaultResponse
+
 interface NicknameService {
+    @PUT("users/profile")
+    suspend fun updateUserProfile(
+        @Header("Authorization") accessToken: String,
+        @Body body: UpdateProfileRequest
+    ): RawDefaultResponse<NicknameResponse>
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt b/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
index a350ae5e..62888994 100644
--- a/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
+++ b/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
@@ -1,4 +1,10 @@
 package umc.onairmate.data.model.response
 
+import com.google.gson.annotations.SerializedName
+
 class NicknameResponse {
+    @SerializedName("nickname")
+    val accessToken : String,
+    @SerializedName("profileImage")
+    val refreshToken : String
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt b/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
index 9488c2ff..5a852606 100644
--- a/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
+++ b/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
@@ -1,4 +1,12 @@
-package umc.onairmate.data.repository.repository
+package umc.onairmate.data.repository
 
-interface NicknameRepository {
-}
\ No newline at end of file
+import umc.onairmate.data.api.NicknameService
+import javax.inject.Inject
+
+class NicknameRepository @Inject constructor(
+    private val nicknameService: NicknameService
+) {
+    suspend fun isNicknameDuplicated(nickname: String): Boolean {
+        // API 호출 등 로직
+    }
+}
diff --git a/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt b/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
index f7c3083a..8208dcf3 100644
--- a/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
+++ b/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
@@ -1,4 +1,9 @@
 package umc.onairmate.data.repository.repositoryImpl
 
-class NicknameRepositoryImpl {
-}
\ No newline at end of file
+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 {}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
index 0d56736d..34914370 100644
--- a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
@@ -1,4 +1,86 @@
 package umc.onairmate.ui.pop_up
 
-class ChangeNicknamePopup {
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import umc.onairmate.R
+import umc.onairmate.data.repository.NicknameRepository
+import umc.onairmate.databinding.PopupChangeNicknameBinding
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChangeNicknamePopup : BottomSheetDialogFragment() {
+
+    private var _binding: PopupChangeNicknameBinding? = null
+    private val binding get() = _binding!!
+
+    @Inject
+    lateinit var repository: NicknameRepository
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = PopupChangeNicknameBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.editNickname.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                val input = s.toString()
+                val isValid = input.length in 3..10
+
+                binding.checkNickname.setBackgroundResource(
+                    if (isValid) R.drawable.bg_btn_main
+                    else R.drawable.bg_btn_disabled
+                )
+                binding.checkNickname.isEnabled = isValid
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        binding.checkNickname.setOnClickListener {
+            val nickname = binding.editNickname.text.toString()
+
+            if (nickname.length !in 3..10) {
+                Toast.makeText(requireContext(), "닉네임은 3자 이상 10자 이하여야 합니다.", Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+
+            viewLifecycleOwner.lifecycleScope.launch {
+                val isDuplicated = withContext(Dispatchers.IO) {
+                    repository.isNicknameDuplicated(nickname)
+                }
+
+                if (isDuplicated) {
+                    Toast.makeText(requireContext(), "이미 사용 중인 닉네임입니다.", Toast.LENGTH_SHORT).show()
+                    binding.editNickname.text.clear()
+                    binding.checkNickname.setBackgroundResource(R.drawable.bg_btn_disabled)
+                    binding.checkNickname.isEnabled = false
+                } else {
+                    Toast.makeText(requireContext(), "사용 가능한 닉네임입니다!", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/onairmate/module/RepositoryModule.kt b/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
index aa7a3e80..7078d1fa 100644
--- a/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
+++ b/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
@@ -8,7 +8,9 @@ import dagger.hilt.android.scopes.ViewModelScoped
 import umc.onairmate.data.api.FriendService
 import umc.onairmate.data.api.ChatRoomService
 import umc.onairmate.data.api.HomeService
+import umc.onairmate.data.api.NicknameService
 import umc.onairmate.data.api.TestService
+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.HomeRepository
@@ -16,6 +18,7 @@ import umc.onairmate.data.repository.repository.TestRepository
 import umc.onairmate.data.repository.repositoryImpl.FriendRepositoryImpl
 import umc.onairmate.data.repository.repositoryImpl.ChatRoomRepositoryImpl
 import umc.onairmate.data.repository.repositoryImpl.HomeRepositoryImpl
+import umc.onairmate.data.repository.repositoryImpl.NicknameRepositoryImpl
 import umc.onairmate.data.repository.repositoryImpl.TestRepositoryImpl
 
 @Module
@@ -44,4 +47,10 @@ object RepositoryModule {
     fun providesChatRoomRepository(
         chatRoomService: ChatRoomService
     ) : ChatRoomRepository = ChatRoomRepositoryImpl(chatRoomService)
+
+    @ViewModelScoped
+    @Provides
+    fun providesNicknameRepository(
+        nicknameService: NicknameService
+    ) : NicknameRepository = NicknameRepositoryImpl(nicknameService)
 }
diff --git a/app/src/main/java/umc/onairmate/module/ServiceModule.kt b/app/src/main/java/umc/onairmate/module/ServiceModule.kt
index 4d0e045c..ec8553d0 100644
--- a/app/src/main/java/umc/onairmate/module/ServiceModule.kt
+++ b/app/src/main/java/umc/onairmate/module/ServiceModule.kt
@@ -8,6 +8,7 @@ import retrofit2.Retrofit
 import umc.onairmate.data.api.ChatRoomService
 import umc.onairmate.data.api.FriendService
 import umc.onairmate.data.api.HomeService
+import umc.onairmate.data.api.NicknameService
 import umc.onairmate.data.api.TestService
 import javax.inject.Singleton
 
@@ -44,4 +45,10 @@ object ServiceModule {
     fun friendApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): FriendService{
         return retrofit.buildService()
     }
+
+    @Provides
+    @Singleton
+    fun nicknameApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): NicknameService {
+        return retrofit.buildService()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_btn_edit.xml b/app/src/main/res/drawable/bg_btn_edit.xml
index 3ef89983..0b5686a4 100644
--- a/app/src/main/res/drawable/bg_btn_edit.xml
+++ b/app/src/main/res/drawable/bg_btn_edit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  
-</selector>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/disable" />
+    <corners android:radius="8dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_input_edit_text.xml b/app/src/main/res/drawable/bg_input_edit_text.xml
index a8b409b1..48d5829d 100644
--- a/app/src/main/res/drawable/bg_input_edit_text.xml
+++ b/app/src/main/res/drawable/bg_input_edit_text.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-</selector>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <stroke android:color="@color/black" android:width="0.2dp"/>
+    <corners android:radius="5dp"/>
+</shape>
diff --git a/app/src/main/res/layout/popup_change_nickname.xml b/app/src/main/res/layout/popup_change_nickname.xml
index cdc89f25..11493cde 100644
--- a/app/src/main/res/layout/popup_change_nickname.xml
+++ b/app/src/main/res/layout/popup_change_nickname.xml
@@ -1,6 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="340dp"
+    android:layout_height="220dp"
+    android:layout_gravity="center"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingLeft="20dp"
+    android:paddingRight="20dp"
+    android:paddingTop="15dp"
+    android:paddingBottom="15dp"
+    android:orientation="vertical"
+    android:id="@+id/popup_change_nickname">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <TextView
+        android:layout_width="278dp"
+        android:layout_height="17dp"
+        android:text="닉네임 수정"
+        android:textSize="14sp"
+        android:textColor="@color/black"
+        android:fontFamily="@font/pretendard_medium" />
+
+    <LinearLayout
+        android:id="@+id/layout_change_nickname"
+        android:layout_width="278dp"
+        android:layout_height="88dp"
+        android:orientation="horizontal"
+        android:layout_marginTop="17dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title_image">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/pretendard_regular"
+            android:text="닉네임"
+            android:textSize="14sp"/>
+
+        <LinearLayout
+            android:id="@+id/layout_input_nickname"
+            android:layout_width="180dp"
+            android:layout_height="40dp"
+            android:orientation="vertical">
+
+            <EditText
+                android:id="@+id/edit_nickname"
+                android:layout_width="180dp"
+                android:layout_height="20dp"
+                android:background="@drawable/bg_input_edit_text"
+                android:maxLines="1"
+                android:textSize="14sp"
+                android:layout_marginLeft="3dp"/>
+
+            <TextView
+                android:id="@+id/nickname_info"
+                android:layout_width="180dp"
+                android:layout_height="14dp"
+                android:text="(3~10자 이내로 입력해주세요)"
+                android:textSize="12sp"
+                android:fontFamily="@font/pretendard_regular"
+                android:layout_marginLeft="3dp"/>
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/check_nickname"
+            android:layout_width="50dp"
+            android:layout_height="20dp"
+            android:background="@drawable/bg_btn_disabled"
+            android:gravity="center"
+            android:text="중복 확인"
+            android:textSize="12sp"
+            android:fontFamily="@font/pretendard_medium"
+            android:textColor="@color/white"
+            android:layout_marginLeft="5dp"/>
+
+    </LinearLayout>
+    
+    <LinearLayout
+        android:layout_width="278dp"
+        android:layout_height="24dp"
+        android:orientation="vertical"
+        android:layout_gravity="left">
+        
+        <TextView
+            android:id="@+id/explain_shop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="*최소 1회 무료\n추가 변경권은 M:Shop 에서 구매 가능"
+            android:textSize="10sp"
+            android:fontFamily="@font/pretendard_medium"/>
+    </LinearLayout>
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/cancel_create"
+        android:layout_width="50dp"
+        android:layout_height="20dp"
+        android:background="@drawable/bg_btn_main"
+        android:fontFamily="@font/pretendard_semi_bold"
+        android:text="완료"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"/>
+
+</LinearLayout>
\ No newline at end of file

From 7019f20eb22d1886f1e2898c82aeabdb80692674 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Wed, 13 Aug 2025 01:00:32 +0900
Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=EB=8B=89=EB=84=A4=EC=9E=84=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=B2=B4=ED=81=AC=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

hilt 부분에서 오류 발생, build 불가
---
 .../umc/OnAirMate/data/api/NicknameService.kt | 11 +++----
 .../data/model/entity/NicknameData.kt         | 11 +++++++
 .../data/model/response/NicknameResponse.kt   | 14 +++++----
 .../repository/NicknameRepository.kt          | 13 ++------
 .../repositoryImpl/NicknameRepositoryImpl.kt  | 16 +++++++++-
 .../ui/chat_room/ChatRoomFragment.kt          |  2 +-
 .../ui/pop_up/ChangeNicknameViewModel.kt      | 30 +++++++++++++++++++
 .../umc/onairmate/module/RepositoryModule.kt  | 13 ++++----
 8 files changed, 81 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/umc/OnAirMate/data/model/entity/NicknameData.kt
 create mode 100644 app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknameViewModel.kt

diff --git a/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt b/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
index 3d937bca..c847b99c 100644
--- a/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
+++ b/app/src/main/java/umc/OnAirMate/data/api/NicknameService.kt
@@ -1,15 +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 {
-    @PUT("users/profile")
-    suspend fun updateUserProfile(
-        @Header("Authorization") accessToken: String,
-        @Body body: UpdateProfileRequest
-    ): RawDefaultResponse<NicknameResponse>
+    @GET("auth/check-nickname/{nickname}")
+    suspend fun checkNickname(
+        @Path("nickname") nickname: String
+    ): NicknameResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/model/entity/NicknameData.kt b/app/src/main/java/umc/OnAirMate/data/model/entity/NicknameData.kt
new file mode 100644
index 00000000..764419d7
--- /dev/null
+++ b/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
+)
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt b/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
index 62888994..b005976b 100644
--- a/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
+++ b/app/src/main/java/umc/OnAirMate/data/model/response/NicknameResponse.kt
@@ -1,10 +1,12 @@
 package umc.onairmate.data.model.response
 
 import com.google.gson.annotations.SerializedName
+import umc.onairmate.data.model.entity.NicknameData
 
-class NicknameResponse {
-    @SerializedName("nickname")
-    val accessToken : String,
-    @SerializedName("profileImage")
-    val refreshToken : String
-}
\ No newline at end of file
+class NicknameResponse (
+    @SerializedName("success")
+    val success: Boolean,
+
+    @SerializedName("data")
+    val data: NicknameData
+)
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt b/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
index 5a852606..928a2029 100644
--- a/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
+++ b/app/src/main/java/umc/OnAirMate/data/repository/repository/NicknameRepository.kt
@@ -1,12 +1,5 @@
 package umc.onairmate.data.repository
 
-import umc.onairmate.data.api.NicknameService
-import javax.inject.Inject
-
-class NicknameRepository @Inject constructor(
-    private val nicknameService: NicknameService
-) {
-    suspend fun isNicknameDuplicated(nickname: String): Boolean {
-        // API 호출 등 로직
-    }
-}
+interface NicknameRepository {
+    suspend fun isNicknameDuplicated(nickname: String): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt b/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
index 8208dcf3..def93ae2 100644
--- a/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
+++ b/app/src/main/java/umc/OnAirMate/data/repository/repositoryImpl/NicknameRepositoryImpl.kt
@@ -1,9 +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 {}
\ No newline at end of file
+): 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
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/ui/chat_room/ChatRoomFragment.kt b/app/src/main/java/umc/OnAirMate/ui/chat_room/ChatRoomFragment.kt
index 358de4b1..92d61afa 100644
--- a/app/src/main/java/umc/OnAirMate/ui/chat_room/ChatRoomFragment.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/chat_room/ChatRoomFragment.kt
@@ -83,7 +83,7 @@ class ChatRoomFragment : Fragment() {
         lifecycle.addObserver(youtubePlayer)
 
         youtubePlayer.addYouTubePlayerListener(object : AbstractYouTubePlayerListener() {
-            override fun onReady(youTubePlayer: YouTubePlayer) {\
+            override fun onReady(youTubePlayer: YouTubePlayer) {
                 val videoId = roomData.videoId ?: "CgCVZdcKcqY"
                 youTubePlayer.loadVideo(videoId, 0f) // todo: RoomData duration 연동
             }
diff --git a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknameViewModel.kt b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknameViewModel.kt
new file mode 100644
index 00000000..e300b4ef
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknameViewModel.kt
@@ -0,0 +1,30 @@
+package umc.onairmate.ui.pop_up
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import umc.onairmate.data.repository.NicknameRepository
+
+@HiltViewModel
+class ChangeNicknameViewModel @Inject constructor(
+    private val nicknameRepository: NicknameRepository
+) : ViewModel() {
+
+    // 닉네임 중복 확인 결과를 콜백으로 전달하거나 LiveData로 관리 가능
+    fun checkNickname(
+        nickname: String,
+        onResult: (Boolean) -> Unit
+    ) {
+        viewModelScope.launch {
+            try {
+                val isDuplicated = nicknameRepository.isNicknameDuplicated(nickname)
+                onResult(isDuplicated)
+            } catch (e: Exception) {
+                // 에러 처리 필요하면 여기서
+                onResult(false) // 중복 아님으로 처리하거나 별도 처리
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/onairmate/module/RepositoryModule.kt b/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
index 7078d1fa..417968cd 100644
--- a/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
+++ b/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
@@ -29,28 +29,29 @@ object RepositoryModule {
     @Provides
     fun providesHomeRepository(
         homeService: HomeService
-    ) : HomeRepository = HomeRepositoryImpl(homeService)
+    ): HomeRepository = HomeRepositoryImpl(homeService)
 
     @ViewModelScoped
     @Provides
     fun providesTestRepository(
         testService: TestService
-    ) : TestRepository = TestRepositoryImpl(testService)
+    ): TestRepository = TestRepositoryImpl(testService)
 
     @ViewModelScoped
     @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
     fun providesNicknameRepository(
         nicknameService: NicknameService
-    ) : NicknameRepository = NicknameRepositoryImpl(nicknameService)
-}
+    ): NicknameRepository = NicknameRepositoryImpl(nicknameService)
+}
\ No newline at end of file

From 3c8a7b10cd7d83a55f8f03fc3749e448852abe2b Mon Sep 17 00:00:00 2001
From: iwannacat <ju0808lie@naver.com>
Date: Wed, 13 Aug 2025 01:23:04 +0900
Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/pop_up/ChangeNicknamePopup.kt          | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
index 34914370..b7cc447b 100644
--- a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
@@ -24,8 +24,8 @@ class ChangeNicknamePopup : BottomSheetDialogFragment() {
     private var _binding: PopupChangeNicknameBinding? = null
     private val binding get() = _binding!!
 
-    @Inject
-    lateinit var repository: NicknameRepository
+//    @Inject
+//    lateinit var repository: NicknameRepository
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -62,20 +62,20 @@ class ChangeNicknamePopup : BottomSheetDialogFragment() {
                 return@setOnClickListener
             }
 
-            viewLifecycleOwner.lifecycleScope.launch {
-                val isDuplicated = withContext(Dispatchers.IO) {
-                    repository.isNicknameDuplicated(nickname)
-                }
-
-                if (isDuplicated) {
-                    Toast.makeText(requireContext(), "이미 사용 중인 닉네임입니다.", Toast.LENGTH_SHORT).show()
-                    binding.editNickname.text.clear()
-                    binding.checkNickname.setBackgroundResource(R.drawable.bg_btn_disabled)
-                    binding.checkNickname.isEnabled = false
-                } else {
-                    Toast.makeText(requireContext(), "사용 가능한 닉네임입니다!", Toast.LENGTH_SHORT).show()
-                }
-            }
+//            viewLifecycleOwner.lifecycleScope.launch {
+//                val isDuplicated = withContext(Dispatchers.IO) {
+//                    repository.isNicknameDuplicated(nickname)
+//                }
+//
+//                if (isDuplicated) {
+//                    Toast.makeText(requireContext(), "이미 사용 중인 닉네임입니다.", Toast.LENGTH_SHORT).show()
+//                    binding.editNickname.text.clear()
+//                    binding.checkNickname.setBackgroundResource(R.drawable.bg_btn_disabled)
+//                    binding.checkNickname.isEnabled = false
+//                } else {
+//                    Toast.makeText(requireContext(), "사용 가능한 닉네임입니다!", Toast.LENGTH_SHORT).show()
+//                }
+//            }
         }
     }
 

From 1a6f51148031c8a1e43dc7f5a8215e0110a221f2 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Wed, 13 Aug 2025 10:14:48 +0900
Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=ED=95=84=20?=
 =?UTF-8?q?=ED=94=84=EB=9E=98=EA=B7=B8=EB=A8=BC=ED=8A=B8=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99=20ui=20=EC=9D=B4=EB=8F=99=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/pop_up/ChangeNicknamePopup.kt          | 19 +++-
 .../onairmate/ui/profile/ProfileFragment.kt   | 89 +++++++-----------
 app/src/main/res/layout/fragment_profile.xml  | 93 +++++++++----------
 3 files changed, 92 insertions(+), 109 deletions(-)

diff --git a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
index 34914370..9f693f9e 100644
--- a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
@@ -24,8 +24,8 @@ class ChangeNicknamePopup : BottomSheetDialogFragment() {
     private var _binding: PopupChangeNicknameBinding? = null
     private val binding get() = _binding!!
 
-    @Inject
-    lateinit var repository: NicknameRepository
+    // 외부에서 중복 체크를 처리하기 위한 콜백 람다 추가
+    var onCheckNickname: ((String, (Boolean) -> Unit) -> Unit)? = null
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -62,6 +62,19 @@ class ChangeNicknamePopup : BottomSheetDialogFragment() {
                 return@setOnClickListener
             }
 
+            // 외부 콜백 호출해서 중복 검사 요청
+            onCheckNickname?.invoke(nickname) { isDuplicated ->
+                if (isDuplicated) {
+                    Toast.makeText(requireContext(), "이미 사용 중인 닉네임입니다.", Toast.LENGTH_SHORT).show()
+                    binding.editNickname.text?.clear()
+                    binding.checkNickname.setBackgroundResource(R.drawable.bg_btn_disabled)
+                    binding.checkNickname.isEnabled = false
+                } else {
+                    Toast.makeText(requireContext(), "사용 가능한 닉네임입니다!", Toast.LENGTH_SHORT).show()
+                }
+            }
+
+            /*
             viewLifecycleOwner.lifecycleScope.launch {
                 val isDuplicated = withContext(Dispatchers.IO) {
                     repository.isNicknameDuplicated(nickname)
@@ -76,6 +89,8 @@ class ChangeNicknamePopup : BottomSheetDialogFragment() {
                     Toast.makeText(requireContext(), "사용 가능한 닉네임입니다!", Toast.LENGTH_SHORT).show()
                 }
             }
+            */
+
         }
     }
 
diff --git a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
index 5721c581..e8b7693d 100644
--- a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
@@ -1,28 +1,32 @@
 package umc.onairmate.ui.profile
 
-
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.PopupWindow
-import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
-import umc.onairmate.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import umc.onairmate.databinding.FragmentProfileBinding
-
+import umc.onairmate.ui.pop_up.ChangeNicknamePopup
+import umc.onairmate.ui.pop_up.ChangeNicknameViewModel
 
 @AndroidEntryPoint
 class ProfileFragment : Fragment() {
 
     private var _binding: FragmentProfileBinding? = null
     private val binding get() = _binding!!
+
+    // ChangeNicknameViewModel 선언
+    private val changeNicknameViewModel: ChangeNicknameViewModel by viewModels()
+
     private var nickname = ""
 
     override fun onCreateView(
@@ -39,6 +43,25 @@ class ProfileFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.tvNicknameValue.text = nickname
+
+        // 닉네임 영역 클릭 시 팝업 띄우기
+        binding.layoutNickname.setOnClickListener {
+            val popup = ChangeNicknamePopup()
+
+            // 팝업에 중복 검사 콜백 연결
+            popup.onCheckNickname = { newNickname, callback ->
+                // 뷰모델의 checkNickname 함수 사용
+                changeNicknameViewModel.checkNickname(newNickname) { isDuplicated ->
+                    // 결과 콜백 호출
+                    callback(isDuplicated)
+                }
+            }
+
+            popup.show(childFragmentManager, "ChangeNicknamePopup")
+        }
+
+        // 기존에 있던 다른 클릭 리스너들 유지
         binding.btnChangeProfile.setOnClickListener {
             Toast.makeText(requireContext(), "프로필 사진 변경 클릭", Toast.LENGTH_SHORT).show()
         }
@@ -46,60 +69,10 @@ class ProfileFragment : Fragment() {
         binding.ivTooltip.setOnClickListener {
             Toast.makeText(requireContext(), "추천 및 제재에 따라 인기도가 조정됩니다.", Toast.LENGTH_LONG).show()
         }
-
-        /*
-        binding.layoutMyRooms.setOnClickListener {
-            // 참여한 방 이동
-        }
-
-         */
-
-        binding.tvNicknameValue.text = nickname
-
-        // 다른 버튼들에 대한 clickListener도 동일하게 설정
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-
-    //도움말 클릭시 글귀 표시
-    private fun showTooltip(anchorView: View, message: String) {
-        val inflater = LayoutInflater.from(anchorView.context)
-        val popupView = inflater.inflate(R.layout.popup_tooltip, null)
-
-        // 텍스트 설정
-        val tooltipText = popupView.findViewById<TextView>(R.id.tooltip_text)
-        tooltipText.text = message
-
-        // PopupWindow 생성
-        val popupWindow = PopupWindow(
-            popupView,
-            ViewGroup.LayoutParams.WRAP_CONTENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT,
-            true
-        ).apply {
-            isOutsideTouchable = true
-            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        }
-
-        // 위치 계산
-        val location = IntArray(2)
-        anchorView.getLocationOnScreen(location)
-
-        val anchorX = location[0]
-        val anchorY = location[1]
-
-        // anchorView 위에 말풍선 위치 조정
-        popupWindow.showAtLocation(
-            anchorView, Gravity.NO_GRAVITY,
-            anchorX - popupView.measuredWidth / 2 + anchorView.width / 2,
-            anchorY - anchorView.height - 20  // 말풍선 높이 조절
-        )
-
-        binding.ivTooltip.setOnClickListener {
-            showTooltip(it, "추천 및 제재에 따라 인기도가 조정됩니다.")
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 803fd278..f22cb0dc 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
-    android:layout_marginTop="20dp">
+    android:layout_marginTop="20dp"
+    android:id="@+id/fragment_profile">
 
     <!-- 상단 타이틀 -->
     <TextView
@@ -102,15 +103,13 @@
                         android:fontFamily="@font/pretendard_medium"
                         android:text="개인정보"
                         android:textSize="16sp" />
-                    
+
                     <ImageView
                         android:layout_width="10dp"
                         android:layout_height="10dp"
                         android:layout_marginLeft="214dp"
                         android:src="@drawable/arrow"/>
-                    
                 </LinearLayout>
-                
 
                 <!-- 닉네임 -->
                 <LinearLayout
@@ -137,44 +136,44 @@
                 </LinearLayout>
 
                 <!-- 인기도 영역 -->
-                    <LinearLayout
-                        android:id="@+id/layout_popular_content"
-                        android:layout_width="match_parent"
-                        android:layout_height="17dp"
-                        android:orientation="horizontal"
-                        android:layout_marginTop="15dp">
-
-                        <TextView
-                            android:id="@+id/tv_popular"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/pretendard_regular"
-                            android:text="인기도"
-                            android:textSize="14sp" />
-
-                        <ImageView
-                            android:id="@+id/iv_popularity_icon"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginLeft="38dp"
-                            android:src="@drawable/ic_popular" />
-
-                        <TextView
-                            android:id="@+id/tv_popularity_score"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="***점"
-                            android:textSize="14sp"
-                            android:layout_marginLeft="60dp"/>
-
-                        <!-- 툴팁 -->
-                        <ImageView
-                            android:id="@+id/iv_tooltip"
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_marginLeft="85dp"
-                            android:src="@drawable/ic_question" />
-                    </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/layout_popular_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="17dp"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="15dp">
+
+                    <TextView
+                        android:id="@+id/tv_popular"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/pretendard_regular"
+                        android:text="인기도"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:id="@+id/iv_popularity_icon"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginLeft="38dp"
+                        android:src="@drawable/ic_popular" />
+
+                    <TextView
+                        android:id="@+id/tv_popularity_score"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="***점"
+                        android:textSize="14sp"
+                        android:layout_marginLeft="60dp"/>
+
+                    <!-- 툴팁 -->
+                    <ImageView
+                        android:id="@+id/iv_tooltip"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_marginLeft="85dp"
+                        android:src="@drawable/ic_question" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
@@ -283,7 +282,6 @@
                 </LinearLayout>
             </LinearLayout>
 
-
             <!-- 하단 로고 -->
             <LinearLayout
                 android:id="@+id/layout_logo"
@@ -292,7 +290,7 @@
                 android:orientation="vertical"
                 android:gravity="center"
                 android:padding="16dp"
-                android:layout_marginStart="@id/layout_my_active">
+                android:layout_marginStart="16dp"> <!-- ✅ 여기 수정 -->
 
                 <ImageView
                     android:id="@+id/onairmate_bottom_logo"
@@ -313,11 +311,8 @@
                     android:text="로그아웃"
                     android:textColor="@color/text5"
                     android:textSize="14sp"
-                    android:fontFamily="@font/pretendard_semi_bold"
-                    app:layout_constraintTop_toBottomOf="@id/onairmate_bottom_logo"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    android:fontFamily="@font/pretendard_semi_bold"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From fb07c173f51781ddc773d75a76494d719a9ae822 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Wed, 13 Aug 2025 12:53:18 +0900
Subject: [PATCH 08/12] =?UTF-8?q?feat:=20=EC=B0=A8=EB=8B=A8=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9D=B4=EB=8F=99=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnAirMate/ui/profile/BlockListAdapter.kt  | 45 ++++++++++
 .../OnAirMate/ui/profile/BlockListFragment.kt | 66 ++++++++++++++
 .../onairmate/ui/profile/ProfileFragment.kt   |  7 ++
 .../main/res/layout/fragment_block_list.xml   | 87 +++++++++++++++++++
 app/src/main/res/layout/item_blocked_user.xml | 63 ++++++++++++++
 .../main/res/navigation/mobile_navigation.xml | 11 ++-
 app/src/main/res/navigation/nav_graph.xml     | 15 ++++
 7 files changed, 293 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt
 create mode 100644 app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_block_list.xml
 create mode 100644 app/src/main/res/layout/item_blocked_user.xml

diff --git a/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt
new file mode 100644
index 00000000..129f6f45
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt
@@ -0,0 +1,45 @@
+package umc.onairmate.ui.profile
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+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
+
+            binding.btnUnblock.setOnClickListener {
+                onUnblockClick(user)
+            }
+        }
+    }
+
+    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
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt
new file mode 100644
index 00000000..13664267
--- /dev/null
+++ b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt
@@ -0,0 +1,66 @@
+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 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
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
index e8b7693d..4013ea49 100644
--- a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
@@ -10,10 +10,12 @@ import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import umc.onairmate.R
 import umc.onairmate.databinding.FragmentProfileBinding
 import umc.onairmate.ui.pop_up.ChangeNicknamePopup
 import umc.onairmate.ui.pop_up.ChangeNicknameViewModel
@@ -69,6 +71,11 @@ class ProfileFragment : Fragment() {
         binding.ivTooltip.setOnClickListener {
             Toast.makeText(requireContext(), "추천 및 제재에 따라 인기도가 조정됩니다.", Toast.LENGTH_LONG).show()
         }
+
+        binding.layoutBlock.setOnClickListener {
+            findNavController().navigate(R.id.action_profileFragment_to_blockListFragment)
+        }
+
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/res/layout/fragment_block_list.xml b/app/src/main/res/layout/fragment_block_list.xml
new file mode 100644
index 00000000..30bdfe02
--- /dev/null
+++ b/app/src/main/res/layout/fragment_block_list.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:id="@+id/blockListFragment">
+
+    <!-- 상단 타이틀 -->
+    <TextView
+        android:id="@+id/tv_app_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="ON AIR mate"
+        android:textColor="@color/main"
+        android:textSize="24sp"
+        android:fontFamily="@font/pretendard_bold"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="16dp" />
+
+    <!-- 검색 아이콘 -->
+    <ImageView
+        android:id="@+id/iv_search"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/ic_search"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/iv_alarm"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"/>
+
+    <!-- 알림 아이콘 -->
+    <ImageView
+        android:id="@+id/iv_alarm"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/ic_alarm_off"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="20dp"/>
+
+    <!-- 뒤로가기 + 제목 -->
+    <LinearLayout
+        android:id="@+id/layout_back_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        app:layout_constraintTop_toBottomOf="@id/tv_app_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="20dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp">
+
+        <ImageView
+            android:id="@+id/ivBack"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_back"
+            android:contentDescription="뒤로가기" />
+
+        <TextView
+            android:id="@+id/tv_block_list_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="차단 리스트"
+            android:textSize="18sp"
+            android:fontFamily="@font/pretendard_semi_bold"
+            android:layout_marginStart="8dp"/>
+    </LinearLayout>
+
+    <!-- 차단 리스트 RecyclerView -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_block_list"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/layout_back_title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:padding="16dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml
new file mode 100644
index 00000000..ead4254c
--- /dev/null
+++ b/app/src/main/res/layout/item_blocked_user.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+
+    <ImageView
+        android:id="@+id/iv_profile_icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:src="@drawable/profile"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/layout_texts"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintStart_toEndOf="@id/iv_profile_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginStart="8dp">
+
+        <TextView
+            android:id="@+id/tvNickname"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="[차단한 사용자 닉네임]"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tvReason"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="[차단 사유]"
+            android:textSize="12sp"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:id="@+id/tvDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="[차단한 일자]"
+            android:textSize="12sp"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btnUnblock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="차단 해제"
+        android:textSize="12sp"
+        android:textColor="@color/black"
+        android:backgroundTint="@color/sub"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index ca0fb107..25e7e552 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -37,5 +37,14 @@
         android:id="@+id/navigation_profile"
         android:name="umc.onairmate.ui.profile.ProfileFragment"
         android:label="@string/title_profile"
-        tools:layout="@layout/fragment_profile" />
+        tools:layout="@layout/fragment_profile">
+        <action
+            android:id="@+id/action_profileFragment_to_blockListFragment"
+            app:destination="@id/blockListFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/blockListFragment"
+        android:name="umc.onairmate.ui.profile.BlockListFragment"
+        tools:layout="@layout/fragment_block_list" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 245ca37b..b0e3e025 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -24,4 +24,19 @@
             android:name="collection"
             app:argType="umc.onairmate.ui.lounge.model.Collection" />
     </fragment>
+
+    <fragment
+        android:id="@+id/profileFragment"
+        android:name="umc.onairmate.ui.profile.ProfileFragment"
+        tools:layout="@layout/fragment_profile">
+        <action
+            android:id="@+id/action_profileFragment_to_blockListFragment"
+            app:destination="@id/blockListFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/blockListFragment"
+        android:name="umc.onairmate.ui.profile.BlockListFragment"
+        tools:layout="@layout/fragment_block_list" />
+
 </navigation>

From e364f122f05fc55ede7d965abea13f77c2343d7a Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Wed, 13 Aug 2025 15:07:54 +0900
Subject: [PATCH 09/12] =?UTF-8?q?chore:=20ui=20=EB=B0=B0=EC=B9=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnAirMate/ui/profile/BlockListAdapter.kt  | 32 +++++--
 .../OnAirMate/ui/profile/BlockListFragment.kt |  3 +
 .../res/drawable/ic_more_vert_black_24dp.xml  |  5 ++
 app/src/main/res/layout/item_blocked_user.xml | 85 ++++++++++---------
 app/src/main/res/menu/menu_block_option.xml   |  5 ++
 5 files changed, 84 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_more_vert_black_24dp.xml
 create mode 100644 app/src/main/res/menu/menu_block_option.xml

diff --git a/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt
index 129f6f45..b5b530c0 100644
--- a/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListAdapter.kt
@@ -2,9 +2,11 @@ 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)
@@ -26,20 +28,36 @@ class BlockListAdapter(
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(user: BlockedUser) {
+            // 데이터 바인딩
             binding.tvNickname.text = "[${user.nickname}]"
-            binding.tvReason.text = user.reason
-            binding.tvDate.text = user.date
-
-            binding.btnUnblock.setOnClickListener {
-                onUnblockClick(user)
+            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
+            override fun areItemsTheSame(oldItem: BlockedUser, newItem: BlockedUser) =
+                oldItem.nickname == newItem.nickname
+
+            override fun areContentsTheSame(oldItem: BlockedUser, newItem: BlockedUser) =
+                oldItem == newItem
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt
index 13664267..987c8abd 100644
--- a/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/profile/BlockListFragment.kt
@@ -5,6 +5,8 @@ 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
@@ -50,6 +52,7 @@ class BlockListFragment : Fragment() {
                 BlockedUser("차단한 사용자 닉네임", "차단 사유", "0000년 00월 00일")
             )
         )
+
     }
 
     private fun setupListeners() {
diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
new file mode 100644
index 00000000..5ffb98a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml
index ead4254c..52fe636d 100644
--- a/app/src/main/res/layout/item_blocked_user.xml
+++ b/app/src/main/res/layout/item_blocked_user.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="8dp">
 
+    <!-- 프로필 아이콘 -->
     <ImageView
         android:id="@+id/iv_profile_icon"
         android:layout_width="40dp"
@@ -13,51 +15,56 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/layout_texts"
+    <!-- 닉네임 -->
+    <TextView
+        android:id="@+id/tvNickname"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:text="[차단한 사용자 닉네임]"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@id/iv_profile_icon"
         app:layout_constraintStart_toEndOf="@id/iv_profile_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginStart="8dp">
-
-        <TextView
-            android:id="@+id/tvNickname"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="[차단한 사용자 닉네임]"
-            android:textSize="14sp"
-            android:textStyle="bold" />
+        app:layout_constraintEnd_toStartOf="@id/btnMore"
+        android:layout_marginStart="8dp" />
 
-        <TextView
-            android:id="@+id/tvReason"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="[차단 사유]"
-            android:textSize="12sp"
-            android:textColor="@color/black" />
-
-        <TextView
-            android:id="@+id/tvDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="[차단한 일자]"
-            android:textSize="12sp"
-            android:textColor="@color/black" />
-    </LinearLayout>
+    <!-- 차단 사유 -->
+    <TextView
+        android:id="@+id/tvReason"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="[차단 사유]"
+        android:textSize="12sp"
+        android:textColor="@color/black"
+        app:layout_constraintTop_toBottomOf="@id/iv_profile_icon"
+        app:layout_constraintStart_toStartOf="@id/iv_profile_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="4dp" />
 
-    <Button
-        android:id="@+id/btnUnblock"
-        android:layout_width="wrap_content"
+    <!-- 차단 일자 -->
+    <TextView
+        android:id="@+id/tvDate"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="차단 해제"
+        android:text="[차단한 일자 (0000년 00월 00일)]"
         android:textSize="12sp"
         android:textColor="@color/black"
-        android:backgroundTint="@color/sub"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvReason"
+        app:layout_constraintStart_toStartOf="@id/tvReason"
+        app:layout_constraintEnd_toEndOf="@id/tvReason"
+        android:layout_marginTop="2dp" />
+
+    <!-- 더보기 버튼 -->
+    <ImageButton
+        android:id="@+id/btnMore"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="더보기"
+        android:src="@drawable/ic_more_vert_black_24dp"
+        app:tint="@color/black"
+        app:layout_constraintTop_toTopOf="@id/tvNickname"
+        app:layout_constraintBottom_toBottomOf="@id/tvNickname"
         app:layout_constraintEnd_toEndOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/menu_block_option.xml b/app/src/main/res/menu/menu_block_option.xml
new file mode 100644
index 00000000..d46cc949
--- /dev/null
+++ b/app/src/main/res/menu/menu_block_option.xml
@@ -0,0 +1,5 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menuUnblock"
+        android:title="차단 해제"/>
+</menu>

From a61d9122a90b17acb8f866949013c25dccb5bb49 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Wed, 13 Aug 2025 15:53:38 +0900
Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=EB=8B=89=EB=84=A4=EC=9E=84=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=ED=8C=9D=EC=97=85=20=EC=9E=AC=EB=B0=B0?=
 =?UTF-8?q?=EC=B9=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/dialog_opinion.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 app/src/main/res/layout/dialog_opinion.xml

diff --git a/app/src/main/res/layout/dialog_opinion.xml b/app/src/main/res/layout/dialog_opinion.xml
new file mode 100644
index 00000000..cdc89f25
--- /dev/null
+++ b/app/src/main/res/layout/dialog_opinion.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 533b736abc4b0829639c83a497a0eacdc6ca70f4 Mon Sep 17 00:00:00 2001
From: tama <rufina130@naver.com>
Date: Wed, 13 Aug 2025 20:17:31 +0900
Subject: [PATCH 11/12] =?UTF-8?q?chore:=20=EC=A0=84=EC=B2=B4=EC=A0=81?=
 =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

약간씩 수정이 되었는데, 올라온 내용 받아와야해서 먼저 커밋 날려놓겠습니다.
---
 .../ui/pop_up/ChangeNicknamePopup.kt          |  3 +-
 .../onairmate/ui/profile/ProfileFragment.kt   | 32 ++++++++++
 app/src/main/res/layout/dialog_opinion.xml    | 64 +++++++++++++++++--
 3 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
index c687f1cf..15e78786 100644
--- a/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
+++ b/app/src/main/java/umc/OnAirMate/ui/pop_up/ChangeNicknamePopup.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
@@ -19,7 +20,7 @@ import umc.onairmate.databinding.PopupChangeNicknameBinding
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ChangeNicknamePopup : BottomSheetDialogFragment() {
+class ChangeNicknamePopup : DialogFragment() {
 
     private var _binding: PopupChangeNicknameBinding? = null
     private val binding get() = _binding!!
diff --git a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
index 4013ea49..f65a17fb 100644
--- a/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/umc/onairmate/ui/profile/ProfileFragment.kt
@@ -5,7 +5,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import android.widget.ImageView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -63,6 +67,10 @@ class ProfileFragment : Fragment() {
             popup.show(childFragmentManager, "ChangeNicknamePopup")
         }
 
+        binding.layoutOpinion.setOnClickListener {
+            showFeedbackDialog()
+        }
+
         // 기존에 있던 다른 클릭 리스너들 유지
         binding.btnChangeProfile.setOnClickListener {
             Toast.makeText(requireContext(), "프로필 사진 변경 클릭", Toast.LENGTH_SHORT).show()
@@ -75,7 +83,31 @@ class ProfileFragment : Fragment() {
         binding.layoutBlock.setOnClickListener {
             findNavController().navigate(R.id.action_profileFragment_to_blockListFragment)
         }
+    }
+    private fun showFeedbackDialog() {
+        val dialogView = layoutInflater.inflate(R.layout.dialog_opinion, null)
+        val dialog = AlertDialog.Builder(requireContext())
+            .setView(dialogView)
+            .create()
+
+        // 뷰 바인딩
+        val etFeedback = dialogView.findViewById<EditText>(R.id.etFeedback)
+        val btnClose = dialogView.findViewById<ImageView>(R.id.btnClose)
+        val btnSubmit = dialogView.findViewById<Button>(R.id.btnSubmit)
+
+
+        btnClose.setOnClickListener { dialog.dismiss() }
+        btnSubmit.setOnClickListener {
+            val feedback = etFeedback.text.toString()
+            if (feedback.isNotBlank()) {
+                // 의견 전송 로직
+                dialog.dismiss()
+            } else {
+                Toast.makeText(requireContext(), "내용을 입력해주세요", Toast.LENGTH_SHORT).show()
+            }
+        }
 
+        dialog.show()
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/res/layout/dialog_opinion.xml b/app/src/main/res/layout/dialog_opinion.xml
index cdc89f25..17d9dc84 100644
--- a/app/src/main/res/layout/dialog_opinion.xml
+++ b/app/src/main/res/layout/dialog_opinion.xml
@@ -1,6 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="320dp"
+    android:layout_height="300dp"
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:paddingLeft="21dp"
+    android:paddingRight="21dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:background="@drawable/background_box_5dp"
+    android:id="@+id/dialog_opinion">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <!-- 상단 타이틀과 닫기 버튼 -->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="의견 보내기"
+            android:textSize="14sp"
+            android:fontFamily="@font/pretendard_medium"/>
+
+        <ImageView
+            android:id="@+id/btnClose"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_alignParentEnd="true"
+            android:src="@drawable/btn_close"
+            android:contentDescription="닫기" />
+    </RelativeLayout>
+
+    <!-- 내용 입력창 -->
+    <EditText
+        android:id="@+id/etFeedback"
+        android:layout_width="278.47dp"
+        android:layout_height="200dp"
+        android:layout_marginTop="13dp"
+        android:background="@drawable/background_input_text"
+        android:gravity="top"
+        android:hint="ON AIR mate에 대한 의견을 자유롭게 작성해주세요. mate들의 소중한 의견은 ON AIR mate에게 아주 큰 도움이 됩니다."
+        android:textSize="14sp"
+        android:fontFamily="@font/pretendard_regular"
+        android:inputType="textMultiLine"
+        android:padding="10dp" />
+
+    <!-- 완료 버튼 -->
+    <Button
+        android:id="@+id/btnSubmit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:backgroundTint="@color/main"
+        android:text="완료"
+        android:textSize="12sp"
+        android:fontFamily="@font/pretendard_semi_bold"
+        android:textColor="@android:color/white" />
+
+</LinearLayout>

From adfaa89af63ff5998017f88851f25efdf24252c7 Mon Sep 17 00:00:00 2001
From: iwannacat <ju0808lie@naver.com>
Date: Fri, 15 Aug 2025 00:56:53 +0900
Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../umc/onairmate/module/NetworkModule.kt     | 21 +-----------------
 .../umc/onairmate/module/RepositoryModule.kt  | 22 +++++++++++++------
 .../umc/onairmate/module/ServiceModule.kt     |  6 +++++
 app/src/main/res/layout/fragment_profile.xml  | 10 ++++-----
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/umc/onairmate/module/NetworkModule.kt b/app/src/main/java/umc/onairmate/module/NetworkModule.kt
index 7cce93bb..62b15c29 100644
--- a/app/src/main/java/umc/onairmate/module/NetworkModule.kt
+++ b/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)
-        }
-    }
+    
 
 }
diff --git a/app/src/main/java/umc/onairmate/module/RepositoryModule.kt b/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
index 1cdec80a..0226c144 100644
--- a/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
+++ b/app/src/main/java/umc/onairmate/module/RepositoryModule.kt
@@ -14,6 +14,7 @@ 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
@@ -27,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)
@@ -67,11 +69,17 @@ object RepositoryModule {
     fun providesCollectionRepository(
         collectionService: CollectionService
     ) : CollectionRepository = CollectionRepositoryImpl(collectionService)
-            joinService: JoinService
-        ): JoinRepository {
-            return JoinRepositoryImpl(joinService)
-        }
-        fun provideJoinRepository(
-        @ViewModelScoped
-        @Provides
+
+    @ViewModelScoped
+    @Provides
+    fun provideJoinRepository(
+    joinService: JoinService
+    ): JoinRepository = JoinRepositoryImpl(joinService)
+
+    @ViewModelScoped
+    @Provides
+    fun provideNicknameRepository(
+        nicknameService: NicknameService
+    ): NicknameRepository = NicknameRepositoryImpl(nicknameService)
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/umc/onairmate/module/ServiceModule.kt b/app/src/main/java/umc/onairmate/module/ServiceModule.kt
index 97490213..5dbcefa3 100644
--- a/app/src/main/java/umc/onairmate/module/ServiceModule.kt
+++ b/app/src/main/java/umc/onairmate/module/ServiceModule.kt
@@ -11,6 +11,7 @@ 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
 
@@ -64,4 +65,9 @@ object ServiceModule {
     fun nicknameApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): NicknameService {
         return retrofit.buildService()
     }
+    @Provides
+    @Singleton
+    fun joinApi(@NetworkModule.BaseRetrofit retrofit: Retrofit): JoinService {
+        return retrofit.buildService()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index f22cb0dc..cc0503f9 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -108,7 +108,7 @@
                         android:layout_width="10dp"
                         android:layout_height="10dp"
                         android:layout_marginLeft="214dp"
-                        android:src="@drawable/arrow"/>
+                        android:src="@drawable/ic_arrow"/>
                 </LinearLayout>
 
                 <!-- 닉네임 -->
@@ -212,7 +212,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="14dp"
-                        android:src="@drawable/arrow"/>
+                        android:src="@drawable/ic_arrow"/>
                 </LinearLayout>
 
                 <!-- 차단 리스트 -->
@@ -234,7 +234,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="14dp"
-                        android:src="@drawable/arrow"/>
+                        android:src="@drawable/ic_arrow"/>
                 </LinearLayout>
 
                 <!-- 의견 보내기 -->
@@ -256,7 +256,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="14dp"
-                        android:src="@drawable/arrow"/>
+                        android:src="@drawable/ic_arrow"/>
                 </LinearLayout>
 
                 <!-- 좋아한 컬렉션 -->
@@ -278,7 +278,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="14dp"
-                        android:src="@drawable/arrow"/>
+                        android:src="@drawable/ic_arrow"/>
                 </LinearLayout>
             </LinearLayout>