diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0ed0539..df57da28 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,13 +20,6 @@
-
-
-
-
-
-
+ android:exported="true">
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/com/hous/hous_aos/ui/profile/SettingActivity.kt b/app/src/main/java/com/hous/hous_aos/ui/profile/SettingActivity.kt
new file mode 100644
index 00000000..93f6f37e
--- /dev/null
+++ b/app/src/main/java/com/hous/hous_aos/ui/profile/SettingActivity.kt
@@ -0,0 +1,15 @@
+package com.hous.hous_aos.ui.profile
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.hous.hous_aos.databinding.ActivitySettingBinding
+
+class SettingActivity : AppCompatActivity() {
+ private lateinit var binding: ActivitySettingBinding
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ binding = ActivitySettingBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+ binding.ivSettingAlarm.setOnClickListener { it.isSelected = !it.isSelected }
+ }
+}
diff --git a/app/src/main/res/drawable/ic_alarmoff_red.xml b/app/src/main/res/drawable/ic_alarmoff_red.xml
new file mode 100644
index 00000000..3a8808a6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarmoff_red.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_alarmoff_red_24.xml b/app/src/main/res/drawable/ic_alarmoff_red_24.xml
new file mode 100644
index 00000000..9e494c5a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarmoff_red_24.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_alarmon_red.xml b/app/src/main/res/drawable/ic_alarmon_red.xml
new file mode 100644
index 00000000..a3ee5b4c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarmon_red.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_alarmon_red_24.xml b/app/src/main/res/drawable/ic_alarmon_red_24.xml
new file mode 100644
index 00000000..02f80d03
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarmon_red_24.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_next.xml b/app/src/main/res/drawable/ic_next.xml
new file mode 100644
index 00000000..49ab69ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_next.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/sel_setting_alarm.xml b/app/src/main/res/drawable/sel_setting_alarm.xml
new file mode 100644
index 00000000..c764ffe7
--- /dev/null
+++ b/app/src/main/res/drawable/sel_setting_alarm.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_yellow_fill_8_rect.xml b/app/src/main/res/drawable/shape_yellow_fill_8_rect.xml
index 3002b2ec..f813f6c3 100644
--- a/app/src/main/res/drawable/shape_yellow_fill_8_rect.xml
+++ b/app/src/main/res/drawable/shape_yellow_fill_8_rect.xml
@@ -1,6 +1,13 @@
+<<<<<<<< HEAD:app/src/main/res/drawable/shape_red_stroke_15_rect.xml
+
+
+========
+>>>>>>>> 46b294cb4264d431bf5dcdaa88bfe27647afbfaa:app/src/main/res/drawable/shape_yellow_fill_8_rect.xml
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
new file mode 100644
index 00000000..b1b0c342
--- /dev/null
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file