From b7ccd71c7ed39f550cc5dfcfb6283232d0ce9cec Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 15:42:04 +0900
Subject: [PATCH 1/9] =?UTF-8?q?design=20:=20=EC=84=A4=EC=A0=95=20=EB=B7=B0?=
 =?UTF-8?q?=20ui=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable/ic_setting_right.xml    |  15 +
 app/src/main/res/layout/fragment_setting.xml  | 337 ++++++++++--------
 app/src/main/res/values/fonts.xml             |   4 +
 app/src/main/res/values/strings.xml           |  11 +-
 4 files changed, 210 insertions(+), 157 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_setting_right.xml

diff --git a/app/src/main/res/drawable/ic_setting_right.xml b/app/src/main/res/drawable/ic_setting_right.xml
new file mode 100644
index 00000000..9d33d781
--- /dev/null
+++ b/app/src/main/res/drawable/ic_setting_right.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.529,19.392C7.319,19.181 7.2,18.895 7.2,18.597C7.2,18.299 7.319,18.013 7.529,17.802L13.484,11.847L7.529,5.892C7.33,5.679 7.222,5.397 7.227,5.105C7.233,4.814 7.351,4.536 7.557,4.33C7.763,4.123 8.041,4.005 8.332,4C8.624,3.995 8.906,4.103 9.119,4.302L15.869,11.052C16.08,11.263 16.198,11.549 16.198,11.847C16.198,12.145 16.08,12.431 15.869,12.642L9.119,19.392C8.908,19.603 8.622,19.721 8.324,19.721C8.026,19.721 7.74,19.603 7.529,19.392Z"
+      android:fillColor="#50525F"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.529,19.392C7.319,19.181 7.2,18.895 7.2,18.597C7.2,18.299 7.319,18.013 7.529,17.802L13.484,11.847L7.529,5.892C7.33,5.679 7.222,5.397 7.227,5.105C7.233,4.814 7.351,4.536 7.557,4.33C7.763,4.123 8.041,4.005 8.332,4C8.624,3.995 8.906,4.103 9.119,4.302L15.869,11.052C16.08,11.263 16.198,11.549 16.198,11.847C16.198,12.145 16.08,12.431 15.869,12.642L9.119,19.392C8.908,19.603 8.622,19.721 8.324,19.721C8.026,19.721 7.74,19.603 7.529,19.392Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.2"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index cca01404..a6faca85 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -10,209 +11,239 @@
             android:id="@+id/setting_toolbar"
             layout="@layout/standard_toolbar"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
+            android:layout_height="?android:attr/actionBarSize"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:title="@{@string/setting_title}" />
 
         <ScrollView
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="20dp"
             android:fillViewport="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/setting_toolbar">
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
                 <TextView
-                    style="@style/PretendardBold16"
-                    android:layout_width="match_parent"
+                    android:id="@+id/tv_setting_university_title"
+                    style="@style/PretendardSemiBold15"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="4dp"
-                    android:paddingStart="16dp"
-                    android:text="@string/setting_dmu"
-                    android:textColor="@color/main" />
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="20dp"
+                    android:paddingBottom="4dp"
+                    android:text="@string/setting_university"
+                    android:textColor="@color/blue300"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/setting_school_alarm_switch"
-                    style="@style/PretendardRegular16"
-                    bind_is_checked="@{vm.isAccessSchoolAlarm()}"
-                    android:layout_width="match_parent"
+                    android:id="@+id/switch_setting_university_alarm"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:foreground="?attr/selectableItemBackground"
                     android:minHeight="0dp"
-                    android:padding="12dp"
-                    android:paddingStart="16dp"
-                    android:text="@string/setting_notice" />
+                    android:padding="20dp"
+                    android:text="@string/setting_notice"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_setting_university_title"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:id="@+id/btn_setting_edit_keyword"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="@string/setting_keyword_alarm"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/switch_setting_university_alarm"
+                    tools:ignore="RtlSymmetry" />
 
                 <View
-                    android:layout_width="match_parent"
+                    android:id="@+id/view_setting_divider_university"
+                    android:layout_width="0dp"
                     android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="12dp"
-                    android:background="@color/line" />
+                    android:background="@color/gray200"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btn_setting_edit_keyword" />
 
                 <TextView
-                    android:id="@+id/setting_department"
-                    style="@style/PretendardBold16"
-                    android:layout_width="match_parent"
+                    android:id="@+id/tv_setting_department_title"
+                    style="@style/PretendardSemiBold15"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="4dp"
-                    android:paddingStart="16dp"
-                    android:text="@{vm.myDepartment, default = 컴퓨터소프트웨어공학과}"
-                    android:textColor="@color/main" />
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="20dp"
+                    android:paddingBottom="4dp"
+                    android:text="@string/setting_department"
+                    android:textColor="@color/blue300"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/view_setting_divider_university" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/setting_department_alarm_switch"
-                    style="@style/PretendardRegular16"
-                    bind_is_checked="@{vm.isAccessDepartAlarm()}"
-                    android:layout_width="match_parent"
+                    android:id="@+id/switch_setting_department_alarm"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:foreground="?attr/selectableItemBackground"
                     android:minHeight="0dp"
-                    android:padding="12dp"
-                    android:paddingStart="16dp"
-                    android:text="@string/setting_notice" />
-
-                <TextView
-                    android:id="@+id/setting_department_choice"
-                    style="@style/PretendardRegular16"
-                    android:layout_width="match_parent"
+                    android:padding="20dp"
+                    android:text="@string/setting_notice"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_setting_department_title"
+                    tools:ignore="RtlSymmetry" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/btn_setting_edit_department"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/department_title"
-                    android:textColor="@color/black"
-                    android:background="?attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:padding="12dp"
-                    android:paddingStart="16dp"/>
+                    android:padding="20dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/switch_setting_department_alarm">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="12dp"
-                    android:background="@color/line" />
-
-                <TextView
-                    style="@style/PretendardBold16"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="4dp"
-                    android:paddingStart="16dp"
-                    android:text="@string/setting_keyword"
-                    android:textColor="@color/main" />
-
-                <LinearLayout
-                    android:id="@+id/setting_keyword"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:padding="12dp"
-                    android:paddingStart="16dp">
+                    <TextView
+                        android:id="@+id/tv_setting_edit_department"
+                        style="@style/PretendardMedium18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/setting_edit_department"
+                        android:textColor="@color/gray500"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:ignore="RtlSymmetry" />
 
                     <TextView
-                        style="@style/PretendardRegular16"
-                        android:layout_width="match_parent"
+                        android:id="@+id/tv_setting_department"
+                        style="@style/PretendardMedium14"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:textColor="@color/gray400"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/iv_setting_department"
+                        app:layout_constraintHorizontal_bias="1"
+                        app:layout_constraintHorizontal_chainStyle="packed"
+                        app:layout_constraintStart_toEndOf="@id/tv_setting_edit_department"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="자동화공학과" />
+
+                    <ImageView
+                        android:id="@+id/iv_setting_department"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/setting_keyword_choice"
-                        android:textColor="@color/black" />
-                </LinearLayout>
+                        android:src="@drawable/ic_setting_right"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
-                    android:layout_width="match_parent"
+                    android:id="@+id/view_setting_divider_department"
+                    android:layout_width="0dp"
                     android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="12dp"
-                    android:background="@color/line" />
+                    android:background="@color/gray200"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btn_setting_edit_department" />
 
                 <TextView
-                    style="@style/PretendardBold16"
-                    android:layout_width="match_parent"
+                    android:id="@+id/tv_setting_info_title"
+                    style="@style/PretendardSemiBold15"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="4dp"
-                    android:paddingStart="16dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="20dp"
+                    android:paddingBottom="4dp"
                     android:text="@string/setting_app_info"
-                    android:textColor="@color/main" />
+                    android:textColor="@color/blue300"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/view_setting_divider_department" />
 
-                <LinearLayout
-                    android:id="@+id/setting_ask"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/btn_setting_app_help"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:padding="12dp"
-                    android:paddingStart="16dp">
-
-                    <TextView
-                        style="@style/PretendardRegular16"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/setting_app_help"
-                        android:textColor="@color/black" />
-                </LinearLayout>
+                    android:padding="20dp"
+                    android:text="@string/setting_app_help"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_setting_info_title" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/btn_setting_app_personal_policy"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="12dp"
-                    android:paddingStart="16dp">
+                    android:padding="20dp"
+                    android:text="@string/setting_app_personal_policy"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btn_setting_app_help" />
 
-                    <TextView
-                        style="@style/PretendardRegular16"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/setting_app_version"
-                        android:textColor="@color/black" />
+                <TextView
+                    android:id="@+id/btn_setting_app_opensource"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="@string/setting_app_license"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btn_setting_app_personal_policy" />
 
-                    <TextView
-                        android:id="@+id/setting_version"
-                        style="@style/PretendardRegular16"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:layout_weight="1"
-                        android:textAlignment="textEnd"
-                        android:textColor="@color/black"
-                        android:textSize="16sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/setting_app_license"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/btn_setting_app_version"
+                    style="@style/PretendardMedium18"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:padding="12dp"
-                    android:paddingStart="16dp">
+                    android:padding="20dp"
+                    android:text="@string/setting_app_version"
+                    android:textColor="@color/gray500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btn_setting_app_opensource" />
 
-                    <TextView
-                        style="@style/PretendardRegular16"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/setting_app_license"
-                        android:textColor="@color/black" />
-                </LinearLayout>
+                <TextView
+                    android:id="@+id/tv_setting_app_version"
+                    style="@style/PretendardMedium14"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/setting_app_version_release"
+                    android:textColor="@color/gray400"
+                    android:layout_marginEnd="20dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/btn_setting_app_version"
+                    app:layout_constraintBottom_toBottomOf="@id/btn_setting_app_version"/>
 
-            </LinearLayout>
+                <View
+                    android:id="@+id/view_setting_divider_app_info"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:background="@color/gray200"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btn_setting_app_version" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </ScrollView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <data>
-
-        <variable
-            name="vm"
-            type="com.dongyang.android.youdongknowme.ui.view.setting.SettingViewModel" />
-    </data>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml
index e8bdc5ad..9a9ad374 100644
--- a/app/src/main/res/values/fonts.xml
+++ b/app/src/main/res/values/fonts.xml
@@ -85,6 +85,10 @@
         <item name="android:textSize">@dimen/font_size_14</item>
     </style>
 
+    <style name="PretendardSemiBold15" parent="PretnedardSemiBold">
+        <item name="android:textSize">15dp드</item>
+    </style>
+
     <style name="PretendardSemiBold16" parent="PretnedardSemiBold">
         <item name="android:textSize">@dimen/font_size_16</item>
     </style>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c33ef388..c9bda3e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,17 +44,20 @@
 
     <!-- setting -->
     <string name="setting_title">설정</string>
-    <string name="setting_dmu">동양미래대학교</string>
+    <string name="setting_university">대학 공지</string>
     <string name="setting_notice">알림 설정</string>
     <string name="setting_sw">컴퓨터소프트웨어공학과</string>
-    <string name="setting_department">학과 설정</string>
+    <string name="setting_department">학과 공지</string>
+    <string name="setting_edit_department">학과 설정</string>
     <string name="setting_keyword">키워드</string>
-    <string name="setting_keyword_alarm">키워드 알림 설정</string>
+    <string name="setting_keyword_alarm">키워드 설정</string>
     <string name="setting_keyword_choice">키워드 선택</string>
     <string name="setting_app_info">앱 정보</string>
     <string name="setting_app_help">문의하기</string>
+    <string name="setting_app_personal_policy">개인정보 처리방침</string>
     <string name="setting_app_version">앱 버전</string>
-    <string name="setting_app_license">오픈소스 라이센스</string>
+    <string name="setting_app_version_release">1.0.0</string>
+    <string name="setting_app_license">오픈소스 라이선스</string>
 
     <!-- calendar -->
     <string name="calendar_year">년</string>

From 2883fa094efa4883d49647a57c29d330683a7607 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 15:47:06 +0900
Subject: [PATCH 2/9] =?UTF-8?q?feat=20:=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/view/setting/SettingFragment.kt        | 21 ++++++++-----------
 app/src/main/res/layout/fragment_setting.xml  |  6 +++---
 app/src/main/res/values/fonts.xml             |  2 +-
 app/src/main/res/values/strings.xml           |  1 -
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 81095467..9ee8cd69 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -16,18 +16,16 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     override val viewModel: SettingViewModel by viewModel()
 
     override fun initStartView() {
-        binding.settingVersion.text = getAppVersion()
+        binding.tvSettingAppVersion.text = getAppVersion()
     }
 
-    override fun initDataBinding() { }
+    override fun initDataBinding() = Unit
 
     override fun initAfterBinding() {
-        binding.vm = viewModel
-
         viewModel.checkAccessAlarm()
         viewModel.getUserDepartment()
 
-        binding.settingSchoolAlarmSwitch.setOnCheckedChangeListener { compoundButton, _ ->
+        binding.switchSettingUniversityAlarm.setOnCheckedChangeListener { compoundButton, _ ->
             if (compoundButton.isChecked) {
                 viewModel.setIsAccessSchoolAlarm(true)
             } else {
@@ -35,7 +33,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
         }
 
-        binding.settingDepartmentAlarmSwitch.setOnCheckedChangeListener { compoundButton, _ ->
+        binding.switchSettingDepartmentAlarm.setOnCheckedChangeListener { compoundButton, _ ->
             if (compoundButton.isChecked) {
                 viewModel.setIsAccessDepartAlarm(true)
             } else {
@@ -44,25 +42,25 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         }
 
         // 이메일 연동
-        binding.settingAsk.setOnClickListener {
+        binding.btnSettingAppHelp.setOnClickListener {
             val intent = Intent(Intent.ACTION_SEND)
             intent.type = "plain/text"
-            val address = arrayOf("jiwon0705@m365.dongyang.ac.kr")
+            val address = arrayOf("https://forms.gle/8ZKfV96qyisLu1pcA")
             intent.putExtra(Intent.EXTRA_EMAIL, address)
             startActivity(intent)
         }
 
-        binding.settingDepartmentChoice.setOnClickListener {
+        binding.btnSettingEditDepartment.setOnClickListener {
             val intent = Intent(requireActivity(), DepartActivity::class.java)
             startActivity(intent)
         }
 
-        binding.settingKeyword.setOnClickListener {
+        binding.btnSettingEditKeyword.setOnClickListener {
             val intent = Intent(requireActivity(), KeywordActivity::class.java)
             startActivity(intent)
         }
 
-        binding.settingAppLicense.setOnClickListener {
+        binding.btnSettingAppOpensource.setOnClickListener {
             val intent = Intent(requireActivity(), LicenseActivity::class.java)
             startActivity(intent)
         }
@@ -73,5 +71,4 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
         return packageManager.versionName
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index a6faca85..390a280d 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -228,12 +228,12 @@
                     style="@style/PretendardMedium14"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/setting_app_version_release"
-                    android:textColor="@color/gray400"
                     android:layout_marginEnd="20dp"
+                    android:textColor="@color/gray400"
+                    app:layout_constraintBottom_toBottomOf="@id/btn_setting_app_version"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/btn_setting_app_version"
-                    app:layout_constraintBottom_toBottomOf="@id/btn_setting_app_version"/>
+                    tools:text="1.0.0" />
 
                 <View
                     android:id="@+id/view_setting_divider_app_info"
diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml
index 9a9ad374..d0977463 100644
--- a/app/src/main/res/values/fonts.xml
+++ b/app/src/main/res/values/fonts.xml
@@ -86,7 +86,7 @@
     </style>
 
     <style name="PretendardSemiBold15" parent="PretnedardSemiBold">
-        <item name="android:textSize">15dp드</item>
+        <item name="android:textSize">15dp</item>
     </style>
 
     <style name="PretendardSemiBold16" parent="PretnedardSemiBold">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9bda3e7..a467800b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,7 +56,6 @@
     <string name="setting_app_help">문의하기</string>
     <string name="setting_app_personal_policy">개인정보 처리방침</string>
     <string name="setting_app_version">앱 버전</string>
-    <string name="setting_app_version_release">1.0.0</string>
     <string name="setting_app_license">오픈소스 라이선스</string>
 
     <!-- calendar -->

From 2b596889346b60c883c7cdf0bcdaf37b787b25e9 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 15:59:11 +0900
Subject: [PATCH 3/9] =?UTF-8?q?feat=20:=20=EC=95=B1=20=EB=AC=B8=EC=9D=98?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youdongknowme/ui/view/setting/SettingFragment.kt      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 9ee8cd69..d2f332e7 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -1,6 +1,7 @@
 package com.dongyang.android.youdongknowme.ui.view.setting
 
 import android.content.Intent
+import android.net.Uri
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseFragment
@@ -41,12 +42,9 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
         }
 
-        // 이메일 연동
         binding.btnSettingAppHelp.setOnClickListener {
-            val intent = Intent(Intent.ACTION_SEND)
-            intent.type = "plain/text"
-            val address = arrayOf("https://forms.gle/8ZKfV96qyisLu1pcA")
-            intent.putExtra(Intent.EXTRA_EMAIL, address)
+            val intent =
+                Intent(Intent.ACTION_VIEW, Uri.parse("https://forms.gle/8ZKfV96qyisLu1pcA"))
             startActivity(intent)
         }
 

From 29df37983a598ff5308e791b1fe226b8cce58fa6 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 16:06:35 +0900
Subject: [PATCH 4/9] =?UTF-8?q?feat=20:=20=EC=84=A4=EC=A0=95=EB=90=9C=20?=
 =?UTF-8?q?=ED=95=99=EA=B3=BC=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youdongknowme/ui/view/setting/SettingFragment.kt        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index d2f332e7..abd95534 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -20,7 +20,11 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         binding.tvSettingAppVersion.text = getAppVersion()
     }
 
-    override fun initDataBinding() = Unit
+    override fun initDataBinding() {
+        viewModel.myDepartment.observe(viewLifecycleOwner) {department ->
+            binding.tvSettingDepartment.text = department
+        }
+    }
 
     override fun initAfterBinding() {
         viewModel.checkAccessAlarm()

From 5bc30429b641d2a48b15ee7dfff4e7332503bf2a Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 16:10:51 +0900
Subject: [PATCH 5/9] =?UTF-8?q?style=20:=20=EC=BD=94=EB=93=9C=20=ED=8F=AC?=
 =?UTF-8?q?=EB=A7=B7=ED=8C=85=20=EB=B0=8F=20=EA=B0=9C=EC=9D=B8=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20todo=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/view/setting/SettingFragment.kt             | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index abd95534..1fb7963e 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -46,9 +46,8 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             }
         }
 
-        binding.btnSettingAppHelp.setOnClickListener {
-            val intent =
-                Intent(Intent.ACTION_VIEW, Uri.parse("https://forms.gle/8ZKfV96qyisLu1pcA"))
+        binding.btnSettingEditKeyword.setOnClickListener {
+            val intent = Intent(requireActivity(), KeywordActivity::class.java)
             startActivity(intent)
         }
 
@@ -57,11 +56,16 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
             startActivity(intent)
         }
 
-        binding.btnSettingEditKeyword.setOnClickListener {
-            val intent = Intent(requireActivity(), KeywordActivity::class.java)
+        binding.btnSettingAppHelp.setOnClickListener {
+            val intent =
+                Intent(Intent.ACTION_VIEW, Uri.parse("https://forms.gle/8ZKfV96qyisLu1pcA"))
             startActivity(intent)
         }
 
+        binding.btnSettingAppPersonalPolicy.setOnClickListener {
+            // TODO : 개인정보 처리방침으로 연결
+        }
+
         binding.btnSettingAppOpensource.setOnClickListener {
             val intent = Intent(requireActivity(), LicenseActivity::class.java)
             startActivity(intent)

From a2612aaa4db6ecd69ac27c19f873120d26153153 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 16:13:43 +0900
Subject: [PATCH 6/9] =?UTF-8?q?design=20:=20=EB=B2=84=ED=8A=BC=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=20=ED=9A=A8=EA=B3=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_setting.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index 390a280d..32e29f7c 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -63,6 +63,7 @@
                     style="@style/PretendardMedium18"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:foreground="?attr/selectableItemBackground"
                     android:padding="20dp"
                     android:text="@string/setting_keyword_alarm"
                     android:textColor="@color/gray500"
@@ -112,6 +113,7 @@
                     android:id="@+id/btn_setting_edit_department"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:foreground="?attr/selectableItemBackground"
                     android:padding="20dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -180,6 +182,7 @@
                     style="@style/PretendardMedium18"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:foreground="?attr/selectableItemBackground"
                     android:padding="20dp"
                     android:text="@string/setting_app_help"
                     android:textColor="@color/gray500"
@@ -192,6 +195,7 @@
                     style="@style/PretendardMedium18"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:foreground="?attr/selectableItemBackground"
                     android:padding="20dp"
                     android:text="@string/setting_app_personal_policy"
                     android:textColor="@color/gray500"
@@ -204,6 +208,7 @@
                     style="@style/PretendardMedium18"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:foreground="?attr/selectableItemBackground"
                     android:padding="20dp"
                     android:text="@string/setting_app_license"
                     android:textColor="@color/gray500"

From d5eb1a0fcc691337926a10f9779d369d7d185df9 Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Mon, 25 Mar 2024 20:12:30 +0900
Subject: [PATCH 7/9] =?UTF-8?q?feat=20:=20=EC=8A=A4=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=95=8C=EB=9E=8C=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20on/off=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youdongknowme/ui/view/setting/SettingFragment.kt   | 10 +++++++++-
 .../youdongknowme/ui/view/setting/SettingViewModel.kt  |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 1fb7963e..03c4b8e5 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -21,9 +21,17 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
     }
 
     override fun initDataBinding() {
-        viewModel.myDepartment.observe(viewLifecycleOwner) {department ->
+        viewModel.myDepartment.observe(viewLifecycleOwner) { department ->
             binding.tvSettingDepartment.text = department
         }
+
+        viewModel.isAccessUniversityAlarm.observe(viewLifecycleOwner) { isChecked ->
+            binding.switchSettingUniversityAlarm.isChecked = isChecked
+        }
+
+        viewModel.isAccessDepartAlarm.observe(viewLifecycleOwner) { isChecked ->
+            binding.switchSettingDepartmentAlarm.isChecked = isChecked
+        }
     }
 
     override fun initAfterBinding() {
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
index 1895cb2d..28c401e2 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingViewModel.kt
@@ -8,8 +8,8 @@ import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 /* 설정 뷰모델 */
 class SettingViewModel(private val settingRepository: SettingRepository) : BaseViewModel() {
 
-    private val _isAccessSchoolAlarm: MutableLiveData<Boolean> = MutableLiveData(false)
-    val isAccessSchoolAlarm: LiveData<Boolean> get() = _isAccessSchoolAlarm
+    private val _isAccessUniversityAlarm: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isAccessUniversityAlarm: LiveData<Boolean> get() = _isAccessUniversityAlarm
 
     private val _isAccessDepartAlarm: MutableLiveData<Boolean> = MutableLiveData(false)
     val isAccessDepartAlarm: LiveData<Boolean> get() = _isAccessDepartAlarm
@@ -19,7 +19,7 @@ class SettingViewModel(private val settingRepository: SettingRepository) : BaseV
 
     fun checkAccessAlarm() {
         val isAccessSchoolAlarm = settingRepository.getIsAccessSchoolAlarm()
-        _isAccessSchoolAlarm.postValue(isAccessSchoolAlarm)
+        _isAccessUniversityAlarm.postValue(isAccessSchoolAlarm)
 
         val isAccessDepartAlarm = settingRepository.getIsAccessDepartAlarm()
         _isAccessDepartAlarm.postValue(isAccessDepartAlarm)

From f1909cbf51ef9feb16b47e28c48dc9767a599f4b Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Tue, 26 Mar 2024 20:18:46 +0900
Subject: [PATCH 8/9] =?UTF-8?q?feat=20:=20=EB=AC=B8=EC=9D=98=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20url=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/youdongknowme/ui/view/setting/SettingFragment.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index 03c4b8e5..cd4268b1 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -66,7 +66,10 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
 
         binding.btnSettingAppHelp.setOnClickListener {
             val intent =
-                Intent(Intent.ACTION_VIEW, Uri.parse("https://forms.gle/8ZKfV96qyisLu1pcA"))
+                Intent(
+                    Intent.ACTION_VIEW,
+                    Uri.parse("https://docs.google.com/forms/d/e/1FAIpQLSeRTKalenelmffTbCZeK4mqmQg0palobghkXSoie1FlmV22ZQ/viewform")
+                )
             startActivity(intent)
         }
 

From 90d8a2eaf606c2217739f17375a39beeee24030e Mon Sep 17 00:00:00 2001
From: Son Myeongji <sonmyungj1zz@gmail.com>
Date: Tue, 26 Mar 2024 20:33:46 +0900
Subject: [PATCH 9/9] =?UTF-8?q?feat=20:=20=EA=B0=9C=EC=9D=B8=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youdongknowme/ui/view/setting/SettingFragment.kt        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
index cd4268b1..616dbcd4 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -74,7 +74,11 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
         }
 
         binding.btnSettingAppPersonalPolicy.setOnClickListener {
-            // TODO : 개인정보 처리방침으로 연결
+            val intent = Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("https://sites.google.com/view/dmforu-privacy-policy/%ED%99%88")
+            )
+            startActivity(intent)
         }
 
         binding.btnSettingAppOpensource.setOnClickListener {