diff --git a/.gitignore b/.gitignore
index b4959436..d658d9f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-.DS_Store
-### Android template
 # Gradle files
 .gradle/
 build/
@@ -33,5 +31,6 @@ google-services.json
 
 # Android Profiling
 *.hprof
-/keyStore
-/app/release
+
+# Mac OS
+.DS_Store
diff --git a/README.md b/README.md
index 99676874..87e5cbb3 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,13 @@
 # android-map-notification
+## step1 구현할 기능 목록
+
+- [ ]  serviceState 값이 ON_SERVICE인 경우 지도화면으로 넘어가는 기능 
+- [ ]  serviceState 값이 ON_SERVICE가 아닌 경우 serviceMessage 값을 띄우는 기능
+- [ ]  처음 앱을 접속할 때 초기 진입 화면을 띄우는 기능
+
+------------------------------------
+## step2 구현할 기능 목록
+
+- [ ]  Notification을 발생시키능 기능 구현
+- [ ]  앱의 상태에 따라 커스텀 Notification을 발생시키는 기능 구현
+- [ ]  Notification 창을 터치하면 초기 진입 화면이 호출하는 기능 구현.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 803085bd..7fd44c0e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,10 +1,13 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jlleitschuh.gradle.ktlint")
-    id("kotlin-parcelize")
     id("kotlin-kapt")
     id("com.google.dagger.hilt.android")
+    id("kotlin-parcelize")
     id("com.google.gms.google-services")
 }
 
@@ -12,6 +15,7 @@ android {
     namespace = "campus.tech.kakao.map"
     compileSdk = 34
 
+
     defaultConfig {
         applicationId = "campus.tech.kakao.map"
         minSdk = 26
@@ -19,7 +23,12 @@ android {
         versionCode = 1
         versionName = "1.0"
 
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "KAKAO_LOCAL_API_KEY", gradleLocalProperties(rootDir, providers).getProperty("KAKAO_LOCAL_API_KEY"))
+        buildConfigField("String", "KAKAO_BASE_URL", gradleLocalProperties(rootDir, providers).getProperty("KAKAO_BASE_URL"))
+        buildConfigField("String", "KAKAO_NATIVE_APP_KEY", gradleLocalProperties(rootDir, providers).getProperty("KAKAO_NATIVE_APP_KEY"))
+
     }
 
     buildTypes {
@@ -41,12 +50,13 @@ android {
 
     buildFeatures {
         dataBinding = true
+        viewBinding = true
         buildConfig = true
     }
+
 }
 
 dependencies {
-
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
@@ -55,26 +65,32 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.retrofit2:converter-gson:2.11.0")
     implementation("com.kakao.maps.open:android:2.9.5")
-    implementation("androidx.activity:activity-ktx:1.9.0")
+    implementation("androidx.activity:activity-ktx:1.9.1")
     implementation("androidx.test:core-ktx:1.6.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
     implementation("androidx.room:room-runtime:2.6.1")
+    implementation("androidx.activity:activity:1.8.0")
     kapt("androidx.room:room-compiler:2.6.1")
     implementation("com.google.dagger:hilt-android:2.48.1")
     kapt("com.google.dagger:hilt-compiler:2.48.1")
-    implementation("androidx.activity:activity-ktx:1.9.0")
     implementation("androidx.room:room-ktx:2.6.1")
+    testImplementation("androidx.room:room-testing:2.6.1")
+    implementation("androidx.datastore:datastore-preferences:1.1.1")
     implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("com.google.firebase:firebase-config-ktx:22.0.0")
     implementation("com.google.firebase:firebase-messaging-ktx:24.0.0")
-    testImplementation("androidx.room:room-testing:2.6.1")
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk-android:1.13.11")
     testImplementation("io.mockk:mockk-agent:1.13.11")
     testImplementation("androidx.arch.core:core-testing:2.2.0")
     testImplementation("org.robolectric:robolectric:4.11.1")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test:rules:1.5.0")
+    androidTestImplementation("androidx.test.espresso:espresso-intents:3.5.1")
+    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.5.1")
     androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
@@ -82,4 +98,4 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-intents:3.6.1")
     androidTestImplementation("com.google.dagger:hilt-android-testing:2.48.1")
     kaptAndroidTest("com.google.dagger:hilt-android-compiler:2.48.1")
-}
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/campus/tech/kakao/map/view/MapActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/view/MapActivityTest.kt
new file mode 100644
index 00000000..f1fc9670
--- /dev/null
+++ b/app/src/androidTest/java/campus/tech/kakao/map/view/MapActivityTest.kt
@@ -0,0 +1,69 @@
+package campus.tech.kakao.map.view
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.idling.CountingIdlingResource
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.Visibility
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.intent.Intents
+
+import org.junit.Test
+import campus.tech.kakao.map.R
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+
+
+class MapActivityTest{
+
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MapActivity::class.java)
+
+
+    @Before
+    fun setUp() {
+        Intents.init()
+        testInit()
+    }
+
+    @After
+    fun tearDown() {
+        Intents.release()
+    }
+    @Test
+    // 초기 화면이 잘 구성되는지
+    fun testInit() {
+        onView(withId(R.id.input_search_field)).check(
+            matches(isDisplayed()))
+        onView(withId(R.id.search_icon)).check(
+            matches(isDisplayed()))
+        onView(withId(R.id.error_text)).check(
+            matches(withEffectiveVisibility(Visibility.GONE)))
+        onView(withId(R.id.map_view)).check(
+            matches(isDisplayed()))
+    }
+
+    @Test
+    // 오류가 났을 때 오류화면이 잘 띄워지는지
+    fun testError(){
+        activityRule.scenario.onActivity { activity ->
+            activity.showErrorMessageView("인증 과정 중 원인을 알 수 없는 에러가 발생했습니다")
+        }
+        onView(withId(R.id.error_text)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    // 액티비티가 잘 이동하는지
+    fun testMoveSearchActivity(){
+        onView(withId(R.id.input_search_field)).perform(click())
+        intended(hasComponent("campus.tech.kakao.map.view.SearchActivity"))
+    }
+}
diff --git a/app/src/androidTest/java/campus/tech/kakao/map/view/SearchActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/view/SearchActivityTest.kt
new file mode 100644
index 00000000..a21a03e8
--- /dev/null
+++ b/app/src/androidTest/java/campus/tech/kakao/map/view/SearchActivityTest.kt
@@ -0,0 +1,196 @@
+package campus.tech.kakao.map.view
+
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.content.Intent
+import android.view.View
+import android.widget.EditText
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.*
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.*
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.*
+import androidx.test.espresso.intent.matcher.IntentMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import campus.tech.kakao.map.R
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.SavedPlace
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+
+class SearchActivityTest {
+
+    @get:Rule
+    var activityRule = ActivityScenarioRule(SearchActivity::class.java)
+
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun tearDown() {
+        Intents.release()
+    }
+
+    @Test
+    // 초기 화면이 잘 구성되는지
+    fun testInit() {
+        onView(withId(R.id.search_result_recyclerView)).check(
+            matches(isDisplayed())
+        )
+        onView(withId(R.id.input_search_field)).check(
+            matches(isDisplayed())
+        )
+        onView(withId(R.id.no_search_result)).check(
+            matches(isDisplayed())
+        )
+        onView(withId(R.id.saved_search_recyclerView)).check(
+            matches(isDisplayed())
+        )
+    }
+
+    @Test
+    // PlaceRecyclerView가 검색어를 입력했을 때 최대 15개의 데이터를 불러오는 지 확인
+    fun testPlaceRecyclerView() {
+
+        onView(withId(R.id.input_search_field)).check(matches(isDisplayed()))
+        onView(withId(R.id.search_result_recyclerView)).check(matches(isDisplayed()))
+        onView(withId(R.id.input_search_field)).perform(replaceText("전남대"))
+        Thread.sleep(1000)
+
+        activityRule.scenario.onActivity { activity ->
+            val inputSearchField = activity.findViewById<EditText>(R.id.input_search_field)
+            val placeRecyclerView =
+                activity.findViewById<RecyclerView>(R.id.search_result_recyclerView)
+            val itemCount = placeRecyclerView.adapter?.getItemCount() ?: 0
+            assert(itemCount in 1..15)
+        }
+    }
+
+    @Test
+    // recyclerview의 아이템을 클릭했을 때 이동이 잘 되는지
+    fun testMoveToMapActivity() {
+        onView(withId(R.id.input_search_field)).check(matches(isDisplayed()))
+        onView(withId(R.id.search_result_recyclerView)).check(matches(isDisplayed()))
+        onView(withId(R.id.input_search_field)).perform(replaceText("전남대"))
+        Thread.sleep(1000)
+        lateinit var place: Place
+
+        activityRule.scenario.onActivity { activity ->
+            val searchRecyclerView =
+                activity.findViewById<RecyclerView>(R.id.search_result_recyclerView)
+            val adapter = searchRecyclerView.adapter as PlaceViewAdapter
+            place = (adapter.getPlaceAtPosition(0))
+        }
+
+        val intent = Intent()
+        intent.putExtra(Constants.Keys.KEY_PLACE, place)
+        val result = Instrumentation.ActivityResult(Activity.RESULT_OK, intent)
+        onView(withId(R.id.search_result_recyclerView)).perform(
+            actionOnItemAtPosition<PlaceViewHolder>(
+                0,
+                click()
+            )
+        )
+
+        intending(toPackage("campus.tech.kakao.map.view.MapActivity")).respondWith(result)
+    }
+
+    @Test
+    // 아이템 클릭시 데이터가 저장되는지
+    fun testSavePlace() {
+        onView(withId(R.id.input_search_field)).check(matches(isDisplayed()))
+        onView(withId(R.id.search_result_recyclerView)).check(matches(isDisplayed()))
+        onView(withId(R.id.input_search_field)).perform(replaceText("전남대"))
+        Thread.sleep(1000)
+
+        var existTaget: Boolean
+        lateinit var place: Place
+        activityRule.scenario.onActivity { activity ->
+            val searchRecyclerView =
+                activity.findViewById<RecyclerView>(R.id.search_result_recyclerView)
+            val placeViewAdapter = searchRecyclerView.adapter as PlaceViewAdapter
+            place = (placeViewAdapter.getPlaceAtPosition(0))
+        }
+
+        onView(withId(R.id.search_result_recyclerView)).perform(
+            actionOnItemAtPosition<PlaceViewHolder>(0,click())
+        )
+
+        val newScenario = ActivityScenario.launch(SearchActivity::class.java)
+
+        newScenario.onActivity { activity ->
+            val savedPlaceRecyclerView =
+                activity.findViewById<RecyclerView>(R.id.saved_search_recyclerView)
+            val savedPlaceAdapter = savedPlaceRecyclerView.adapter as SavedPlaceViewAdapter
+            existTaget = savedPlaceAdapter.existPlace(SavedPlace(place.name))
+            assertTrue(existTaget)
+        }
+    }
+
+    @Test
+    // 삭제 버튼 클릭시 저장된 데이터가 삭제되는지
+    fun testRemoveSavedPlace() {
+        onView(withId(R.id.input_search_field)).check(matches(isDisplayed()))
+        onView(withId(R.id.search_result_recyclerView)).check(matches(isDisplayed()))
+        Thread.sleep(1000)
+
+        var existTaget: Boolean
+        lateinit var savedPlace: SavedPlace
+        lateinit var savedPlaceRecyclerView : RecyclerView
+        lateinit var savedPlaceAdapter : SavedPlaceViewAdapter
+
+        activityRule.scenario.onActivity { activity ->
+            savedPlaceRecyclerView =
+                activity.findViewById<RecyclerView>(R.id.saved_search_recyclerView)
+            savedPlaceAdapter = savedPlaceRecyclerView.adapter as SavedPlaceViewAdapter
+
+            savedPlace = (savedPlaceAdapter.getSavedPlaceAtPosition(0))
+            existTaget = savedPlaceAdapter.existPlace(savedPlace)
+            assertTrue(existTaget)
+        }
+
+        onView(withId(R.id.saved_search_recyclerView)).perform(
+            actionOnItemAtPosition<PlaceViewHolder>(0, MyViewAction.clickChildViewWithId(R.id.button_saved_delete))
+        )
+        Thread.sleep(1000)
+
+        activityRule.scenario.onActivity { activity ->
+            existTaget = savedPlaceAdapter.existPlace(savedPlace)
+            assertFalse(existTaget)
+        }
+
+
+    }
+    object MyViewAction {
+        fun clickChildViewWithId(id: Int): ViewAction {
+            return object : ViewAction {
+                override fun getConstraints(): org.hamcrest.Matcher<View> {
+                    return isAssignableFrom(View::class.java)
+                }
+
+                override fun getDescription(): String {
+                    return "Click on a child view with specified id."
+                }
+
+                override fun perform(uiController: UiController?, view: View) {
+                    val v = view.findViewById<View>(id)
+                    v.performClick()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f2e7b45a..57e2e2f1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".MainApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -15,9 +16,16 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Map"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".view.SearchActivity"
+            android:exported="false" />
+        <activity
+            android:name=".view.MapActivity"
+            android:exported="false" />
+        <activity
+            android:name=".view.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,6 +33,28 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service
+            android:name=".AppFirebaseMessagingService"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/fcm_default_channel_id" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_launcher_foreground" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/colorAccent" />
+
+
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/FirebaseMessagingService.kt b/app/src/main/java/campus/tech/kakao/map/FirebaseMessagingService.kt
new file mode 100644
index 00000000..c630cc24
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/FirebaseMessagingService.kt
@@ -0,0 +1,70 @@
+package campus.tech.kakao.map
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.view.SplashActivity
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+
+class AppFirebaseMessagingService : FirebaseMessagingService() {
+    private lateinit var notificationManager: NotificationManager
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        Log.d("testtt", "From: ${remoteMessage.from}")
+
+        remoteMessage.notification?.let {
+            Log.d("testtt", "Message Notification Body: ${it.body}")
+        }
+        notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        createNotificationChannel()
+        sendNotification()
+    }
+
+    private fun createNotificationChannel() {
+        val descriptionText = "알림 테스트"
+        val channel = NotificationChannel(
+            Constants.FirebaseMessage.CHANNEL_ID,
+            Constants.FirebaseMessage.CHANNEL_NAME,
+            NotificationManager.IMPORTANCE_DEFAULT
+        ).apply {
+            description = descriptionText
+        }
+        notificationManager.createNotificationChannel(channel)
+    }
+
+    private fun sendNotification(){
+
+        val intent = Intent(this, SplashActivity::class.java).apply { // 클릭하면 출력될 Activity
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            intent,
+            PendingIntent.FLAG_IMMUTABLE
+        )
+        val builder = NotificationCompat.Builder(
+            this,
+            Constants.FirebaseMessage.CHANNEL_ID
+        )
+            .setSmallIcon(R.drawable.map_app_splash_screen) // 필수
+            .setContentTitle("포그라운드 알림")
+            .setContentText("앱이 실행 중입니다.")
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setContentIntent(pendingIntent)
+            .setStyle(
+                NotificationCompat.BigTextStyle()
+                    .bigText("포그라운드 발생.")
+            )
+            .setAutoCancel(true) // 만약 없으면 notification 눌러도 사라지지 않음
+
+
+        notificationManager.notify(Constants.FirebaseMessage.NOTIFICATION_ID, builder.build())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/MainApplication.kt b/app/src/main/java/campus/tech/kakao/map/MainApplication.kt
new file mode 100644
index 00000000..efc54cb1
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/MainApplication.kt
@@ -0,0 +1,13 @@
+package campus.tech.kakao.map
+
+import android.app.Application
+import com.kakao.vectormap.KakaoMapSdk
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MainApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        KakaoMapSdk.init(this, BuildConfig.KAKAO_NATIVE_APP_KEY)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/api/KakaoApiDataSource.kt b/app/src/main/java/campus/tech/kakao/map/api/KakaoApiDataSource.kt
new file mode 100644
index 00000000..5abae54c
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/api/KakaoApiDataSource.kt
@@ -0,0 +1,53 @@
+package campus.tech.kakao.map.api
+
+import android.util.Log
+import campus.tech.kakao.map.BuildConfig
+import campus.tech.kakao.map.data.Place
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.create
+
+class KakaoApiDataSource {
+    object KakaoRetrofitInstance {
+
+        val kakaoLocalApi : KakaoLocalApi = getApiClient().create()
+
+        private fun getApiClient(): Retrofit {
+            return Retrofit.Builder()
+                .baseUrl(BuildConfig.KAKAO_BASE_URL)
+                .client(provideOkHttpClient(AppInterceptor()))
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
+        }
+
+        private fun provideOkHttpClient(interceptor: AppInterceptor): OkHttpClient
+                = OkHttpClient.Builder().run {
+            addInterceptor(interceptor)
+            build()
+        }
+
+        class AppInterceptor : Interceptor {
+            override fun intercept(chain: Interceptor.Chain) : okhttp3.Response = with(chain) {
+                val newRequest = request().newBuilder()
+                    .addHeader("Authorization", BuildConfig.KAKAO_LOCAL_API_KEY)
+                    .build()
+                proceed(newRequest)
+            }
+        }
+    }
+
+    suspend fun getPlaceData(text: String) : List<Place> {
+        val emptyList = listOf<Place>()
+        val kakaoApi = KakaoRetrofitInstance.kakaoLocalApi
+        return try{
+            val placeList = kakaoApi.getPlaceData(text)
+            Log.d("coroutineTest", "return")
+            placeList.documents ?: emptyList
+        } catch (e : Exception){
+            Log.d("coroutineTest", e.toString())
+            emptyList
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/api/KakaoLocalApi.kt b/app/src/main/java/campus/tech/kakao/map/api/KakaoLocalApi.kt
new file mode 100644
index 00000000..f0000403
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/api/KakaoLocalApi.kt
@@ -0,0 +1,13 @@
+package campus.tech.kakao.map.api
+
+import campus.tech.kakao.map.data.ResultSearch
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface KakaoLocalApi {
+    @GET("v2/local/search/keyword.json")
+    suspend fun getPlaceData(
+        @Query("query") query: String
+    ): ResultSearch
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/CoroutineDispatcher.kt b/app/src/main/java/campus/tech/kakao/map/data/CoroutineDispatcher.kt
new file mode 100644
index 00000000..c3b7148b
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/CoroutineDispatcher.kt
@@ -0,0 +1,6 @@
+package campus.tech.kakao.map.data
+
+import javax.inject.Qualifier
+
+@Qualifier
+annotation class CoroutineIoDispatcher
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/Place.kt b/app/src/main/java/campus/tech/kakao/map/data/Place.kt
new file mode 100644
index 00000000..458ea00e
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/Place.kt
@@ -0,0 +1,17 @@
+package campus.tech.kakao.map.data
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+data class ResultSearch(
+    val documents: List<Place>
+)
+@Parcelize
+data class Place(
+    @SerializedName("place_name") val name : String,
+    @SerializedName("road_address_name") val location : String?,
+    @SerializedName("category_group_name") val category : String?,
+    @SerializedName("x") val x: String? = "",
+    @SerializedName("y") val y: String? = ""
+) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepository.kt
new file mode 100644
index 00000000..b43e8f05
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepository.kt
@@ -0,0 +1,24 @@
+package campus.tech.kakao.map.data
+
+import campus.tech.kakao.map.api.KakaoApiDataSource
+import campus.tech.kakao.map.data.Place
+import com.kakao.vectormap.LatLng
+import kotlinx.coroutines.flow.first
+import javax.inject.Inject
+
+class PlaceRepository @Inject constructor(private val kakaoApiDataSource : KakaoApiDataSource, private val positionDataSource : PositionDataSource){
+    suspend fun getKakaoLocalPlaceData(text : String) : List<Place>{
+        val placeList = kakaoApiDataSource.getPlaceData(text)
+        return placeList
+    }
+
+    suspend fun saveCurrentPosToDataStore(latitude : Double, longitude : Double){
+        positionDataSource.putPos(latitude, longitude)
+    }
+
+    suspend fun fetchLastPosFromDataStore() : LatLng{
+        val lastPos = positionDataSource.pos.first()
+        return lastPos
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/PositionDataSource.kt b/app/src/main/java/campus/tech/kakao/map/data/PositionDataSource.kt
new file mode 100644
index 00000000..faa50818
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/PositionDataSource.kt
@@ -0,0 +1,34 @@
+package campus.tech.kakao.map.data
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.doublePreferencesKey
+import androidx.datastore.preferences.core.edit
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.view.MapActivity
+import com.kakao.vectormap.LatLng
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PositionDataSource @Inject constructor(private val dataStore: DataStore<Preferences>) {
+
+    companion object {
+        val KEY_LATITUDE = doublePreferencesKey("latitude")
+        val KEY_LONGITUDE = doublePreferencesKey("longitude")
+    }
+
+    suspend fun putPos(latitude : Double, longitude : Double){
+        dataStore.edit { preferences ->
+            preferences[KEY_LATITUDE] = latitude
+            preferences[KEY_LONGITUDE] = longitude
+        }
+    }
+
+    val pos = dataStore.data.map { preferences ->
+        val latitude = preferences[KEY_LATITUDE] ?: Constants.ChonnamUnivLocation.LATITUDE.toDouble()
+        val longitude = preferences[KEY_LONGITUDE] ?: Constants.ChonnamUnivLocation.LONGITUDE.toDouble()
+        LatLng.from(latitude, longitude)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/RemoteConfigRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/RemoteConfigRepository.kt
new file mode 100644
index 00000000..a9cea67a
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/RemoteConfigRepository.kt
@@ -0,0 +1,25 @@
+package campus.tech.kakao.map.data
+
+import android.content.Intent
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.core.view.isVisible
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.view.MapActivity
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.tasks.await
+import java.util.concurrent.Flow
+import javax.inject.Inject
+
+class RemoteConfigRepository @Inject constructor(private val remoteConfig: FirebaseRemoteConfig) {
+
+    suspend fun getRemoteConfig() = flow {
+        Log.d("testtt", "3번")
+        val result = remoteConfig.fetchAndActivate().await()
+        val state = remoteConfig.getString(Constants.RemoteConfigKeys.KEY_SERVICE_STATE)
+        val serviceMessage = remoteConfig.getString(Constants.RemoteConfigKeys.KEY_SERVICE_MESSAGE)
+        emit(RemoteConfigs(state, serviceMessage))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/RemoteConfigs.kt b/app/src/main/java/campus/tech/kakao/map/data/RemoteConfigs.kt
new file mode 100644
index 00000000..f49a3f7c
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/RemoteConfigs.kt
@@ -0,0 +1,6 @@
+package campus.tech.kakao.map.data
+
+data class RemoteConfigs(
+    val state : String,
+    val message : String
+)
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/SavedPlace.kt b/app/src/main/java/campus/tech/kakao/map/data/SavedPlace.kt
new file mode 100644
index 00000000..2adddc44
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/SavedPlace.kt
@@ -0,0 +1,10 @@
+package campus.tech.kakao.map.data
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import campus.tech.kakao.map.utilities.PlaceContract
+
+@Entity(tableName = PlaceContract.SavedPlaceEntry.TABLE_NAME)
+data class SavedPlace(
+    @PrimaryKey val name: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceDao.kt b/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceDao.kt
new file mode 100644
index 00000000..709c1d5e
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceDao.kt
@@ -0,0 +1,21 @@
+package campus.tech.kakao.map.data
+
+import androidx.room.Dao
+import androidx.room.Query
+import campus.tech.kakao.map.utilities.PlaceContract
+
+@Dao
+interface SavedPlaceDao {
+
+    @Query("SELECT * FROM ${PlaceContract.SavedPlaceEntry.TABLE_NAME}")
+    fun readSavedPlaceData(): List<SavedPlace>
+
+    @Query("SELECT * FROM ${PlaceContract.SavedPlaceEntry.TABLE_NAME} WHERE ${PlaceContract.SavedPlaceEntry.COLUMN_NAME} = :name")
+    fun readSavedPlaceDataWithSamedName(name: String): List<SavedPlace>
+
+    @Query("DELETE FROM ${PlaceContract.SavedPlaceEntry.TABLE_NAME} WHERE ${PlaceContract.SavedPlaceEntry.COLUMN_NAME} = :name")
+    fun deleteSavedPlace(name: String)
+
+    @Query("INSERT INTO ${PlaceContract.SavedPlaceEntry.TABLE_NAME} (${PlaceContract.SavedPlaceEntry.COLUMN_NAME}) VALUES (:name)")
+    fun insertSavedPlaceData(name:String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceDatabase.kt b/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceDatabase.kt
new file mode 100644
index 00000000..154718a6
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceDatabase.kt
@@ -0,0 +1,12 @@
+package campus.tech.kakao.map.data
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import campus.tech.kakao.map.utilities.PlaceContract
+
+@Database(entities = [SavedPlace::class], version = PlaceContract.VERSION, exportSchema = false)
+abstract class SavedPlaceDatabase : RoomDatabase() {
+
+    abstract fun savedPlaceDao(): SavedPlaceDao
+}
+
diff --git a/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceRepository.kt
new file mode 100644
index 00000000..181596c0
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/data/SavedPlaceRepository.kt
@@ -0,0 +1,27 @@
+package campus.tech.kakao.map.data
+
+import android.util.Log
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SavedPlaceRepository @Inject constructor(private val savedPlaceDao : SavedPlaceDao){
+    suspend fun getAllSavedPlace() : List<SavedPlace> = savedPlaceDao.readSavedPlaceData()
+
+
+    suspend fun writePlace(place: Place){
+        val savedList = savedPlaceDao.readSavedPlaceDataWithSamedName(place.name)
+        if (savedList.isNotEmpty()) {
+            Log.d("testt", "데이터 중복")
+            // 입력의 시간순대로 정렬되기 떄문에 레코드 삭제후 다시 집어넣기
+            savedPlaceDao.deleteSavedPlace(place.name)
+            savedPlaceDao.insertSavedPlaceData(place.name)
+        } else {
+            savedPlaceDao.insertSavedPlaceData(place.name)
+        }
+    }
+
+    suspend fun deleteSavedPlace(savedPlace: SavedPlace){
+        savedPlaceDao.deleteSavedPlace(savedPlace.name)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/di/DispatcherModule.kt b/app/src/main/java/campus/tech/kakao/map/di/DispatcherModule.kt
new file mode 100644
index 00000000..272fb9e0
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/di/DispatcherModule.kt
@@ -0,0 +1,18 @@
+package campus.tech.kakao.map.di
+
+import campus.tech.kakao.map.data.CoroutineIoDispatcher
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object DispatchersModule {
+
+    @Provides
+    @CoroutineIoDispatcher
+    fun providesIODispatcher(): CoroutineDispatcher = Dispatchers.IO
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/di/LocalDataSourceModule.kt b/app/src/main/java/campus/tech/kakao/map/di/LocalDataSourceModule.kt
new file mode 100644
index 00000000..3a5e33f7
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/di/LocalDataSourceModule.kt
@@ -0,0 +1,51 @@
+package campus.tech.kakao.map.di
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStore
+import androidx.room.Room
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.data.SavedPlaceDao
+import campus.tech.kakao.map.data.SavedPlaceDatabase
+import campus.tech.kakao.map.utilities.PlaceContract
+import com.google.firebase.Firebase
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.remoteConfig
+import com.google.firebase.remoteconfig.remoteConfigSettings
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+class LocalDataSourceModule {
+
+    @Singleton
+    @Provides
+    fun provideRoomDatabase(@ApplicationContext context: Context): SavedPlaceDatabase {
+        return Room.databaseBuilder(
+            context, SavedPlaceDatabase::class.java, PlaceContract.DATABASE_NAME
+        ).build()
+    }
+
+    @Provides
+    fun providePlantDao(savedPlaceDatabase: SavedPlaceDatabase): SavedPlaceDao {
+        return savedPlaceDatabase.savedPlaceDao()
+    }
+
+    private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = Constants.DataStore.PREFERENCES_NAME)
+
+    @Singleton
+    @Provides
+    fun provideDataStore(@ApplicationContext context: Context) : DataStore<Preferences>{
+        return context.dataStore
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/di/NetworkModule.kt b/app/src/main/java/campus/tech/kakao/map/di/NetworkModule.kt
new file mode 100644
index 00000000..dd399c41
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/di/NetworkModule.kt
@@ -0,0 +1,18 @@
+package campus.tech.kakao.map.di
+
+import campus.tech.kakao.map.api.KakaoApiDataSource
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class NetworkModule{
+    @Singleton
+    @Provides
+    fun provideKakaoApiDataSource(): KakaoApiDataSource {
+        return KakaoApiDataSource()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/di/firebaseModule.kt b/app/src/main/java/campus/tech/kakao/map/di/firebaseModule.kt
new file mode 100644
index 00000000..98f5d883
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/di/firebaseModule.kt
@@ -0,0 +1,26 @@
+package campus.tech.kakao.map.di
+
+import com.google.firebase.Firebase
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.remoteConfig
+import com.google.firebase.remoteconfig.remoteConfigSettings
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class FirebaseModule {
+    @Singleton
+    @Provides
+    fun provideRemoteConfig() : FirebaseRemoteConfig {
+        val configSettings = remoteConfigSettings {
+            minimumFetchIntervalInSeconds = 0
+        }
+        val firebase = Firebase.remoteConfig
+        firebase.setConfigSettingsAsync(configSettings)
+        return firebase
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/utilities/Constants.kt b/app/src/main/java/campus/tech/kakao/map/utilities/Constants.kt
new file mode 100644
index 00000000..7e8dfc7b
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/utilities/Constants.kt
@@ -0,0 +1,27 @@
+package campus.tech.kakao.map.utilities
+
+class Constants {
+    object Keys{
+        const val KEY_PLACE = "place"
+    }
+
+    object DataStore{
+        const val PREFERENCES_NAME = "location_preferences"
+    }
+
+    object ChonnamUnivLocation {
+        const val LATITUDE = "35.175487"
+        const val LONGITUDE = "126.907163"
+    }
+
+    object RemoteConfigKeys{
+        const val KEY_SERVICE_STATE = "serviceState"
+        const val KEY_SERVICE_MESSAGE = "serviceMessage"
+    }
+
+    object FirebaseMessage{
+        const val NOTIFICATION_ID = 1
+        const val CHANNEL_ID = "main_default_channel"
+        const val CHANNEL_NAME = "main channelName"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/utilities/PlaceContract.kt b/app/src/main/java/campus/tech/kakao/map/utilities/PlaceContract.kt
new file mode 100644
index 00000000..742f885a
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/utilities/PlaceContract.kt
@@ -0,0 +1,13 @@
+package campus.tech.kakao.map.utilities
+
+import android.provider.BaseColumns
+
+object PlaceContract{
+    const val DATABASE_NAME = "PLACE.DB"
+    const val VERSION = 1
+
+    object SavedPlaceEntry : BaseColumns{
+        const val TABLE_NAME = "SAVED_PLACE"
+        const val COLUMN_NAME = "name"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/view/ClickListener.kt b/app/src/main/java/campus/tech/kakao/map/view/ClickListener.kt
new file mode 100644
index 00000000..29feefae
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/view/ClickListener.kt
@@ -0,0 +1,13 @@
+package campus.tech.kakao.map.view
+
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.SavedPlace
+
+interface OnClickPlaceListener {
+    fun savePlace(place: Place)
+}
+
+interface OnClickSavedPlaceListener {
+    fun deleteSavedPlace(savedPlace: SavedPlace)
+    fun loadPlace(savedPlace: SavedPlace)
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/view/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/view/MapActivity.kt
new file mode 100644
index 00000000..ec2e4112
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/view/MapActivity.kt
@@ -0,0 +1,214 @@
+package campus.tech.kakao.map.view
+
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.app.ActivityOptionsCompat
+import androidx.core.view.isVisible
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import campus.tech.kakao.map.R
+import campus.tech.kakao.map.databinding.ActivityMapBinding
+import campus.tech.kakao.map.databinding.BottomSheetBinding
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.viewmodel.MapActivityViewModel
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.kakao.vectormap.KakaoMap
+import com.kakao.vectormap.KakaoMapReadyCallback
+import com.kakao.vectormap.LatLng
+import com.kakao.vectormap.MapLifeCycleCallback
+import com.kakao.vectormap.MapView
+import com.kakao.vectormap.camera.CameraUpdateFactory
+import com.kakao.vectormap.label.LabelOptions
+import com.kakao.vectormap.label.LabelStyle
+import com.kakao.vectormap.label.LabelStyles
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class MapActivity : AppCompatActivity() {
+
+    private lateinit var binding : ActivityMapBinding
+    private lateinit var bottomSheetBinding : BottomSheetBinding
+    lateinit var map: MapView
+    lateinit var kakaoMap : KakaoMap
+    lateinit var resultLauncher : ActivityResultLauncher<Intent>
+    lateinit var bottomSheetBehavior : BottomSheetBehavior<ConstraintLayout>
+    private val viewModel : MapActivityViewModel by viewModels()
+    var isMapDisplay = false
+    var isInitState = true
+
+    enum class ErrorCode(val code: String, val errorMessage : String){
+        UNKNOWN_ERROR("-1", "인증 과정 중 원인을 알 수 없는 에러가 발생했습니다"),
+        CONNECTION_ERROR("-2", "통신 연결 시도 중 에러가 발생하였습니다"),
+        SOCKET_TIMEOUT("-3", "통신 연결 중 SocketTimeoutException 에러가 발생하였습니다"),
+        CONNECT_TIMEOUT("-4", "통신 시도 중 ConnectTimeoutException 에러가 발생하였습니다"),
+        BAD_REQUEST("400", "요청을 처리하지 못하였습니다"),
+        AUTHORIZED_FAILURE("401", "인증 오류가 발생하였습니다. 인증 자격 증명이 충분치 않습니다"),
+        FORBIDDEN("403", "권한 오류가 발생하였습니다"),
+        TOO_MANY_REQUESTS("429", "정해진 사용량이나, 초당 요청 한도를 초과하였습니다"),
+        CONNECTION_FAILURE("499", "통신이 실패하였습니다. 인터넷 연결을 확인해주십시오"),
+        UNKNOWN("X", "오류 코드 X");
+
+        companion object {
+            fun getErrorMessage(errorText: String): ErrorCode {
+                return entries.find { errorText == it.code } ?: UNKNOWN
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        initVar()
+        initMapView()
+        initBottomSheet()
+        initClickListener()
+        initResultLauncher()
+        initObserver()
+
+    }
+
+
+    private fun initVar() {
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_map)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        bringFrontSearchField()
+    }
+
+
+    private fun initBottomSheet(){
+        bottomSheetBinding = binding.bottomSheetInclude
+        bottomSheetBehavior = BottomSheetBehavior.from(bottomSheetBinding.bottomSheet)
+        bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+    }
+
+
+    private fun initMapView() {
+        map = findViewById<MapView>(R.id.map_view)
+        map.start(object : MapLifeCycleCallback() {
+            override fun onMapDestroy() {
+                Log.d("testt", "MapDestroy")
+            }
+
+            override fun onMapError(error: Exception) {
+                Log.d("testt", "string : " + error.toString())
+                Log.d("testt", "message : " + error.message.toString())
+                Log.d("testt", "hashCode : " + error.localizedMessage)
+                showErrorMessageView(error.message.toString())
+            }
+        }, object : KakaoMapReadyCallback() {
+            override fun onMapReady(kakaoMap: KakaoMap) {
+                Log.d("testt", "MapReady")
+                binding.errorText.isVisible = false
+                this@MapActivity.kakaoMap = kakaoMap
+                isMapDisplay = true
+                viewModel.getRecentPos()
+            }
+        })
+    }
+
+    private fun bringFrontSearchField() {
+        binding.inputSearchField.bringToFront()
+        binding.searchIcon.bringToFront()
+    }
+
+    private fun initClickListener() {
+        binding.inputSearchField.setOnClickListener {
+            moveSearchPage(it)
+        }
+    }
+
+    private fun initResultLauncher(){
+        resultLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == RESULT_OK) {
+                    val place = getPlaceToResult(result)
+                    val latitude = place?.y?.toDouble() ?: Constants.ChonnamUnivLocation.LATITUDE.toDouble()
+                    val longitude = place?.x?.toDouble()?: Constants.ChonnamUnivLocation.LONGITUDE.toDouble()
+                    val pos = LatLng.from(latitude, longitude)
+                    Log.d("testtt", "LAT" + pos.toString())
+                    isInitState = false
+                    bottomSheetBinding.place = place
+                    Log.d("placeTest", "Place : ${place}, Binding : ${bottomSheetBinding.place}")
+                    viewModel.setRecentPos(latitude, longitude)
+                }
+            }
+    }
+
+    fun initObserver(){
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED){
+                viewModel.recentPos.collect{
+                    Log.d("testtt", "밖" + it.toString())
+                    if(isMapDisplay and !isInitState) {
+                        Log.d("testtt", "안" + it.toString())
+                        moveMapCamera(it)
+                        createLabel(it)
+                        bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+                    }
+                    else if (isMapDisplay) moveMapCamera(it)
+                }
+            }
+        }
+    }
+
+    private fun moveSearchPage(view: View) {
+        val intent = Intent(this, SearchActivity::class.java)
+        val options = ActivityOptionsCompat.makeSceneTransitionAnimation(
+            this, view, "inputFieldTransition"
+        )
+        resultLauncher.launch(intent, options)
+    }
+
+    fun showErrorMessageView(error: String) {
+        binding.errorText.isVisible = true
+        val errorCode = getErrorCode(error)
+        val errorText = ErrorCode.getErrorMessage(errorCode).errorMessage + "\n\n" + error
+        binding.errorText.text = errorText
+    }
+
+    private fun getErrorCode(errorText: String): String {
+        val regex = Regex("\\((\\d+)\\)")
+        val code = regex.find(errorText)
+        Log.d("testt", "errorcode" + code?.groups?.get(1)?.value)
+        return code?.groups?.get(1)?.value ?: ""
+    }
+
+    private fun getPlaceToResult(result: ActivityResult): Place? {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            result.data?.getParcelableExtra(Constants.Keys.KEY_PLACE, Place::class.java)
+        } else {
+            result.data?.getParcelableExtra(Constants.Keys.KEY_PLACE)
+        }
+    }
+
+    private fun moveMapCamera(pos : LatLng){
+        kakaoMap.moveCamera(CameraUpdateFactory.newCenterPosition(pos))
+    }
+
+    private fun removeAllLabel(){
+        kakaoMap.labelManager?.clearAll()
+    }
+
+    private fun createLabel(pos : LatLng){
+        val labelManager = kakaoMap.labelManager
+        removeAllLabel()
+        val style = labelManager
+            ?.addLabelStyles(LabelStyles.from(LabelStyle.from(R.drawable.ic_location_marker_2).setAnchorPoint(0.5f, 1f)))
+        var label = kakaoMap.getLabelManager()?.getLayer()?.addLabel(LabelOptions.from("center",pos).setStyles(style).setRank(1))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/view/PlaceViewAdapter.kt b/app/src/main/java/campus/tech/kakao/map/view/PlaceViewAdapter.kt
new file mode 100644
index 00000000..8f9e0b95
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/view/PlaceViewAdapter.kt
@@ -0,0 +1,54 @@
+package campus.tech.kakao.map.view
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import campus.tech.kakao.map.R
+import campus.tech.kakao.map.databinding.PlaceItemBinding
+import campus.tech.kakao.map.data.Place
+
+class PlaceViewAdapter(
+    val listener: OnClickPlaceListener
+) : ListAdapter<Place, PlaceViewHolder>(PlaceDiffCallBack()) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PlaceViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = DataBindingUtil.inflate<PlaceItemBinding>(inflater, R.layout.place_item, parent, false)
+        return PlaceViewHolder(binding, listener)
+    }
+
+    override fun onBindViewHolder(holder: PlaceViewHolder, position: Int) {
+        val currentPlace = getItem(position)
+        holder.bind(currentPlace)
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun getPlaceAtPosition(position : Int) : Place{
+        return getItem(position)
+    }
+}
+
+class PlaceDiffCallBack : DiffUtil.ItemCallback<Place>() {
+    override fun areItemsTheSame(oldItem: Place, newItem: Place): Boolean {
+        return oldItem === newItem
+    }
+
+    override fun areContentsTheSame(oldItem: Place, newItem: Place): Boolean {
+        return oldItem == newItem
+    }
+}
+
+class PlaceViewHolder(private val binding : PlaceItemBinding, listener : OnClickPlaceListener) :
+    RecyclerView.ViewHolder(binding.root) {
+    init {
+        binding.listener = listener
+    }
+
+    fun bind(place : Place){
+        binding.place = place
+    }
+}
diff --git a/app/src/main/java/campus/tech/kakao/map/view/SavedPlaceViewAdapter.kt b/app/src/main/java/campus/tech/kakao/map/view/SavedPlaceViewAdapter.kt
new file mode 100644
index 00000000..783f8ec4
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/view/SavedPlaceViewAdapter.kt
@@ -0,0 +1,62 @@
+package campus.tech.kakao.map.view
+
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import campus.tech.kakao.map.R
+import campus.tech.kakao.map.databinding.SavedPlaceItemBinding
+import campus.tech.kakao.map.data.SavedPlace
+
+class SavedPlaceViewAdapter(
+    val listener: OnClickSavedPlaceListener
+) : ListAdapter<SavedPlace, SavedPlaceViewHolder>(SavedPlaceDiffCallBack()) {
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SavedPlaceViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = DataBindingUtil.inflate<SavedPlaceItemBinding>(inflater, R.layout.saved_place_item, parent, false)
+        Log.d("testt", "저장된 장소를 띄우는 뷰 홀더 생성")
+        return SavedPlaceViewHolder(binding, listener)
+    }
+
+    override fun onBindViewHolder(holder: SavedPlaceViewHolder, position: Int) {
+        val currentSavedPlace = getItem(position)
+        holder.bind(currentSavedPlace)
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun existPlace(savedPlace: SavedPlace) : Boolean = currentList.contains(savedPlace)
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun getSavedPlaceAtPosition(position : Int) : SavedPlace{
+        return getItem(position)
+    }
+}
+
+class SavedPlaceDiffCallBack : DiffUtil.ItemCallback<SavedPlace>() {
+    override fun areItemsTheSame(oldItem: SavedPlace, newItem: SavedPlace): Boolean {
+        return oldItem === newItem
+    }
+
+    override fun areContentsTheSame(oldItem: SavedPlace, newItem: SavedPlace): Boolean {
+        return oldItem.name == newItem.name
+    }
+}
+
+class SavedPlaceViewHolder(private val binding: SavedPlaceItemBinding, listener: OnClickSavedPlaceListener) :
+    RecyclerView.ViewHolder(binding.root) {
+
+    init {
+        binding.listener = listener
+    }
+
+    fun bind(savedPlace: SavedPlace) {
+        binding.savedPlace = savedPlace
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/view/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/view/SearchActivity.kt
new file mode 100644
index 00000000..3a291919
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/view/SearchActivity.kt
@@ -0,0 +1,154 @@
+package campus.tech.kakao.map.view
+
+import android.content.Context
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.Log
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.ImageView
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import campus.tech.kakao.map.R
+import campus.tech.kakao.map.databinding.ActivitySearchBinding
+import campus.tech.kakao.map.utilities.Constants
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.SavedPlace
+import campus.tech.kakao.map.viewmodel.SearchActivityViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class SearchActivity : AppCompatActivity(), OnClickPlaceListener, OnClickSavedPlaceListener {
+    private lateinit var binding : ActivitySearchBinding
+    lateinit var savedPlaceRecyclerViewAdapter: SavedPlaceViewAdapter
+    lateinit var searchRecyclerViewAdapter: PlaceViewAdapter
+    private val viewModel: SearchActivityViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        initBinding()
+        initListeners()
+        initRecyclerViews()
+        initObserver()
+        binding.inputSearchField.requestFocus()
+    }
+
+    override fun deleteSavedPlace(savedPlace: SavedPlace) {
+        Log.d("testt", "삭제 콜백함수 처리")
+        viewModel.deleteSavedPlace(savedPlace)
+    }
+
+    override fun loadPlace(savedPlace: SavedPlace){
+        binding.inputSearchField.setText(savedPlace.name)
+    }
+
+    override fun savePlace(place: Place) {
+        Log.d("testt", "콜백함수 처리")
+        viewModel.savePlace(place)
+        intent.putExtra(Constants.Keys.KEY_PLACE, place)
+        Log.d("testt", "Intent" + place.toString())
+        setResult(RESULT_OK, intent)
+        finish()
+    }
+
+    fun initBinding() {
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_search)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+
+    fun initListeners() {
+        initDeleteButtonListener()
+        initInputFieldListener()
+    }
+
+    fun initDeleteButtonListener() {
+        binding.buttonX.setOnClickListener {
+            binding.inputSearchField.setText("")
+            binding.inputSearchField.clearFocus()
+            binding.inputSearchField.parent.clearChildFocus(binding.inputSearchField)
+            val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            inputMethodManager.hideSoftInputFromWindow(window.decorView.applicationWindowToken, 0)
+        }
+    }
+
+    fun initInputFieldListener() {
+        binding.inputSearchField.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+            }
+
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+            }
+
+            override fun afterTextChanged(searchText: Editable?) {
+                val text = searchText.toString()
+                Log.d("inputField", "text : ${text}")
+                Log.d("coroutine", "입력변경")
+                lifecycleScope.launch {
+                    viewModel.getKakaoLocalData(text)
+                }
+            }
+        })
+    }
+
+    fun initRecyclerViews() {
+        initSearchRecyclerView()
+        initSavedPlaceRecyclerView()
+    }
+
+    fun initSearchRecyclerView() {
+        searchRecyclerViewAdapter = PlaceViewAdapter(this)
+        binding.searchResultRecyclerView.layoutManager = LinearLayoutManager(this)
+        binding.searchResultRecyclerView.adapter = searchRecyclerViewAdapter
+    }
+
+    fun initSavedPlaceRecyclerView() {
+        savedPlaceRecyclerViewAdapter =
+            SavedPlaceViewAdapter(this)
+        binding.savedSearchRecyclerView.layoutManager =
+            LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)
+        binding.savedSearchRecyclerView.adapter = savedPlaceRecyclerViewAdapter
+    }
+
+    fun initObserver(){
+        initPlaceObserver()
+        initSavedPlaceObserver()
+    }
+
+    fun initPlaceObserver(){
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.place.collect { placeList ->
+                    searchRecyclerViewAdapter.submitList(placeList)
+                }
+            }
+        }
+    }
+
+    fun initSavedPlaceObserver(){
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.savedPlace.collect { savedPlaceList ->
+                    savedPlaceRecyclerViewAdapter.submitList(savedPlaceList)
+                    if (savedPlaceList.isEmpty()) binding.savedSearchRecyclerView.visibility = View.GONE
+                    else binding.savedSearchRecyclerView.visibility = View.VISIBLE
+                }
+            }
+        }
+    }
+}
+
+
+
+
+
diff --git a/app/src/main/java/campus/tech/kakao/map/view/SplashActivity.kt b/app/src/main/java/campus/tech/kakao/map/view/SplashActivity.kt
new file mode 100644
index 00000000..6d8e4dbc
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/view/SplashActivity.kt
@@ -0,0 +1,152 @@
+package campus.tech.kakao.map.view
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import android.util.Log
+import android.view.View
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import campus.tech.kakao.map.R
+import campus.tech.kakao.map.databinding.ActivitySearchBinding
+import campus.tech.kakao.map.databinding.ActivitySplashBinding
+import campus.tech.kakao.map.viewmodel.SearchActivityViewModel
+import campus.tech.kakao.map.viewmodel.SplashActivityViewModel
+import campus.tech.kakao.map.viewmodel.SplashUIState
+import campus.tech.kakao.map.viewmodel.UiState
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.Firebase
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.get
+import com.google.firebase.remoteconfig.remoteConfig
+import com.google.firebase.remoteconfig.remoteConfigSettings
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class SplashActivity : AppCompatActivity() {
+    private lateinit var binding: ActivitySplashBinding
+    private val viewModel: SplashActivityViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        askNotificationPermission()
+
+        binding = ActivitySplashBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        initObserve()
+
+        getFCMToken()
+
+
+    }
+
+    fun initObserve() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.splashUiState.collect { uiState ->
+                    Log.d("testtt", uiState.toString())
+                    UpdateSplash(uiState)
+                }
+            }
+        }
+    }
+
+    fun UpdateSplash(uiState : SplashUIState){
+        when (uiState) {
+            is SplashUIState.Loading -> {
+                binding.serviceMessage.isVisible = true
+                binding.serviceMessage.text = "로딩"
+            }
+
+            is SplashUIState.OnService -> {
+                Handler(Looper.getMainLooper()).postDelayed({
+                    val mainIntent =
+                        Intent(this@SplashActivity, MapActivity::class.java)
+                    startActivity(mainIntent)
+                    finish()
+                }, 2000)
+            }
+
+            is SplashUIState.OffService -> {
+                binding.serviceMessage.isVisible = true
+                binding.serviceMessage.text = uiState.message
+            }
+        }
+    }
+
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission(),
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            Toast.makeText(this, "notification이 전송됩니다.", Toast.LENGTH_SHORT).show()
+        } else {
+            Toast.makeText(this, "notification이 전송되지 않습니다.", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun askNotificationPermission() {
+        // This is only necessary for API level >= 33 (TIRAMISU)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (ContextCompat.checkSelfPermission(
+                    this,
+                    android.Manifest.permission.POST_NOTIFICATIONS
+                ) ==
+                PackageManager.PERMISSION_GRANTED
+            ) {
+            } else if (shouldShowRequestPermissionRationale(android.Manifest.permission.POST_NOTIFICATIONS)) {
+                // TODO 사용자에게 버튼 제공
+                showNotificationPermissionDialog()
+            } else {
+                requestPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
+            }
+        }
+    }
+
+    private fun showNotificationPermissionDialog() {
+        AlertDialog.Builder(this@SplashActivity).apply {
+            setTitle("권한 확인")
+            setMessage(
+                String.format(
+                    "다양한 알림 소식을 받기 위해 권한을 허용하시겠어요?\n(알림 에서 %s의 알림 권한을 허용해주세요.)",
+                    getString(R.string.app_name)
+                )
+            )
+            setPositiveButton("yes") { _, _ ->
+                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                val uri = Uri.fromParts("package", packageName, null)
+                intent.data = uri
+                startActivity(intent)
+            }
+            setNegativeButton("no") { _, _ -> }
+            show()
+        }
+    }
+
+    fun getFCMToken(){
+        FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
+            if (!task.isSuccessful) {
+                return@OnCompleteListener
+            }
+            Log.d("testtt", task.result.toString())
+
+        })
+    }
+
+
+}
+
diff --git a/app/src/main/java/campus/tech/kakao/map/viewmodel/MapActivityViewModel.kt b/app/src/main/java/campus/tech/kakao/map/viewmodel/MapActivityViewModel.kt
new file mode 100644
index 00000000..9a2c3975
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/viewmodel/MapActivityViewModel.kt
@@ -0,0 +1,45 @@
+package campus.tech.kakao.map.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import campus.tech.kakao.map.data.PlaceRepository
+import campus.tech.kakao.map.data.PositionDataSource
+import campus.tech.kakao.map.utilities.Constants
+import com.kakao.vectormap.LatLng
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class MapActivityViewModel @Inject constructor(
+    private val placeRepository: PlaceRepository
+) : ViewModel() {
+    private val _recentPos = MutableStateFlow<LatLng>(
+        LatLng.from(
+            Constants.ChonnamUnivLocation.LATITUDE.toDouble(),
+            Constants.ChonnamUnivLocation.LONGITUDE.toDouble()
+        )
+    )
+    val recentPos: StateFlow<LatLng> get() = _recentPos
+
+    fun getRecentPos(){
+        viewModelScope.launch{
+            _recentPos.value = placeRepository.fetchLastPosFromDataStore()
+            Log.d("testtt", "recent" + recentPos.value.toString())
+
+        }
+    }
+
+    fun setRecentPos(latitude : Double, longitude : Double){
+        viewModelScope.launch {
+            placeRepository.saveCurrentPosToDataStore(latitude, longitude)
+            getRecentPos()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/viewmodel/SearchActivityViewModel.kt b/app/src/main/java/campus/tech/kakao/map/viewmodel/SearchActivityViewModel.kt
new file mode 100644
index 00000000..d5ed4133
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/viewmodel/SearchActivityViewModel.kt
@@ -0,0 +1,79 @@
+package campus.tech.kakao.map.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import campus.tech.kakao.map.data.CoroutineIoDispatcher
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.SavedPlace
+import campus.tech.kakao.map.data.PlaceRepository
+import campus.tech.kakao.map.data.SavedPlaceRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+data class UiState(
+    val isPlaceListEmpty : Boolean = true
+)
+
+
+@HiltViewModel
+class SearchActivityViewModel @Inject constructor(
+    private val placeRepository: PlaceRepository,
+    private val savedPlaceRepository: SavedPlaceRepository,
+    @CoroutineIoDispatcher private val IoDispatcher : CoroutineDispatcher
+) : ViewModel() {
+    private val _place = MutableStateFlow<List<Place>>(emptyList())
+    private val _savedPlace = MutableStateFlow<List<SavedPlace>>(emptyList())
+    val place: StateFlow<List<Place>> get() = _place.asStateFlow()
+    val savedPlace: StateFlow<List<SavedPlace>> get() = _savedPlace.asStateFlow()
+    private val _uiState = MutableStateFlow(UiState())
+    val uiState : StateFlow<UiState>get() = _uiState.asStateFlow()
+
+    init {
+        getSavedPlace()
+
+    }
+
+    fun getSavedPlace() {
+        viewModelScope.launch(IoDispatcher) {
+            _savedPlace.value = savedPlaceRepository.getAllSavedPlace()
+        }
+    }
+
+    fun savePlace(place: Place) {
+        viewModelScope.launch(IoDispatcher) {
+            savedPlaceRepository.writePlace(place)
+            getSavedPlace()
+        }
+    }
+
+    fun deleteSavedPlace(savedPlace: SavedPlace) {
+        viewModelScope.launch(IoDispatcher){
+            savedPlaceRepository.deleteSavedPlace(savedPlace)
+            getSavedPlace()
+        }
+    }
+
+    suspend fun getKakaoLocalData(text: String) {
+        if (text.isNotEmpty()) {
+            val placeList = placeRepository.getKakaoLocalPlaceData(text)
+            _place.value = (placeList)
+        } else _place.value = listOf<Place>()
+
+        _uiState.update {currentState ->
+            currentState.copy(
+                isPlaceListEmpty = if(_place.value.isEmpty()) true else false
+            )
+        }
+        Log.d("testt", "value : ${uiState.value}")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/campus/tech/kakao/map/viewmodel/SplashActivityViewModel.kt b/app/src/main/java/campus/tech/kakao/map/viewmodel/SplashActivityViewModel.kt
new file mode 100644
index 00000000..916af958
--- /dev/null
+++ b/app/src/main/java/campus/tech/kakao/map/viewmodel/SplashActivityViewModel.kt
@@ -0,0 +1,52 @@
+package campus.tech.kakao.map.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import campus.tech.kakao.map.data.CoroutineIoDispatcher
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.PlaceRepository
+import campus.tech.kakao.map.data.RemoteConfigRepository
+import campus.tech.kakao.map.data.SavedPlace
+import campus.tech.kakao.map.data.SavedPlaceRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+sealed class SplashUIState {
+    object Loading : SplashUIState()
+    object OnService : SplashUIState()
+    data class OffService(val message: String) : SplashUIState()
+}
+
+@HiltViewModel
+class SplashActivityViewModel @Inject constructor(
+    private val remoteConfigRepository: RemoteConfigRepository,
+) : ViewModel() {
+
+    private val _splashUiState = MutableStateFlow<SplashUIState>(SplashUIState.Loading)
+    val splashUiState : StateFlow<SplashUIState>
+        get() = _splashUiState.asStateFlow()
+
+    init{
+        getRemoteConfigs()
+    }
+
+    fun getRemoteConfigs(){
+        Log.d("testtt", "2번")
+        viewModelScope.launch {
+            remoteConfigRepository.getRemoteConfig().collect{
+                if(it.state == "ON_SERVICE"){
+                    _splashUiState.value = SplashUIState.OnService
+                } else{
+                    _splashUiState.value = SplashUIState.OffService(it.message)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_location_marker.png b/app/src/main/res/drawable/ic_location_marker.png
new file mode 100644
index 00000000..13a18c86
Binary files /dev/null and b/app/src/main/res/drawable/ic_location_marker.png differ
diff --git a/app/src/main/res/drawable/ic_location_marker_2.png b/app/src/main/res/drawable/ic_location_marker_2.png
new file mode 100644
index 00000000..5af03930
Binary files /dev/null and b/app/src/main/res/drawable/ic_location_marker_2.png differ
diff --git a/app/src/main/res/drawable/map_app_splash_screen.png b/app/src/main/res/drawable/map_app_splash_screen.png
new file mode 100644
index 00000000..7bb81ecb
Binary files /dev/null and b/app/src/main/res/drawable/map_app_splash_screen.png differ
diff --git a/app/src/main/res/drawable/map_app_splash_screen_final_resized.png b/app/src/main/res/drawable/map_app_splash_screen_final_resized.png
new file mode 100644
index 00000000..2dc9c4e9
Binary files /dev/null and b/app/src/main/res/drawable/map_app_splash_screen_final_resized.png differ
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
new file mode 100644
index 00000000..21225175
--- /dev/null
+++ b/app/src/main/res/layout/activity_map.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="campus.tech.kakao.map.viewmodel.MapActivityViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".view.MapActivity">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/main"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/input_search_field"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/white"
+                android:focusable="false"
+                android:hint="@string/search_hint"
+                android:padding="10dp"
+                android:paddingHorizontal="20dp"
+                android:transitionName="inputFieldTransition"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/search_icon"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginEnd="10dp"
+                android:src="@android:drawable/ic_search_category_default"
+                android:transitionName="inputFieldTransition"
+                app:layout_constraintBottom_toBottomOf="@+id/input_search_field"
+                app:layout_constraintEnd_toEndOf="@id/input_search_field"
+                app:layout_constraintTop_toTopOf="@id/input_search_field" />
+
+            <com.kakao.vectormap.MapView
+                android:id="@+id/map_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/error_text"
+                android:layout_width="350dp"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <include layout="@layout/bottom_sheet"
+            android:id="@+id/bottom_sheet_include"/>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
new file mode 100644
index 00000000..253b0b79
--- /dev/null
+++ b/app/src/main/res/layout/activity_search.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="viewModel"
+            type="campus.tech.kakao.map.viewmodel.SearchActivityViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        tools:context=".view.SearchActivity">
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/input_search_field"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="5dp"
+            android:layout_marginTop="5dp"
+            android:background="@color/white"
+            android:hint="@string/search_hint"
+            android:padding="10dp"
+            android:paddingHorizontal="20dp"
+            android:transitionName="inputFieldTransition"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/button_X"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            app:layout_constraintBottom_toBottomOf="@+id/input_search_field"
+            app:layout_constraintEnd_toEndOf="@id/input_search_field"
+            app:layout_constraintTop_toTopOf="@id/input_search_field" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@color/white"
+            android:transitionName="inputFieldTransition"
+            app:layout_constraintBottom_toBottomOf="@id/search_result_recyclerView"
+            app:layout_constraintEnd_toEndOf="@id/search_result_recyclerView"
+            app:layout_constraintStart_toStartOf="@id/search_result_recyclerView"
+            app:layout_constraintTop_toTopOf="@id/search_result_recyclerView" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/saved_search_recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            app:layout_constraintBottom_toTopOf="@id/search_result_recyclerView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/input_search_field" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/search_result_recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/saved_search_recyclerView" />
+
+        <TextView
+            android:id="@+id/no_search_result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/no_search_result"
+            android:textColor="#737373"
+            android:textSize="18sp"
+            android:visibility="@{viewModel.uiState.isPlaceListEmpty ? View.VISIBLE : View.INVISIBLE}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
new file mode 100644
index 00000000..800e54bd
--- /dev/null
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,31 @@
+<?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/logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/map_app_splash_screen_final_resized"
+        />
+
+    <TextView
+        android:id="@+id/serviceMessage"
+        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"
+        android:textSize="20sp"
+        android:visibility="invisible"
+        android:layout_marginBottom="75dp"
+        />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml
new file mode 100644
index 00000000..48a2ecdf
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="place"
+            type="campus.tech.kakao.map.data.Place"/>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bottom_sheet"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:background="@color/white"
+        app:behavior_hideable="true"
+        app:behavior_peekHeight="100dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+        <TextView
+            android:id="@+id/place_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:text="@{place.name}"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/place_location"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/place_location"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:text="@{place.location}"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/place_name" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/place_item.xml b/app/src/main/res/layout/place_item.xml
new file mode 100644
index 00000000..fb8ef55a
--- /dev/null
+++ b/app/src/main/res/layout/place_item.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="place"
+            type="campus.tech.kakao.map.data.Place"/>
+
+        <variable
+            name="listener"
+            type="campus.tech.kakao.map.view.OnClickPlaceListener"/>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:onClick="@{() -> listener.savePlace(place)}">
+
+        <ImageView
+            android:id="@+id/place_image"
+            android:layout_width="80dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/ic_launcher_background"
+            android:src="@drawable/ic_launcher_foreground"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/place_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:text="@{place.name}"
+            android:textSize="22sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@id/place_image"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/place_location"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:text="@{place.location}"
+            android:textColor="@color/text_location"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@id/place_image"
+            app:layout_constraintTop_toBottomOf="@id/place_name" />
+
+        <TextView
+            android:id="@+id/place_category"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:text="@{place.category}"
+            android:textColor="@color/text_location"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/saved_place_item.xml b/app/src/main/res/layout/saved_place_item.xml
new file mode 100644
index 00000000..e7357cfe
--- /dev/null
+++ b/app/src/main/res/layout/saved_place_item.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <data>
+        <variable
+            name="savedPlace"
+            type="campus.tech.kakao.map.data.SavedPlace"/>
+
+        <variable
+            name="listener"
+            type="campus.tech.kakao.map.view.OnClickSavedPlaceListener"/>
+    </data>
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="wrap_content"
+    android:minWidth="100dp"
+    android:layout_height="wrap_content"
+    android:onClick="@{() -> listener.loadPlace(savedPlace)}"
+>
+
+    <ImageView
+        android:id="@+id/button_saved_delete"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@android:drawable/ic_menu_close_clear_cancel"
+        android:onClick="@{() -> listener.deleteSavedPlace(savedPlace)}"/>
+
+    <TextView
+        android:id="@+id/saved_place_name"
+        app:layout_constraintStart_toEndOf="@id/button_saved_delete"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@{savedPlace.name}"
+        android:textSize="16sp"
+        />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 768b058a..53d8fe9d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="black">#FF000000</color>
+    <color name="text_location">#7C7C7C</color>
     <color name="white">#FFFFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5ba5b9c..79f73188 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">Map</string>
+    <string name="search_hint">검색어를 입력해 주세요.</string>
+    <string name="no_search_result">검색 결과가 없습니다.</string>
+    <string name="fcm_default_channel_id">fcm_default_channel</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 05ed4b9e..e00c56c1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,6 +3,7 @@
     <style name="Base.Theme.Map" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+        <item name="android:windowActivityTransitions">true</item>
     </style>
 
     <style name="Theme.Map" parent="Base.Theme.Map" />
diff --git a/app/src/test/java/campus/tech/kakao/map/repository/PlaceRepositoryTest.kt b/app/src/test/java/campus/tech/kakao/map/repository/PlaceRepositoryTest.kt
new file mode 100644
index 00000000..48d474da
--- /dev/null
+++ b/app/src/test/java/campus/tech/kakao/map/repository/PlaceRepositoryTest.kt
@@ -0,0 +1,40 @@
+package campus.tech.kakao.map.repository
+
+import android.util.Log
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import campus.tech.kakao.map.api.KakaoApiDataSource
+import campus.tech.kakao.map.data.PlaceRepository
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
+
+import org.junit.Test
+
+class PlaceRepositoryTest {
+
+    private lateinit var DataSource: KakaoApiDataSource
+    private lateinit var placeRepository : PlaceRepository
+
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
+
+    @Before
+    fun setup(){
+        DataSource = mockk(relaxed = true)
+        placeRepository = PlaceRepository(DataSource)
+        mockkStatic(Log::class)
+        every { Log.d(any(), any()) } returns 0
+    }
+
+    @Test
+    fun `카카오 데이터소스에서 데이터를 호출하는지`() = runTest{
+        val text = "전남대학교 광주"
+        val result = placeRepository.getKakaoLocalPlaceData(text)
+        coVerify { placeRepository.getKakaoLocalPlaceData(text) }
+        assert(result[0].name == "전남대학교 광주캠퍼스")
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/campus/tech/kakao/map/repository/SavedPlaceRepositoryTest.kt b/app/src/test/java/campus/tech/kakao/map/repository/SavedPlaceRepositoryTest.kt
new file mode 100644
index 00000000..dcb5c64a
--- /dev/null
+++ b/app/src/test/java/campus/tech/kakao/map/repository/SavedPlaceRepositoryTest.kt
@@ -0,0 +1,76 @@
+package campus.tech.kakao.map.repository
+
+import android.database.Cursor
+import android.util.Log
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.SavedPlace
+import campus.tech.kakao.map.data.SavedPlaceDao
+import campus.tech.kakao.map.data.SavedPlaceRepository
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.*
+import org.junit.Before
+
+import org.junit.Test
+
+class SavedPlaceRepositoryTest {
+    private lateinit var savedPlaceRepository: SavedPlaceRepository
+    private lateinit var savedPlaceDao : SavedPlaceDao
+    private lateinit var cursor: Cursor
+
+    @Before
+    fun setup(){
+        savedPlaceDao = mockk(relaxed = true)
+        savedPlaceRepository = SavedPlaceRepository(savedPlaceDao)
+        mockkStatic(Log::class)
+        every { Log.d(any(), any()) } returns 0
+    }
+
+    @Test
+    fun `sqlite에 저장된 장소명들을 잘 불러오는 지 확인`() = runTest{
+        coEvery { savedPlaceDao.readSavedPlaceData() }.returnsMany(listOf(SavedPlace("저장된 장소명"), SavedPlace("저장된 장소명")))
+
+        val savedPlaceList = savedPlaceRepository.getAllSavedPlace()
+        assert(savedPlaceList == listOf<SavedPlace>(SavedPlace("저장된 장소명"), SavedPlace("저장된 장소명")))
+
+        coVerify { savedPlaceDao.readSavedPlaceData() }
+
+    }
+
+    @Test
+    fun `검색어가 이전에 저장되어있지 않은 경우의 데이터 저장`() = runTest{
+        val place = Place("새로운 장소", "새로운 위치", "카테고리", "x", "y")
+        coEvery { savedPlaceDao.readSavedPlaceDataWithSamedName("새로운 장소") } returns listOf()
+
+        savedPlaceRepository.writePlace(place)
+
+        coVerify { savedPlaceDao.insertSavedPlaceData(place.name) }
+        coVerify (inverse = true){ savedPlaceDao.deleteSavedPlace(place.name) }
+    }
+
+    @Test
+    fun `검색어가 이전에 저장되어있는 경우의 데이터 저장`() = runTest{
+        val place = Place("저장된 장소", "저장된 위치", "카테고리", "x", "y")
+        coEvery { savedPlaceDao.readSavedPlaceDataWithSamedName("저장된 장소") } returns listOf(SavedPlace(place.name))
+
+        savedPlaceRepository.writePlace(place)
+
+        coVerify { savedPlaceDao.insertSavedPlaceData(place.name) }
+        coVerify { savedPlaceDao.deleteSavedPlace(place.name) }
+    }
+
+    @Test
+    fun `검색어 삭제가 잘 요청되는지`() = runTest{
+        val savedPlace = SavedPlace("저장된 장소")
+        coEvery { savedPlaceDao.deleteSavedPlace(savedPlace.name) } returns Unit
+
+        savedPlaceRepository.deleteSavedPlace(savedPlace)
+
+        verify { savedPlaceDao.deleteSavedPlace(savedPlace.name) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/campus/tech/kakao/map/viewmodel/SearchActivityViewModelTest.kt b/app/src/test/java/campus/tech/kakao/map/viewmodel/SearchActivityViewModelTest.kt
new file mode 100644
index 00000000..00b962f2
--- /dev/null
+++ b/app/src/test/java/campus/tech/kakao/map/viewmodel/SearchActivityViewModelTest.kt
@@ -0,0 +1,81 @@
+package campus.tech.kakao.map.viewmodel
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Observer
+import campus.tech.kakao.map.data.Place
+import campus.tech.kakao.map.data.SavedPlace
+import campus.tech.kakao.map.data.PlaceRepository
+import campus.tech.kakao.map.data.SavedPlaceRepository
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+
+import org.junit.Test
+
+class SearchActivityViewModelTest{
+
+    private lateinit var placeRepository: PlaceRepository
+    private lateinit var savedPlaceRepository : SavedPlaceRepository
+    private lateinit var viewModel : SearchActivityViewModel
+    private lateinit var observerPlace: Observer<List<Place>>
+    private lateinit var observerSavedPlace : Observer<List<SavedPlace>>
+
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
+
+    @Before
+    fun setup(){
+        placeRepository = mockk(relaxed = true)
+        savedPlaceRepository = mockk(relaxed = true)
+        coEvery { savedPlaceRepository.getAllSavedPlace() } returns emptyList()
+        viewModel = SearchActivityViewModel(placeRepository, savedPlaceRepository)
+
+        observerPlace = mockk(relaxed = true)
+        observerSavedPlace = mockk(relaxed = true)
+        viewModel.place.observeForever(observerPlace)
+        viewModel.savedPlace.observeForever(observerSavedPlace)
+
+    }
+
+    @Test
+    fun `PlaceRepository에서 데이터를 제대로 요청하고 있는지 검사`() = runTest{
+
+        val text = "test"
+        coEvery { placeRepository.getKakaoLocalPlaceData(text) } returns emptyList()
+
+        viewModel.getKakaoLocalData(text)
+        coVerify { placeRepository.getKakaoLocalPlaceData(text) }
+    }
+
+    @Test
+    fun `SavedPlaceRepository에서 데이터를 제대로 요청하고 있는지 검사`() = runTest{
+        viewModel.getSavedPlace()
+        coVerify { savedPlaceRepository.getAllSavedPlace() }
+    }
+
+    @Test
+    fun `Place 데이터를 저장하기 위해 Repository를 호출하고 있는지 검사`() = runTest{
+        val place : Place = mockk()
+        viewModel.savePlace(place)
+        coVerify { savedPlaceRepository.writePlace(place) }
+        coVerify { savedPlaceRepository.getAllSavedPlace() }
+    }
+
+    @Test
+    fun `Place 데이터를 삭제하기 위해 Repository를 호출하고 있는지 검사`() = runTest{
+        val savedPlace : SavedPlace = mockk()
+        viewModel.deleteSavedPlace(savedPlace)
+        coVerify { savedPlaceRepository.deleteSavedPlace(savedPlace) }
+        coVerify { savedPlaceRepository.getAllSavedPlace() }
+    }
+
+    @After
+    fun removeObserver(){
+        viewModel.place.removeObserver(observerPlace)
+        viewModel.savedPlace.removeObserver(observerSavedPlace)
+    }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c0..7f93135c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2927e499..3fa8f862 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sat Jun 15 19:44:23 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c..1aa94a42 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e3b43d09..ef99bf26 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven("https://devrepo.kakao.com/nexus/repository/kakaomap-releases/")
+        maven{ url = uri("https://devrepo.kakao.com/nexus/content/groups/public/") }
     }
 }