From e24b7b17e4a27f9613f7d004830bec3337f11c08 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Sat, 30 Dec 2023 18:05:02 +0900
Subject: [PATCH 01/54] [setting]: Fix Merge Error

---
 .gitignore              |   1 -
 app/build.gradle.kts    |   9 +++++++++
 keystore/debug.keystore | Bin 0 -> 2686 bytes
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 keystore/debug.keystore

diff --git a/.gitignore b/.gitignore
index 2a37cc12..ae099a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ render.experimental.xml
 
 # Keystore files
 *.jks
-*.keystore
 
 # Google Services (e.g. APIs or Firebase)
 google-services.json
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 20eaf069..c06c8c2b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,6 +16,15 @@ android {
         versionName = libs.versions.appVersion.get()
     }
 
+    signingConfigs {
+        getByName("debug") {
+            keyAlias = "android_debug_key"
+            keyPassword = "android"
+            storeFile = File("${project.rootDir.absolutePath}/keystore/debug.keystore")
+            storePassword = "android"
+        }
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
diff --git a/keystore/debug.keystore b/keystore/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..fad34262174d98209ef7b452741a55990d1e6d00
GIT binary patch
literal 2686
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
Krc3`XGX4dH#?jOO

literal 0
HcmV?d00001


From f0b04fef84f10db28c20c29964221250ec95ed6a Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Sat, 30 Dec 2023 18:25:05 +0900
Subject: [PATCH 02/54] [feat]: Feat Login Module

---
 feature/login/.gitignore                   |  1 +
 feature/login/build.gradle.kts             | 12 ++++++++++++
 feature/login/consumer-rules.pro           |  0
 feature/login/proguard-rules.pro           | 21 +++++++++++++++++++++
 feature/login/src/main/AndroidManifest.xml |  4 ++++
 settings.gradle.kts                        |  1 +
 6 files changed, 39 insertions(+)
 create mode 100644 feature/login/.gitignore
 create mode 100644 feature/login/build.gradle.kts
 create mode 100644 feature/login/consumer-rules.pro
 create mode 100644 feature/login/proguard-rules.pro
 create mode 100644 feature/login/src/main/AndroidManifest.xml

diff --git a/feature/login/.gitignore b/feature/login/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/feature/login/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
new file mode 100644
index 00000000..f2676648
--- /dev/null
+++ b/feature/login/build.gradle.kts
@@ -0,0 +1,12 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    hmh("feature")
+}
+
+android {
+    namespace = "com.hmh.hamyeonham.feature.login"
+}
+
+dependencies {
+    implementation(projects.core.common)
+}
diff --git a/feature/login/consumer-rules.pro b/feature/login/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/feature/login/proguard-rules.pro b/feature/login/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/feature/login/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/login/src/main/AndroidManifest.xml b/feature/login/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..8bdb7e14
--- /dev/null
+++ b/feature/login/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fcc2fc01..359d3322 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,3 +19,4 @@ dependencyResolutionManagement {
 rootProject.name = "HMH-Android"
 include(":app")
 include(":core:common")
+include(":feature:login")

From cb31fcca2d074e2cb7267aaeb3f214850b67cda5 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Sat, 30 Dec 2023 18:42:29 +0900
Subject: [PATCH 03/54] [feat]: Feat SampleClass

---
 .../main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt  | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt
new file mode 100644
index 00000000..72ee7cde
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt
@@ -0,0 +1,3 @@
+package com.hmh.hamyeonham.feature.login
+
+class SampleClass {}

From 9c0bafecb6047da07cb7b06375ea7b627ac7efe7 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Sun, 31 Dec 2023 04:08:16 +0900
Subject: [PATCH 04/54] =?UTF-8?q?[setting]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?=
 =?UTF-8?q?=20sdk=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c06c8c2b..220aeb3a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -45,4 +45,9 @@ dependencies {
     // Splash
     implementation(libs.splash.screen)
 
+    implementation(projects.feature.login)
+
+    // kakao
+    implementation(libs.kakao.login)
+
 }

From deb2ecebca39d3aab0b3c42ed4be61e0d8668c2f Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Sun, 31 Dec 2023 15:42:52 +0900
Subject: [PATCH 05/54] =?UTF-8?q?[setting]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?=
 =?UTF-8?q?=20sdk=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 359d3322..3498ed64 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,6 +13,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { setUrl("https://devrepo.kakao.com/nexus/content/groups/public/") }
     }
 }
 

From 289f3cca27f1efaedc723adcfe8f375dfbe48eec Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Sun, 31 Dec 2023 15:48:39 +0900
Subject: [PATCH 06/54] =?UTF-8?q?[feat]:=20=EB=84=98=EB=B2=84=ED=94=BC?=
 =?UTF-8?q?=EC=BB=A4=20=EC=BD=94=EB=93=9C=20=EC=9D=B4=EB=8F=99=20=ED=9B=84?=
 =?UTF-8?q?=20=EC=A0=91=EA=B7=BC=EA=B6=8C=ED=95=9C=20=ED=97=88=EC=9A=A9?=
 =?UTF-8?q?=EC=9A=A9=20=EC=98=A8=EB=B3=B4=EB=94=A9=20=EB=B7=B0=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/onboarding/OnBoardingActivity.kt         |  4 ++++
 .../src/main/res/layout/activity_on_boarding.xml     | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 00e84cf4..c2c5dc70 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -11,6 +11,10 @@ class OnBoardingActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
+
+    }
+
+    private fun numberPickerTest() {
         binding.run {
             numberPicker.npCustomHours.minValue = 1
             numberPicker.npCustomHours.maxValue = 6
diff --git a/feature/onboarding/src/main/res/layout/activity_on_boarding.xml b/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
index 4339e9b8..0f2fb988 100644
--- a/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
+++ b/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
@@ -6,11 +6,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".OnBoardingActivity">
 
-    <include
-        android:id="@+id/numberPicker"
-        layout="@layout/dialog_numberpicker_custom"
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="30dp"
+        android:text="권한 허용하러 가기"
+        />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4790d2914a02138fcb9a9c3b9128304e848b860e Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Sun, 31 Dec 2023 15:49:20 +0900
Subject: [PATCH 07/54] =?UTF-8?q?[delete]:=20=EB=84=98=EB=B2=84=ED=94=BC?=
 =?UTF-8?q?=EC=BB=A4=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamyeonham/feature/onboarding/OnBoardingActivity.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index c2c5dc70..9c2fb04b 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -16,10 +16,10 @@ class OnBoardingActivity : AppCompatActivity() {
 
     private fun numberPickerTest() {
         binding.run {
-            numberPicker.npCustomHours.minValue = 1
-            numberPicker.npCustomHours.maxValue = 6
-            numberPicker.npCustomMinutes.minValue = 1
-            numberPicker.npCustomMinutes.maxValue = 59
+//            numberPicker.npCustomHours.minValue = 1
+//            numberPicker.npCustomHours.maxValue = 6
+//            numberPicker.npCustomMinutes.minValue = 1
+//            numberPicker.npCustomMinutes.maxValue = 59
         }
     }
 }

From 1b23b555bc7e865a9f071358c149711c8648b45e Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Mon, 1 Jan 2024 02:57:51 +0900
Subject: [PATCH 08/54] =?UTF-8?q?[feat]:=20=EC=82=AC=EC=9A=A9=20=EA=B8=B0?=
 =?UTF-8?q?=EB=A1=9D=EC=97=90=20=EC=95=A1=EC=84=B8=EC=8A=A4=20=ED=97=88?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=B4=20=EB=90=98=EC=96=B4=EC=9E=88=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EC=9D=80=20=EA=B2=BD=EC=9A=B0=20=EC=82=AC=EC=9A=A9=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=97=88=EC=9A=A9=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onboarding/src/main/AndroidManifest.xml   |  2 +
 .../feature/onboarding/OnBoardingActivity.kt  | 51 +++++++++++++++++++
 .../main/res/layout/activity_on_boarding.xml  |  1 +
 .../res/layout/dialog_numberpicker_custom.xml |  1 -
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index 0a100119..ba938b68 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission-sdk-23 android:name="android.permission.PACKAGE_USAGE_STATS" />
+
     <application>
         <activity
             android:name=".OnBoardingActivity"
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 9c2fb04b..82fc3657 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -1,17 +1,68 @@
 package com.hmh.hamyeonham.feature.onboarding
 
+import android.accessibilityservice.AccessibilityService
+import android.app.AppOpsManager
+import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingBinding
 
 class OnBoardingActivity : AppCompatActivity() {
+
+    override fun onResume() {
+        super.onResume()
+        if (hasUsageStatsPermission()) {
+            toast("권한이 허용되어 있음")
+        } else {
+            toast("권한이 허용되어 있지 않음")
+            requirePermission()
+        }
+    }
+
     private lateinit var binding: ActivityOnBoardingBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+    }
+
+    private fun requirePermission() {
+        binding.btnPermission.setOnClickListener {
+            startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
+        }
+    }
+
+    private fun hasUsageStatsPermission(): Boolean {
+        val appOps = getSystemService(APP_OPS_SERVICE) as AppOpsManager
+        val mode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            appOps.unsafeCheckOpNoThrow(
+                AppOpsManager.OPSTR_GET_USAGE_STATS,
+                android.os.Process.myUid(),
+                packageName,
+            )
+        } else {
+            appOps.checkOpNoThrow(
+                AppOpsManager.OPSTR_GET_USAGE_STATS,
+                android.os.Process.myUid(),
+                packageName,
+            )
+        }
+        return mode == AppOpsManager.MODE_ALLOWED
+    }
 
+    private fun isAccessibilityServiceEnabled(service: Class<out AccessibilityService>): Boolean {
+        val expectedId = packageName + "/" + service.canonicalName
+        val enabledServicesSetting = Settings.Secure.getString(
+            contentResolver,
+            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+        ) ?: return false
+        Log.d("TAG", "enabledServicesSetting: $enabledServicesSetting")
 
+        return enabledServicesSetting.split(':').any { it.equals(expectedId, ignoreCase = true) }
     }
 
     private fun numberPickerTest() {
diff --git a/feature/onboarding/src/main/res/layout/activity_on_boarding.xml b/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
index 0f2fb988..191bd5b1 100644
--- a/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
+++ b/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
@@ -7,6 +7,7 @@
     tools:context=".OnBoardingActivity">
 
     <Button
+        android:id="@+id/btn_permission"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/feature/onboarding/src/main/res/layout/dialog_numberpicker_custom.xml b/feature/onboarding/src/main/res/layout/dialog_numberpicker_custom.xml
index 4d6a17b7..fa243454 100644
--- a/feature/onboarding/src/main/res/layout/dialog_numberpicker_custom.xml
+++ b/feature/onboarding/src/main/res/layout/dialog_numberpicker_custom.xml
@@ -12,7 +12,6 @@
         android:id="@+id/np_custom_hours"
         android:layout_width="50dp"
         android:layout_height="100dp"
-        android:theme="@style/AppTheme.NumberPicker"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

From 85651e378c3382df3493449e0f2772a5ab2c7724 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Mon, 1 Jan 2024 18:34:37 +0900
Subject: [PATCH 09/54] =?UTF-8?q?[feat]:=20=EC=82=AC=EC=9A=A9=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=ED=97=88=EC=9A=A9=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onboarding/src/main/AndroidManifest.xml   |  7 +++-
 .../OnBoardingAccessibilityService.kt         | 15 +++++++
 .../feature/onboarding/OnBoardingActivity.kt  | 40 +++++++++++++------
 3 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt

diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index ba938b68..9274870d 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission-sdk-23 android:name="android.permission.PACKAGE_USAGE_STATS" />
+    <uses-permission-sdk-23 android:name="android.permission.WRITE_SECURE_SETTINGS" />
+
 
     <application>
         <activity
@@ -9,4 +12,6 @@
             android:exported="false" />
     </application>
 
+
+
 </manifest>
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt
new file mode 100644
index 00000000..9185453b
--- /dev/null
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt
@@ -0,0 +1,15 @@
+package com.hmh.hamyeonham.feature.onboarding
+
+import android.accessibilityservice.AccessibilityService
+import com.hmh.hamyeonham.common.context.toast
+
+class OnBoardingAccessibilityService : AccessibilityService() {
+    override fun onInterrupt() {
+        toast("서비스 onInterrupt ")
+    }
+
+    override fun onAccessibilityEvent(event: android.view.accessibility.AccessibilityEvent?) {
+        toast("서비스 onAccessibilityEvent ")
+
+    }
+}
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 82fc3657..61943d6a 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -17,6 +17,7 @@ class OnBoardingActivity : AppCompatActivity() {
         super.onResume()
         if (hasUsageStatsPermission()) {
             toast("권한이 허용되어 있음")
+            requirePermission()
         } else {
             toast("권한이 허용되어 있지 않음")
             requirePermission()
@@ -32,7 +33,7 @@ class OnBoardingActivity : AppCompatActivity() {
 
     private fun requirePermission() {
         binding.btnPermission.setOnClickListener {
-            startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
+            moveAppToTopInAccessibilitySettings(AccessibilityService::class.java)
         }
     }
 
@@ -54,23 +55,36 @@ class OnBoardingActivity : AppCompatActivity() {
         return mode == AppOpsManager.MODE_ALLOWED
     }
 
-    private fun isAccessibilityServiceEnabled(service: Class<out AccessibilityService>): Boolean {
+    // 사용 접근 권한 앱 목록 순서 변경 함수
+    private fun moveAppToTopInAccessibilitySettings(service: Class<out AccessibilityService>) {
         val expectedId = packageName + "/" + service.canonicalName
+        Log.d("TAG1", "expectedId: $expectedId")
+        startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
+
         val enabledServicesSetting = Settings.Secure.getString(
             contentResolver,
             Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-        ) ?: return false
-        Log.d("TAG", "enabledServicesSetting: $enabledServicesSetting")
-
-        return enabledServicesSetting.split(':').any { it.equals(expectedId, ignoreCase = true) }
-    }
+        )
+        Log.d("TAG2", "enabledServicesSetting: $enabledServicesSetting")
 
-    private fun numberPickerTest() {
-        binding.run {
-//            numberPicker.npCustomHours.minValue = 1
-//            numberPicker.npCustomHours.maxValue = 6
-//            numberPicker.npCustomMinutes.minValue = 1
-//            numberPicker.npCustomMinutes.maxValue = 59
+        if (enabledServicesSetting == null) {
+            Log.e("TAG3", "Enabled services setting is null")
+            return
         }
+
+        // 서비스 목록 순서 재배열
+        val serviceList = enabledServicesSetting.split(':').toMutableList()
+        serviceList.remove(expectedId)
+        serviceList.add(0, expectedId)
+        Log.d("TAG4", "serviceList: $serviceList")
+        val updatedServicesSetting = serviceList.joinToString(":")
+        Log.d("TAG5", "updatedServicesSetting: $updatedServicesSetting")
+
+        // 변경된 서비스 목록을 설정에 저장
+        Settings.Secure.putString(
+            contentResolver,
+            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+            updatedServicesSetting,
+        )
     }
 }

From 682a0be37e9271130ac8d2dee6d77efda1282a40 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Mon, 1 Jan 2024 20:06:49 +0900
Subject: [PATCH 10/54] =?UTF-8?q?[feat]:=20=EC=84=A4=EC=B9=98=EB=90=9C=20?=
 =?UTF-8?q?=EC=95=B1=20=EB=AA=A9=EB=A1=9D=20=EA=B0=80=EC=A0=B8=EC=98=A4?=
 =?UTF-8?q?=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20=EC=9E=84=EC=8B=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamyeonham/feature/onboarding/OnBoardingActivity.kt   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 61943d6a..3dc90575 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -3,6 +3,9 @@ package com.hmh.hamyeonham.feature.onboarding
 import android.accessibilityservice.AccessibilityService
 import android.app.AppOpsManager
 import android.content.Intent
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
@@ -29,11 +32,16 @@ class OnBoardingActivity : AppCompatActivity() {
         binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        // 설치된 앱 목록 가져오기
+        val installedApps: List<PackageInfo> = packageManager.getInstalledPackages(PackageManager.GET_META_DATA)
+        Log.d("TAG", "installedApps: $installedApps")
+
     }
 
     private fun requirePermission() {
         binding.btnPermission.setOnClickListener {
             moveAppToTopInAccessibilitySettings(AccessibilityService::class.java)
+            // startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
         }
     }
 

From 55be136be6f791f8a5020c5bfec71370115e6eea Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Mon, 1 Jan 2024 20:33:12 +0900
Subject: [PATCH 11/54] =?UTF-8?q?[feat]:=20=EC=84=A4=EC=B9=98=EB=90=9C=20?=
 =?UTF-8?q?=EC=95=B1=20=EB=AA=A9=EB=A1=9D=20=EC=84=B8=EB=B6=80=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=9E=84=EC=8B=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/onboarding/OnBoardingActivity.kt           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 3dc90575..b1bb2872 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -5,7 +5,6 @@ import android.app.AppOpsManager
 import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
@@ -33,9 +32,16 @@ class OnBoardingActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         // 설치된 앱 목록 가져오기
-        val installedApps: List<PackageInfo> = packageManager.getInstalledPackages(PackageManager.GET_META_DATA)
+        val installedApps: List<PackageInfo> =
+            packageManager.getInstalledPackages(PackageManager.GET_META_DATA)
         Log.d("TAG", "installedApps: $installedApps")
+        for (packageInfo in installedApps) {
+            val appName: String = packageInfo.applicationInfo.loadLabel(packageManager).toString()
+            val packageName: String = packageInfo.packageName
+            val flags = packageInfo.applicationInfo.flags
 
+            Log.d("AppInfo", "Name: $appName, Package: $packageName, Flags: $flags")
+        }
     }
 
     private fun requirePermission() {

From 7c140d38fdb5fa383d0fbd15ce875c23a153572a Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Mon, 1 Jan 2024 20:41:27 +0900
Subject: [PATCH 12/54] =?UTF-8?q?[feat]:=20=EC=9D=B8=ED=84=B0=EB=84=B7=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=ED=97=88=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3de3e838..964f0e7e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -21,6 +23,8 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+
+
             </intent-filter>
         </activity>
     </application>

From db86698647765de291358f9641b65005f3c995b2 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Mon, 1 Jan 2024 23:34:58 +0900
Subject: [PATCH 13/54] [fix]: Request Permission

---
 .../onboarding/ExampleInstrumentedTest.kt     | 24 -----
 .../onboarding/src/main/AndroidManifest.xml   | 18 +++-
 .../OnBoardingAccessibilityService.kt         | 12 ++-
 .../feature/onboarding/OnBoardingActivity.kt  | 88 +++----------------
 .../src/main/res/values/strings.xml           |  4 +-
 .../res/xml/accessibility_service_config.xml  |  7 ++
 .../feature/onboarding/ExampleUnitTest.kt     | 17 ----
 7 files changed, 47 insertions(+), 123 deletions(-)
 delete mode 100644 feature/onboarding/src/androidTest/java/com/hmh/hamyeonham/feature/onboarding/ExampleInstrumentedTest.kt
 create mode 100644 feature/onboarding/src/main/res/xml/accessibility_service_config.xml
 delete mode 100644 feature/onboarding/src/test/java/com/hmh/hamyeonham/feature/onboarding/ExampleUnitTest.kt

diff --git a/feature/onboarding/src/androidTest/java/com/hmh/hamyeonham/feature/onboarding/ExampleInstrumentedTest.kt b/feature/onboarding/src/androidTest/java/com/hmh/hamyeonham/feature/onboarding/ExampleInstrumentedTest.kt
deleted file mode 100644
index 152c7bd4..00000000
--- a/feature/onboarding/src/androidTest/java/com/hmh/hamyeonham/feature/onboarding/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.hmh.hamyeonham.feature.onboarding
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.hmh.hamyeonham.feature.onboarding.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index 9274870d..4396102e 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission-sdk-23 android:name="android.permission.PACKAGE_USAGE_STATS" />
     <uses-permission-sdk-23 android:name="android.permission.WRITE_SECURE_SETTINGS" />
@@ -10,8 +10,20 @@
         <activity
             android:name=".OnBoardingActivity"
             android:exported="false" />
-    </application>
 
+        <service
+            android:name=".OnBoardingAccessibilityService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/accessibility_service_config" />
+        </service>
+    </application>
 
 
 </manifest>
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt
index 9185453b..774a15ed 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt
@@ -1,15 +1,19 @@
 package com.hmh.hamyeonham.feature.onboarding
 
 import android.accessibilityservice.AccessibilityService
+import android.util.Log
+import android.view.accessibility.AccessibilityEvent
 import com.hmh.hamyeonham.common.context.toast
 
 class OnBoardingAccessibilityService : AccessibilityService() {
-    override fun onInterrupt() {
-        toast("서비스 onInterrupt ")
+    override fun onAccessibilityEvent(event: AccessibilityEvent) {
+        if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
+            val packageName = event.packageName ?: return
+            Log.d("AccessibilityService", "현재 실행 중인 앱 패키지: $packageName")
+        }
     }
 
-    override fun onAccessibilityEvent(event: android.view.accessibility.AccessibilityEvent?) {
-        toast("서비스 onAccessibilityEvent ")
+    override fun onInterrupt() {
 
     }
 }
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index b1bb2872..0123837f 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -1,104 +1,44 @@
 package com.hmh.hamyeonham.feature.onboarding
 
 import android.accessibilityservice.AccessibilityService
-import android.app.AppOpsManager
+import android.app.ActivityManager
+import android.content.ComponentName
+import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
-import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingBinding
 
 class OnBoardingActivity : AppCompatActivity() {
 
-    override fun onResume() {
-        super.onResume()
-        if (hasUsageStatsPermission()) {
-            toast("권한이 허용되어 있음")
-            requirePermission()
-        } else {
-            toast("권한이 허용되어 있지 않음")
-            requirePermission()
-        }
-    }
-
     private lateinit var binding: ActivityOnBoardingBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        // 설치된 앱 목록 가져오기
-        val installedApps: List<PackageInfo> =
-            packageManager.getInstalledPackages(PackageManager.GET_META_DATA)
-        Log.d("TAG", "installedApps: $installedApps")
-        for (packageInfo in installedApps) {
-            val appName: String = packageInfo.applicationInfo.loadLabel(packageManager).toString()
-            val packageName: String = packageInfo.packageName
-            val flags = packageInfo.applicationInfo.flags
-
-            Log.d("AppInfo", "Name: $appName, Package: $packageName, Flags: $flags")
-        }
+        requirePermission()
     }
 
     private fun requirePermission() {
         binding.btnPermission.setOnClickListener {
-            moveAppToTopInAccessibilitySettings(AccessibilityService::class.java)
-            // startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
-        }
-    }
-
-    private fun hasUsageStatsPermission(): Boolean {
-        val appOps = getSystemService(APP_OPS_SERVICE) as AppOpsManager
-        val mode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            appOps.unsafeCheckOpNoThrow(
-                AppOpsManager.OPSTR_GET_USAGE_STATS,
-                android.os.Process.myUid(),
-                packageName,
-            )
-        } else {
-            appOps.checkOpNoThrow(
-                AppOpsManager.OPSTR_GET_USAGE_STATS,
-                android.os.Process.myUid(),
-                packageName,
-            )
+            openAccessibilitySettingsIfNeeded()
         }
-        return mode == AppOpsManager.MODE_ALLOWED
     }
 
-    // 사용 접근 권한 앱 목록 순서 변경 함수
-    private fun moveAppToTopInAccessibilitySettings(service: Class<out AccessibilityService>) {
-        val expectedId = packageName + "/" + service.canonicalName
-        Log.d("TAG1", "expectedId: $expectedId")
-        startActivity(Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS))
-
+    private fun isAccessibilityServiceEnabled(): Boolean {
+        val service = packageName + "/" + OnBoardingAccessibilityService::class.java.canonicalName
         val enabledServicesSetting = Settings.Secure.getString(
             contentResolver,
-            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES
         )
-        Log.d("TAG2", "enabledServicesSetting: $enabledServicesSetting")
+        return enabledServicesSetting?.contains(service) == true
+    }
 
-        if (enabledServicesSetting == null) {
-            Log.e("TAG3", "Enabled services setting is null")
-            return
+    private fun openAccessibilitySettingsIfNeeded() {
+        if (!isAccessibilityServiceEnabled()) {
+            val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+            startActivity(intent)
         }
-
-        // 서비스 목록 순서 재배열
-        val serviceList = enabledServicesSetting.split(':').toMutableList()
-        serviceList.remove(expectedId)
-        serviceList.add(0, expectedId)
-        Log.d("TAG4", "serviceList: $serviceList")
-        val updatedServicesSetting = serviceList.joinToString(":")
-        Log.d("TAG5", "updatedServicesSetting: $updatedServicesSetting")
-
-        // 변경된 서비스 목록을 설정에 저장
-        Settings.Secure.putString(
-            contentResolver,
-            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-            updatedServicesSetting,
-        )
     }
 }
diff --git a/feature/onboarding/src/main/res/values/strings.xml b/feature/onboarding/src/main/res/values/strings.xml
index 73862c41..ab795438 100644
--- a/feature/onboarding/src/main/res/values/strings.xml
+++ b/feature/onboarding/src/main/res/values/strings.xml
@@ -1 +1,3 @@
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="accessibility_service_description">화면 동작 감지</string>
+</resources>
diff --git a/feature/onboarding/src/main/res/xml/accessibility_service_config.xml b/feature/onboarding/src/main/res/xml/accessibility_service_config.xml
new file mode 100644
index 00000000..c150fa1c
--- /dev/null
+++ b/feature/onboarding/src/main/res/xml/accessibility_service_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accessibilityEventTypes="typeWindowStateChanged"
+    android:accessibilityFeedbackType="feedbackSpoken"
+    android:accessibilityFlags="flagDefault"
+    android:canRetrieveWindowContent="true"
+    android:notificationTimeout="100" />
diff --git a/feature/onboarding/src/test/java/com/hmh/hamyeonham/feature/onboarding/ExampleUnitTest.kt b/feature/onboarding/src/test/java/com/hmh/hamyeonham/feature/onboarding/ExampleUnitTest.kt
deleted file mode 100644
index f726f340..00000000
--- a/feature/onboarding/src/test/java/com/hmh/hamyeonham/feature/onboarding/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hmh.hamyeonham.feature.onboarding
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file

From bd23756b208da298171d4d3ecad3643f689121d2 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Mon, 1 Jan 2024 23:44:25 +0900
Subject: [PATCH 14/54] [fix]: Request Permission

---
 .../feature/onboarding/OnBoardingActivity.kt  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 0123837f..b4a709b9 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -1,18 +1,30 @@
 package com.hmh.hamyeonham.feature.onboarding
 
-import android.accessibilityservice.AccessibilityService
-import android.app.ActivityManager
-import android.content.ComponentName
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.provider.Settings
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingBinding
 
 class OnBoardingActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityOnBoardingBinding
+
+    private val accessibilitySettingsLauncher: ActivityResultLauncher<Intent> =
+        registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (isAccessibilityServiceEnabled()) {
+                toast("접근성 서비스가 활성화되었습니다.")
+            } else {
+                toast("접근성 서비스가 활성화되지 않았습니다.")
+            }
+        }
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
@@ -38,7 +50,7 @@ class OnBoardingActivity : AppCompatActivity() {
     private fun openAccessibilitySettingsIfNeeded() {
         if (!isAccessibilityServiceEnabled()) {
             val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-            startActivity(intent)
+            accessibilitySettingsLauncher.launch(intent)
         }
     }
 }

From 474ccb9de67faf8c0193d227c0c4a0ce96126d93 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Mon, 1 Jan 2024 23:44:33 +0900
Subject: [PATCH 15/54] [fix]: Request Permission

---
 .../com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index b4a709b9..cccd2dd6 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -24,7 +24,6 @@ class OnBoardingActivity : AppCompatActivity() {
             }
         }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)

From 9ec42cf3f1e26a589d62c0513041d43e194d470e Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Mon, 1 Jan 2024 23:57:45 +0900
Subject: [PATCH 16/54] [fix]: Debug KeyStore

---
 app/build.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 220aeb3a..4540cc17 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,8 +26,13 @@ android {
     }
 
     buildTypes {
+        debug {
+            isDebuggable = true
+            signingConfig = signingConfigs.getByName("debug")
+        }
         release {
             isMinifyEnabled = false
+            isDebuggable = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",

From d62dd0ff1f8c22f09894a3cd0ede8448d1fda429 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:03:29 +0900
Subject: [PATCH 17/54] =?UTF-8?q?[delete]:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EA=B6=8C=ED=95=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/onboarding/src/main/AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index 4396102e..f059446a 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission-sdk-23 android:name="android.permission.PACKAGE_USAGE_STATS" />
-    <uses-permission-sdk-23 android:name="android.permission.WRITE_SECURE_SETTINGS" />
 
 
     <application>

From 12464830fd1285ecf9e9101350ea4e3b3e97d13a Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:12:20 +0900
Subject: [PATCH 18/54] =?UTF-8?q?[feat]:=20=EA=B6=8C=ED=95=9C=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/activity_on_boarding.xml  | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/feature/onboarding/src/main/res/layout/activity_on_boarding.xml b/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
index 191bd5b1..0be76867 100644
--- a/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
+++ b/feature/onboarding/src/main/res/layout/activity_on_boarding.xml
@@ -1,19 +1,38 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".OnBoardingActivity">
 
     <Button
-        android:id="@+id/btn_permission"
+        android:id="@+id/btn_accessibility"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="접근성 허용하러 가기"
+        app:layout_constraintBottom_toTopOf="@+id/btn_usage"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="30dp"/>
+
+    <Button
+        android:id="@+id/btn_usage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="사용 정보접근 허용하러 가기"
+        app:layout_constraintBottom_toTopOf="@+id/btn_draw_on_others"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="30dp"/>
+
+    <Button
+        android:id="@+id/btn_draw_on_others"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="30dp"
-        android:text="권한 허용하러 가기"
-        />
+        android:text="다른 앱 위에 그리기허용하러 가기"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b8edc686eb65823c55075ddb3ac30e4efd98e7fc Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:13:07 +0900
Subject: [PATCH 19/54] =?UTF-8?q?[fix]:=20=ED=95=A8=EC=88=98=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/onboarding/OnBoardingActivity.kt           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index cccd2dd6..ed9e277c 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -15,7 +15,7 @@ class OnBoardingActivity : AppCompatActivity() {
 
     private val accessibilitySettingsLauncher: ActivityResultLauncher<Intent> =
         registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
+            ActivityResultContracts.StartActivityForResult(),
         ) {
             if (isAccessibilityServiceEnabled()) {
                 toast("접근성 서비스가 활성화되었습니다.")
@@ -28,11 +28,11 @@ class OnBoardingActivity : AppCompatActivity() {
         binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        requirePermission()
+        clickRequireAccessibilityBtn()
     }
 
-    private fun requirePermission() {
-        binding.btnPermission.setOnClickListener {
+    private fun clickRequireAccessibilityBtn() {
+        binding.btnAccessibility.setOnClickListener {
             openAccessibilitySettingsIfNeeded()
         }
     }
@@ -41,7 +41,7 @@ class OnBoardingActivity : AppCompatActivity() {
         val service = packageName + "/" + OnBoardingAccessibilityService::class.java.canonicalName
         val enabledServicesSetting = Settings.Secure.getString(
             contentResolver,
-            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES
+            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
         )
         return enabledServicesSetting?.contains(service) == true
     }

From a0143040d9c8ac52e85ea3058470ce7595ec636a Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Tue, 2 Jan 2024 01:17:34 +0900
Subject: [PATCH 20/54] [fix]: Fix Usage Permission

---
 .../onboarding/src/main/AndroidManifest.xml   |  8 ++++---
 .../feature/onboarding/OnBoardingActivity.kt  | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index f059446a..cf6b4e44 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission-sdk-23 android:name="android.permission.PACKAGE_USAGE_STATS" />
+    <uses-permission
+        android:name="android.permission.PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions" />
 
 
     <application>
@@ -12,8 +14,8 @@
 
         <service
             android:name=".OnBoardingAccessibilityService"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
-            android:exported="true">
+            android:exported="true"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService" />
             </intent-filter>
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index ed9e277c..93d79165 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -1,6 +1,9 @@
 package com.hmh.hamyeonham.feature.onboarding
 
+import android.app.usage.UsageStatsManager
+import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import androidx.activity.result.ActivityResultLauncher
@@ -9,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingBinding
 
+
 class OnBoardingActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityOnBoardingBinding
@@ -35,6 +39,13 @@ class OnBoardingActivity : AppCompatActivity() {
         binding.btnAccessibility.setOnClickListener {
             openAccessibilitySettingsIfNeeded()
         }
+        binding.btnUsage.setOnClickListener {
+            if (!hasUsageStatsPermission()) {
+                val packageUri = Uri.parse("package:$packageName")
+                val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
+                startActivity(intent)
+            }
+        }
     }
 
     private fun isAccessibilityServiceEnabled(): Boolean {
@@ -52,4 +63,15 @@ class OnBoardingActivity : AppCompatActivity() {
             accessibilitySettingsLauncher.launch(intent)
         }
     }
+
+    private fun hasUsageStatsPermission(): Boolean {
+        val usageStatsManager = getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+        val time = System.currentTimeMillis()
+        val stats = usageStatsManager.queryUsageStats(
+            UsageStatsManager.INTERVAL_DAILY,
+            time - 1000 * 60,
+            time
+        )
+        return stats != null && stats.isNotEmpty()
+    }
 }

From 4cd8c02439ef7af48b4acdabdfd447397e46d617 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Tue, 2 Jan 2024 01:33:44 +0900
Subject: [PATCH 21/54] [fix]: Fix Usage Permission

---
 feature/onboarding/src/main/AndroidManifest.xml   |  1 -
 .../feature/onboarding/OnBoardingActivity.kt      | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index cf6b4e44..0c849145 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
         android:name="android.permission.PACKAGE_USAGE_STATS"
         tools:ignore="ProtectedPermissions" />
 
-
     <application>
         <activity
             android:name=".OnBoardingActivity"
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index 93d79165..a850b8df 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -40,11 +40,20 @@ class OnBoardingActivity : AppCompatActivity() {
             openAccessibilitySettingsIfNeeded()
         }
         binding.btnUsage.setOnClickListener {
-            if (!hasUsageStatsPermission()) {
+            requestUsageAccessPermission()
+        }
+    }
+
+    private fun requestUsageAccessPermission() {
+        if (!hasUsageStatsPermission()) {
+            val intent = try {
                 val packageUri = Uri.parse("package:$packageName")
-                val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
-                startActivity(intent)
+                Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
+
+            } catch (e: Exception) {
+                Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
             }
+            startActivity(intent)
         }
     }
 

From e192362c824ef8aea5de24719682a251b8dc9f0a Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Tue, 2 Jan 2024 01:38:03 +0900
Subject: [PATCH 22/54] [fix]: Fix Usage Permission

---
 .../hamyeonham/feature/onboarding/OnBoardingActivity.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index a850b8df..b03e11c4 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -46,14 +46,15 @@ class OnBoardingActivity : AppCompatActivity() {
 
     private fun requestUsageAccessPermission() {
         if (!hasUsageStatsPermission()) {
-            val intent = try {
+            try {
                 val packageUri = Uri.parse("package:$packageName")
-                Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
+                val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
+                startActivity(intent)
 
             } catch (e: Exception) {
-                Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
+                val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
+                startActivity(intent)
             }
-            startActivity(intent)
         }
     }
 

From 099b90e74502978a14713053627e313935a435b4 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:43:46 +0900
Subject: [PATCH 23/54] =?UTF-8?q?[feat]:=20=EB=8B=A4=EB=A5=B8=20=EC=95=B1?=
 =?UTF-8?q?=20=EC=9C=84=EC=97=90=20=EA=B7=B8=EB=A6=AC=EA=B8=B0=20=EA=B6=8C?=
 =?UTF-8?q?=ED=95=9C=20=ED=97=88=EC=9A=A9=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onboarding/src/main/AndroidManifest.xml   |  4 +--
 .../feature/onboarding/OnBoardingActivity.kt  | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/feature/onboarding/src/main/AndroidManifest.xml b/feature/onboarding/src/main/AndroidManifest.xml
index 0c849145..a2fcd80d 100644
--- a/feature/onboarding/src/main/AndroidManifest.xml
+++ b/feature/onboarding/src/main/AndroidManifest.xml
@@ -6,6 +6,8 @@
         android:name="android.permission.PACKAGE_USAGE_STATS"
         tools:ignore="ProtectedPermissions" />
 
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
     <application>
         <activity
             android:name=".OnBoardingActivity"
@@ -24,6 +26,4 @@
                 android:resource="@xml/accessibility_service_config" />
         </service>
     </application>
-
-
 </manifest>
diff --git a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
index b03e11c4..3d88903b 100644
--- a/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
+++ b/feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingBinding
 
-
 class OnBoardingActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityOnBoardingBinding
@@ -42,6 +41,13 @@ class OnBoardingActivity : AppCompatActivity() {
         binding.btnUsage.setOnClickListener {
             requestUsageAccessPermission()
         }
+        binding.btnDrawOnOthers.setOnClickListener {
+            if (!hasOverlayPermission()) {
+                requestOverlayPermission()
+            } else {
+                toast("다른 앱 위에 그리기 권한이 이미 허용되어 있습니다.")
+            }
+        }
     }
 
     private fun requestUsageAccessPermission() {
@@ -50,14 +56,25 @@ class OnBoardingActivity : AppCompatActivity() {
                 val packageUri = Uri.parse("package:$packageName")
                 val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
                 startActivity(intent)
-
             } catch (e: Exception) {
                 val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
                 startActivity(intent)
             }
+        } else {
+            toast("사용 정보 접근 권한이 이미 허용되어 있습니다.")
         }
     }
 
+    private fun requestOverlayPermission() {
+        val packageUri = Uri.parse("package:$packageName")
+        val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, packageUri)
+        startActivity(intent)
+    }
+
+    private fun hasOverlayPermission(): Boolean {
+        return Settings.canDrawOverlays(this)
+    }
+
     private fun isAccessibilityServiceEnabled(): Boolean {
         val service = packageName + "/" + OnBoardingAccessibilityService::class.java.canonicalName
         val enabledServicesSetting = Settings.Secure.getString(
@@ -71,6 +88,8 @@ class OnBoardingActivity : AppCompatActivity() {
         if (!isAccessibilityServiceEnabled()) {
             val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
             accessibilitySettingsLauncher.launch(intent)
+        } else {
+            toast("접근성 권한이 이미 허용되어 있습니다.")
         }
     }
 
@@ -80,7 +99,7 @@ class OnBoardingActivity : AppCompatActivity() {
         val stats = usageStatsManager.queryUsageStats(
             UsageStatsManager.INTERVAL_DAILY,
             time - 1000 * 60,
-            time
+            time,
         )
         return stats != null && stats.isNotEmpty()
     }

From b29e66378e1b6d7ba7cfc339adda705fd93cd451 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:54:57 +0900
Subject: [PATCH 24/54] =?UTF-8?q?[feat]:=20LoginActivity=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/login/build.gradle.kts                        |  4 ++++
 feature/login/src/main/AndroidManifest.xml            |  8 +++++++-
 .../com/hmh/hamyeonham/feature/login/LoginActivity.kt | 11 +++++++++++
 feature/login/src/main/res/layout/activity_login.xml  |  9 +++++++++
 feature/login/src/main/res/values/strings.xml         |  1 +
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
 create mode 100644 feature/login/src/main/res/layout/activity_login.xml
 create mode 100644 feature/login/src/main/res/values/strings.xml

diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
index f2676648..7af05406 100644
--- a/feature/login/build.gradle.kts
+++ b/feature/login/build.gradle.kts
@@ -1,6 +1,7 @@
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     hmh("feature")
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -9,4 +10,7 @@ android {
 
 dependencies {
     implementation(projects.core.common)
+    implementation(libs.appcompat)
+    implementation(libs.material)
+    implementation(libs.constraintlayout)
 }
diff --git a/feature/login/src/main/AndroidManifest.xml b/feature/login/src/main/AndroidManifest.xml
index 8bdb7e14..035e0ed7 100644
--- a/feature/login/src/main/AndroidManifest.xml
+++ b/feature/login/src/main/AndroidManifest.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
+    <application>
+        <activity
+            android:name=".LoginActivity"
+            android:exported="false" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
new file mode 100644
index 00000000..d423d24b
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -0,0 +1,11 @@
+package com.hmh.hamyeonham.feature.login
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class LoginActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_login)
+    }
+}
\ No newline at end of file
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
new file mode 100644
index 00000000..c401d016
--- /dev/null
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -0,0 +1,9 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".LoginActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/feature/login/src/main/res/values/strings.xml b/feature/login/src/main/res/values/strings.xml
new file mode 100644
index 00000000..73862c41
--- /dev/null
+++ b/feature/login/src/main/res/values/strings.xml
@@ -0,0 +1 @@
+<resources></resources>
\ No newline at end of file

From 699173851917d0f686d5eb59e4df439eda0f1c1d Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:55:37 +0900
Subject: [PATCH 25/54] =?UTF-8?q?[delete]:=20sampleClass=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt  | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt
deleted file mode 100644
index 72ee7cde..00000000
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/SampleClass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.hmh.hamyeonham.feature.login
-
-class SampleClass {}

From 394008b414af35912111842b57a8db9ddaa59698 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 01:57:59 +0900
Subject: [PATCH 26/54] [feat]: LoginActivity viewBinding

---
 .../hmh/hamyeonham/feature/login/LoginActivity.kt    |  5 ++++-
 feature/login/src/main/res/layout/activity_login.xml | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index d423d24b..f9dcca29 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -2,10 +2,13 @@ package com.hmh.hamyeonham.feature.login
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
 
 class LoginActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityLoginBinding
     override fun onCreate(savedInstanceState: Bundle?) {
+        binding = ActivityLoginBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
+        setContentView(binding.root)
     }
 }
\ No newline at end of file
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index c401d016..007a9b26 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -1,9 +1,19 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".LoginActivity">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Login"
+        android:textSize="30sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="50dp"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From afdd14343311f90af8044cac9c7638108c944123 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 02:48:27 +0900
Subject: [PATCH 27/54] =?UTF-8?q?[feat]:=20local=20properties=EC=97=90=20K?=
 =?UTF-8?q?AKAO=5FNATIVE=5FAPP=5FKEY=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                 | 10 ++++++++++
 app/src/main/AndroidManifest.xml                     |  5 +++++
 app/src/main/java/com/hmh/hamyeonham/MainActivity.kt |  8 ++++++++
 3 files changed, 23 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4540cc17..f8652a82 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
 plugins {
     hmh("application")
     hmh("compose")
@@ -14,6 +16,14 @@ android {
         applicationId = "com.hmh.hamyeonham"
         versionCode = libs.versions.versionCode.get().toInt()
         versionName = libs.versions.appVersion.get()
+
+        buildConfigField(
+            "String",
+            "KAKAO_NATIVE_APP_KEY",
+            gradleLocalProperties(rootDir).getProperty("kakao.native.app.key"),
+        )
+        manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] =
+            gradleLocalProperties(rootDir).getProperty("kakao.native.app.key")
     }
 
     signingConfigs {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 964f0e7e..90785ae0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,9 +24,14 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
 
+                <data
+                    android:host="oauth"
+                    android:scheme="kakao${KAKAO_NATIVE_APP_KEY}" />
 
             </intent-filter>
         </activity>
+
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt b/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt
index 7ee73dc9..36904a66 100644
--- a/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt
@@ -1,11 +1,13 @@
 package com.hmh.hamyeonham
 
 import android.os.Bundle
+import android.util.Log
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.kakao.sdk.common.KakaoSdk
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -15,6 +17,12 @@ class MainActivity : AppCompatActivity() {
         initSplashAnimation(splashScreen)
 
         setContentView(R.layout.activity_main)
+
+        initKakaoSdk()
+    }
+
+    private fun initKakaoSdk() {
+        KakaoSdk.init(this, BuildConfig.KAKAO_NATIVE_APP_KEY)
     }
 
     private fun initSplashAnimation(splashScreen: SplashScreen) {

From 9c95a29fe2cc1af31ff1f233f5f3d66d6e84ffc3 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 03:11:17 +0900
Subject: [PATCH 28/54] =?UTF-8?q?[feat]:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=A1=B0=ED=95=A9=20=EC=98=88=EC=A0=9C=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=82=BD=EC=9E=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hmh/hamyeonham/MainActivity.kt   |  4 +-
 feature/login/build.gradle.kts                |  3 ++
 feature/login/src/main/AndroidManifest.xml    |  3 ++
 .../hamyeonham/feature/login/LoginActivity.kt | 54 ++++++++++++++++++-
 .../feature/login/UserInfoActivity.kt         | 11 ++++
 .../src/main/res/layout/activity_login.xml    |  8 +++
 .../main/res/layout/activity_user_info.xml    |  9 ++++
 7 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
 create mode 100644 feature/login/src/main/res/layout/activity_user_info.xml

diff --git a/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt b/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt
index 36904a66..625d4ef9 100644
--- a/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/MainActivity.kt
@@ -1,12 +1,13 @@
 package com.hmh.hamyeonham
 
+import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.hmh.hamyeonham.feature.login.LoginActivity
 import com.kakao.sdk.common.KakaoSdk
 
 class MainActivity : AppCompatActivity() {
@@ -19,6 +20,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         initKakaoSdk()
+        Intent(this, LoginActivity::class.java).let(::startActivity)
     }
 
     private fun initKakaoSdk() {
diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
index 7af05406..4e331ef1 100644
--- a/feature/login/build.gradle.kts
+++ b/feature/login/build.gradle.kts
@@ -13,4 +13,7 @@ dependencies {
     implementation(libs.appcompat)
     implementation(libs.material)
     implementation(libs.constraintlayout)
+
+    // kakao
+    implementation(libs.kakao.login)
 }
diff --git a/feature/login/src/main/AndroidManifest.xml b/feature/login/src/main/AndroidManifest.xml
index 035e0ed7..ec037070 100644
--- a/feature/login/src/main/AndroidManifest.xml
+++ b/feature/login/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
+        <activity
+            android:name=".UserInfoActivity"
+            android:exported="false" />
         <activity
             android:name=".LoginActivity"
             android:exported="false" />
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index f9dcca29..2c497234 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -1,14 +1,64 @@
 package com.hmh.hamyeonham.feature.login
 
-import androidx.appcompat.app.AppCompatActivity
+import android.content.ContentValues.TAG
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
+import com.kakao.sdk.auth.model.OAuthToken
+import com.kakao.sdk.common.model.ClientError
+import com.kakao.sdk.common.model.ClientErrorCause
+import com.kakao.sdk.user.UserApiClient
 
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
+
+    // 카카오계정으로 로그인 공통 callback 구성
+    private val mCallback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+        if (error != null) {
+            Log.e(TAG, "로그인 실패 $error")
+        } else if (token != null) {
+            Log.d(TAG, "로그인 성공 ${token.accessToken}")
+            userInfoActivity()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityLoginBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+
+        loginWithKakaoTalk()
+    }
+
+    // 로그인 조합 예제
+    private fun loginWithKakaoTalk() {
+        binding.btnLogin.setOnClickListener {
+            if (UserApiClient.instance.isKakaoTalkLoginAvailable(this)) {
+                UserApiClient.instance.loginWithKakaoTalk(this) { token, error ->
+                    if (error != null) {
+                        Log.e(TAG, "로그인 실패 $error")
+                        if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
+                            return@loginWithKakaoTalk
+                        } else {
+                            UserApiClient.instance.loginWithKakaoAccount(this, callback = mCallback)
+                        }
+                    } else if (token != null) {
+                        Log.d(TAG, "로그인 성공 ${token.accessToken}")
+                        Toast.makeText(this, "로그인 성공!", Toast.LENGTH_SHORT).show()
+                        userInfoActivity()
+                    }
+                }
+            } else {
+                UserApiClient.instance.loginWithKakaoAccount(this, callback = mCallback)
+            }
+        }
+    }
+
+    private fun userInfoActivity() {
+        startActivity(Intent(this, UserInfoActivity::class.java))
+        finish()
     }
-}
\ No newline at end of file
+}
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
new file mode 100644
index 00000000..adc16df3
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
@@ -0,0 +1,11 @@
+package com.hmh.hamyeonham.feature.login
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class UserInfoActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_user_info)
+    }
+}
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index 007a9b26..9d9a780b 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -16,4 +16,12 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="50dp"/>
 
+
+    <Button
+        android:id="@+id/btn_login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Login"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/feature/login/src/main/res/layout/activity_user_info.xml b/feature/login/src/main/res/layout/activity_user_info.xml
new file mode 100644
index 00000000..8727db3c
--- /dev/null
+++ b/feature/login/src/main/res/layout/activity_user_info.xml
@@ -0,0 +1,9 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".UserInfoActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 84af8ad20f855dccc3c160a3317984e20d04f285 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 03:13:20 +0900
Subject: [PATCH 29/54] =?UTF-8?q?[feat]:=20LoginViewModel=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt  | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
new file mode 100644
index 00000000..67103801
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
@@ -0,0 +1,5 @@
+package com.hmh.hamyeonham.feature.login
+
+import androidx.lifecycle.ViewModel
+
+class LoginViewModel : ViewModel(){}

From 46f8344278701ad41dcfa2ce3a1faa6b5d637a37 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 18:05:51 +0900
Subject: [PATCH 30/54] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=20(=EC=95=B1,=20=EC=9B=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 15 +++++--
 .../hamyeonham/feature/login/LoginActivity.kt | 42 ++++++++++---------
 .../feature/login/LoginViewModel.kt           |  4 +-
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90785ae0..36db6051 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,10 +24,19 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
 
-                <data
-                    android:host="oauth"
-                    android:scheme="kakao${KAKAO_NATIVE_APP_KEY}" />
+            </intent-filter>
+        </activity>
 
+        <activity
+            android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:host="oauth"
+                    android:scheme="kakao${KAKAO_NATIVE_APP_KEY}" />
             </intent-filter>
         </activity>
 
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index 2c497234..5d24e2e8 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -4,7 +4,6 @@ import android.content.ContentValues.TAG
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
 import com.kakao.sdk.auth.model.OAuthToken
@@ -15,16 +14,6 @@ import com.kakao.sdk.user.UserApiClient
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
 
-    // 카카오계정으로 로그인 공통 callback 구성
-    private val mCallback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
-        if (error != null) {
-            Log.e(TAG, "로그인 실패 $error")
-        } else if (token != null) {
-            Log.d(TAG, "로그인 성공 ${token.accessToken}")
-            userInfoActivity()
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityLoginBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
@@ -36,28 +25,43 @@ class LoginActivity : AppCompatActivity() {
     // 로그인 조합 예제
     private fun loginWithKakaoTalk() {
         binding.btnLogin.setOnClickListener {
+            // 카카오계정으로 로그인 공통 callback 구성
+// 카카오톡으로 로그인 할 수 없어 카카오계정으로 로그인할 경우 사용됨
+            val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+                if (error != null) {
+                    Log.e(TAG, "카카오계정으로 로그인 실패", error)
+                } else if (token != null) {
+                    Log.i(TAG, "카카오계정으로 로그인 성공 ${token.accessToken}")
+                    moveToUserInfoActivity()
+                }
+            }
+
+// 카카오톡이 설치되어 있으면 카카오톡으로 로그인, 아니면 카카오계정으로 로그인
             if (UserApiClient.instance.isKakaoTalkLoginAvailable(this)) {
                 UserApiClient.instance.loginWithKakaoTalk(this) { token, error ->
                     if (error != null) {
-                        Log.e(TAG, "로그인 실패 $error")
+                        Log.e(TAG, "카카오톡으로 로그인 실패", error)
+
+                        // 사용자가 카카오톡 설치 후 디바이스 권한 요청 화면에서 로그인을 취소한 경우,
+                        // 의도적인 로그인 취소로 보고 카카오계정으로 로그인 시도 없이 로그인 취소로 처리 (예: 뒤로 가기)
                         if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
                             return@loginWithKakaoTalk
-                        } else {
-                            UserApiClient.instance.loginWithKakaoAccount(this, callback = mCallback)
                         }
+
+                        // 카카오톡에 연결된 카카오계정이 없는 경우, 카카오계정으로 로그인 시도
+                        UserApiClient.instance.loginWithKakaoAccount(this, callback = callback)
                     } else if (token != null) {
-                        Log.d(TAG, "로그인 성공 ${token.accessToken}")
-                        Toast.makeText(this, "로그인 성공!", Toast.LENGTH_SHORT).show()
-                        userInfoActivity()
+                        Log.i(TAG, "카카오톡으로 로그인 성공 ${token.accessToken}")
+                        moveToUserInfoActivity()
                     }
                 }
             } else {
-                UserApiClient.instance.loginWithKakaoAccount(this, callback = mCallback)
+                UserApiClient.instance.loginWithKakaoAccount(this, callback = callback)
             }
         }
     }
 
-    private fun userInfoActivity() {
+    private fun moveToUserInfoActivity() {
         startActivity(Intent(this, UserInfoActivity::class.java))
         finish()
     }
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
index 67103801..22bf4eeb 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
@@ -2,4 +2,6 @@ package com.hmh.hamyeonham.feature.login
 
 import androidx.lifecycle.ViewModel
 
-class LoginViewModel : ViewModel(){}
+class LoginViewModel : ViewModel(){
+
+}

From 2c56cdfadb1497b2ec337bfde1214e5d5f10d988 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 18:16:00 +0900
Subject: [PATCH 31/54] =?UTF-8?q?[feat]:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=84=B1=EA=B3=B5=20=EC=8B=9C=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=B0=98=ED=99=98=20=EC=95=A1=ED=8B=B0=EB=B9=84?=
 =?UTF-8?q?=ED=8B=B0=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=84=B8=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/login/UserInfoActivity.kt         |  7 ++++++-
 .../feature/login/UserInfoViewModel.kt        |  5 +++++
 .../src/main/res/layout/activity_login.xml    | 13 ++++++++----
 .../main/res/layout/activity_user_info.xml    | 20 +++++++++++++++++++
 4 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
index adc16df3..d807108e 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
@@ -2,10 +2,15 @@ package com.hmh.hamyeonham.feature.login
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.hmh.hamyeonham.feature.login.databinding.ActivityUserInfoBinding
 
 class UserInfoActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityUserInfoBinding
     override fun onCreate(savedInstanceState: Bundle?) {
+        binding = ActivityUserInfoBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_user_info)
+        setContentView(binding.root)
+
+
     }
 }
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt
new file mode 100644
index 00000000..4aba560a
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt
@@ -0,0 +1,5 @@
+package com.hmh.hamyeonham.feature.login
+
+import androidx.lifecycle.ViewModel
+
+class UserInfoViewModel : ViewModel()
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index 9d9a780b..bc603ddc 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -1,27 +1,32 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".LoginActivity">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
         android:text="Login"
         android:textSize="30sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="50dp"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
     <Button
         android:id="@+id/btn_login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
         android:text="Login"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/feature/login/src/main/res/layout/activity_user_info.xml b/feature/login/src/main/res/layout/activity_user_info.xml
index 8727db3c..8f23b60a 100644
--- a/feature/login/src/main/res/layout/activity_user_info.xml
+++ b/feature/login/src/main/res/layout/activity_user_info.xml
@@ -6,4 +6,24 @@
     android:layout_height="match_parent"
     tools:context=".UserInfoActivity">
 
+    <TextView
+        android:id="@+id/tv_login_nickname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
+        android:textSize="50sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="nickname" />
+
+    <Button
+        android:id="@+id/btn_login_logout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:text="로그아웃"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From c3941f6c65206c5553bb248328660b0cc97048b0 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 18:33:14 +0900
Subject: [PATCH 32/54] =?UTF-8?q?[feat]:=20=EC=9C=A0=EC=A0=80=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EB=B0=98=ED=99=98,=20=EC=B9=B4=EC=B9=B4?=
 =?UTF-8?q?=EC=98=A4=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/login/UserInfoActivity.kt         | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
index d807108e..4fd6e9f8 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
@@ -1,8 +1,12 @@
 package com.hmh.hamyeonham.feature.login
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.hmh.hamyeonham.common.context.toast
+import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
 import com.hmh.hamyeonham.feature.login.databinding.ActivityUserInfoBinding
+import com.kakao.sdk.user.UserApiClient
 
 class UserInfoActivity : AppCompatActivity() {
     private lateinit var binding: ActivityUserInfoBinding
@@ -11,6 +15,36 @@ class UserInfoActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
+        getKakaoUserNickname()
+        binding.btnLoginLogout.setOnClickListener {
+            logoutFromKakao()
+        }
+    }
+
+    private fun getKakaoUserNickname() {
+        UserApiClient.instance.me { user, error ->
+            if (error != null) {
+                moveToLogin()
+            } else if (user != null) {
+                val kakaoNickname = user.kakaoAccount?.profile?.nickname
+                binding.tvLoginNickname.text = kakaoNickname
+            }
+        }
+    }
+
+    private fun logoutFromKakao() {
+        UserApiClient.instance.logout { error ->
+            if (error != null) {
+                toast("다시 로그아웃 해주세요.")
+            } else {
+                toast("로그아웃 되었습니다.")
+                moveToLogin()
+            }
+        }
+    }
 
+    private fun moveToLogin() {
+        startActivity(Intent(this, LoginActivity::class.java))
+        finish()
     }
 }

From 74c9e8f1060d6e552f1550cfd0d9c1f7f46e1e68 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 19:24:28 +0900
Subject: [PATCH 33/54] =?UTF-8?q?[refact]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?=
 =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=BD=94=EB=93=9C=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamyeonham/feature/login/LoginActivity.kt | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index 5d24e2e8..25becd76 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -1,10 +1,9 @@
 package com.hmh.hamyeonham.feature.login
 
-import android.content.ContentValues.TAG
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.common.model.ClientError
@@ -14,53 +13,51 @@ import com.kakao.sdk.user.UserApiClient
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
 
+    private val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+        when {
+            error != null -> {
+            }
+
+            token != null -> {
+                moveToUserInfoActivity()
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityLoginBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        loginWithKakaoTalk()
+        binding.btnLogin.setOnClickListener {
+            loginWithKakaoApp()
+        }
     }
 
-    // 로그인 조합 예제
-    private fun loginWithKakaoTalk() {
-        binding.btnLogin.setOnClickListener {
-            // 카카오계정으로 로그인 공통 callback 구성
-// 카카오톡으로 로그인 할 수 없어 카카오계정으로 로그인할 경우 사용됨
-            val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+    private fun loginWithKakaoApp() {
+        if (UserApiClient.instance.isKakaoTalkLoginAvailable(this)) {
+            UserApiClient.instance.loginWithKakaoTalk(this) { token, error ->
                 if (error != null) {
-                    Log.e(TAG, "카카오계정으로 로그인 실패", error)
+                    toast("카카오 로그인 실패")
+                    if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
+                        toast("다시 로그인 해주세요.")
+                        return@loginWithKakaoTalk
+                    }
+                    loginWithKakaoAccount()
                 } else if (token != null) {
-                    Log.i(TAG, "카카오계정으로 로그인 성공 ${token.accessToken}")
+                    toast("카카오 로그인 성공")
                     moveToUserInfoActivity()
                 }
             }
-
-// 카카오톡이 설치되어 있으면 카카오톡으로 로그인, 아니면 카카오계정으로 로그인
-            if (UserApiClient.instance.isKakaoTalkLoginAvailable(this)) {
-                UserApiClient.instance.loginWithKakaoTalk(this) { token, error ->
-                    if (error != null) {
-                        Log.e(TAG, "카카오톡으로 로그인 실패", error)
-
-                        // 사용자가 카카오톡 설치 후 디바이스 권한 요청 화면에서 로그인을 취소한 경우,
-                        // 의도적인 로그인 취소로 보고 카카오계정으로 로그인 시도 없이 로그인 취소로 처리 (예: 뒤로 가기)
-                        if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
-                            return@loginWithKakaoTalk
-                        }
-
-                        // 카카오톡에 연결된 카카오계정이 없는 경우, 카카오계정으로 로그인 시도
-                        UserApiClient.instance.loginWithKakaoAccount(this, callback = callback)
-                    } else if (token != null) {
-                        Log.i(TAG, "카카오톡으로 로그인 성공 ${token.accessToken}")
-                        moveToUserInfoActivity()
-                    }
-                }
-            } else {
-                UserApiClient.instance.loginWithKakaoAccount(this, callback = callback)
-            }
+        } else {
+            loginWithKakaoAccount()
         }
     }
 
+    private fun loginWithKakaoAccount() {
+        UserApiClient.instance.loginWithKakaoAccount(this, callback = callback)
+    }
+
     private fun moveToUserInfoActivity() {
         startActivity(Intent(this, UserInfoActivity::class.java))
         finish()

From 3bc8510c7d090ba59164e179513aa87b12edef4d Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Tue, 2 Jan 2024 19:46:06 +0900
Subject: [PATCH 34/54] [fix]: Fix Navigation Resource

---
 .../main/src/main/res/drawable/ic_android_black_24dp.xml    | 5 +++++
 feature/main/src/main/res/menu/bottom_nav_menu.xml          | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 feature/main/src/main/res/drawable/ic_android_black_24dp.xml

diff --git a/feature/main/src/main/res/drawable/ic_android_black_24dp.xml b/feature/main/src/main/res/drawable/ic_android_black_24dp.xml
new file mode 100644
index 00000000..fe512307
--- /dev/null
+++ b/feature/main/src/main/res/drawable/ic_android_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"/>
+</vector>
diff --git a/feature/main/src/main/res/menu/bottom_nav_menu.xml b/feature/main/src/main/res/menu/bottom_nav_menu.xml
index 6fbc7ad5..69dec067 100644
--- a/feature/main/src/main/res/menu/bottom_nav_menu.xml
+++ b/feature/main/src/main/res/menu/bottom_nav_menu.xml
@@ -1,14 +1,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/challenge_dest"
-        android:icon="@color/material_dynamic_neutral0"
+        android:icon="@drawable/ic_android_black_24dp"
         android:title="@string/challenge" />
     <item
         android:id="@+id/home_dest"
-        android:icon="@color/material_dynamic_neutral0"
+        android:icon="@drawable/ic_android_black_24dp"
         android:title="@string/home" />
     <item
         android:id="@+id/my_page_dest"
-        android:icon="@color/material_dynamic_neutral0"
+        android:icon="@drawable/ic_android_black_24dp"
         android:title="@string/my_page" />
 </menu>

From 3b8cbf4dc7bc12595ea638e48f80295bee5d8aac Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Tue, 2 Jan 2024 19:46:38 +0900
Subject: [PATCH 35/54] [fix]: Fix Common Dependency

---
 core/common/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
index 57bc993c..47f0cbfa 100644
--- a/core/common/build.gradle.kts
+++ b/core/common/build.gradle.kts
@@ -13,6 +13,5 @@ android {
 }
 
 dependencies {
-    implementation(libs.fragment.ktx)
     implementation(libs.retrofit)
 }

From eb2e8f6ae227c1711af475ac58644b619dd20997 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 20:11:19 +0900
Subject: [PATCH 36/54] [fix]: resolve conflict

---
 app/build.gradle.kts                                   | 3 +++
 app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d1e54ac7..cfd74eed 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,7 +60,10 @@ dependencies {
     // Splash
     implementation(libs.splash.screen)
 
+    // Features
     implementation(projects.feature.login)
+    implementation(projects.feature.onboarding)
+    implementation(projects.feature.main)
 
     // kakao
     implementation(libs.kakao.login)
diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
index f8fc26f4..d3bcf2b5 100644
--- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
@@ -10,7 +10,6 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.hmh.hamyeonham.feature.login.LoginActivity
 import com.kakao.sdk.common.KakaoSdk
 import com.hmh.hamyeonham.feature.main.MainActivity
-import com.hmh.hamyeonham.feature.onboarding.OnBoardingActivity
 
 class SampleActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -22,13 +21,11 @@ class SampleActivity : AppCompatActivity() {
         setContentView(R.layout.activity_sample)
 
         initKakaoSdk()
-        Intent(this, LoginActivity::class.java).let(::startActivity)
+        Intent(this, MainActivity::class.java).let(::startActivity)
     }
 
     private fun initKakaoSdk() {
         KakaoSdk.init(this, BuildConfig.KAKAO_NATIVE_APP_KEY)
-        setContentView(R.layout.activity_sample)
-        Intent(this, MainActivity::class.java).let(::startActivity)
     }
 
     private fun initSplashAnimation(splashScreen: SplashScreen) {

From 3e804a1e90a6f13c9d1d78b89849e76045d8d8ea Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Tue, 2 Jan 2024 20:17:36 +0900
Subject: [PATCH 37/54] =?UTF-8?q?[feat]:=20viewModel,=20Livedata=20?=
 =?UTF-8?q?=EC=84=B8=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hmh/hamyeonham/SampleActivity.kt    |  2 +-
 .../com/hmh/hamyeonham/feature/login/LoginActivity.kt |  3 +++
 .../hmh/hamyeonham/feature/login/LoginViewModel.kt    |  5 +++++
 .../hmh/hamyeonham/feature/login/UserInfoActivity.kt  |  5 ++++-
 .../hmh/hamyeonham/feature/login/UserInfoViewModel.kt | 11 ++++++++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
index d3bcf2b5..1957a36a 100644
--- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
@@ -21,7 +21,7 @@ class SampleActivity : AppCompatActivity() {
         setContentView(R.layout.activity_sample)
 
         initKakaoSdk()
-        Intent(this, MainActivity::class.java).let(::startActivity)
+        Intent(this, LoginActivity::class.java).let(::startActivity)
     }
 
     private fun initKakaoSdk() {
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index 25becd76..abf1daaf 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -2,6 +2,7 @@ package com.hmh.hamyeonham.feature.login
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.common.context.toast
 import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
@@ -13,6 +14,8 @@ import com.kakao.sdk.user.UserApiClient
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
 
+    private val loginViewModel: LoginViewModel by viewModels()
+
     private val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
         when {
             error != null -> {
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
index 22bf4eeb..0d5cdf4c 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewModel.kt
@@ -1,7 +1,12 @@
 package com.hmh.hamyeonham.feature.login
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
 class LoginViewModel : ViewModel(){
 
+    private val _kakaoLoginResult = MutableLiveData<Boolean>()
+    val kakaoLoginResult: LiveData<Boolean> get() = _kakaoLoginResult
+
 }
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
index 4fd6e9f8..fc020b48 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoActivity.kt
@@ -2,14 +2,17 @@ package com.hmh.hamyeonham.feature.login
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.common.context.toast
-import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
 import com.hmh.hamyeonham.feature.login.databinding.ActivityUserInfoBinding
 import com.kakao.sdk.user.UserApiClient
 
 class UserInfoActivity : AppCompatActivity() {
     private lateinit var binding: ActivityUserInfoBinding
+
+    private val userInfoViewModel: UserInfoViewModel by viewModels()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityUserInfoBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt
index 4aba560a..69e9365a 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/UserInfoViewModel.kt
@@ -1,5 +1,14 @@
 package com.hmh.hamyeonham.feature.login
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
-class UserInfoViewModel : ViewModel()
+class UserInfoViewModel : ViewModel() {
+
+    private val _kakaoLogoutResult = MutableLiveData<Boolean>()
+    val kakaoLogoutResult: LiveData<Boolean> get() = _kakaoLogoutResult
+
+    private val _kakaoUserNickname = MutableLiveData<Boolean>()
+    val kakaoUserNickname: LiveData<Boolean> get() = _kakaoUserNickname
+}

From dcb394e8e498fda53ef7685feb061dc96c0b9883 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Wed, 3 Jan 2024 15:48:18 +0900
Subject: [PATCH 38/54] [fix]: Fix Kakao Api Key

---
 .github/workflows/develop_PR_builder.yml               |  6 ++++++
 app/build.gradle.kts                                   | 10 ----------
 app/src/main/AndroidManifest.xml                       |  2 +-
 app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt |  2 +-
 .../kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt  |  9 +++++++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/develop_PR_builder.yml b/.github/workflows/develop_PR_builder.yml
index 33d22b83..2f72d32c 100644
--- a/.github/workflows/develop_PR_builder.yml
+++ b/.github/workflows/develop_PR_builder.yml
@@ -36,6 +36,12 @@ jobs:
       - name: Change gradlew permissions
         run: chmod +x ./gradlew
 
+      - name: Add Local Properties
+        env:
+          KAKAO_API_KEY: ${{ secrets.KAKAO_API_KEY }}
+        run: |
+          echo kakaoApiKey=$KAKAO_API_KEY >> ./local.properties
+
       - name: Access Firebase Service
         run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cfd74eed..48f50825 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-
 plugins {
     hmh("application")
     hmh("compose")
@@ -16,14 +14,6 @@ android {
         applicationId = "com.hmh.hamyeonham"
         versionCode = libs.versions.versionCode.get().toInt()
         versionName = libs.versions.appVersion.get()
-
-        buildConfigField(
-            "String",
-            "KAKAO_NATIVE_APP_KEY",
-            gradleLocalProperties(rootDir).getProperty("kakao.native.app.key"),
-        )
-        manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] =
-            gradleLocalProperties(rootDir).getProperty("kakao.native.app.key")
     }
 
     signingConfigs {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af0efbae..43f73e8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:host="oauth"
-                    android:scheme="kakao${KAKAO_NATIVE_APP_KEY}" />
+                    android:scheme="kakao${kakaoApiKey}" />
             </intent-filter>
         </activity>
 
diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
index 1957a36a..698291d1 100644
--- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
@@ -25,7 +25,7 @@ class SampleActivity : AppCompatActivity() {
     }
 
     private fun initKakaoSdk() {
-        KakaoSdk.init(this, BuildConfig.KAKAO_NATIVE_APP_KEY)
+        KakaoSdk.init(this, BuildConfig.KAKAO_API_KEY)
     }
 
     private fun initSplashAnimation(splashScreen: SplashScreen) {
diff --git a/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt b/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt
index 11c11dd6..2508ec41 100644
--- a/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt
+++ b/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt
@@ -6,7 +6,6 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
-import java.util.Properties
 
 internal fun Project.configureAndroidCommonPlugin() {
 
@@ -18,7 +17,13 @@ internal fun Project.configureAndroidCommonPlugin() {
     apply<AndroidHiltPlugin>()
 
     extensions.getByType<BaseExtension>().apply {
-        defaultConfig {}
+        defaultConfig {
+            val kakaoApiKey = properties["kakaoApiKey"] as? String ?: ""
+
+            manifestPlaceholders["kakaoApiKey"] = properties["kakaoApiKey"] as? String ?: ""
+
+            buildConfigField("String", "KAKAO_API_KEY", "\"${kakaoApiKey}\"")
+        }
         buildFeatures.apply {
             viewBinding = true
             buildConfig = true

From 8f612252917a076c8161e62649a9768f91137cc3 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 14:58:41 +0900
Subject: [PATCH 39/54] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B2=84=ED=8A=BC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable/login_kakao_large_wide.png | Bin 0 -> 7213 bytes
 .../login/src/main/res/layout/activity_login.xml |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 feature/login/src/main/res/drawable/login_kakao_large_wide.png

diff --git a/feature/login/src/main/res/drawable/login_kakao_large_wide.png b/feature/login/src/main/res/drawable/login_kakao_large_wide.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0c1856129a03c5e5812854c7b7a1a6134f0f5c0
GIT binary patch
literal 7213
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

literal 0
HcmV?d00001

diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index bc603ddc..d6c3f7ae 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -17,16 +17,17 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <Button
+    <ImageView
         android:id="@+id/btn_login"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
+        android:layout_marginBottom="22dp"
+        android:layout_marginHorizontal="20dp"
         android:text="Login"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-
+        android:src="@drawable/login_kakao_large_wide"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From cde45aa0e2383b3640453876683fd67e086d048f Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 15:21:51 +0900
Subject: [PATCH 40/54] =?UTF-8?q?[feat]:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=BB=A8=EC=85=89=EC=84=A4=EB=AA=85=20=EB=B7=B0=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A0=80=20UI=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/login/build.gradle.kts                |  3 ++
 .../feature/login/LoginViewPagerFragment.kt   | 21 +++++++++++
 .../src/main/res/layout/activity_login.xml    | 31 ++++++++++++----
 .../res/layout/fragment_login_view_pager.xml  | 36 +++++++++++++++++++
 feature/login/src/main/res/values/strings.xml |  5 ++-
 5 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt
 create mode 100644 feature/login/src/main/res/layout/fragment_login_view_pager.xml

diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
index 4e331ef1..b93bb875 100644
--- a/feature/login/build.gradle.kts
+++ b/feature/login/build.gradle.kts
@@ -16,4 +16,7 @@ dependencies {
 
     // kakao
     implementation(libs.kakao.login)
+
+    implementation (libs.dot.indicator)
+
 }
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt
new file mode 100644
index 00000000..4e7550ae
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt
@@ -0,0 +1,21 @@
+package com.hmh.hamyeonham.feature.login
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class LoginViewPagerFragment : Fragment() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        return inflater.inflate(R.layout.fragment_login_view_pager, container, false)
+    }
+}
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index d6c3f7ae..fc0e9fb3 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -6,15 +6,34 @@
     android:layout_height="match_parent"
     tools:context=".LoginActivity">
 
-    <TextView
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/vp_explore"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/indicator_viewpager_image_dots"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="70dp"
+        android:layout_marginBottom="30dp"
+        />
+
+    <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
+        android:id="@+id/indicator_viewpager_image_dots"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:text="Login"
-        android:textSize="30sp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="86dp"
+        app:dotsColor="#FFFFFF"
+        app:dotsCornerRadius="8dp"
+        app:dotsSize="6dp"
+        app:dotsSpacing="4dp"
+        app:dotsWidthFactor="1"
+        app:layout_constraintBottom_toTopOf="@+id/btn_login"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:progressMode="true"
+        app:selectedDotColor="#FFFFFF" />
 
 
     <ImageView
diff --git a/feature/login/src/main/res/layout/fragment_login_view_pager.xml b/feature/login/src/main/res/layout/fragment_login_view_pager.xml
new file mode 100644
index 00000000..61d8d108
--- /dev/null
+++ b/feature/login/src/main/res/layout/fragment_login_view_pager.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".LoginViewPagerFragment">
+
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/vp_explore"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
+        android:id="@+id/indicator_viewpager_image_dots"
+        android:layout_width="0dp"
+        android:layout_height="30dp"
+        android:layout_marginBottom="10dp"
+        app:dotsColor="#FFFFFF"
+        app:dotsCornerRadius="8dp"
+        app:dotsSize="6dp"
+        app:dotsSpacing="4dp"
+        app:dotsWidthFactor="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:progressMode="true"
+        app:selectedDotColor="#FFFFFF" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/feature/login/src/main/res/values/strings.xml b/feature/login/src/main/res/values/strings.xml
index 73862c41..6048840e 100644
--- a/feature/login/src/main/res/values/strings.xml
+++ b/feature/login/src/main/res/values/strings.xml
@@ -1 +1,4 @@
-<resources></resources>
\ No newline at end of file
+<resources>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+</resources>
\ No newline at end of file

From 74bf4561999230d6afeb9f4ba0adf3046e8d0ff3 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 15:22:34 +0900
Subject: [PATCH 41/54] =?UTF-8?q?[delete]:=20=ED=94=84=EB=9E=98=EA=B7=B8?=
 =?UTF-8?q?=EB=A8=BC=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/login/LoginViewPagerFragment.kt   | 21 -----------
 .../res/layout/fragment_login_view_pager.xml  | 36 -------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt
 delete mode 100644 feature/login/src/main/res/layout/fragment_login_view_pager.xml

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt
deleted file mode 100644
index 4e7550ae..00000000
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerFragment.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hmh.hamyeonham.feature.login
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-
-class LoginViewPagerFragment : Fragment() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.fragment_login_view_pager, container, false)
-    }
-}
diff --git a/feature/login/src/main/res/layout/fragment_login_view_pager.xml b/feature/login/src/main/res/layout/fragment_login_view_pager.xml
deleted file mode 100644
index 61d8d108..00000000
--- a/feature/login/src/main/res/layout/fragment_login_view_pager.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".LoginViewPagerFragment">
-
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/vp_explore"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
-        android:id="@+id/indicator_viewpager_image_dots"
-        android:layout_width="0dp"
-        android:layout_height="30dp"
-        android:layout_marginBottom="10dp"
-        app:dotsColor="#FFFFFF"
-        app:dotsCornerRadius="8dp"
-        app:dotsSize="6dp"
-        app:dotsSpacing="4dp"
-        app:dotsWidthFactor="1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:progressMode="true"
-        app:selectedDotColor="#FFFFFF" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 5b5c5b0d4b50229fe34a8ad7c2dc3023af64d158 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 16:10:02 +0900
Subject: [PATCH 42/54] =?UTF-8?q?[feat]:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B7=B0=ED=8E=98=EC=9D=B4=EC=A0=80=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/login/build.gradle.kts                |  4 +-
 .../hamyeonham/feature/login/LoginActivity.kt | 20 ++++++++++
 .../feature/login/LoginViewPagerAdapter.kt    | 38 +++++++++++++++++++
 .../feature/login/data/DummyImage.kt          |  5 +++
 .../login_sample_rectagle_viewpager.xml       |  9 +++++
 .../src/main/res/layout/activity_login.xml    |  4 +-
 .../main/res/layout/item_login_view_pager.xml | 16 ++++++++
 feature/login/src/main/res/values/strings.xml |  1 +
 8 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerAdapter.kt
 create mode 100644 feature/login/src/main/java/com/hmh/hamyeonham/feature/login/data/DummyImage.kt
 create mode 100644 feature/login/src/main/res/drawable/login_sample_rectagle_viewpager.xml
 create mode 100644 feature/login/src/main/res/layout/item_login_view_pager.xml

diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
index b93bb875..da2007b1 100644
--- a/feature/login/build.gradle.kts
+++ b/feature/login/build.gradle.kts
@@ -17,6 +17,6 @@ dependencies {
     // kakao
     implementation(libs.kakao.login)
 
-    implementation (libs.dot.indicator)
-
+    implementation(libs.dot.indicator)
+    implementation(libs.coil.core)
 }
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index abf1daaf..c5f9369b 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.hmh.hamyeonham.common.context.toast
+import com.hmh.hamyeonham.feature.login.data.DummyImage
 import com.hmh.hamyeonham.feature.login.databinding.ActivityLoginBinding
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.common.model.ClientError
@@ -15,6 +16,7 @@ class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
 
     private val loginViewModel: LoginViewModel by viewModels()
+    private lateinit var loginViewPagerAdapter: LoginViewPagerAdapter
 
     private val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
         when {
@@ -35,6 +37,24 @@ class LoginActivity : AppCompatActivity() {
         binding.btnLogin.setOnClickListener {
             loginWithKakaoApp()
         }
+
+        val dummyImageList = listOf(
+            DummyImage(
+                Image = R.drawable.login_sample_rectagle_viewpager,
+            ),
+            DummyImage(
+                Image = R.drawable.login_sample_rectagle_viewpager,
+            ),
+            DummyImage(
+                Image = R.drawable.login_sample_rectagle_viewpager,
+            ),
+        )
+
+        loginViewPagerAdapter = LoginViewPagerAdapter(dummyImageList)
+        binding.run {
+            vpExplore.adapter = loginViewPagerAdapter
+            indicatorViewpagerImageDots.attachTo(binding.vpExplore)
+        }
     }
 
     private fun loginWithKakaoApp() {
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerAdapter.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerAdapter.kt
new file mode 100644
index 00000000..328a8d7b
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginViewPagerAdapter.kt
@@ -0,0 +1,38 @@
+package com.hmh.hamyeonham.feature.login
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import coil.load
+import com.hmh.hamyeonham.feature.login.data.DummyImage
+import com.hmh.hamyeonham.feature.login.databinding.ItemLoginViewPagerBinding
+
+class LoginViewPagerAdapter(private val imageList: List<DummyImage>) :
+    RecyclerView.Adapter<LoginViewPagerAdapter.PagerViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PagerViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_login_view_pager, parent, false)
+        return PagerViewHolder(ItemLoginViewPagerBinding.bind(view))
+    }
+
+    class PagerViewHolder(private val binding: ItemLoginViewPagerBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun onBindView(imageInfo: DummyImage) {
+            binding.run {
+                ivLoginViewPagerItem.load(imageInfo.Image) {
+                    placeholder(R.drawable.login_sample_rectagle_viewpager)
+                    error(R.drawable.login_sample_rectagle_viewpager)
+                }
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = imageList.size
+
+    override fun onBindViewHolder(holder: PagerViewHolder, position: Int) {
+        val exploreImage = imageList[position]
+        holder.onBindView(exploreImage)
+    }
+}
diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/data/DummyImage.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/data/DummyImage.kt
new file mode 100644
index 00000000..807c56a3
--- /dev/null
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/data/DummyImage.kt
@@ -0,0 +1,5 @@
+package com.hmh.hamyeonham.feature.login.data
+
+data class DummyImage(
+    val Image: Int,
+)
diff --git a/feature/login/src/main/res/drawable/login_sample_rectagle_viewpager.xml b/feature/login/src/main/res/drawable/login_sample_rectagle_viewpager.xml
new file mode 100644
index 00000000..5932a8db
--- /dev/null
+++ b/feature/login/src/main/res/drawable/login_sample_rectagle_viewpager.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="361dp"
+    android:height="421dp"
+    android:viewportWidth="361"
+    android:viewportHeight="421">
+  <path
+      android:pathData="M0.28,0.43h360v420h-360z"
+      android:fillColor="#BBC6FF"/>
+</vector>
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index fc0e9fb3..5c9b4f2a 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_marginBottom="86dp"
-        app:dotsColor="#FFFFFF"
+        app:dotsColor="#121212"
         app:dotsCornerRadius="8dp"
         app:dotsSize="6dp"
         app:dotsSpacing="4dp"
@@ -33,7 +33,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:progressMode="true"
-        app:selectedDotColor="#FFFFFF" />
+        app:selectedDotColor="#121212" />
 
 
     <ImageView
diff --git a/feature/login/src/main/res/layout/item_login_view_pager.xml b/feature/login/src/main/res/layout/item_login_view_pager.xml
new file mode 100644
index 00000000..ec932b78
--- /dev/null
+++ b/feature/login/src/main/res/layout/item_login_view_pager.xml
@@ -0,0 +1,16 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:id="@+id/iv_login_view_pager_item"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:contentDescription="@string/iv_login_view_pager_item_description" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/feature/login/src/main/res/values/strings.xml b/feature/login/src/main/res/values/strings.xml
index 6048840e..e04d8a19 100644
--- a/feature/login/src/main/res/values/strings.xml
+++ b/feature/login/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="iv_login_view_pager_item_description">Service detailed description</string>
 </resources>
\ No newline at end of file

From cbcd38d94244de87a72471c13e0be2d1db69fca4 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Wed, 3 Jan 2024 16:44:29 +0900
Subject: [PATCH 43/54] [fix]: Fix properties reference

---
 .../main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt b/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt
index 2508ec41..cc1306ad 100644
--- a/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt
+++ b/build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt
@@ -6,9 +6,14 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
+import java.util.Properties
 
 internal fun Project.configureAndroidCommonPlugin() {
 
+    val properties = Properties().apply {
+        load(rootProject.file("local.properties").inputStream())
+    }
+
     apply<AndroidKotlinPlugin>()
     apply<KotlinSerializationPlugin>()
     with(plugins) {
@@ -20,7 +25,7 @@ internal fun Project.configureAndroidCommonPlugin() {
         defaultConfig {
             val kakaoApiKey = properties["kakaoApiKey"] as? String ?: ""
 
-            manifestPlaceholders["kakaoApiKey"] = properties["kakaoApiKey"] as? String ?: ""
+            manifestPlaceholders["kakaoApiKey"] = properties["kakaoApiKey"] as String
 
             buildConfigField("String", "KAKAO_API_KEY", "\"${kakaoApiKey}\"")
         }

From 5c2f1598359b55d2f3f76defbbef25030f154d77 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <93872496+KwakEuiJin@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:07:18 +0900
Subject: [PATCH 44/54] Update README.md

---
 README.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/README.md b/README.md
index 5c762140..0fdd8ef3 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,59 @@
 # HMH Android
+
+## 스크린 타임 제한을 통한 디지털 디톡스 하면함!
+
+<br/>
+<div align="center">
+  <p align="center">
+    <img src="https://img.shields.io/badge/Kotlin-1.9.20-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white"/>
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+<img src="https://img.shields.io/badge/all_contributors-3-orange.svg?style=for-the-badge"/>
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+  </p>
+  <br />
+</div>
+
+<h2>Tech Stack</h2>
+
+- [Android App Architecture](https://developer.android.com/topic/architecture)
+- [Dagger-Hilt](https://developer.android.com/training/dependency-injection/hilt-android)
+- [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html), [Flow](https://kotlinlang.org/docs/flow.html)
+- [Jetpack Compose](https://developer.android.com/jetpack/compose)
+- [Material 3](https://m3.material.io/)
+- [Gradle Version Catalog](https://docs.gradle.org/current/userguide/platforms.html)
+  and [Custom Convention Plugins](https://docs.gradle.org/current/samples/sample_convention_plugins.html)
+
+<h2>Activity Graph</h2>
+
+![Alt](https://repobeats.axiom.co/api/embed/8aafd7e55d7655ad9ec829f95a445ba7f7758e58.svg "Repobeats analytics image")
+
+## Contributors ✨
+
+하면한다는 Android 개발자
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KwakEuiJin"><img src="https://avatars.githubusercontent.com/u/93872496?v=4?s=100" width="100px;" alt="KwakEuiJin"/><br/><sub><b>KwakEuiJin</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=KwakEuiJin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kangyuri1114"><img src="https://avatars.githubusercontent.com/u/83583757?v=4?s=100" width="100px;" alt="KangYuri"/><br/><sub><b>Jihyeon An</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=kangyuri1114" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/memoryBangwool"><img src="https://avatars.githubusercontent.com/u/84266681?v=4?s=100" width="100px;" alt="JiHyun Kyoung"/><br /><sub><b>JaewonSeo</b></sub></a><br/><a href="https://github.com/Team-HMH/HMH-Android/commits?author=memoryBangwool" title="Code">💻</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the all-contributors specification. Contributions of any kind welcome!

From 1ff301f1f08686c3755954772b6840c97982e6cc Mon Sep 17 00:00:00 2001
From: KwakEuiJin <93872496+KwakEuiJin@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:13:15 +0900
Subject: [PATCH 45/54] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0fdd8ef3..3bcba3f7 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 
 <h2>Activity Graph</h2>
 
-![Alt](https://repobeats.axiom.co/api/embed/8aafd7e55d7655ad9ec829f95a445ba7f7758e58.svg "Repobeats analytics image")
+![Alt](https://repobeats.axiom.co/api/embed/d2c401ae723c367a03ed9fb81ea6e6e7cfbee2ea.svg "Repobeats analytics image")
 
 ## Contributors ✨
 

From f39c00ea1b9c8c7ada6f432f10b82178d5a991f7 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 18:05:30 +0900
Subject: [PATCH 46/54] =?UTF-8?q?[fix]:=20indicator=20=EC=83=89=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/login/src/main/res/layout/activity_login.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index 5c9b4f2a..6ff66237 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_marginBottom="86dp"
-        app:dotsColor="#121212"
+        app:dotsColor="#DBDAE7"
         app:dotsCornerRadius="8dp"
         app:dotsSize="6dp"
         app:dotsSpacing="4dp"
@@ -33,7 +33,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:progressMode="true"
-        app:selectedDotColor="#121212" />
+        app:selectedDotColor="#8D8D9F" />
 
 
     <ImageView

From 811a6d527a1c6ed99e35593c3bca160342658a71 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 18:12:59 +0900
Subject: [PATCH 47/54] =?UTF-8?q?[fix]:=20id=20=EB=AA=85=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/login/src/main/res/layout/activity_login.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index 6ff66237..b0f8532b 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -8,19 +8,19 @@
 
 
     <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/vp_explore"
+        android:id="@+id/vp_login"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/indicator_viewpager_image_dots"
+        app:layout_constraintBottom_toTopOf="@id/indicator_login_dots"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="70dp"
         android:layout_marginBottom="30dp"
         />
 
     <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
-        android:id="@+id/indicator_viewpager_image_dots"
+        android:id="@+id/indicator_login_dots"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_marginBottom="86dp"

From acb4224b5e5bede07a5897ea0ebedbd0c65050cf Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 18:24:11 +0900
Subject: [PATCH 48/54] =?UTF-8?q?[fix]:=20id=20=EB=AA=85=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hmh/hamyeonham/feature/login/LoginActivity.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index c5f9369b..2516c923 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -52,8 +52,8 @@ class LoginActivity : AppCompatActivity() {
 
         loginViewPagerAdapter = LoginViewPagerAdapter(dummyImageList)
         binding.run {
-            vpExplore.adapter = loginViewPagerAdapter
-            indicatorViewpagerImageDots.attachTo(binding.vpExplore)
+            vpLogin.adapter = loginViewPagerAdapter
+            indicatorLoginDots.attachTo(binding.vpLogin)
         }
     }
 

From 66850b44b490b8dcb7ca6851fe4858a748583900 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 18:26:29 +0900
Subject: [PATCH 49/54] =?UTF-8?q?[fix]:=20=EB=B7=B0=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A0=80=20=ED=95=A8=EC=88=98=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hmh/hamyeonham/feature/login/LoginActivity.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index 2516c923..209c0cd0 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -38,6 +38,10 @@ class LoginActivity : AppCompatActivity() {
             loginWithKakaoApp()
         }
 
+        setLoginViewPager()
+    }
+
+    private fun setLoginViewPager() {
         val dummyImageList = listOf(
             DummyImage(
                 Image = R.drawable.login_sample_rectagle_viewpager,

From 75aa724ed01ef9eed0b44bbbb369045855cff031 Mon Sep 17 00:00:00 2001
From: kangyuri1114 <yuri3334@gmail.com>
Date: Wed, 3 Jan 2024 18:27:35 +0900
Subject: [PATCH 50/54] =?UTF-8?q?[fix]:=20=EB=B7=B0=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A0=80=20=ED=95=A8=EC=88=98=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamyeonham/feature/login/LoginActivity.kt | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
index 209c0cd0..c5fddea4 100644
--- a/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/hmh/hamyeonham/feature/login/LoginActivity.kt
@@ -18,6 +18,19 @@ class LoginActivity : AppCompatActivity() {
     private val loginViewModel: LoginViewModel by viewModels()
     private lateinit var loginViewPagerAdapter: LoginViewPagerAdapter
 
+    // 삭제 예정
+    private val dummyImageList = listOf(
+        DummyImage(
+            Image = R.drawable.login_sample_rectagle_viewpager,
+        ),
+        DummyImage(
+            Image = R.drawable.login_sample_rectagle_viewpager,
+        ),
+        DummyImage(
+            Image = R.drawable.login_sample_rectagle_viewpager,
+        ),
+    )
+
     private val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
         when {
             error != null -> {
@@ -37,23 +50,10 @@ class LoginActivity : AppCompatActivity() {
         binding.btnLogin.setOnClickListener {
             loginWithKakaoApp()
         }
-
         setLoginViewPager()
     }
 
     private fun setLoginViewPager() {
-        val dummyImageList = listOf(
-            DummyImage(
-                Image = R.drawable.login_sample_rectagle_viewpager,
-            ),
-            DummyImage(
-                Image = R.drawable.login_sample_rectagle_viewpager,
-            ),
-            DummyImage(
-                Image = R.drawable.login_sample_rectagle_viewpager,
-            ),
-        )
-
         loginViewPagerAdapter = LoginViewPagerAdapter(dummyImageList)
         binding.run {
             vpLogin.adapter = loginViewPagerAdapter

From 13c809244d7cdb51d0a9f66c362e84469723e7d4 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <93872496+KwakEuiJin@users.noreply.github.com>
Date: Wed, 3 Jan 2024 23:14:46 +0900
Subject: [PATCH 51/54] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3bcba3f7..8965d5c9 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@
   <tbody>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KwakEuiJin"><img src="https://avatars.githubusercontent.com/u/93872496?v=4?s=100" width="100px;" alt="KwakEuiJin"/><br/><sub><b>KwakEuiJin</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=KwakEuiJin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kangyuri1114"><img src="https://avatars.githubusercontent.com/u/83583757?v=4?s=100" width="100px;" alt="KangYuri"/><br/><sub><b>Jihyeon An</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=kangyuri1114" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/memoryBangwool"><img src="https://avatars.githubusercontent.com/u/84266681?v=4?s=100" width="100px;" alt="JiHyun Kyoung"/><br /><sub><b>JaewonSeo</b></sub></a><br/><a href="https://github.com/Team-HMH/HMH-Android/commits?author=memoryBangwool" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kangyuri1114"><img src="https://avatars.githubusercontent.com/u/83583757?v=4?s=100" width="100px;" alt="KangYuri"/><br/><sub><b>KangYuri</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=kangyuri1114" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/memoryBangwool"><img src="https://avatars.githubusercontent.com/u/84266681?v=4?s=100" width="100px;" alt="JiHyun Kyoung"/><br /><sub><b>JiHyun Kyoung</b></sub></a><br/><a href="https://github.com/Team-HMH/HMH-Android/commits?author=memoryBangwool" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

From 9f7f8cd433122b2ba3c03421f8a946f9ce91f896 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <93872496+KwakEuiJin@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:00:53 +0900
Subject: [PATCH 52/54] Update README.md

---
 README.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/README.md b/README.md
index 8965d5c9..34910a06 100644
--- a/README.md
+++ b/README.md
@@ -56,4 +56,47 @@
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
+## Folder Tree 📁
+
+- 📁 app
+  - 📁 build
+  - 📄 build.gradle.kts
+  - 📄 google-services.json
+  - 📁 libs
+  - 📄 proguard-rules.pro
+  - 📁 src
+- 📁 build-logic
+  - 📁 convention
+  - 📁 gradle
+  - 📄 gradle.properties
+  - 📄 settings.gradle.kts
+- 📄 build.gradle.kts
+- 📁 buildSrc
+  - 📁 build
+  - 📄 build.gradle.kts
+  - 📄 gradle.properties
+  - 📄 settings.gradle.kts
+  - 📁 src
+- 📁 core
+  - 📁 common
+  - 📁 database
+- 📁 data
+  - 📁 usagestats
+- 📁 domain
+  - 📁 usagestats
+- 📁 feature
+  - 📁 login
+  - 📁 main
+  - 📁 onboarding
+  - 📁 statistics
+- 📁 gradle
+  - 📄 libs.versions.toml
+  - 📁 wrapper
+- 📄 gradle.properties
+- 📄 gradlew
+- 📄 gradlew.bat
+- 📄 local.properties
+- 📄 settings.gradle.kts 
+
+
 This project follows the all-contributors specification. Contributions of any kind welcome!

From 5387df6f2cd1fc4de47e18f7441286010a9e6fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A6=AC=EC=9C=A0?=
 <83583757+kangyuri1114@users.noreply.github.com>
Date: Thu, 4 Jan 2024 21:05:07 +0900
Subject: [PATCH 53/54] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 컨벤션 추가
- 오타 수정
- 칸반보드 추가
---
 README.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 34910a06..0023faf4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
-# HMH Android
-
-## 스크린 타임 제한을 통한 디지털 디톡스 하면함!
+# 하면함 Android
 
+## 스마트폰 중독 탈출, 너도 하면함!
 <br/>
 <div align="center">
   <p align="center">
@@ -37,9 +36,9 @@
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KwakEuiJin"><img src="https://avatars.githubusercontent.com/u/93872496?v=4?s=100" width="100px;" alt="KwakEuiJin"/><br/><sub><b>KwakEuiJin</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=KwakEuiJin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kangyuri1114"><img src="https://avatars.githubusercontent.com/u/83583757?v=4?s=100" width="100px;" alt="KangYuri"/><br/><sub><b>KangYuri</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=kangyuri1114" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/memoryBangwool"><img src="https://avatars.githubusercontent.com/u/84266681?v=4?s=100" width="100px;" alt="JiHyun Kyoung"/><br /><sub><b>JiHyun Kyoung</b></sub></a><br/><a href="https://github.com/Team-HMH/HMH-Android/commits?author=memoryBangwool" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KwakEuiJin"><img src="https://avatars.githubusercontent.com/u/93872496?v=4?s=100" width="100px;" alt="Kwak EuiJin"/><br/><sub><b>KwakEuiJin</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=KwakEuiJin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kangyuri1114"><img src="https://avatars.githubusercontent.com/u/83583757?v=4?s=100" width="100px;" alt="Kang Yuri"/><br/><sub><b>KangYuri</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=kangyuri1114" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/memoryBangwool"><img src="https://avatars.githubusercontent.com/u/84266681?v=4?s=100" width="100px;" alt="Kyoung JiHyun"/><br /><sub><b>JiHyun Kyoung</b></sub></a><br/><a href="https://github.com/Team-HMH/HMH-Android/commits?author=memoryBangwool" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
@@ -98,5 +97,15 @@
 - 📄 local.properties
 - 📄 settings.gradle.kts 
 
+## Progress Board 📋
+- [Team-HMH-Android](https://github.com/orgs/Team-HMH/projects/1)
+
+  
+## Code Convention 💻
+- [Kotlin Code Convention](https://www.notion.so/msmmx/Kotlin-Convention-5ab4410e68c949c287804d2380c51af4)
+- [XML Convention](https://www.notion.so/msmmx/XML-Convention-b11209ba2b404df08f251383c7d3c316)
+- [name convention](https://www.notion.so/msmmx/name-convention-ca8bab7da7314b30b2a962755854b11e)
+- [GitHub Convention](https://www.notion.so/msmmx/b75d3559813e478f9f6d73e9c818834b?pvs=4#bc0bf41e7df9421391dc1000d25a17c6)
+
 
 This project follows the all-contributors specification. Contributions of any kind welcome!

From f3e4b47c9d52bd2d6159c62166765d2c3a944a37 Mon Sep 17 00:00:00 2001
From: KwakEuiJin <yuijin0909@gmail.com>
Date: Thu, 4 Jan 2024 21:53:38 +0900
Subject: [PATCH 54/54] [fix]: Fix Merge Error

---
 app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt | 10 ++--------
 app/src/main/res/layout/activity_sample.xml            |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
index ce8394da..62aa7129 100644
--- a/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
+++ b/app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt
@@ -1,27 +1,21 @@
 package com.hmh.hamyeonham
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.hmh.hamyeonham.common.view.viewBinding
 import com.hmh.hamyeonham.databinding.ActivitySampleBinding
-import com.hmh.hamyeonham.statistics.StaticsActivity
 import dagger.hilt.android.AndroidEntryPoint
-import com.hmh.hamyeonham.feature.login.LoginActivity
-import com.kakao.sdk.common.KakaoSdk
-import com.hmh.hamyeonham.feature.main.MainActivity
 
 @AndroidEntryPoint
 class SampleActivity : AppCompatActivity() {
-    private lateinit var binding: ActivitySampleBinding
+    private val binding by viewBinding(ActivitySampleBinding::inflate)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        binding = ActivitySampleBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
-
         val splashScreen = installSplashScreen()
         initSplashAnimation(splashScreen)
         setContentView(binding.root)
diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml
index d36955d3..e7c78653 100644
--- a/app/src/main/res/layout/activity_sample.xml
+++ b/app/src/main/res/layout/activity_sample.xml
@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black">
+    android:background="@color/white">
 
 </androidx.constraintlayout.widget.ConstraintLayout>