From 63c009ad76a3d8892376dafc69dfbab8038fc565 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Mon, 22 Jul 2024 14:46:17 +0900 Subject: [PATCH 01/22] =?UTF-8?q?init:=204=EC=A3=BC=EC=B0=A8=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 +- README.md | 19 +- app/build.gradle.kts | 61 ++-- app/build.gradle.kts.rej | 21 ++ .../campus/tech/kakao/map/MapActivityTest.kt | 37 +++ .../tech/kakao/map/RepositoryImplTest.kt | 80 +++++ .../tech/kakao/map/SearchActivityTest.kt | 61 ++++ app/src/main/AndroidManifest.xml | 15 +- .../campus/tech/kakao/map/PlaceApplication.kt | 39 +++ .../kakao/map/data/PlaceRepositoryImpl.kt | 130 ++++++++ .../tech/kakao/map/data/net/KakaoApi.kt | 18 ++ .../tech/kakao/map/data/net/KakaoApiClient.kt | 20 ++ .../tech/kakao/map/domain/model/Place.kt | 14 + .../map/domain/model/ResultSearchKeyword.kt | 15 + .../map/domain/repository/PlaceRepository.kt | 13 + .../kakao/map/presentation/MapActivity.kt | 145 +++++++++ .../kakao/map/presentation/MapBottomSheet.kt | 27 ++ .../kakao/map/presentation/SearchActivity.kt | 105 +++++++ .../kakao/map/presentation/SearchUiState.kt | 10 + .../kakao/map/presentation/SearchViewModel.kt | 90 ++++++ .../map/presentation/adapter/LogAdapter.kt | 33 ++ .../adapter/SearchedPlaceAdapter.kt | 34 +++ .../tech/kakao/map/util/DiffUtilCalback.kt | 14 + .../tech/kakao/map/util/PlaceContract.kt | 37 +++ .../campus/tech/kakao/map/util/PlaceMapper.kt | 21 ++ app/src/main/res/drawable/icon_cancel.xml | 10 + app/src/main/res/drawable/icon_location.png | Bin 0 -> 101892 bytes app/src/main/res/drawable/icon_location3.png | Bin 0 -> 6911 bytes .../res/drawable/icon_location_resize.xml | 7 + app/src/main/res/drawable/icon_search.xml | 10 + app/src/main/res/drawable/icon_search2.xml | 10 + app/src/main/res/drawable/icon_x.png | Bin 0 -> 9496 bytes .../res/drawable/searchview_background.xml | 5 + .../res/drawable/searchview_background2.xml | 7 + app/src/main/res/layout/activity_main.xml | 119 ++++++-- app/src/main/res/layout/activity_map.xml | 39 +++ app/src/main/res/layout/bottom_sheet.xml | 22 ++ app/src/main/res/layout/error_page.xml | 18 ++ app/src/main/res/layout/list_item.xml | 64 ++++ app/src/main/res/layout/log_item.xml | 43 +++ app/src/main/res/values/themes.xml | 1 + build.gradle.kts | 1 - gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 282 +++++++++++------- gradlew.bat | 15 +- settings.gradle.kts | 9 +- 47 files changed, 1552 insertions(+), 179 deletions(-) create mode 100644 app/build.gradle.kts.rej create mode 100644 app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt create mode 100644 app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt create mode 100644 app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/net/KakaoApi.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/domain/model/Place.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/adapter/LogAdapter.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/adapter/SearchedPlaceAdapter.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/util/DiffUtilCalback.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/util/PlaceMapper.kt create mode 100644 app/src/main/res/drawable/icon_cancel.xml create mode 100644 app/src/main/res/drawable/icon_location.png create mode 100644 app/src/main/res/drawable/icon_location3.png create mode 100644 app/src/main/res/drawable/icon_location_resize.xml create mode 100644 app/src/main/res/drawable/icon_search.xml create mode 100644 app/src/main/res/drawable/icon_search2.xml create mode 100644 app/src/main/res/drawable/icon_x.png create mode 100644 app/src/main/res/drawable/searchview_background.xml create mode 100644 app/src/main/res/drawable/searchview_background2.xml create mode 100644 app/src/main/res/layout/activity_map.xml create mode 100644 app/src/main/res/layout/bottom_sheet.xml create mode 100644 app/src/main/res/layout/error_page.xml create mode 100644 app/src/main/res/layout/list_item.xml create mode 100644 app/src/main/res/layout/log_item.xml 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 73ba54e1..18986352 100644 --- a/README.md +++ b/README.md @@ -1 +1,18 @@ -# android-map-refactoring +# android-map-location + +카카오 맵 클론 코딩 +카카오로컬 API 사용 + +## 기능 요구 사항 +- 저장된 검색어를 선택하면 해당 검색어의 검색 결과가 표시된다. +- 검색 결과 목록 중 하나의 항목을 선택하면 해당 항목의 위치를 지도에 표시한다. +- 앱 종료 시 마지막 위치를 저장하여 다시 앱 실행 시 해당 위치로 포커스 한다. +- 카카오지도 onMapError() 호출 시 에러 화면을 보여준다. +- +## 프로그래밍 요구 사항 +- BottomSheet를 사용한다. +- 카카오 API 사용을 위한 앱 키를 외부에 노출하지 않는다. +- 가능한 MVVM 아키텍처 패턴을 적용하도록 한다. +- 코드 컨벤션을 준수하며 프로그래밍한다. + + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2c1a15f2..4de1ea7b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,22 +1,28 @@ +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") } android { namespace = "campus.tech.kakao.map" compileSdk = 34 + defaultConfig { + resValue("string", "kakao_api_key", getApiKey("KAKAO_API_KEY")) + buildConfigField("String", "KAKAO_REST_API_KEY", getApiKey("KAKAO_REST_API_KEY")) applicationId = "campus.tech.kakao.map" minSdk = 26 targetSdk = 34 versionCode = 1 versionName = "1.0" + ndk { + abiFilters.add("arm64-v8a") + abiFilters.add("armeabi-v7a")} + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -39,42 +45,35 @@ android { } buildFeatures { + viewBinding = true dataBinding = 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") - implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.recyclerview:recyclerview:1.3.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("com.kakao.sdk:v2-all:2.20.3") + implementation("com.kakao.maps.open:android:2.9.5") 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.test:core-ktx:1.6.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3") - implementation("androidx.room:room-runtime:2.6.1") - 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.core:core-ktx:1.12.0") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("com.google.android.material:material:1.11.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.recyclerview:recyclerview:1.3.2") + implementation("androidx.datastore:datastore-preferences:1.0.0") + implementation("androidx.activity:activity:1.8.0") 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") - androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3") + testImplementation("io.mockk:mockk:1.13.12") androidTestImplementation("androidx.test.ext:junit:1.2.1") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation("androidx.test:rules:1.6.1") - 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") + implementation("androidx.test:core-ktx:1.6.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") + androidTestImplementation("androidx.test.espresso:espresso-contrib:3.3.0") + androidTestImplementation("androidx.test.espresso:espresso-intents:3.3.0") } + +fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key) \ No newline at end of file diff --git a/app/build.gradle.kts.rej b/app/build.gradle.kts.rej new file mode 100644 index 00000000..75749712 --- /dev/null +++ b/app/build.gradle.kts.rej @@ -0,0 +1,21 @@ +diff a/app/build.gradle.kts b/app/build.gradle.kts (rejected hunks) +@@ -69,10 +69,17 @@ + implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.recyclerview:recyclerview:1.3.2") + implementation("androidx.datastore:datastore-preferences:1.0.0") +- implementation("androidx.activity:activity:1.8.0") ++ implementation("androidx.activity:activity-ktx:1.8.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") ++ androidTestImplementation("androidx.test:rules:1.4.0") ++ androidTestImplementation("androidx.test:runner:1.4.0") ++ androidTestImplementation("androidx.test.espresso:espresso-contrib:3.5.1") ++ androidTestImplementation("androidx.test.espresso:espresso-intents:3.5.1") ++ androidTestImplementation("io.mockk:mockk-android:1.13.3") ++ androidTestImplementation("androidx.arch.core:core-testing:2.1.0") + } + ++ + fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key) +\ No newline at end of file diff --git a/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt new file mode 100644 index 00000000..55428797 --- /dev/null +++ b/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt @@ -0,0 +1,37 @@ +package campus.tech.kakao.map + +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.matcher.IntentMatchers +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.ext.junit.rules.ActivityScenarioRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import campus.tech.kakao.map.presentation.MapActivity +import campus.tech.kakao.map.presentation.SearchActivity +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class MapActivityTest { + @get:Rule + var activityScenarioRule = ActivityScenarioRule(MapActivity::class.java) + + @Test + fun testActivityLaunch() { + + onView(withId(R.id.mapView)).check(matches(isDisplayed())) + onView(withId(R.id.searchView)).check(matches(isDisplayed())) + } + + @Test + fun testSearchedResultOnMap() { + Intents.init() + onView(withId(R.id.searchView)).perform(click()) + Intents.intended(IntentMatchers.hasComponent(SearchActivity::class.java.name)) + Intents.release() + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt new file mode 100644 index 00000000..c707bb46 --- /dev/null +++ b/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt @@ -0,0 +1,80 @@ +package campus.tech.kakao.map + +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import campus.tech.kakao.map.data.PlaceRepositoryImpl +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.util.PlaceContract +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class RepositoryImplTest { + + private lateinit var repository: PlaceRepositoryImpl + private lateinit var context: Context + + @Before + fun setUp() { + context = ApplicationProvider.getApplicationContext() + context.deleteDatabase(PlaceContract.DATABASE_NAME) + repository = PlaceRepositoryImpl.getInstance(context) + } + + @After + fun after() { + repository.close() + context.deleteDatabase(PlaceContract.DATABASE_NAME) + } + + @Test + fun testInsertAndGetPlaces() { + val place1 = Place("1", "Place1", "Address1", "Category1", "10.0", "20.0") + val place2 = Place("2", "Place2", "Address2", "Category2", "30.0", "40.0") + val places = listOf(place1, place2) + + repository.updatePlaces(places) + + val result = repository.getAllPlaces() + assertEquals(2, result.size) + assertEquals("Place1", result[0].place) + assertEquals("Place2", result[1].place) + } + + @Test + fun testSearchPlaces() { + val place1 = Place("1", "Gangnam", "Address1", "Category1", "10.0", "20.0") + val place2 = Place("2", "Gangbuk", "Address2", "Category2", "30.0", "40.0") + val places = listOf(place1, place2) + + repository.updatePlaces(places) + + val result = repository.getPlaces("Gang") + assertEquals(2, result.size) + assertEquals("Gangnam", result[0].place) + assertEquals("Gangbuk", result[1].place) + } + + @Test + fun testLogs() { + val log1 = Place("1", "Log1", "", "", "", "") + val log2 = Place("2", "Log2", "", "", "", "") + val logs = listOf(log1, log2) + + repository.updateLogs(logs) + + var result = repository.getLogs() + assertEquals(2, result.size) + assertEquals("Log1", result[0].place) + assertEquals("Log2", result[1].place) + + repository.removeLog("1") + result = repository.getLogs() + assertEquals(1, result.size) + assertEquals("Log2", result[0].place) + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt new file mode 100644 index 00000000..cc8ae613 --- /dev/null +++ b/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt @@ -0,0 +1,61 @@ +package campus.tech.kakao.map + +import android.content.Context +import android.content.SharedPreferences +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.replaceText +import androidx.test.espresso.contrib.RecyclerViewActions +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.ext.junit.rules.ActivityScenarioRule +import campus.tech.kakao.map.presentation.MapActivity +import campus.tech.kakao.map.presentation.SearchActivity +import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter +import org.hamcrest.CoreMatchers.instanceOf +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class SearchActivityTest { + + private lateinit var sharedPreferences: SharedPreferences + private lateinit var context: Context + + @get:Rule + var activityScenarioRule = ActivityScenarioRule(SearchActivity::class.java) + + @Before + fun setUp() { + context = ApplicationProvider.getApplicationContext() + sharedPreferences = context.getSharedPreferences("mockk", Context.MODE_PRIVATE) + Intents.init() + } + + @After + fun after() { + sharedPreferences.edit().clear().apply() + Intents.release() + } + + @Test + fun testSearchAndVerifyMapActivityLaunched() { + onView(withId(R.id.edtSearch)).perform(click()).perform(replaceText("부산대")) + + Thread.sleep(1200L) + onView(withId(R.id.recyclerPlace)) + .perform( + RecyclerViewActions.actionOnHolderItem( + instanceOf(SearchedPlaceAdapter.LocationViewHolder::class.java), click() + ).atPosition(3) + ) + + Intents.intended(hasComponent(MapActivity::class.java.name)) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6bca2f54..e38c414c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,10 @@ + + @@ -21,6 +24,14 @@ + + + + - + \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt new file mode 100644 index 00000000..1c7d3a1d --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -0,0 +1,39 @@ +package campus.tech.kakao.map + +import android.app.Application +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import campus.tech.kakao.map.data.PlaceRepositoryImpl +import campus.tech.kakao.map.domain.repository.PlaceRepository +import com.kakao.vectormap.KakaoMapSdk + +class PlaceApplication: Application() { + + val placeRepository: PlaceRepository by lazy { PlaceRepositoryImpl.getInstance(this)} + + override fun onCreate() { + super.onCreate() + appInstance = this + + val key = getString(R.string.kakao_api_key) + KakaoMapSdk.init(this, key) + } + companion object { + @Volatile + private lateinit var appInstance: PlaceApplication + fun isNetworkActive(): Boolean { + val connectivityManager: ConnectivityManager = + appInstance.getSystemService(ConnectivityManager::class.java) + val network: Network = connectivityManager.activeNetwork ?: return false + val actNetwork: NetworkCapabilities = + connectivityManager.getNetworkCapabilities(network) ?: return false + + return when { + actNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true + actNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true + else -> false + } + } + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt new file mode 100644 index 00000000..50315bd2 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt @@ -0,0 +1,130 @@ +package campus.tech.kakao.map.data + +import android.content.ContentValues +import android.content.Context +import android.database.sqlite.SQLiteDatabase +import android.database.sqlite.SQLiteOpenHelper +import androidx.lifecycle.viewModelScope +import campus.tech.kakao.map.BuildConfig +import campus.tech.kakao.map.PlaceApplication +import campus.tech.kakao.map.data.net.KakaoApiClient +import campus.tech.kakao.map.util.PlaceContract +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.domain.repository.PlaceRepository +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +class PlaceRepositoryImpl(context: Context): + SQLiteOpenHelper(context, PlaceContract.DATABASE_NAME, null, 1), + PlaceRepository { + + override fun onCreate(db: SQLiteDatabase?) { + db?.execSQL(PlaceContract.CREATE_QUERY) + db?.execSQL(PlaceContract.CREATE_LOG_QUERY) + } + + override fun onUpgrade(db: SQLiteDatabase?, oldVersion: Int, newVersion: Int) { + db?.execSQL(PlaceContract.DROP_QUERY) + db?.execSQL(PlaceContract.DROP_LOG_QUERY) + onCreate(db) + } + override suspend fun getPlaces(keyword: String): List = + withContext(Dispatchers.IO){ + val resultPlaces = mutableListOf() + for (page in 1..3) { + val response = KakaoApiClient.api.getSearchKeyword( + key = BuildConfig.KAKAO_REST_API_KEY, + query = keyword, + size = 15, + page = page + ) + if (response.isSuccessful) { + response.body()?.documents?.let { resultPlaces.addAll(it) } + } else throw RuntimeException("통신 에러 발생") + } + updatePlaces(resultPlaces) + resultPlaces + } + override suspend fun updatePlaces(places: List) { + val db = writableDatabase + + db.execSQL(PlaceContract.DELETE_QUERY) + places.forEach { + val values = ContentValues().apply { + put(PlaceContract.COLUMN_ID, it.id) + put(PlaceContract.COLUMN_NAME, it.place) + put(PlaceContract.COLUMN_LOCATION, it.address) + put(PlaceContract.COLUMN_TYPE, it.category) + put(PlaceContract.COLUMN_X_POS, it.xPos) + put(PlaceContract.COLUMN_Y_POS, it.yPos) + } + db.insert(PlaceContract.TABLE_NAME, null, values) + } + } + + override fun getPlaceById(id: String): Place? { + val cursor = readableDatabase.query( + PlaceContract.TABLE_NAME, + null, "${PlaceContract.COLUMN_ID} = ?", arrayOf(id), null, null, null + ) + var place: Place? = null + cursor?.use { + if (it.moveToFirst()) { + val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_NAME)) + val address = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOCATION)) + val type = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_TYPE)) + val xPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_X_POS)) + val yPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_Y_POS)) + place = Place(id, name, address, type, xPos, yPos) + } + } + return place + } + + override fun updateLogs(logs: List) { + val db = writableDatabase + db.execSQL(PlaceContract.DELETE_LOG_QUERY) + logs.forEach { placeLog -> + val values = ContentValues().apply { + put(PlaceContract.COLUMN_LOG_ID, placeLog.id) + put(PlaceContract.COLUMN_LOG_NAME, placeLog.place) + } + db.insert(PlaceContract.TABLE_LOG_NAME, null, values) + } + } + + override fun removeLog(id: String) { + val db = writableDatabase + db.delete(PlaceContract.TABLE_LOG_NAME, "${PlaceContract.COLUMN_LOG_ID}=?", arrayOf(id)) + } + + override fun getLogs(): List { + val logs = mutableListOf() + val cursor = readableDatabase.query( + PlaceContract.TABLE_LOG_NAME, + null, null, null, null, null, null + ) + cursor?.use { + while (it.moveToNext()) { + val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_NAME)) + val id = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_ID)) + logs.add(Place(id,name, "", "", "","")) + } + } + return logs + } + + companion object { + + @Volatile + private var INSTANCE: PlaceRepositoryImpl? = null + + fun getInstance(context: Context): PlaceRepositoryImpl { + return INSTANCE ?: synchronized(this) { + INSTANCE ?: PlaceRepositoryImpl(context.applicationContext).also { INSTANCE = it } + } + } + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApi.kt b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApi.kt new file mode 100644 index 00000000..1a4264d7 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApi.kt @@ -0,0 +1,18 @@ +package campus.tech.kakao.map.data.net + +import campus.tech.kakao.map.BuildConfig +import campus.tech.kakao.map.domain.model.ResultSearchKeyword +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Header +import retrofit2.http.Query + +interface KakaoApi { + @GET("v2/local/search/keyword.json") + suspend fun getSearchKeyword( + @Header("Authorization") key: String, + @Query("query") query: String, + @Query("size") size: Int = 15, + @Query("page") page: Int = 1 + ): Response +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt new file mode 100644 index 00000000..e3f34c03 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt @@ -0,0 +1,20 @@ +package campus.tech.kakao.map.data.net + + +import campus.tech.kakao.map.BuildConfig +import campus.tech.kakao.map.domain.model.ResultSearchKeyword +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +object KakaoApiClient { + private const val BASE_URL = "https://dapi.kakao.com/" + + val api: KakaoApi by lazy { + Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(KakaoApi::class.java) + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/domain/model/Place.kt b/app/src/main/java/campus/tech/kakao/map/domain/model/Place.kt new file mode 100644 index 00000000..643e5f4a --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/domain/model/Place.kt @@ -0,0 +1,14 @@ +package campus.tech.kakao.map.domain.model + +import com.google.gson.annotations.SerializedName +import java.io.Serializable + + +data class Place( + @SerializedName("id") var id: String, + @SerializedName("place_name") var place: String, + @SerializedName("address_name") var address: String, + @SerializedName("category_name")var category: String, + @SerializedName("x") var xPos: String, + @SerializedName("y") var yPos: String +): Serializable diff --git a/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt b/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt new file mode 100644 index 00000000..607bd9d4 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt @@ -0,0 +1,15 @@ +package campus.tech.kakao.map.domain.model + +import com.google.gson.annotations.SerializedName + +data class ResultSearchKeyword( + var documents: List, + val meta: PlaceMeta +) +data class PlaceMeta ( + @SerializedName("total_count") var totalCount: Int, + @SerializedName("pageable_count") var pageableCount: Int, + @SerializedName("is_end") var isEnd: Boolean +) + + diff --git a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt new file mode 100644 index 00000000..5b31d557 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt @@ -0,0 +1,13 @@ +package campus.tech.kakao.map.domain.repository + +import campus.tech.kakao.map.domain.model.Place + +interface PlaceRepository { + suspend fun getPlaces(placeName: String): List + suspend fun updatePlaces(places:List) + fun getPlaceById(id: String):Place? + fun getLogs(): List + fun updateLogs(placeLog: List) + fun removeLog(id: String) + +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt new file mode 100644 index 00000000..02700068 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt @@ -0,0 +1,145 @@ +package campus.tech.kakao.map.presentation + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import android.widget.TextView +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatActivity +import androidx.constraintlayout.widget.ConstraintLayout +import campus.tech.kakao.map.PlaceApplication +import campus.tech.kakao.map.R +import campus.tech.kakao.map.domain.model.Place +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 + +class MapActivity : AppCompatActivity() { + private val mapView by lazy { findViewById(R.id.mapView) } + private val searchView by lazy { findViewById(R.id.searchView) } + private lateinit var resultLauncher: ActivityResultLauncher + private lateinit var mapBottomSheet: MapBottomSheet + private lateinit var tvErrorMessage: TextView + private lateinit var kakaoMap: KakaoMap + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_map) + + initializeMapView() + initializeSearchView() + setResultLauncher() + } + + private fun initializeMapView() { + mapView.start(object : MapLifeCycleCallback() { + override fun onMapDestroy() {} + override fun onMapError(error: Exception) { + showErrorPage(error) + } + }, object : KakaoMapReadyCallback() { + override fun onMapReady(map: KakaoMap) { + if(!isNetworkAvailable()){ + showErrorPage(java.lang.Exception("네트워크 연결 오류")) + } + kakaoMap = map + initMap() + } + }) + } + + private fun isNetworkAvailable(): Boolean { + return PlaceApplication.isNetworkActive() + } + + private fun initializeSearchView() { + searchView.setOnClickListener { + val intent = Intent(this, SearchActivity::class.java) + resultLauncher.launch(intent) + } + } + + private fun showErrorPage(error: Exception){ + setContentView(R.layout.error_page) + tvErrorMessage = findViewById(R.id.tvErrorMessage) + tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n"+ error.message + } + + private fun setResultLauncher() { + resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == Activity.RESULT_OK) { + val placeData = result.data?.getSerializableExtra("placeData") as? Place + placeData?.let { + updateMapWithPlaceData(it) + saveLastVisitedPlace(it) + showBottomSheet(it) + } + } + } + } + + private fun updateMapWithPlaceData(place: Place) { + val cameraUpdate = CameraUpdateFactory.newCenterPosition( + LatLng.from(place.yPos.toDouble(), place.xPos.toDouble()), 15 + ) + kakaoMap.moveCamera(cameraUpdate) + + val styles = kakaoMap.labelManager?.addLabelStyles( + LabelStyles.from(LabelStyle.from(R.drawable.icon_location3)) + ) + val options = LabelOptions.from( + LatLng.from(place.yPos.toDouble(), place.xPos.toDouble()) + ).setStyles(styles) + + val layer = kakaoMap.labelManager?.layer + layer?.addLabel(options) + } + + private fun showBottomSheet(place: Place) { + mapBottomSheet = MapBottomSheet(place) + mapBottomSheet.show(supportFragmentManager, mapBottomSheet.tag) + } + + private fun initMap() { + val sharedPreferences = getSharedPreferences("LastVisitedPlace", MODE_PRIVATE) + val placeName = sharedPreferences.getString("placeName", null) + val roadAddressName = sharedPreferences.getString("roadAddressName", null) + val categoryName = sharedPreferences.getString("categoryName", null) + val yPos = sharedPreferences.getString("yPos", null) + val xPos = sharedPreferences.getString("xPos", null) + + if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { + val place = Place("", placeName, roadAddressName, categoryName, xPos, yPos) + updateMapWithPlaceData(place) + showBottomSheet(place) + } + } + + private fun saveLastVisitedPlace(place: Place) { + val sharedPreferences = getSharedPreferences("LastVisitedPlace", MODE_PRIVATE) + val editor = sharedPreferences.edit() + editor.putString("placeName", place.place) + editor.putString("roadAddressName", place.address) + editor.putString("categoryName", place.category) + editor.putString("yPos", place.yPos) + editor.putString("xPos", place.xPos) + editor.apply() + } + + override fun onResume() { + super.onResume() + mapView.resume() + } + + override fun onPause() { + super.onPause() + mapView.pause() + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt b/app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt new file mode 100644 index 00000000..8eeeb3f3 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt @@ -0,0 +1,27 @@ +package campus.tech.kakao.map.presentation + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import campus.tech.kakao.map.R +import campus.tech.kakao.map.domain.model.Place +import com.google.android.material.bottomsheet.BottomSheetDialogFragment + +class MapBottomSheet(private val place: Place) : BottomSheetDialogFragment() { + private lateinit var tvPlaceName : TextView + private lateinit var tvPlaceAddress: TextView + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle?, + ): View? { + val view = inflater.inflate(R.layout.bottom_sheet, container, false) + tvPlaceName = view.findViewById(R.id.tvPlaceName) + tvPlaceAddress = view.findViewById(R.id.tvPlaceAddress) + tvPlaceName.text = place.place + tvPlaceAddress.text = place.place + return view + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt new file mode 100644 index 00000000..868de2fa --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt @@ -0,0 +1,105 @@ +package campus.tech.kakao.map.presentation + +import android.content.Intent +import android.os.Bundle +import android.view.View +import androidx.appcompat.app.AppCompatActivity +import androidx.databinding.DataBindingUtil +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import campus.tech.kakao.map.R +import campus.tech.kakao.map.databinding.ActivityMainBinding +import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter +import campus.tech.kakao.map.presentation.adapter.LogAdapter +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.util.PlaceMapper +import kotlinx.coroutines.launch + +class SearchActivity : AppCompatActivity() { + private lateinit var binding: ActivityMainBinding + private lateinit var searchedPlaceAdapter: SearchedPlaceAdapter + private lateinit var logAdapter: LogAdapter + private lateinit var viewModel: SearchViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + init() + } + + private fun init() { + initViewModel() + initBinding() + setupRecyclerViews() + observeViewModel() + } + + private fun initViewModel() { + viewModel = ViewModelProvider(this,SearchViewModel.Factory) + .get(SearchViewModel::class.java) + } + + private fun initBinding() { + binding = DataBindingUtil.setContentView(this, R.layout.activity_main) + binding.lifecycleOwner = this + binding.viewModel = viewModel + } + + private fun setupRecyclerViews() { + setupSearchedPlaceRecyclerView() + setupLogRecyclerView() + } + + private fun setupSearchedPlaceRecyclerView() { + val searchedPlaceRecyclerView = binding.recyclerPlace + searchedPlaceAdapter = SearchedPlaceAdapter { place -> + viewModel.updateLogs(place) + handlePlaceClick(place) + } + + searchedPlaceRecyclerView.apply { + layoutManager = LinearLayoutManager(this@SearchActivity) + addItemDecoration(DividerItemDecoration(this@SearchActivity, DividerItemDecoration.VERTICAL )) + adapter = searchedPlaceAdapter + } + } + + private fun handlePlaceClick(place: Place) { + val intent = Intent(this, MapActivity::class.java).apply { + putExtra("placeData", viewModel.getPlaceById(place.id)) + } + setResult(RESULT_OK,intent) + finish() + } + + private fun setupLogRecyclerView() { + val logRecyclerView = binding.recyclerLog + logAdapter = LogAdapter { id -> viewModel.removeLog(id) } + logAdapter.submitList(viewModel.getLogs()) + + logRecyclerView.apply { + layoutManager = LinearLayoutManager(this@SearchActivity, RecyclerView.HORIZONTAL, false) + adapter = logAdapter + } + } + + private fun observeViewModel() { + + lifecycleScope.launch { + viewModel.searchedPlaces.collect { places -> + updateSearchedPlaceList(places) + binding.tvHelpMessage.visibility = if (places.isEmpty()) View.VISIBLE else View.GONE + } + } + viewModel.logList.observe(this, Observer { logList -> + logAdapter.submitList(PlaceMapper.mapPlaces(logList)) + }) + } + + private fun updateSearchedPlaceList(places: List) { + searchedPlaceAdapter.submitList(PlaceMapper.mapPlaces(places)) + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt b/app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt new file mode 100644 index 00000000..ed05bfc5 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt @@ -0,0 +1,10 @@ +package campus.tech.kakao.map.presentation + +import campus.tech.kakao.map.domain.model.Place + +data class SearchUiState( + val isloading: Boolean = false, + val isError: Boolean = false, + val Places: List = emptyList() + +) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt new file mode 100644 index 00000000..1d1dbbf7 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt @@ -0,0 +1,90 @@ +package campus.tech.kakao.map.presentation + +import androidx.lifecycle.* +import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY +import androidx.lifecycle.viewmodel.initializer +import androidx.lifecycle.viewmodel.viewModelFactory +import campus.tech.kakao.map.PlaceApplication +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.domain.repository.PlaceRepository +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.stateIn + +class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { + + val searchText = MutableLiveData() + + private val _uiState = MutableStateFlow(SearchUiState(true,false)) + val UiState: StateFlow = _uiState.asStateFlow() + + private val _logList = MutableLiveData>() + val logList: LiveData> get() = _logList + + private val _searchedPlaces = searchText.asFlow() + .debounce(500L) + .flatMapLatest { query -> + if (query.isNotBlank()) { + flow { + val places = getPlaces(query) + emit(places) + } + } else { + flowOf(emptyList()) + } + }.stateIn(viewModelScope,SharingStarted.Lazily, emptyList()) + val searchedPlaces: StateFlow> get() = _searchedPlaces + + + init { + _logList.value = getLogs() + } + + fun clearSearch() { + searchText.value = "" + } + suspend fun getPlaces(keyword: String): List{ + return withContext(Dispatchers.IO) { repository.getPlaces(keyword) } + } + + fun getPlaceById(id: String): Place?{ + return repository.getPlaceById(id) + } + fun getLogs(): List { + return repository.getLogs() + } + + fun updateLogs(place: Place) { + val updatedList = _logList.value?.toMutableList() ?: mutableListOf() + val existingLog = updatedList.find { it.id == place.id } + if (existingLog != null) { + updatedList.remove(existingLog) + updatedList.add(0, existingLog) + } else { + updatedList.add(0, place) + } + _logList.value = updatedList + repository.updateLogs(updatedList) + } + + fun removeLog(id: String) { + repository.removeLog(id) + _logList.value = getLogs() + } + + companion object { + val Factory: ViewModelProvider.Factory = viewModelFactory { + initializer { + val placeRepository = (this[APPLICATION_KEY] as PlaceApplication).placeRepository + SearchViewModel(repository = placeRepository) + } + } + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/adapter/LogAdapter.kt b/app/src/main/java/campus/tech/kakao/map/presentation/adapter/LogAdapter.kt new file mode 100644 index 00000000..d972bfef --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/adapter/LogAdapter.kt @@ -0,0 +1,33 @@ +package campus.tech.kakao.map.presentation.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import campus.tech.kakao.map.util.DiffUtilCallback +import campus.tech.kakao.map.databinding.LogItemBinding +import campus.tech.kakao.map.domain.model.Place + +class LogAdapter( + private val onRemoveLog: (String) -> Unit +) + : ListAdapter(DiffUtilCallback()) { + inner class LogViewHolder(private val binding: LogItemBinding) + : RecyclerView.ViewHolder(binding.root){ + fun bind(place: Place){ + binding.place = place + binding.btnLogDel.setOnClickListener { + onRemoveLog(place.id) + } + } + } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LogViewHolder { + val binding = LogItemBinding.inflate(LayoutInflater.from(parent.context),parent,false) + return LogViewHolder(binding) + } + + override fun onBindViewHolder(holder: LogViewHolder, position: Int) { + val location = getItem(position) + holder.bind(location) + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/adapter/SearchedPlaceAdapter.kt b/app/src/main/java/campus/tech/kakao/map/presentation/adapter/SearchedPlaceAdapter.kt new file mode 100644 index 00000000..1d49c77f --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/adapter/SearchedPlaceAdapter.kt @@ -0,0 +1,34 @@ +package campus.tech.kakao.map.presentation.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import campus.tech.kakao.map.util.DiffUtilCallback +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.databinding.ListItemBinding + + +class SearchedPlaceAdapter( + private var onItemClicked: (Place) -> Unit +): ListAdapter(DiffUtilCallback()) { + + inner class LocationViewHolder(private val binding: ListItemBinding ) + :RecyclerView.ViewHolder(binding.root){ + fun bind(place: Place){ + binding.place = place + binding.root.setOnClickListener { + onItemClicked(place) + } + } + } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LocationViewHolder { + val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context),parent,false) + return LocationViewHolder(binding) + } + + override fun onBindViewHolder(holder: LocationViewHolder, position: Int) { + val location = getItem(position) + holder.bind(location) + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/util/DiffUtilCalback.kt b/app/src/main/java/campus/tech/kakao/map/util/DiffUtilCalback.kt new file mode 100644 index 00000000..7694ea34 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/util/DiffUtilCalback.kt @@ -0,0 +1,14 @@ +package campus.tech.kakao.map.util + +import androidx.recyclerview.widget.DiffUtil +import campus.tech.kakao.map.domain.model.Place + +class DiffUtilCallback: DiffUtil.ItemCallback(){ + override fun areItemsTheSame(oldItem: Place, newItem: Place): Boolean { + return oldItem.id == newItem.id + } + + override fun areContentsTheSame(oldItem: Place, newItem: Place): Boolean { + return oldItem == newItem + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt b/app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt new file mode 100644 index 00000000..34647795 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt @@ -0,0 +1,37 @@ +package campus.tech.kakao.map.util + +object PlaceContract { + const val DATABASE_NAME = "place.db" + + const val TABLE_NAME: String = "db_place" + const val COLUMN_ID: String = "id" + const val COLUMN_NAME: String = "name" + const val COLUMN_LOCATION: String = "place" + const val COLUMN_TYPE: String = "type" + const val COLUMN_X_POS: String = "x_pos" + const val COLUMN_Y_POS: String = "y_pos" + + const val CREATE_QUERY = "CREATE TABLE $TABLE_NAME (" + + "$COLUMN_ID TEXT NOT NULL, " + + "$COLUMN_NAME TEXT NOT NULL, " + + "$COLUMN_LOCATION TEXT NOT NULL, " + + "$COLUMN_TYPE TEXT, " + + "$COLUMN_X_POS TEXT NOT NULL, " + + "$COLUMN_Y_POS TEXT NOT NULL " + + ");" + + const val DELETE_QUERY = "DELETE FROM $TABLE_NAME" + const val DROP_QUERY = "DROP TABLE IF EXISTS $TABLE_NAME" + + const val TABLE_LOG_NAME = "db_Log" + const val COLUMN_LOG_ID = "log_id" + const val COLUMN_LOG_NAME = "log_name" + + const val CREATE_LOG_QUERY = "CREATE TABLE IF NOT EXISTS $TABLE_LOG_NAME (" + + "$COLUMN_LOG_ID TEXT NOT NULL, " + + "$COLUMN_LOG_NAME TEXT NOT NULL" + + ");" + + const val DELETE_LOG_QUERY = "DELETE FROM $TABLE_LOG_NAME" + const val DROP_LOG_QUERY = "DROP TABLE IF EXISTS $TABLE_LOG_NAME" +} diff --git a/app/src/main/java/campus/tech/kakao/map/util/PlaceMapper.kt b/app/src/main/java/campus/tech/kakao/map/util/PlaceMapper.kt new file mode 100644 index 00000000..77d8f211 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/util/PlaceMapper.kt @@ -0,0 +1,21 @@ +package campus.tech.kakao.map.util + +import campus.tech.kakao.map.domain.model.Place + +class PlaceMapper { + companion object{ + fun mapPlaces(places: List): List { + return places.map { place -> + place.copy(category = setCategoryName(place.category), + place = setPlaceName(place.place) + ) + } + } + private fun setPlaceName(placeName: String): String { + return if (placeName.length > 12){ placeName.take(10)+"..." } else placeName + } + private fun setCategoryName(categoryName: String): String { + return categoryName.split(" ").lastOrNull() ?: "" + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_cancel.xml b/app/src/main/res/drawable/icon_cancel.xml new file mode 100644 index 00000000..eae1d2b5 --- /dev/null +++ b/app/src/main/res/drawable/icon_cancel.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/icon_location.png b/app/src/main/res/drawable/icon_location.png new file mode 100644 index 0000000000000000000000000000000000000000..b3782a34515b35fd34c9e8350f914e635cd36f87 GIT binary patch literal 101892 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 M07*qoM6N<$f_P$#LI3~& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_location3.png b/app/src/main/res/drawable/icon_location3.png new file mode 100644 index 0000000000000000000000000000000000000000..365df3ae100a1989211d9d122f715a86c856c526 GIT binary patch literal 6911 zcmVqP)$iUEvIpUS*XF0rEibld6*C?0n&t@tTxlD8D^Ok`;%D`v6MlY^C{HNCwOQ`3 zF5+nO$(KKI9S(3I9Kd?*GcT{U(7u}mJ=p**^F6eP`eX7hKZFL6fCyCy$d5Adt9+NU zyhe$ir<{RrqL>XzY5nPsf94A8^V&BBY@R!_^w?W|@^sU*XIR*!j)mqOho)(W9|DVu zDl`y=BJ|gZ{FWhS(qoBILe_OfqhtytN<1KCmuiD zA)INOc4;Jnw=MaOW9z>VJFZX31RdObH&vZ@u@lnTuw~d%N^3L;)qwY2OCL`itr^D|}P!(BT8wigkKB}JN5&tLF zk;Nrg8LSAHi6Um{`i$uO&z$@Hb=c$DlLB62U>lF|OXId(9e3>QO@kc^*{E+fyrp%g z&C2y&tXfsU=8gpb-5UJfaG@w-U=dI)f~^MF9e^zXW_^Zf>L*jA6MM0S26nl=!@It? z&}<$Vbte`_9gZ2{7TSi?=TX28s$hDu8PM*Lw-6vF-C*RMR7q4SxwrTH^YR+Mlt913 zVWHudT7JFb!?t|*5&zaAyV_#cz>%(9UL@T7&da}k8g{vMWdW~$?%W^nuAg3LTjZS= zKgU);&JUzQy6`wOZOVFIeBG@UaL| zJnXju{_C@6zdY``Qwv=OBSv?*6(9H0;j?j*&ua3Z0H>OOf!XWxfjj79cXk{IPX19t z5V=SH%;3~DTCmIYi4{RTDK03V@<1v3?Ac3o2k%;kyn6JD@1X%nCh-I$DxGNF?Eskiik|^a-~6 z{_0bo{NraICfh?X;0@k+_V?o={8*6Qq8G{+LooC>t|ywSFEe>@zt6U#Wd6)72T^_7 z-s8{fu~4Dj{hrMlNl5@dHvG`<2v=}?AbnkwmXYxRTh`B5v7rHW)8lV^>_cCEn0ybk zfHyvO{w$mNIo^F38L=THG#u*mgo{6Cjq+jYX5u+qf~o~%#|0{G0KUNpgAl2kYP;^6 zTs}8{#=?k!LyPXMSeNq92Ve$$#E4=%;%LmGpDA>V(#1s_I)#SmgLHt&> zASDyHXJ1Ydrh4V`!s~DH`y1@q*V$Ze>ggt0Vyzx$e0j$62q9L~wT3pTj3R9SD24c$fuz_fx-pYH{3s`N+Zu#!U-CaGb{%q*vrGJ00&vCi$VK(b;@Y@&I3a&i;+0Spl1J>4=Q^y%P&#(fX8#m1{jyfnwm7j+Q zMs9X-?k;kTj%qI+G&wrpHlGi>0^RP}71q|*?yCSb{ciCxoBpzxey66dz8A>~xu9r1 z4(4zQbV+uc5(_Q6KAp`t6s4Q2j0@ktGhTakZS5xPV!d|e)bbeesS!43g=v~1(A*KR zh;F;DgiD;Mc#FwzJdDW^h!WoH`&&0MtvtK7Ue0CC1-fQ*deq{wCN^L{6oe+woG2G% zXe5vaYVNZ0w&PO)p4oK5A3pKa?|yy)dsyzT=h!0F-<-`ZFXp^VtOQOx6#a@4va=@< zK7+>t&pXUn6jON1kVE8KAA@v8jvK#IEI@XDpD+4ZRk?3-C)A=#HAD zCB1F4;M>!g+^*i*UO2JaUBBOAB`mSBFCS@}>s6p%zA~OmyBV++ILW-*AKm+i81Z$qXn1aljMbmtCJtXSCnK%Ua=+ z<&bcK{rD=QI!Zds)}~QL&H=NTBzoA5aP04kkV=w9D8PtIkM+}%G*tyOa8}TljSSVu z3}r}}7X+Pk^EY;9Iv_*%o=tzdpI+xLKEI#B50wC2|2*T$q<2n{jV{%KiYh@FDGWec zWe|D9-(3l3<`nSyCx7!fHml_>%2!y*G8h6o=_%yKZhR8Gg*veS-kEbNd-VC8Dd8_C z)HkOXXV|34$P_p~pt~~4A=MTu(9#pJ@T!QV*FX5eYEb~2*Qt^Eyv2NU!6|;AusREW zjnY4l_fnXUP}k3{yz|pvya)%pR{rGAuS^qNnQ5q1B1I)7BCoQN141n@si{a!!T5o4 zgm)JOFx6OX16gC&^^mSb^2De3J>MmHn3#9>YW}Qi<%|e-#dSF~fV+D#kR=X3ZiXY7~Py1X#{tZXji~ zHZ`ja$CGDUqnMtGYHDktuhgSF>oX9f0K)7Tz%N~aLtZS#h9Xp?f{{X6LP%bh3{1e1 zpvgBuvrl2U$64;?xY6BOi3xsh=ASDGvKv}K!fzap@1!(=LtbsyUDetMnDprNC}Txf ztRiv-kC*6RNNNcL%MH8z6NVsG+A78PN-UfcIH*u0`KlPDoIks^eiaURF)x?|&?`ej ztfew49}CMjcBmF%`I5ZBR&cCie}9{yCOVXw(2%3BQK~!WfM9xXtdK|mKc*E;wh+n6 zQiDv%g)StSs+D``eMzcYPXM^-c%cGdSfa``w&sYb0f-7H2tTG}F0Z!;er^=;0sqI# z${PI~0~9KdT_EZlFsRd)0*4AM)=;njN=#Khvc!DrgD)(@A+PVAdEarZk~Cf@K&Z7e z7u?IzNM2inigC&c6%R~k7=#R{Tz`NE?rAhAXRGH)eKd7=91eLkFkWu7H(^_86wd2L z1Re#dH5BVNIWa6dyX?#X!(H_4?}pw zhyp5*RgeZ~IKOT-nbP+|z#OG+s-2mE)~G7NT0TwO5Z(=kyqb1&vaJ?S0s)m!AS-Y$ zb`h+n5P1&e8=|)VCM(ZE)ljsqA}gB12rBVZvMct1j&M1$tHW4ZzwzSgxWQvB*DPDK z79HWBC|C<6j_9RZZ_6D_MKd)YSu%7Mh^ z=OTd}RDMjdNd_gk$+XBbkB{5S`>6yG{%s2jms$AZW1mfEEb)_uknI``h|YkW8Xg9# zCrP8Z5v9>?^V#){n~iJb6*md+`cgER2nsF?T)@?CpR@Cjcq==zz$eG;>1WGYAS6s z^shh&G37$@<1WSt^h8?e9!sKa#kJ+_F>GzU_?~lj`h4+S>z5|5i>15Xb*I_a&n$G! z(x`FagYiOX$rW?QLRT#1HTj`Tpc#f|9lJ}t6>(GnZ3~y!0=}fh4V+7Fu%O;R%j9Kq zd&|vCm?6uaS@y9tG?iv@hxQ!f)vvtqf%jg)rdxaR3x9R(L4v=2<`l>H=DCIi@49wr zp|vK>D8}#f=Q7UkxC6KrD=S-##Er~KWQ%qBRI1oVvD;JuQsuvdOvqLwQZJXdp4sV%+i(R zuYUbRu>jr3ls0;7R&$fh3G$%36wQaSaJX&b5m*mFQqUt+PZ8c!hzFjs94LZ)}2C$3fI> z2;I!(VKXRdP?Y){e|*ejC_F^T-WxeUbxH-*0erwRZKq4c$A|uR{pAn;-_cRKbVQo4 zgmwZtjFbSq7pFr@YI-RKmPpUnC!K>wP-G%zBRV{*My1tP8@REgqLFbBwE~mg#;Tjh zW3U`2tZP{0tX1qV`=W#d;T}3Y#{G-iGcJdxe(Ts*zfnr~b5mk{rmtw@(Z~D(UvY6t)^v5Q3l!6xs2+}SFq<4kaK^jml1Vt`(%RoWjO$Oc@3+;g&NG|5Aj-M zln#`-Gw!Pepkm@ggh?t8+Y}=4x z5&CmUTtF_kfQ`H5z1Ni36&XHAjUcv+$-NN28mz;d;gO}M2Ru?7l z5DT?Q5Y>KY8hs+H_^X8+s__?M=j)Hf*t42FA{1Qp@=8>7q2T^pZXe1(r@3*jug=XU zR(3e;WpZknS06a>1WE!e<)DHcF!wz>n`aDSFRg>1H}zpOIa#WYwa9 z@DR3ocOpJKK`7+OO~J?Ms9K9g0}ofF>zsUWIvF0M`dYcARIx(wA^EsYvao3pK_46U z7Y-nwonG0o0%RVCEoWnvv(G~#MtcP-FGjk{g`5%xdmAJqR0gUVYp_^qmZ`?oQm>3pBt)xOE4 zb&e6Xs<=*!t!-GSF_OD~uKo%^rvn6mG`*AO*^&o$ED8ciFkkO7kaKIykrY{k!KiFg z6tMJiI~&@}bn$*-B0OMS|LBX%3A&}lR&oR81cLBlb`olmW?B|^%>*GdACweo(o#rq zjiV*k^5~9^Gl=!nN{->7#MDp@VG<9MB#i{}u3S)chpp&`vwrf#EC0N5KN%l*!33Z7 zg_%x*P!0cupcE9uI#*!-VAKww)L32Tozwh?B1 z!6->*7WC3O0YP~1?9zj;80q^p&JS)T&+k1i1}xEk-W~MOe9$h)NHKR*Pu@VZyk=k) zVKqi^g3~*Vrn#J-D*vZkY7=s5y-VgkCqySkQLtmZo zX6ay}a~Mlw2fH3Ru)<-Dh2bI&j#RQ*pF^nE43V|pEwNE|alb>$_bC)(<*i!uK+guz zt|1~zdh{lacm84WJyZctudQ#eCO4##l8Z$TaH>3>Ys;GsD4?viqibk%J^()I6p56^ zaGgr8<+uRStg#J(iTXfConQyqq^w1cKJ`}~w);C$fC`f6{M0ygz#R-U0F?|@_KF1( zgW>r#u{1<+$BbymWTN>@FWaDF&QaBI+DnCD20oZU=mk?CE}N)XhaD`09j@zVPHi0> zapwo656EHLfD7mHa>*42;8j_l-;@bDpsCdJq3uT#uDc?P6AFraD;TQDk2C)FO}Q{4 z=gAX)`>mCo$hG5ZhkHmDB&-+~xNm!JK0ZT{Hk5BU4R(p-gc~o?1z{P^8xM}6>JQw)~!0%Mdq`t`4c#KL zrn1|y$|NU1q`ubqmGV6p=T{4WudICi>I8PVc5eZ)y72{e0m%~#vcUb`G(bMK295`{ zmljch0vqo>u$uwZUALEmNrDY%J03dlN#SFQRkIFzSbI`{T0u{u1c?Zkqt@X{@FpL) zYYcLHD7XOOIUz6%A_j!q295+3F92fB*^yt*fiCW4_xG#-UE{HU;Vr3)q~S@su#KBO z#TdF*)iCNp^Skdg*C>40)#TA*j42N&de9Cp3on08CvUyu8{a+;dt7@~fTzmmx3!fP z^c+iCK((Y#5e2-CfK?gxp6@UXV<$OsR>7$Npcbas1Qdq|_AI;~_|ew?e&~fQ?j|oU z%8(QUi%Z@^uuhO&dz5^zqE>pMjn(8p_Ht>yj^9x*LBA9r^f6^jxXpy@cBaYOzwzxA zc!afg7w|R9{rhLh{4qHY;K1Zdo{Tm6*A{b(P?S~dyrj=jKXKwDq=yL)O-Z@PBkjJd zM^?bf=l_Pw=Oj1vOCMcu7ii{+C&mcjuF&V^j-k1*_e?nS2X9Vr%%`a;fv&Fn!@sY? zBd$kQfGo}w&u{DB_mU!{#lSkXYC9ZPcbG+(g-~4OHH?wY6pUS3ia~B!$#xw@*?rqR z5Bsq8MFDOF>oX5cmY~|ved+^XcysW>0aL7iM;<;REZA$3?@6@jHS}?#V~=6)?zJxp zkd?P*FR>MHWRS3Eg)XDSH8Q{;aiVG@5J@Eto25{5EK!2E*EV|vGrmb`N003LvGz>? zE9;kT&Nw7(8&Fy28VB}WK@kSDr!*G|S|{R8Gp=~E=|kUjKL`7~_FVxhe|qUE zgW=k?mG))CN%I1QwLu;*0LFU7CP0A+nkG1a#kd=El&yC4R;DHEY zgQwnSjz7}TI9)CXsIkFo#^Uorw1}pOCda<{pXcBJ)`2KM0Fhn(d5#K9TG;iiELL_M z1Kv#;WmG0IMez&i>Pe<|M-q?E=t(@ znp{o!1x9|7$Z`;-A8X&Ez}@S6@BhWiiwLVSeme%461AjA$K7JW!~dQj=qOvlX)lQ1 z!<{}~ddJ^i-517pzja_15UZ#5`E6o6$X2|_(M+)mf4zL9exXrA{C-FFAdOBiDBhUzZi|3D#HF49HZ(0hk6L5oa7Ucx-sISS;vh{w)`2TP7As*gh4dcj z+fB8xBEq6FJfX}2coORF@PjvXZlYN|4B=%RiUMS#mR?OFrp_E6 z_%%U%xY+}pdi&q~>oqu}b>JX)_u6{jFB~6ZdS!%ktg+E}>h&)~_t!b_oqYQ%hbO$O zLsx*TtrvcN8JgKyj&~=80Llz+(>H4?mp1nOZ;(A~{XfmDMEXqXr`iAj002ovPDHLk FV1jRlE}#Ga literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_location_resize.xml b/app/src/main/res/drawable/icon_location_resize.xml new file mode 100644 index 00000000..f8c25aa8 --- /dev/null +++ b/app/src/main/res/drawable/icon_location_resize.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_search.xml b/app/src/main/res/drawable/icon_search.xml new file mode 100644 index 00000000..4b45fe81 --- /dev/null +++ b/app/src/main/res/drawable/icon_search.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_search2.xml b/app/src/main/res/drawable/icon_search2.xml new file mode 100644 index 00000000..bd1c6e6e --- /dev/null +++ b/app/src/main/res/drawable/icon_search2.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_x.png b/app/src/main/res/drawable/icon_x.png new file mode 100644 index 0000000000000000000000000000000000000000..0f88813d12228a792fb6c6f344e519a3399f8888 GIT binary patch literal 9496 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 + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/searchview_background2.xml b/app/src/main/res/drawable/searchview_background2.xml new file mode 100644 index 00000000..bd5a8698 --- /dev/null +++ b/app/src/main/res/drawable/searchview_background2.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 24d17df2..cc37bc75 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,104 @@ - - - - - + xmlns:tools="http://schemas.android.com/tools"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..4aa3fc52 --- /dev/null +++ b/app/src/main/res/layout/activity_map.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + 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..d3c7b78b --- /dev/null +++ b/app/src/main/res/layout/bottom_sheet.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/app/src/main/res/layout/error_page.xml b/app/src/main/res/layout/error_page.xml new file mode 100644 index 00000000..d93520cc --- /dev/null +++ b/app/src/main/res/layout/error_page.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml new file mode 100644 index 00000000..86b8ce55 --- /dev/null +++ b/app/src/main/res/layout/list_item.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/log_item.xml b/app/src/main/res/layout/log_item.xml new file mode 100644 index 00000000..1615af83 --- /dev/null +++ b/app/src/main/res/layout/log_item.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 05ed4b9e..b9ad7b3f 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,6 +2,7 @@ diff --git a/build.gradle.kts b/build.gradle.kts index d6b55841..6465d171 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,6 @@ plugins { id("com.android.application") version "8.3.1" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false id("org.jlleitschuh.gradle.ktlint") version "12.1.0" apply false - id("com.google.dagger.hilt.android") version "2.48.1" apply false } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 44866 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 G^I3GVOfiq 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 delta 40255 zcmZ6yV{qV2^zRwlwrv{|+qP{xzlm+zww;M>+s4G4OlF_`->uzyx2j)sSD$wW-%r;$ zefa=BJO>V`EC&t&mja4_nS_T93YWy>0{TBEWC#!t5GPkFW^j=I&tenve_f_PfD&TE zfq=lk{AVNrl18~)-USK*f(s4;!knU#iIp<;@gh6OxJ_@w?YlCiNH`zc2M)v1`#LBlR*>wxjtqEW{AUv-^>%_Gy*^7-3w3s(%HY-OxkD8e)TeT2S z@O3PN4+8GfSf_}rnrSeG$6Xx%sO(R1s4Y^{OOacYVEg=r8$VFDUG`Ywv*;*rr};q@ zg~uCIr|C~BJSBa;D3@0?M=@1;DP>^QcImZsN5j6VX?$r!lZL}vtNty82GjkqK~*gd zXRl9nQfc0FjhmBbYLBps zZ4%8pB4)qoZ40a}R3w}fNz{BVcSTEl-Rb( zuUBnA8ES|jK|m-{NIkfKZ8dZ)oPUIFn~e;StaMSqO`%C|KtDgBmWq z#G;DI^Hu zd91CjSsA#&74B+YitO)blk^DRu^I;m+ZwwkEon<+9p`NlAv7kdQ+8vRvumS%aTi|c z9?ePWj6Io5Te^e5!DUZ-d-KrkGw-zP6jI-eb$6Br$M)eXk60l?Jpy>t^%di7d^#6L zOXeJ3yCc@PV6B=%oSBhb#8ost@mw2TC+HgG7K9fu*))($?20ch1Ts!3FYz9KU*Ah_zg%>xq zqeEGKuXN3(+Hi$Te~fF|FTs+!PE#~@SFWb)bNYD4EDP9J(kq(Y!Qww&`)mVw~&!ZFlJziS5}PF0l@2J^%Hjy40SL0iM{4_3n5 z84j3YYV(@9E>|bCn*ygrD?VWNSFEGc4OZP&)qn(y4&)$>4(+Z=eV5q7HO`9r;ra)S z3H9snIAYWhKu`1__YZ@D?;d`Z-(W`AA4CQd-;)n7(9^Lz3pD^XkL}usr#CivlDZUf z=>|*I%}P}Hd8=a&FISpQi)T@LtCCu^K|jqHXB3k5#hYEME5>rJ`7~103zF2s9@3{) z_{jm)6GhLun|swKUugXJsIf(0@s2t4G; zw%iQ^BjDmCX-3D*^^XiB5u?obH$ z&HRJeF8QYOE&jfbryDX0vL@+GDJADM^44mP-ZdMvPV~W&x(JwGt^CLQTrU>?35cbN z{Cw>xRJ$m3V;0$sKzc4J2;_++k4KPbQ2pX|L7|N96J6XVM?~Ez#s0y_~`M*hI8912? z|9_IY0sWs~{wI+{DZYL*z^)p;2FAZ#doK8CC{<~i)b^k4oDj0rnysaE4nfw|G-=8x zb$l5oT=qRTN0#7!@jnmLj6RE%6pj2ZV_{aaUKOl9vEN^c+4)M2Lx_*ZW7*@+4Tq#E zelD|S<@&wl`pw;W3B8^T3KQ>x-y`g?p^n49SP#O|LX}NqQYfw+0;y5U-c6vexk=eA zRC6Ykpu;$L86b0{vot~&1sgg*1k71Kh@ykvbR zPhpUU6;D%{CYAKCQmH;9IPs2N&Kr8Jgb5i;pN5;*X|j9u5JMXEe%Ss^)_$u~W4MRd zVfZYK1cwE!2K+p;fU{5+e9(CCO_nJPvJd6aR%(ZVOA((i{g;f;bz(X19cCB%Xn>y3 zdg`I^Ts@0BQVf0X6$HP8Wuq%oofuMsIs|X-R@{2gzeve4nN-_$(SZDc(GTm(b9Nf3lM&NRJoUH z4BHl$nnKH~53`p6&M;jq*w+=YrcL`Lpjlvx{jwLz$?tOKed4898^(T~63an-({#0n z)@MXvw9Jzm!f+tZBfCi<`kJogKx2~HPA+}%h37BY!cd@o>q2xN*4Bcf2{9i7frN0= z759B~7%T<@Krn_HvzKFqD6iWYN(;Wc^hlTHfxm_DCv~l8se-!N(Re-vu|zzV^*%dn z-DPtKztjFeA$;cF1s`Q!6t|F{21XTMUjpkMg08A(Wx#kxm|=C>Z#IG&#AMNuhe!CM z+iK?+vgMXhXU)9ykR+c-L(+SP4*8IdiM(o@U!r+Rz*#$AJt0ZOyXRn}nX9!_ZhPGd z)w#cu46eCtTuwMEQ-o;F`T8lssjF*vt543>T9e%Df<%W2!3Z{9_UXvN%Q{0u_*!Bv zzV5L3egZfJ^3pQHC8zFj6=tLQ9h+!XzlAle1MVUJR85LGy?b&&${lv)c!u?eR_HV5 zVNl={K)lOSTEE>nWMNC4B-UE7S$o)*022^2SpS)GXR351W?e8S@6i^nRhZK21FxbQ zo=r|Xn3;a2gqkA9jC)ti1U4zFR*N)5@_}gZx{tQzmAd;D`V9VgPp)`CJ<24J3+oWF zOOh|D+JrBTtRrT-UNiTyXc&Q&(3Y6J*MN5lKyyxQW@cU87>WeUxSv5ihX%q+Me6Vr z{fYojb`v!UlW8@JxGN?Ny;K*ipxcvNF8qcqX21P}!@Jv8IRF=5s4jbexRU;sm-rio z_e39m$ld%;hB{CR3NVHMs?_7ryClg9%EdjJGu)cCVf%af}^xSZ$o zf3E)USwvKswhL}f-h0rNx$a-|8ICEr+~Tj>KAIQF_kl(O0r zIVZTf@}DIRHP$InO6BDni!j2SAp_m?6`<1U8Z5(s$q&gfR@Wg!ck)qZqQb6mq9um{tEdfcjs^@n%3_>4 zi^arbE7}gniM%9h@bYJQ`r4`a+ayE@f&%Smtm=C?;7B3oUtQ1Y?h}xt^{B^NNo#rU zj$+|#>AgqJ%{&w>Gp$R9!;PpRhdLobqNa3V6K)ItD^nx#7rWzB)Ow5SShdCghgiki z3>lP^543|GIKu5Y2<}K{K0BJM_Gy4SQ5RTlK`0c5taqdo7?E7&AUdoPDk=-T3DOfn z+^L2w&cHh;i{E=EYB`TS*cFDp;wb zia0w`7S@*Ejt+mcrE2?(Yt^S{C)NEO;{a03;FOEZM9nNI4Rhk5DJFtGAN3vy-N(w!5RUCP#D3L`r-jq{U9sIA zA$|IQzdrg~VSW+s`g=_mu0jsa-rz>0NBleQpu~a2#LzIu*hlXU56|csEV-TGiqWoS zXa=RML!XNZ*>UWQ>Mpz0k$**YAg{*c;zUKrDICHa8<%?)ondHB4zn{94@?5#_hU4Z zXGaFa5bDv6iICiQFZQd54x`F}|1+m3Kqdo^kwHMTNkBkI|L>dvn9S@=+}!GPVZHIk zJpvOTn&g~)M9?TNLM;d}kQb6YlGE*ziYcUf#S>F$b&|CPl0zX)4@X5Y@_6EJC!%g? zJngAna?2fa{#!grxiF~`+p-B0b-P@bsBhBS&(aC43QFsJ$&LRIutL0^aX)1TrG@UZU%F~?7G*7x>p!i-v(Qu~i5qOqhQro;W3Db~1a227|+9+`ji)df$P+z-0kzG`; z(r3))6jiMoGR&Nf5pU7vkP}y<&Mqs~p~5Q|n#MFNdXz=JJ=e7l)vD^<5~KEsn+i;G zQuV1T+yf9Q9{G?FAAQrfy)UkNRZe}wxM5X8rsC+hX`gY!as&wuu+p4R*|_L?B@Xp8 z_NpJb(mHB-#ZL2v#tcOLYNj0M_RAj~)7~omd#1c9d$kzswK~NP1LSpCh`4LxGxO!~ zWXd`J#G(pfw!CGbKV()(eKNSMuq98{TQ6}9OaLd4mpdnWse+axx7OMn3Me(uen@Z6 zM7O-0E1Se{udhGru8IEE?x8IomoSoUM~_KuXVUS{crUFTza|pN;nI1rX|y8$-rwH@ z=r9DrQK99cuA-`{8-Bh00IX=-tB*;{Gom90yW{ur^XKA0t$8?6Zhqeo67Z}N-dw?j z^8u_a%%P+BcA5Tv^Zed0EsR~qXBJhO5-<(QIk(tsFOxDC*-S2@LQUG-CuOv&jdw~C z@a2h~!x89lIgjNzqkO)tnW)Yse}|aAIV^gw>(oX2LFnMyQ}O zwsVv0$XtglpGK;OTyVLDKIga+S%MX%QjmnteUm=;U06bC+kTTUhEOH4NRDcPr&^PU zNsGgp?8))_qMA-W2I4{hn+wepEyk{yFT`cL@yHheUR7pzi{F+pyJ1%l#Du={EkAFHQR{9PN_~}eUEsfo9^U^4M*!38m7{i zSoB=Jd6|eSWVQjm=rSz7$$LDg70s$<;26?J%b(PY3MEE7?kFDPMI1Yq6<+(!xX$O>xl^)-raJjjR%T-g+_T z5a4F#!bJS?r;ft74|Ox6NQl&B5i$h>Q@WNh`?EIZt-ZDs{z=BGi!f^|iOAnFam97R zicV^nKW>Ff&T4HpITK{WPT`iWHHlCsT6-fHfQ%K?BfHT4qMO%^83R{O=>zD05GBX* zKjQ4N)hy^_cZibtXXO5v=+3kSMLtxQ?}!`BrC!5I&^&A}J3m6hUxf%&%*66MW<;T$ z4zh6xP=O^9!Dl-{b#YfWhe8@yn^Qcsc4W^AI&x*tQrfW#Q{l)@%xWGAr_uZ&juiza z8ZVi!0J$hovkoIK|B$a2rF z*LsWQ8!H`X1J3_Q$_U6#2vcPr+ggxM%9(kj*+(p$_60@pksE!8R&L-o9>^aV-Kh zgTh7Be|_M=hi*cL-fZn%RLycwHC5kh$Ix>Z-g6^ovb{hhRwj17?3E;X_T9v3`9>0W00{cmPirBX-p9fVL5l1M zc6uR*eWstmKht!`|G3coFxfjP{=0OT{X#BUB*zSD~w^}!7g*&^qx|Z~f z+r2);2Rj}h3K9fyF`xro&uMis;Ot?^BP6FXV@~462Y4^glU$=UYSk*W*D8HpuTyWI z>?`;f#0gIpfaPL}WFPeJI5@3}l62#~73nooUi=_ZEH?Ebvj6q&K}sBZ~uT(Sm~N)Xn#K?}ATq_$@(5 zr1oB0A@EaasuIK21AZj7#;!Ty`v!AMFpvtZE%}iQK(MgLSps z_4DGu%@yQ*V*UsKi*QY6pc4%bgw@p6xG|0G0Dlx5URW&l)*j9MA7KqUy>R>MdW|T zPxca`dbruCXj9rc`lDyi zL>N5}Lx0VWB`cDI*>dOd8+93P{gzh~bMp%^r69|LOI0t91) z8%GxYe#FC{$FaNd_wU{ZXqLc2;~UHdvkSjb{49T=8-WMaunOqjgoTL3K!_3%I)EHI z{}eH9XGK85Unbf|oh`l4fi%srXnetLf@SIWS>+?IL!Zuc6TMp2T#1H0jgEO1@c7yZPqp~ zwVb3Exa)OA=uP7_EEIDvI(jHACm-5Wu zeWr5MJ$Bi04=r%cE#JA7U6!vkZ~6L4IB1Mo-+C&2#7938ruDNGWS8eebYx@*D2-w2 zW|Y4alv6SFr~A6EG# zr^%K#mGls=>}ftPt(>WqU$ooRt&WD#h(o?9Tam9M0)a5J-Z=WZ(i=h)mcpDWFgE-@IdH`}B3S$|R`_jjI00_L z3YJ|7a(6Hf0Ikg*&c>H}i8a<*^1^4vKTOgld+Y*{4;&xunXo&fUk)n(nZ7>(A~0v{ zk}!HW8=|4a&j(!xARx)

$|chPVR@j{Ne$@@WnWOc#pdglpYbnqRa^G=aT%hc%Yu zeaQ7WQv&S z-Bq<`n10M5tTIoGCSRX*XE}4X-yKG@*&4QX9KS>QdOcc?HyX#d?b+Z|_!H3wjaPATz^QW< zXl!5w`X~SaObxeUZBT*fLl4?DUC)zRKmhCkn4pu!i8AUm!+V1NwN#1|2$6y|u52x5h~<_a*4PTB zwZbROhRfpidY0V55XOH=QZt*L?wXbvb}pSCneNmv;npvM38FTjLG&fWlf3`s2_+t2 zKQ4g+yu+0h>84C@U-5smdKRU|7b<_M;F!_GK`Ub+7qf)^`W+0N9%Pnn7!(Qucc<~J zU&v6het}2E14V3QjeK5XAc$d3d=;ndIDGong1O7+?_HxZ$c3abZz2~p>E#B72eu(E86|crO)*r{Ah21 z(zfHUdORg-wmUIpGP^qQ2|xwyh1fO{oeh9=_Tgn#<2tY1XK2C2X43w$dkicBO%4>y zpv4>!E~T=$lacQiapLm~#FrH}&A*Qy8e+Q3Y~`Y>ec20XUp*BhC$iYf^zQ6C=B!2l zSRVH=@jMSzu<#_aL&JB4o-qpeIcmAW!|iqytW(bxFr$rf-IRQAJq^RcmOHKcg5`E= zDudUZrS((%_%m52HgoWyhnyxRtYJo+ruuwbaG}#iv3P1 zp7+Gi#wUe)DwfkAFQ?y%y7IW4zO~N#aEW}r4(UNOqafk(i%i+`t3*dzPVVh_cj^v! z>F6lBz~(jX0RhPQw`0h_US+ho8gEp?n{l}>@2X%w^%dDMUH!xuX0->`UeQ5%jT!gJ z2Gs}K9eR_ylwrG*dtJ=8V-GmPyK($4?-IBmZd&h_=rHe?Xh`px;EpP72GHN*;BZ9G z$G3Dt-VxDWM+T4AyRO~|1bf%x62eSXl_P&nzW&k)0Y8zeCycd6VTe>8SR^t1r3WoA zuU#ZY4LYyJBTmB;-XByTiBk%QGhzyqA7uQi;R?pAFa*eWh3QFUz6pewBbY1S$@)u= zrr)E38>%hhN_Bg^d3xNT!H6qfRJ@dT<`Y<7HPvam z8ix$50GjMs%`c^WMhO*&LCTY_?XP?3_0oQNNEJ-e%~nQQeopax4L^08t4z%pa9g-83$>rZi^^|%#3g6NL7ql&Rc+~6FalP)DK7jz`tEUQX1x+mEgZN-oNrz%T| z0Ja@*+ARlqYYUkp5`whFxvvE25reCdLi$qRT4cFH%2!P9J2Hl=Oh-pS99}&yT>sp` z#oxc9jwqe9`Z$S0S+R9jvaV@{$|HNq1an)pq91JKVR9Q^E|z60j2Wmh!;V`W9Wi#n zu4mXNesh!#f9>ap9z!3|95OcX*43)Gfa7;A_PiUX4uUi6zYCWp9OG#37znNA{&YkCc9oK$M=^%M<v3Et~jFb@I2<1=rHpGJtC`s#4w7Y4Np)7 z-FsX3{y_(ro50Lf@+l9|`JpHFobqYfQqeE^=L4L7j=MzmGG(z4En~_4zcPl2A+7{7 zJDN4i>=jFYWjfc303!tutzQDgfXweX%;QtVp>Lf*BaSajVENt)cLzAg4hN3#rib%p z;O&xrXbh$Uhx@MkW^msnhb~`QMI@vn7!s*AL)254Dn+mo?^#ORJR;94-ikL0)VJD0 z6O3p^>b9b3y6^F7J__ov3dU|V`SRJGmHUNBu;DBiY3GiS-*AN7b;@f1HR;;Ng3Gjg zXtBM__;V_1wNY-hkxF93?zke3iXOU}L>q=yNu*77CFXz6VjEMwrCJVdp@ZzqAiL(E_PK2Ojap$H%gcM8Dvq220xmznGc4jW41^Al2d-gwOQ{Sffi;Tw#nfQ!8Ky6 zFnp@zRJs|43%>a^AMi-vw|-SlWCSf+Wrc2Sko%DI7J60saN6HTZ+j94R$lCkl}=SN zb7mSZzDM)A2m36a?cAdQQ96qYjX5zB$jt?14(!a|l#+Y= zOP(>cI6=;=5CM(ON5AFpy-AQTyhJ-tYH4kXQf$w|ps-&umyErE{bk!2ixkiI@Bu?e zk6L=4daP6>sh_4inhVcjhBn8vLv@?^c7~MeNp3Oc8s!_1aYTuu4%I2R7#UhEeC1~& zUgb+8uBy5n-UPduT4!hS-A&I-y_EFkn`P7d>6W-+E(UwpwHP1k5!9Fl%rl>p4rN-l zV^xZE9tstUT+&u$TWJ>iq4ae7yFfmc~TVJAM#{A_aUhJdSDmCKmN zAwt!d(uc4Pf=rRD>da&AFnULfIzvv&Dfh%5$2Lq=k`AVRgkk_JS{4X12%+PnTqJh0J4+ z%8IL1VV8h5)7u(kKpd{TQ$5aLtR-b-qAqK6mU$MCHh6;&EK)yX^9ucUT8c$W@r+Z8 z34id*lCzR4-c-b>(G?@u?4bOIH4b-zsfp2oaI9W?A=2^! zl)4$Mr3vnt8Sk1gBwthVUT<2w_U!qrE>0(+RTGht82j%r$y}>gCS&;e!c~{u#A_mg zp*%(4M)E^|Pu@$DEQI_kTNE}U(jCVl^@+rtfP9^Z0#!oTATU)QDxRGHDo^OA2u-R7 zbVGau?)cNn5riVzE!ay8`JgieAukx!uaDOWNnY7n+9ftVSB%5{u^+=Mcv6k2LNm$f zXGvp(stTh&9V*43(--`0R^+kau+n}$d91JkvT4lywF7ONt<|Pq>0SSruqfB#drzue zzraK{cq7vp_8FuO5z?QWBnoL8*+TRpnyPW?`H>wpk>VQ`8FotC^HzGe3oRS@LO5}2 zXAjy5k&SK5F|PllBOSliU@Q`BBo2=KVbMba&+*S_>T0NMvVzbHcNy2yo7}_Nc>eh#g0{O-4XX!=z*)2Et{SB?BSwEe%vwK$G`Qbz9<&(MQ&LuI2SU`y zKOy6Ssu9|EV=f&}crPak)v5)9nJ&i!ntPSs)M|rxXWCr6n4Db~Fm<6=BTV0mXQOor zFx3R3Z^avmDot)^;^!s>IFZAE&lY_w>55!`XQW7Mg4n>BRu$h9OcVYcNgLn)XKg4SU!o z|JjXVIN!WSavbN4-q71c@OH!~|E`(eUq_(Q+eg6K8_A_( zkjHA95%U#rsF9~u-Zt5MklxWW3&+B3S~XW~ArCOz2eOr9zYa|~1;wta+pc|=V1s0p zvWl`Fq>)iGT})y4#C&Z>WrI%3T3d5yr8p7Fw@Y)nTOfKG1Tiz-|2qLDCkfse+*L?B~o}XwTQ$3d{9>TL_Z8-XD(^G1# z%f=XR^t8ALob2v@$((%a0K!DJ!s|K4_=^g&q9UiAD=V-w1s^y0ckXpf$0xv zly=VvX*A9Yxj(>7DNuZ%=dC{2!Ag6`57!@a2Mdv%TzyOPE)@7f@)YDpca6>=GUb=_ zU_#b4^?Oxl0qr|)V9|jxrkH87j4*5BIYjKU)0~i0NPW)_ z`%CK{`b%Xn_?TH-A1pJpQj^|cq*`IRN-?M7deT<5(0067kpnigo0HQbi;?1` z!T;db;T>H5Q0c&u&7DVuf|QcAn&_sMduZOx$!QBEy$$nN>_A#eu;js~ocy9bu+UN# zGv#T*r@WYDXzj&8r=Onplx(MxpOJ2;Pg}%gYgc`IRzDD)oYrn0m#b3XywKF(>C zF;(&U_@me-BYPpb#rc!Vc#|qEX)GJf!fQ+w>udzamBC5oU@KeI;#X&2#&uOY!GgY9 zl_TU!s@1t@v)i@t6x&jKyPQWjFu`ieQC)UXtSh6X;XkLPe8_sHoYi8RqvJ4aZwt@+ z!NI$yF{8(qUgi^HmKAZ6Z$>LsQnORB>G=)W6r*^y@WH{EWc6aZ*6TBu4Nuxs8HyyT znrsDi=;K0Ls{AvAm5Byp#)5K1XK>x z|6tM}?DI|jM>OTPG#k1O__kZTQEntByvx!0@IvBi503r&gL@lY4DON4z^MqUDP&N3 zb|ukI-b-I0hkr<^zMP>5KOqD`Pxnp>q5O+-dpTs{_EO>G^_jud&zF0VyEq|`|K9(| zv0@QqibMr4F!+ljZZM29b%i&6Py_#G{Gb6IdJLr!9(o+57C+({08vRlw6qNwL9QKP zT+v*_llcMN4dOMDeIYWa1hz#k*sq6bENJnl6Z&~gB(4MXG$;C-SgMO#jV;rt>t{9s zR{U~LhGqb+K3DY13$A*6aTXQ?voC%Om9vl4Fa%ZtnYh7f)v~teUrgN4s6d+n>efdg z>2LJ=KU~W@!a)`Wz_b*rKn?74g}n7c#9tj1Q!p({8TtmY;4y@Hs$zudzF9kM{|x|Y z{(7YIRN74mM)H8!QaF|BlSH;Zlz@(fx-X6_J z7FJUMGZd6dDD)^L2pNie9&TP`#~4>b)fj%%)IOh=%NOJESD@RJfLmTPGK7pY`I+_3 zi`9d>-sN9}O2}&H9cO4o+eH!bp8yVgir#V9ee%%9P*j;Ma{R-IK1hjr)@)<#y z%0RqZQ&>kV;Myf-BOIxT(BO!~GX~-{x!lpDL~18N@QA>7lzfAFuEa310+nIm4XD^JKvg{)=65vsWo z3uX8gX@=prNe6NG;crUg;uOiW)^^Z6BksD_AK%3P=j_S`LNbLv*nj^rpg_Pt82?`! z(SJn;(ozkS&_yu9_iZ{1x_3nx14)Yg<@D(E;IdIhab#ktB$!zg?j5zmn;ZX5IM#fV zJ9RFI7cY*;F@LFyvA4+S$s%$n%+GA*z46{{X6*_Cz!#YE5IMNZiG{YJGR?&Ok8*mx zXjgsC#2+%_cp)k;@BQ?KT(-d`t^OnXZqqh^HZy^iKsh}0j>~rb23G%kO)D9Ct+P*` z?QN?-g<+Y7Z)fzNzs8&1jz|FU8#9LL=TnFcwvbe{$V5(DVOC+O zVTO3Ci|u%S)Xi&eRz|Nq9hAJCKJshyIqiRIcAifN^j5CV$zKOBS@HL}k zVx)c+o#qlkSUo?JA?y)AFNE=|3OQl72=Ls$At>j!R0BNNES5HGS_Sncns>q5$w;Xj zkJ6)5^w~|wEQWq8jbQw~(zep>E+$6@&^sB2#lqd!w{!Z)O*(L>{w1j7s1G9aslfU^ zkWENKb4*L~b5PMxdljO~Zt`(tgN`YUc09>~+LRWGsohDpjy;;j?dTx(O8|tV6ZUkXK@JT> zZ_SCAq}vS{qxoaOTpUZvh!MBUUnErQf06AQy+LEZM;2?M?z}vE>A&MAERIsqm_4|9 zv}Tylq5tG+utv0Q1$>&LhH_mI{Qn~L#1qW91Oo(wi4g>Z)FNb3D^n@EK~S*-k&u|;REyj=RNGtUeDW(+x(;OdA{Fy#J{dP z98|``U(hzp=W=Q!vjFard{VhHL3Y&=#^iY`Nt&zl@g>nwfdEb^$$Vl{*3t~zqrH$? zwsYe7{SFD?K}%^?g^NpK`MrOUQK5^>Pq`3x>`xm@PmKD|m0>`U=-v)ZL)Y#Xds zaDczm%qr3L!(gcu;?ifY?7=Z^pRoZO;?h4*DUs_j49^Iobap6!93Rv%ErH8M({_ib z^w!>X2lYhpH;_z)R+_iu=91{?Ml;}df}3V(k!VJM>`XSX>p#iU&O=ML392~xq>5T8 zb-YL75v9@7=_JrM=U3*_Fm?y88kL$MG~rzkqc5g5eNxDl9RYg)l)W_XwiF zQtzOa^%rVfgZUEvk<50aBT};WXS(;t8jmthmMTALnsTLba;{G00!11$mv8+8=z4bJq6`i1k=0YXmv|iF$ zs=rf5u{=8AtIKlzR(~5PMOYWbtif3FDSfsYYx!4YWj~XZ@^Q_=E>Cxk&8AG9fYS^^ zZSCaLHJPSnrAeMg+k3rqhyQT;K-4DVax$I~Vux`fBW9S78$`YyTe4i0-ZRU{DU@*y zz`43e+BmaqFnw~#=C?>34p$Cvpg=TT2qEB-myKdT`(usF^oN~Ve!2LFF@xw zfmNYzrIm~@pbKj!TN*^?JYmVVcB$SQkU4fYbaV`ck?1nkwxZgumF_q;bMhMrZcicn z#!1lRluX49M!H6f!a?BnFdumKunMLUuszC7GHo!Zdl-*cm5*pZqouiRU@4R(~ZV0xwMs+!D!D zFOqAQ@-E?W-=v0(V&{df>(se{*nBy*K~Pl#GA#C^NMS;8Sb9PaJR|rN$z*Voj{T^IS%3WQiSJ0w#`Knt;)g$_aHAoKz^Z_BW4!!()kl%QJ@t71x z-y{nkvg%#ZuR#lNJL>vt(Nlw1+u(F+4J9e+2EjK8NC%Tmnt3aX*h(6KXqe_`*UZ&% zHCFbVEkRiZryklrG40$bbTMP~zkehP7d=peuC|MN87Y>V>S`Zl5AImF6+*T6U}OrY zu$n9=m*;g@FOrojuGcZOFn+~i@`benv%!`59ax^ADb zuGf_a4VcvD9!vHqhi$5Ww?;lvgTZjheEQ^_K-gqOj?I&A22w+_tfo%Dmh=Q-#e{tw0l1g<+S$E;?Hh7(edMt zsmUvEp3|XTk!XE*v(0V>33~j(VL=MzVw6)PsdJzIr(j9d^q!ENK>w-MRJ+KeVd}hJM@6@_dofMi8l4 zPTI{Ph!hfD1_mdUth|kOJ$QP{Mrp5&!k7mg#MGwm>)SajJ7P?{ElW9yuE^T1i~)a+ z)oHR~wR#8~nY#$2C=aU|OeHSoy;$gVE7ocng625K(Y=l#TznDsqrS|t^tYEEc~V$f zUZcQvM<`<=SncCYvwc!PUVj<*s+`|F4D$g-dqhFtmyl6W#>@n$CX;Od~%)rFFU z{BCsjZ62d&G(H0K8O-Y+5s{qEKI-S=IEQ~iK>~qlKZ|h;*UjEM);wTD39h7~^y2}h ztU0Y@2etcIpbP%DN|- zAhj!UP(Ba;HxZNjFd=LWAH&BvHlA?B)6)?SW0F3O)M&*6Jm0SgW}C0(xrX~1zJJL; z*dahvA+++b{)L|hO#c#-xza_we75@Tn*&g!zLWl?Hr;17E1a)Wy!_SK5pZio=SrwN zFF!3m+#zlHXEZ_xtX>j7E9LzgGXjHC%Kgg1$~7enZRTZX7>rGJnY<((V;9n@pYlzy z8Pg;9>E@EGr+DVPwPr!-n|r)JlC+9o`wXx?unwv4wlOVZbf~K5ft21b*;pr5wuM(lo95(A4bRL&~AJ zZ(gU-?|Bw+E!kGo=K4WiaxYQ0;;px&4?%ir{X~W4?x{u^g6)*lf95#_!yrJ0Oaq`E zxU4%jPCpBuDc1Q73u_JT+j`p79b;8@Z^Ieeu=xlkKDLUZD15(eFC*{MQ>Q#szb6=~ z>V?O*qY#HXeuPmX*5f=L3#{6B(b`XEoAUF*&C^uj%N6wTRP!`>I-Y>?Cnbr+P+Xhs zaw*n*BejuNrYz%F_KfRpXnfhv_5<3suWtIId@oOV+_;5N2~6sLwINzo-Vja+yaS+{}o>;#lL0qLdlsU;Ii2H3xRV6RXoT_~B_ zQ)3X$zlSCjIqN3HIV^I}?n=r}#$qZe!Q8-a>NB=J0t zM?WzJR@|W#+y`-jHk*|sOWUaFu&C(pQf=LlS&x2ki{Xl-#r3(lfsWj3QFc6UmXlofPpfP|R<3@|+11l}Q~QL; z+0X4&sxmidl`e;q$~SQhaT3VlbhXi6UqA`6ygQ3WH|`eM6{R9X=rWuRlXdOmd=#}; z%}ClwZJhb6#0}9yfj>UBY{>g2xGk^;TQp`mhg&4xKGt`Q2v6cX10HMWwANAA{iuT* z8=$viWZbNo)6kL>DdhCp>8NP>`)e|8UduR61 zML^KwJ5GV0ZEFyMX+evgDV2bb6c9!oACHSyQ*#XdFinxL*fVVIADNS*6j=YUkCsro zV3?#!G?ru8-=As$qLaD#PEjAENFFIz>b+3Q?-sL04~4E>UHH93GYiqk;Aff-KiMo% zGsk32pJzoo57fOyw*6?zp2qg0tpwgEgFk}Uii_zE5MOD=X(7w%@=AV5in+%oHlp#Q z1~`M8R2N}4Atf>@IoUa=O^p9dwfiG4L_%0y@cCfr06otFXh(i}G_b?=4Ydn3WBqe% ze(L-uQ=0V@qx1DtZSu+J$TmG_zpW5)C#D-n{0UQr_jkT*5L;KVkG~n4r<%t-37V@1ZO#VStkVsF(Md=!(RPED*^ys&sm_Ux^C4P~^ z1khCZlc(AX0QQskx_-k_@fUnZXUJDEA=hu`%I5fGd2>(u!dv2<1F=swd-G9B-67uE zoBO_eN|V2@?!u!|E*v?qz%#`-j}KIhmw$wt@D(ai(U1j?joLgAbEFit1evi|Vm&dc z^U2IKRpO2zek-Cr&dQw?tDP0v0X4;K!wPm2)}4n$02tLNuKlH8fszKZ)R~=NPo)^!v)%>;TK`@28baZ2d6&`h~T$YqdopE|4a61@|Yo|MrH?tWUFC zC|{s8(h@kpTKr<3tW=8TbaA$(aJEDqD5msk=Ms7WRD?S?A+KChD`i)*nN0mDpKS4= zM@SxT0MRcNkJ%L!PeytJ9zkW8-<{9OmQkezuT&}c#do~SN&%D3w4pQ-h@Mx)A)a92 zFqv^mOV2`07HA1@blu8hMBVA~`?G#vUi#26&&2;~AdqVFm$3K|F}C2mb%K%F)lMtP zCfBP(`jVG66jwPAbr=e~Pk*gm@M-uV73#fV0ES&nHL*Jgjg2~_4!GqEV`60mGko=_tdba<+QR)ffC7QeWEy zS&Zyo>K4*kL%D;WT|>m1-kX{86iDqz7$!X_>76BRm&!Mz&NT;RZSEayrZM?^L6~pN z2jn3x(w_2qBt0mnHH+Z$7bz8WO0^x8w_aD&{i;f&`i6ybX8$1I&vy06jogh1YJyQz zr?<3x1l9@~$)vF8YEsJfv@7W5L6>_}TaND|NvSF8=n2B~c9_2ivt@qwTJdkpk?!K=~V;S)UO_VfY0<8o3M0M-(a1mJ2z zoPJ=u+Ts0?1zl8$>FmaC*#^OVdq2&gUkV5-rz%3XaWx`Gv$!ff${CF_+Ow5~v@98L zgVd{6#w&JzRE~1FKtT+tSGNdi!o}Osbr2Hhk}wFD5YSzf$HWii2!X1rwCM2K_9xrx zb-?T>xc{Veo*$EDuSID-;5>w zd*br{0DFodG}QNi>HTCj`x5nR!gbh+*gAoZmbyU?`l7B{7HbrA#a`C=t$k{#;9bA{ z`k?%V?c)q@k(ZxWXfMF`4#!{F`=x*ZidbGJE(8nrDICy+ROZD1`{V@!1_-UQBic9q zSh7^9oV&-dU5r;a;hGZ91M16?7XA6G$#^M)`<}qPm~};6cBPH1yaF7PwXO?V{H*Nh z7@6M7Nw1?0?g{Sj#)sVkP@b{Fzns&bHG4m~O{2>Z!kTb+WQ)>NCL>3Ig}rhqP!7hf zX-`$-`jHZ^)lw^&w8JHi0TeUqn&_(t$H~-!YLi+Zq6qQoEz4P>$J{OEP13HqrUVphfZ_p+TWLz)-`$MFKuWU>X&u z8#ATZ9%Pwha%FrR*y4GqU2y+GkPGzQs1-Idhu|1+gCc!M=X?sxE98k%M0suyTVF&? zZv0bkU%vcULDxLCf_*;FU40ru@3g%TPn69gTtB6f%+&xx6Qgx6g@4QmBi1LbY{|D! zjUWE-D`fPuJWtpcAZ=Ud8>AEvw1Pyg(FTumVw+2Fd z-iY$AbG9VPe60+bdoBU<8OCX?0<5QQ5zPWD)oE+18Fwo>L?Ug`@6xlH0h-~vSZQ0A z8AqA}!+c6ez`yE!%lva@X}ao^6k~ftIQ3<}=0P}e;Z@>*Abe!DH~DpJ96Wkc2{-c` zJcGc69H1H!HI-juGgnovVZDYiW1bg|85aW0V|s!U89F&~8h)yie`nlK5(O$#cIIGw zK5n{T39s`P4p9F&TC&;)xRTLB7?@=n^M&bhbC*^KDyAv}WoI`~0P*sg%K8V4oSw4mFm7+V`3j zz}zD_vxLDZ`Tnk#zQMyQTMLBF!u#ox=_?;)&uzXvYd0=R)c!#ZSZJ%RD1iOwCfCk9 zCJquq1a;sq+HKb`qWaJ$fM%u31J%EJV7w#A_EM6 z$Jb5sVo1ATAweW()rD24RRPjN}~VD_`<{Ai=?!*21RcZQzR z2dkO735OA1Zs?I2VY!%$4^ou08UZ%S6WlFkCm;vWHI+vyQuTC8C=M_E{jU#`59@b( z5B=*ye=i=^_vVGoo&xI2%^o32Z)X|jpn|rY9R@jaBS&Y+%lFeyc2UIvXR9M+-SI>{fDp@QuO-=-DYAsuq zl~pdgZZ)Es`@J@^#x`iR=9tl!`FY=J)Z%(b|KT-$*r5T_8*1U8Ax%@K@>Dty4S)we z4$3VsjlwTzM|?n5`NYD+zydOSg?o2(Iiw#8 zw&y5r;AudS1<;6)ugJ)!WJgE8fUR`GfsWG=7;s`U)IF0T0rHwL_t4m=9+Jb@+32^V z*p?p}!$}^$hiQ&X`6B7IF1JQm`~uZY4ix`rZ%-P{&;15pO1@QIe#Q2a6OtNx0k5UF zk;d*ZI#ul?`M3Da=mi*lX%62ReWCZG+zovJY{4Y0Jf$)=_bE$*&#dSDxn)_neL}BAx~N zXrK(5?P6WaxZLnBD`gEpGE?GGQBnWw^7*N>Z)S$e`wP$dY>M7rt+PY)a&rHKkq_ay ziLa+)VP}ivwP8;csV6qGM0IXMvB?H_+wA zTmPm&=M`pnjMFzPH!k=PMVrCJ9a#qk&C9ZIeRS&r;Y5>+LFbbBpZdloI~>k7{dVN@ zB2M6hpD-wAb*u((_q(0}CnsLnX9c>2bp`;*hmm5QV=^FdDfn3Rd2LSG8`fu{VW|Og z&~xEW^qTfNl4d^VG!_50zZ=}YATD@d!U9#?y{5058rMX>MOG<<1%hS;oSC^ZzfADV zpj({a6`iHHS*kfWI8uL7k94v%<$h0@`AHzT~F)C5A+TBIx|=54q4+Cj_g7xNC*yzsH92XE_jR5WpaX*&kHTw&6%bjp05N zuJVBh#RCiC2PuYiW*EG(&vUnmR&|Ktcy8!E-7^6SUjK+hlz4OK7h2EQ#LOZe2n(UW zpe2Ukq=@H>uG0x&qtt*i(k`*R=UK>$4Xqa#{|$}<7LYxHg~i#H{lQ|4Y1>#^6L%pr(AHv z)`$bdsnkcV+D0X)PZj&EgRl8wl1|84y{UIelkbd8a$flbiJ|81zY8^p-gD3j#OUVM zjL8^{haSy3r~UBaIxYmnouGu}$arl(AZ|4Ei<5MGd?TO~JD&6N(~xCUP%cGOH`N`l zVVxt}a{0w0vWRIlT@rQ>JIK#-tF_Mu$X5WFk~nF%V48QAUy!;FeEX2$_RpR?W9dO? zrKoFUrAOP&115Z$QV5W_H6+V*e&Ku&p4empra#E@Cq2)JR6EEOB1mIk!Gtv2kIIgD z%%v+`x?`dkv>$+soM6oJuzGviDawS`=0bu}OX3K-`*LnkNk$^&zBJKF%HoE*&n{6! zlg-~#MMC(;$;tZsV7i&hwKU=d)#QgGxkW3sf**-c+xIIyA6!s4k04>#`h56CZK>z$AB0>b|W{U7P%#Pff-W>6bl=l8+>fBMM^{&K{+AH{;e&*1$Z!9w>7WK#4B z8X(E`N3Vc1VxIr7zW-Y~56lMy-4b!P2nL1(T2fU8T?8CuC!Rk0Q1WkLMwVtm<<;ZNj(!jDACL*2ALZ6RLy)6H13|GM31|MVwlw+6L}>4Y)G9cxgp39&A>hP&po z#(A@@3$b$!=GpH0ei`8zPb=+2AiXbLxPA8x*uEL7Xqx3Aa;5T|n^L?H3&b80KDp^Q|ow<{tXRRiT~p8`=Xb8vmr+pCdW0d@R=pXtcSm z*8=tA2iTNf`+0!r=>GVMGyJc^V-$Y!h*4Cw=&WF(T)(@&}+Xn0RXP z(LZo3wP4icLJ+3$VvBT-K=NbI@eL?s#6f)Of$3K9!Eg^CU{d2ms^p`f z?2<|lYl2f*1VrG#ET~py-~WU8{})h7e3T)g{}{mVesm60{|zX+U(f+5>dyewW9;u- z`qzVf4HgI+IOJjfcpEq{DB7ac^u1+~W}9&0YHn%scfn=qQq+HFnRD|lMYOh=@mDUh z8R-}{IGp*Y>n_(_@8$;!PoCSnMM+##pF-DOxzFzx$NXJ)*O>Ycb>QELx8czeA|5hA z=-V{=wlINQrGot%uLl4}>}#mqpV325%i{fEiKk!g&&6l7t;~S8d;Fl5T5=yH zNKcI^NE2NB<`GFRdA6>Hmz!&LiqOoK9u7eo>KSiE&gv4Io_9O9 ziJp|VTf6^5jy0>bxyn~^0?h?F#uNzuJyDk+*vZIf=bsRwqbD}Ar^C)@s_lkEqDU7? zD*mZlG#TVOWIKQcnLinZi`+bed#eGSpV6?q(5sJwh z=5lgy^_wc{FHlY{u$Tvchww75S(Ucu-F`YtbdhVD{H zQBmoYc@V%nUIU8@v9Z-@FeSaPcq)qK3PqG#{M^=>PM=$>`@~CVbec)0%oX8^ZLL=k zZcZ||o-p6rw@E}5EMokRL{!3_fkB|ij-f?nIBnT5ljF4X(2KoAy3u9}#SzA0nM+gq zm^3Jv2~QGQwiT7iaI6gRi+;Rc9UUfqz->00EDLa)@V;rFU|SWnU9|}z;H%ndRQkpy zzP9UpEtfF=maaCsd7{I64RspMs4_ZFNT-lrT22)!36*OiiLFjuOI0sBam9Y;X+*zP zNhXHD+uT-EK*G@g1wHlM;Wi3mU;jH??S^-Q!@Z+^@k#}5FNFvxlSSS0aaH7W-wmUuK0lX^Jd#B_NqMCGvXD zo9+^aJ&(7F0KInLTotd^S`|;U6(+`&Kd_LdX8)ax?2>v3fxfo#1z1lpVMGdDz(mRv z4|*zB;gNKBemM0FAyoX7llYzhYXf+_Pt zj(X zR}OAm3u&lmR-r7vblaP51$vpeCXe7GGNKEK+9aU6%gmT@NMHY4!oB{6qCR32I3pww3N+)PNqM8MZKIo-jws?#V@Em_{ zcQ{fZv`IU1)Ni!z7!`$JT0v7}WX`^Vr_WqN`SP0BmV#mkVE^86cocgoO3I>c7c_)h zFDVNeN+C4+uy7(zOi|oH1U-T(VWHSq^f)(9vXMdVq5owgy1se3(kILD;tCM&F;9IM z-{^10*oljT5vkAoBAzS+2sc~w>TODNtjyNHWLfmgH0q1LBh2`LU-I(5t2XUiuW>GP zPc-UBF|}H2h5a>-%JAZvx|ec8^onSVbIU2qN1tVawDdqw9jJGBqyuq=LYOHq!?7`@_Ig$?}vM?Q&L6H8tzm^1WINk^x~ zP^dMkA;^kE8qJkCdz7$rmYIOose~%~V8A0>{C+CzFIQsRs3F)33+*vyN*CL#C(eb@ z6Wz{b=}aI$tX*p$b%CO2rYI0pY=o^hya1OvQ(y=YGrb0LTqTuV?E;uq<2H9s2qR(D zxWwb&4YLL_j&g2U=GLa1Ue*^h&T|-m7=d?m6WO3MQfEy3LgouGM{>oV4G?3qBe7nd z{T`aq5dO}?`p0)Q1dH|^>|p5sB<%O z)hpcgROSr%b`Z8M4GB)>5SI(LN|FO4EIGk#gdfmzGIyx4qQg#)FnbJq{+x+=RkBd? zl@_UESDbSUf~BN`zEx#opnGs6V7oUZ*f!k=*mV9EKOH}3>d&k8%rJqiFSh%!baE_=<~y{ws~EUA1|Ze>Hc3?u%=X#CCtN` zg2e-s>S6^tA}PZ}Re5L9DcJ*^Wl|Cs?Nc+ZS}vyOCa^+DPZ5c+(T zVc?Mn;V3!3x^+OG+SYI)hl+vFZHnQ!`Qp|!vQfOWXviH|4Fj0a zWE9;!!hIY=>A0c}J<=0TkqZQlZjGfC(^3l<=xZ1{GfBXnj7hg;%z+b3U@G**G=?(_ z=pA$Dy+l}rEGJttMM*n2PdFNOfmXg^TJ(0)M)(QrXwK#j&PaCY1HX5_LH<+Nyl5H) zOZXE#kN@+K0ww)BB2SuvMMXZKp_!r`o0M%n1o_|4dddHjSg#L<{j>UWjNOKw(kZ?ofWMAjK>_JH96g`D2^_i3UpOTS4Ms@nW~W8>TzHLqL(B&}uV1}aH0Za{ zN9k=wwBxj0fRT0!7Rq<_#ALR8H#aY6m5cxUJThoHNEBp zg{rJ(YD}Qf;Fy=rl8SSpVav+ehdr!xHhq26b2W1ts+XFf1#)0k4C4tH zb!7r*fJjnJb!LNMNsFxN3Kt4o_0zhW*zcq|y$1@;gB2$-M(e+$6_#aM40;Tw&SrX{ zvUq1Eq?8ObaBc5(H0fC5qO-_8bh7gT-&c7!2sYTKjmYAZs zQ9NsGt$xToVnUwEa-X(H>%dhK@`l2o5SknOCA3d=iu4>o6|G`zA!{i(>d;+4MZK0$ z1Hatmc&HOgiB)7@BPRS|w=+ggCRhvdVMg{CRfwS8NrLIM3 zz2?a(-Psymrwsu<**OvZ+CEAR&~oG(0AUQPCW#aG5xp!X5_>c)Jr;|4yr z`0Lt&7f2s5p@ew!X|By3$nq0t`%xjirTa@nY#~=nZPo(Szy`V62KtgN1W3ES49u2N zLWRNsc1u*K%5Gs?3^)wA7r+0M*b;P=5sZt^FJMiZEQ_SNcUSGs|act?V7|^Q)odHAqA>j=OS~SZaAva>6H^@HHOSFpfHxiUP@X%&w!)RkiOeiM7%%p!wCdjV%WpyN@$W;H zc<5LCJndJiHUlQR^-@}F8GW=p6M(F(s{CLb1KW!aS?DC)^u&66s;ucm86FpZ6yInF zb8cAe_&Vg(oUeW_LSV_{Yuun-+4lCfAi+h)SmRee{)n-8;ICP?k|jZ1PM>6YxZ#Rc zdfF!uiN_(qteNBrrYN`utF~M*PB?r{tRv%7>%Hci?Fa;QPLI{ZNaoUgGXO>_(+rbm z6@*DT*Yq0eBtZ}R$$gA~YUo@GF8@V0jH4eMArJc-z#`p(@XNa0*75ZIaOo@vU;mE9 zz4cN=&z}Y6L8s&tzF0!=5lu>W_9sxkIIKyc$db)mrUi0}&QHiFO$EM-?TJK)H?J_N zdcXj8G{N@IX)K={NI+3tG{CQPmQeWELQPL=&p0ZD1a~zGO2nF(tsxr$D~Jn|gRZQ7-})a}y%lDG7b4tiCvwZlN0_u2(x5I~|Q>_A6)?-vbTn zNz%?}MecwpXLsiB#aiS0WhsB<=Y5{OA1G5;7>k_oEf~BsOK9C_LK3l|rZ`60KwDrX z9%1AZ%t(bo2ZhLwd?Xf^c=Mo*e4pc2BD241Y-cnT2Nw*UJN8?SeYBTPs3D#GT8hk& zT5F}3cqL8-d!?H4)McmPnY(I7%?9_p9*4}p-+l+@dHqjUc=gV$g0!r4llbK-+nn8G zBpWs>)2;5()Jn35BYN3tyNVX#C)s?me=Km-XNdILJ%+0Q*V0ugPFohLR$1lNl?tn_ znxypt#!(M-5j0B;UWH3xIdeKV&{Rzql?`e>H@Jy|mtezLZSU@rSz>MNq*sZvR;!YV z%oLfqdich~^JJMuATNCbs-hP3nPka z2d7Z|P|Ym>X9?d6Kb=^Tfoa?^+HWMYtxZ_I9OQv2tRt+wu1(|kD7ArQDsxd`1osme z*emqxq3}S%?A^AJ_+J>Mdw0IzSue@^tl;D}%!3~r#oMyc!9L z*wVqeZDp~uN5!#2|>p34D$ED)02JcXpBdsOPcakgDRE|h3X5b>kn_BccB{*|Z ze|aCsYkKPO2mJl+DU-$@p)p$I{YfVuB0*N{v_uybTy$dUlM2gvIk^tMrclJ%+X+ zwj;hL0hU`R@W|=`#E3lpn{@s<{c(`8Tfzm=iCSvIA@Cu^+#8EZO#XMzo(gq3!!HRF z%pk@mB>G~BB6Tf$erHe=g&oo~18FeUD8tQuUAW2{V z&8iX$bis5#CFr8jBdQwW7)z_)takAMJqi2qT*9TKL?Gr_`52Pw1sNTi^`KX8A%+~s zJaQg1@3Gv?z2-V2c=rt6M$P`PS1W%{*4u)gE%n60yA4wNVTt7K+sNJy=n@wZW}uW4 zkVNx3A?Co%9U%+yruU4g{TVI3loG%3{-;{$fBC;Ano2F%A8z~lrv^ei$q*es$^SP* z5-2qT!2P{mp;c)jERrN#)j|lvgSjNQOjagyF|H{1IUoP*pIh3bT?An0yElq4{l&oN zi4gmCfBFg{NX&XqvZdg$4^XfCZljJ1Ng`B|F|pDJjUKdyw>ww%3^;9%Wq12WB! zsAoP8SC{Ml*_O~W1qEDE@K%P557w?qg$rz18yuY0QzSo>D zB8d7I#Ui1i3b#mPO0G>PEuKCEr5Ex5Oul_t%#0=yBRZG-Rqmbj3J2`=i4Wjup4VhRGJhr$qC+g}&0JEAJxw3MGA{qNj!xlc`97sL zW~7(fAU&Xa@`wd=_vI5ZTho`zXinMTusW8q)Z9()VdLoxxE^K5Qt%w^%^P1C0!S~v z{jXW@qMB3WN2~9y!Cv=!!l@`Oe;Ys^DJ6#CRWAa!uLfj*IdE7b{0!u0Y`Vdh4UOo1 ze4U8n*3~N-_lzM~P{x=~u>V9+J{L;Uvp-b;6v#=tLX=5u=XiiAjZ=5jpUROgj;W#r zVCe)JF-OspM3;a-UNvj6swS~&3|a=bv3P_cR#&t6K-{a2@JLBT2N6e1KBcOEUYm&D zp~o+r9$aT#tVu<-AeOHOY0ul6?$3|pfRFpfRv@k0kZ7+>@{z9KmEPVmJ0LnVu{v?^VJNF{CkvaT;RE7z;7BXAbq-dJq8K-4S z;YJkYygoJ36FC$e4}7`2$SV3RUL8;bB?)styyQ5Zy0a_v3~F<&Fe4~fX4E+kaGomu zvXW&>LxXiAM^$r?F6q*|DHp?5$}^6XvhxB5vmW1}SMhhw{G^Grfje%awq<(g28F{P zzfe8et8&0zY(~Z{ye~*T0T3J80aidPRhSZwclo3=_qfgk{_JJ5P&t)| z9v5q#=V=n=B@r!ICy`-TFebR)`}eVqCXCVojEkOYNJkQnmKpVmY+5yUK!-s`^GjWoEfqVrzz$GK1%e z-DcH@RAbsLOl7NdU*#%&UBi~jV;`}*cB%~i9G>fFOK41Rt^%iK3ywg@i5YY)^=gnJ zxbBHc9i}x}XDmC)Hd0$rS!)OUNWRY9eF#7XL94Gb&|%q=(DAZsSl!G3OB^s-^jmm4_te6(0uw4zR~ie zUUUTM)%ai#cI$eJ%~w&uwMsRolERPB{Mo0<=%LuAi%P()N>?h%;EyY+7M5(Mnr#3$ zFGH|eKhcxbQ`dNl4wmrBRgmmwJ!zQfWak|v7-;ZmAfQHi`9J@|l-o00Ao(neYlK&*oU{BN3>@1X|*q8RcSw6qAT6Upp@zwB7@0rr3 zDj{B_pUP05jFpQYnnLlnj9O;!{p|qw??=s4bQ=0rBuF7*kF>>^Dp9=!KI^OcihRM= zQQ%g}IA=+S2kjP5)!d zVvX>wod#>901h8qhOFMTDW>PvU1j+?3;Nx|g>y0@gI(bAEfF zjHDv(!qA5fweWjCiAWvUg!1!+y0D9bCbodg3$FN60+}bU!Quj{e{PsGzCcz2DPo$^ z;MFir0=F8L7}$t$e2_pTa)nvGGXSR^5i|T#gJgSfDY&u!INI8Q{$GxU@@|gC3d;51 zda4)YGNejCH=6@6mA2LBv@dDOf99~RA9W%4X%`jY-n6z1-BEz>*I^cw?5==kJg z_J=i3+R(6~YM|?&#TD_M#+jy~$hN-+W+InhW>1`!Ba-c&h)ZM~A8dv1sV1yf9n4CS zUF9jB@EADksShX*s4b_*I;gZ{E?a1$1alsFT#_?Wq~?gi){Ne-<5?2`xmn}up0i4n zh{6zNuECHw8kFAUE=-F5g9~&~^Zc}Ag5Wyk+G;SiT%c1l2{36NB6yyj#lZ$rpIn{2 zgd(Sq>Q2Hjh6`B~EZ|U6T*pt`7kCzFVUsD9s+<&B^Mk{3&OEYQFl{1DLPpJ6=?4z}w?GinK>U z-BDHn^z!dXM2F|qNqWD4G(_FCWbNrh?jQUm7+0B| zK@C9Mr~|cjRE`ISMT*Tipj?@vRAksq?NM|_iFD`cK~b@2h1dnGi^@>15lI-w$li-c z5F^M#uhQm%*#1)EI5gSBK#Pg){$pWM1sf?oe5p5gQ%>j}AB|G={IVTEF#~Tn`0r1` zmHMooWB7N4!>rs+*JL+~u+$Y1{1@k7UnB9Wz<*9Zvcc|x;vcy6@G}AVet5$F>atAw zWa0VY6c!ZFM!wx~x0cbdX~N@VMAtwY;1h_;pr^yIC^HS1`qVL(Co``w?0E}rW9%Om zUW8FX1~L7B1d?wzTPA^}Atn;9vNxRlj_WV;dV2go(}xmc!JK#!M=7Ofs9d!qU^ti7 zq7x$>llRk2XS3;NoJ8?ju|oA*};!&P&54q1!f)U~GImAm(FIdZaV zxU)9(_UDznJh1M!wUVz!ohMxB=b+*z8j#hRXL+M)a#en}j|teN7fCU;NhmfnyZZpL zFl`xdhE(MfH-M>U_Gdol589E?ur6H~i_+kNKp|4-5;f8NypQh>jo}kziUadifXIKN!I5~Bj zpWySKmiB8UFv{b(9@;KF=+!0Ee4#Ro<|ZeXDMimX{8CmpWR~G&&~sxr7V{%Gts&UiyJ|oB zJS7@Y&ddKpiK&1||4O=IS0XBM+-oCC=Fk}@FQS&+l3o|2?sA|;7emh{0vDsP#~n#B z;GhQ#c5$JMmd`TLxUZ;qMVF5n>x9HYgD26T$n)6k z$x^vugVgD&1$$+Q$8aV59b7VA5GRd}#{3f?2RVa5!_s z$SSC#Myf5Om(IB><3v|k_N&Dzk-XCvZa|^?A+qNv1fumkq=AyIqnqt3n|M-8mtqsW zD3$9e)R+*7ESAi>2UFK!SYqL#G^YMB-Tob2X+lmK>nM{v#%1Nyvb>BqA~|#+ePI?5 zr;KA~q|w(Is;!|=S7r!30p}c$QPp`PQ*Q>nLfcy5mu^^>rd_dRmd-7Bsa+!IyalVh5uf;&Fi~wUZ(l6m z-DHwknVOoKr6=GY?n*}Oc+|hTcC-dGZWp^b)z~mGB<9Z)ixbWxK^*#kmM3R>+yx`& z6XO64U^n~@hFZv+r*!Lcc|s@lb;8`0|I(b*jBKP+;Rqy~FbwyxjGV*PngPAcS%gA9 z28Vl}j53i{QOSD=91RocrW)$I!{?h5$)#f0Lm9$mAl<*e_){B0bC!opQSl3)wZI(2}Zau4vj_+YRzq) zluM#g&XVlJlLMt7J(d>v^?Qz4ES#&FmCUJ7H){3&p}Nw^|4nxM9I+KYM=a<6IbzM7 z3{7m3Y|)Yb`*usnjRjEo?*rHGYI#nP2d@^U+aGQVCWu84DH4idj!v`JBy=#&l&!JI zT51Cs5GoMN=m$(1vD^4PT&5p$+yXDhLCv5$GvPb!e8qqK;P?6X3hOVHOm4zNnxEJ6 z#zbo*7YL-<5AvG?LyS&J(wR4gl0=QmM|Dsc*_vb-+lxa6u<^i&od|9kCq%^y2{BMz zVTsFIebl|%J@-t12d9?PZg+WFGj=&j{cocnUP62s_?=hXr6>cY+`jyh9aM`l$`;V>InWff;f39@tRFTG|-t?rsP&$%95E%NGlL>rc zaiR$sK$+EC(ua&ZfY|HVf$}}naQ+aS{GF%}pP8rpNQY2ro#804}PpqTucq|f{f88*j19PhW{j%g^34=`k zv&x5WlgLKgA=}}Nb!nHP7LJ*bu?G8qehPqj)jG%|HS0Ig{5l{>WKWDJ`&H%bD=yM| zD5so0OsXZn=jcCEh$IQ#DkY~l#X_aD$aVTKQ8K1H$hT&hIDz#I|DUMhz)U2)^rz~& z@TX>v>wifcM1Dz77+<_bEq)K+|DV01VE9?AGHLghAmCf>N4)s;A@Fnw<8z zpPIb-e7pao^#AdtiV4W%3^v8GMGDgwGZpUR(7`wIu%U%e!7``y+wSt#?$(5Q!$A`) zV>L`{06s`t`L0%~nz>v)*Fi+&XT!I8OQ#CXJ8pk=Y4=v`mXe0K0GOUZG#Ou$r^D?z)kJ@%5vL=0B6YDOKj$QkU8dw=9e;b^|HH8+&C8vTLlOufxa zGmTK!^k;?SZDv>k>XF>AGVp08s(^E0=!ifq;D+b$Z#tt3O%s6r=qXISllau4Z6-c4 z=%_vv5{_|3#ogV{bPe}#p$f^A_z26%Ji_>7zvWU?v4&4TdN<{RyJN22!Iyp&+V=P_ zZ79=bC=;nLoQ~kIAV!cd9~+ZD95Z7I9GyXe;Q?T?l($CRRTwm`&g37@FcucKeqVYh zU<9t%`POXoV?cjv)9vCV`E=B}z#H+j=2-0gk?P10ugiI#J~SU8iN3Rxb_N%Iq!wjM z4#BoWZEA7;)=rd3ZiZ1-UOnGUiP16*oxX&f+BWD<)bDi&OK2^~NfENiQ{OT(M?xF< zP=qlibb|-4^gz8-!OU_jigyoIIMOyaz-W%-z=0f@l7;+&MR7zC0$t|LAG0LLlh?p{ z!XFiM0*V#m8a6%TY>&~y$)D@RK87JmvQmP8A-1sri@g>Po#Gw{)4OVMLJEp2u_%AB zN(Y%tNG7+qN^25q%J@XtqUf>@aaxa*y9$uCYz6}1HD3JK9hOa-c05ke0ntigAsoB$ z&~ROZBuNvcwvciTGnG?2i4#&YR1_^Cy>SrnLm#xC5?q}?Io5oAibu@<-16o^jt$94 zn?k<99o=>ACST(C;LQNE$j3kMgNTDiYCHcUSEUT&GHg=WzQrkP0 zm8RDzSP(H+2}ok@UaO(PsJ@-`6gbLy?tXSP>+$jaM(!n1b9pcp4`aZD_x#zvDwAV} z389{UWtSK0{^SqF>$K|f{;0$5LUbXT_bvh2a3bs*&ABbHPjugZSDmR?b?$Nc*U-D^ z_qobLA>Df8*SHaEXR5=xFF9zp=jw07PF~@}mt5(4_QHwkpjy@LKT6gfhPsV2;72&1 zy~#Fx*Df+{KqqE&^~)#!uor}9P9Io@?TMzxI%JtaYFfvUe6b}D!*&J>3a-qH=LSe)H^&qNBskm1IX#DJtphcl8nW` z)Ry4sIO{~-2hX~ZQTdS?_KN}(O|Ss-J@;lBpEIy7#TpWHp$X@UM(Jmt^0VZQbgkF~ zqBEg(>n63V8h_kNgAD!k%3&BniY?+vlITdY(z}2F5(pzm)lwM;F!Kkv_&|0B!E{M? zgJA+9`FwS%d|?IM0VUlb6*iNfIMroq$|r?q*eIPj{7F~TC|2*Fi;$ zR1mOZKd*rHB}a`0>+HX=$c>K7iG{n=g&j?SA}cd$7PvOB%`jWXaJanbCjL#S?=v?D z`3>|)u`xk}K5m5L%)`iVL^vqkdsm9l zOKOxYa|EmrH(ICPY9{Gw_toTI1)|YE=Mum?Y-qm##`wZ5o27WEo+MQ#CXI`#017f? z)OC@I>I$ae$=!q-qk^${)!?XmPX0CbmH`X0QxPwj>!XTim_lYaBWM~aI=*jory$BQ zZWrsV6jyh=aVa6Sd@S!2s_-@}BN2A~u+|}5Y#qudT2=@}e)fyHOWvd#vNGYEsf1pt2Ty~*hRjLVP0M9qz&JC&m|uG^roRGmxkYE@cQ0v4V!dqpm}<@ zg-1ot_8AF8<9Lr6!drvE|JT-4fJM1AVOT){32By;Sfmk`kQTUr(jna3PRIkzN75w#pa!^;HBKjUt(o{nb z-wop8MI{9<^5m3Tvkea?Lrt4Y*k|NevjWSrS$CALr&sXhm=2P}t9g{idz8ER20Q5R zb&0nrRwwtMl5GnU__b^n`DZ9N@wkzH5{K*uweb))WdpHesf?}**v+nTR}{&ngGhc8 zdv0WjULymlH`}lxcnnAZ5)k3f3qMnJtc>+LqtE1$5(PYfYNFHSqQ*A!S2p5!s!NgT zVrXD_{J@zAvb^@QojnN~c8{WPXDf4N??3M#4&z03Zq`;mu)oXc2#EG6svZ2fLW2+B5bDIUi|nr&Pz z)~H~d3##E%&sDL6%a>Hto8na%N7<5+->c7;l3QJP(C_v72nK55c-TU2Rjw@y#q1}d zM&4g{!{{qC2bc7!wQ#6EU!gWwH+#*s(#O`qt3sR>%)4H$J8_H@ zsjAgPF#D;}g(Q@j%^Qo@bzv@Qx(fC2oH(I{`_k zO0m$cOdLKjD4f&HsBl{; zux*^DVs2KWi85F>_%a{f z*rI>Yk~ZBM-zqb8oNX`dskI!O+;JvP;3nhe&<#lj4FlgZhN zIx*(R_7O&;{U!VSWv*9HeRV~CVU2tQhDDqWrOi{TYK*WVK1F=UQVs5DwjkG|=MUJQ zRVDPkn`TJRdnuza{6#I4;HhxC+SG2L@nMvV5)}z-C1wH2SQKtcs~{S1Gbx-GsX~4L zVR~ni`M#IRQ9N^!;dI`m}>MO$OjBT!)8KlkZfVA2R2pl9u z|E2KV(Bw!uF-mYSNmGAhJ1|sQ3op^W@#Zsa*xgjtg~BD^6ftK}L^hh71bS~re&%W& zvk|YC*{kFTP`bzeX%JW7)D@Wq-EW$2%k7m;!r+^hY1|HnQ`ldZ8^z!ZgSVT9k)ql0 zY=P7aGn<9BoH6v8iV%_{A9ccZ#}Xg!v_eCY^VQmGiW-U(X@&wNs5q-M$DY})`wut5 z{H|eev8bo%Y}!TZQs<}|3BOiP%)h3mJK*N^Ate!t`Cc9_np8gng(BaL$9*=nqCsMp(P#)(Z1Y+uhfGMnM#v zM{nTBLkRhX!VST0znxn?8Wre#oh^8lrwR3t%0P0esBqSKzKs(J-;AlHZ^-VBl1JW= z;)-X-qJe}hzQ*rtE4U-oOs~b3`IOQzR$tMra$>w(x6`&ZNFyAoRrk6e+#&s{KCE}$ zMw){x0_+%}=5hMD5-UhgqYG=RUb7gwr03W~FTf%@%c4c$i13<;N=81BvTNOf&$88k z_h=w&-)66NmebetyXt7yz0D4dAip!@Vlcq#UhMxqSceQx=#vd=}z*E5f-H zT0Upv0(zk%s4zeMfiFPz2FDRsU7anyQ_q4Nh zcGa1tGJBGK7t_SBg4`%86s0i7o^A?oeN@nBW@VaeC}Qg2CF8(iNR8V)U<|WXc3|K6 z@O)bLb>(rH;}=Hw>0hrUx5|x~h!jb#>FI@KSv5-R$-IPe@+*oEhC@PK;Y2i@P&SK) z;A67l$)#Ml2-^#*J!mYxYHN;(97m)~n`kHJ$bANiP?eG5NaMie4oS{VP8yLiGPrii zZvJ6;eG#;v`Ht~c`{a^?)FF&rnmNwK(Ch1RasPT-jAv)gSf1lXT)CQ5TGXwzF?!Pw z$k9vs5V)7vFqK+Ih~a2^i0hGSweiFxEEV@!pfXA(9V)^>v;UaRPRv4l7L(Ly#r+O- z>9E&+e0su1$N|nZ-&T)I?G-VGETzXho0HwN0j}y$hwYG_0G)vAQ zw0N|&vvQa%t5+~1d;c#N?avq*uL?H08^n|A%DpMf`rZ*#WY8t&>NSw!PxzZDu^_)V zfR`b|lA`fK{<|_xT5TuAtsecvWj^7YtS;=j*Pmf{R_Djtb3}W^kjB==1W=88o-J$} z-%XQ_62T@KBXE3YWY-MqnyGm$m1=6(=&3gwGM@R;W0L4uAkGReF@JpmDqcj-pv5}e znO|M0y7}nY~tdBcPG$iNfeKviaVVplR;x*UwC3S|yr`Y4! ziN7YCNI>5#{S{Ug1&krd<20_eK&*UDp)?JwVpLTR=sHB)$0h&PnLarpcn#yzvx;uX zrRXbRcoIn5l28Fy{oGS;+fvKZS)Zowcx~MoG&F}=fqubGC)fn&J!?jk%=M7%dmQdF zZF9SkOP$e3k&nLZxQZ*&B0JV=N#Kg&&)vimMdi2cWYu)X({?39F!gvgRE2L^g5{f- z+j7BHJW#L46#`QVUksQ8n2-^2h@7)&i5^S7#f*gMBo9$oKE}?n|3uqrWm=0-^n0%K zFAi)%Wn{kOxAF_(v#1Yb;GdbTPi@b3>ue&PYIwI|9F#Ba5N6L)C2hHWwI*~FTyUI5 zck4Tuw-rPC1nqHeTWAa@8lp|OLa@A`6p5Qm>pE|DsI^=hYpC;8!mY^?F)L$0-{pf4AfCy>UyIBFtM`E3BC()C$1Wk3DR!jTz zM)qi3=;4;D-95|YID)>a5lC;A&)3_CQTry9#x;$_GC}?=Z3((h&EC$0l{FyCd}~Vc z$QPewy`o!8Cfx|^@^+-lz0!2oNhB72I*IphX28VkzlAS4fUwI{+HrS(6C z;fyO6!Va#THs#GmwE2o#acQ(FKB+Gl(L-p(baFkB!9_MZjYwzQ z%{FaQ_-sLpBZuo{adAa6!TaD*dBU}c=s}xVR~vIPZl#i`r_#?ub8o4(9*QU!6Ddd& zub1MpJBZC3U_H80y$ITW1=f1R_}-Y<)D}wHMFtazxV}3%6>7A|&?w(`REn3Lh1osA z#%SE)z&F9g{WmTbG{e> zP1=Ipr3tsNM(MO`iG9)^b*h>}A1kFr2Z#*}wZg5N!oPje*f)uMRW^E+KD@;FcAgA9 zOkJ9LXx8;KpxjS8txX;Deg4+6;zIu5W25%kyDwH6{Z^WzEpql#6$fu+yb~P!ay%)I zyU!x3u3Znl#>sI2B|brMa4Mx`h`t{NyTH}w1&37jtyafSDe#qPoVi`h92(V%Zv>_c ziTLxFGmyGrd*Qay(*ioD%mlo1~buh55B4xd*6NDhd6`29F8tGjG(reBt3cPN&7a& z_Y+>qi9K1+R{N44GPAY6`{?RvkOf_b;A{}v7<(Bv=uHGGuw}NB z#BeN^_Chs&_AM_qN{%h&{OGJy%_WVun%+0?_zb&(A6ZckjK)6FDQbKd%tzKx^|hBY zXvICP`@^z+)jKB3^-dv5-Vz3@;jg@}pIg>7+XvXj2m~}vFW#>NzxXt8xAAkxLtMkY z9<|k&Za3`P@8!Xeic&i3gmj5zi$K^~6$0!i;I!n^HAmky{S<8UclZhlJ*~StMR34a z5S|_uX>>#0CGRWkj-V*hsQ%;`2 zkMlcsE&5lLdyhRm)XgUGDBP*5l%6%cHYtuZZZXmIb87^he8$A%n>e-&Tg4(Hk|J1q z%&@GgP>FI@*me-=P42{@HXDSQLO7tVfkE9%2Hq4-Bp=q-iObc~yt_Vj`J)Fej8~ zM}>OY-G?7l94uAsB6542`U0kORF@JpHmdH;ZNw=1`PkTUHTFCZefnMkgTR<7><%V3 zXYawp=D{r!wx?AGncgp?-ov65or;28J0rg5S!s^%p$Ag3aZJg#2r+Bq-0Lu1L+0Oq zH0-I#7h~<-0+$v=(RVE{eq^SrQ2AR_^a$JfmGTH&e8I68xSyS;U(6yBCb9JOrMu@{ z7aY?OlQ}lS;>gmy`*Uo;YBhcIE1Gq&7WsRe?!lJbpKG`x8S~72mBe7-`9^O&Nu)J- zp-j1C$Gbbn1S{sn<|X(_b$5?O3Ts+ZDut)}ZB~XJpDCZlUw2YEY;Q~b+G5}uXRS+QofUJwn+3c zP8;=}C2yAOEukuf9q`sl%wRNYn#8PzyU6eV@KP#h4REo5G_uAW;F4G~oGU=SnX={k zANgiJC~$?ylR9*!-~WXAJ|&(>3ItS%f!`l_Zs$Q&Gfq<*D+Fqp6v%bMCPe<9TsKmD z$Yrp^3KjMhAQcWBL~;cOfsRXxP)E|E<3w|T5s^q1!1oW)0FwIWr!yqu&rbr&>=&wX z#6sTZ)B!;+Fc9?OMz}9CA%^xyc$s*(Ol?e@oPL`Bm*;GS&hds06AkUh^8nX5{QJuG zW4wYe9wh~oZvt+1_837CSm%Nl9yd7twDS52!vkS}DLn;L0+IOF1{zwnpFQ?ZC2WMJ zC*(hhBlSv~96(3k0zqlsONu!7|0-VdrTC8`6I!p&A^{qj_DwW2`b&z>34bbL;az%U zgz-KjsDS=gBjRZS8Nk~3XRup>F&8p7Q_S)s7ufb7sLGV6^)4_?j7=7uzKlcj!RaP zB>}6{e~d`SAtT63>%7BfheQ`*q5qV+qdOu6vFM&R)Ar*bw2x>nxVltv?UJkO`ae~O z{~dzX&MATvCX(M%tnmC?R&Fc!l(8=VaMAu*)7-$C=KeKjUac^KI$RJ@xKPCH zy&pNJe**$#H$VVJh_12$0?SoK5Slk)o`o8bze)oL`$xXtYKIAa|+3h_E#rkO&+QG9v2N@GcD8k91afV9~Sy^+|+(bsl)n_PZ5)4!^N} z^FsFPd48VQIvJ=x^k*w3qJK1B z3*G$9Xh%a6y#(!yIk#WC!EgcoCk61AMz$X+`5aCOr9y~pUcI35gJx9#P+B^G-Q%){ zoiqgcHY)u0B#Lz$l{ma_e##;JKIbb;J@Q2Kmx)gxJNkvXF%xf-~zLf*5Kk|8S6mI z?=T=r&YK!{7(w#`fPfdkDO-XO+$bCn<~xKiN)izGpcp~ZBM6}y^*>3m+I#>2 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 48bba0fc..bb703c82 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,12 +1,6 @@ pluginManagement { repositories { - google { - content { - includeGroupByRegex("com\\.android.*") - includeGroupByRegex("com\\.google.*") - includeGroupByRegex("androidx.*") - } - } + google() mavenCentral() gradlePluginPortal() } @@ -17,6 +11,7 @@ dependencyResolutionManagement { google() mavenCentral() maven("https://devrepo.kakao.com/nexus/repository/kakaomap-releases/") + maven("https://devrepo.kakao.com/nexus/content/groups/public/") } } From d5d1653ff68d410db5440b9b051bc902a25a4d5d Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Mon, 22 Jul 2024 15:47:28 +0900 Subject: [PATCH 02/22] =?UTF-8?q?refactor:=20=EC=9E=A5=EC=86=8C=20DB=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - local, remote DB 객체 연결 --- .../tech/kakao/map/RepositoryImplTest.kt | 6 +- .../campus/tech/kakao/map/MainActivity.kt | 11 -- .../campus/tech/kakao/map/PlaceApplication.kt | 5 +- .../tech/kakao/map/data/PlaceDBHelper.kt | 125 ++++++++++++++++++ .../kakao/map/data/PlaceRepositoryImpl.kt | 124 ++--------------- 5 files changed, 144 insertions(+), 127 deletions(-) delete mode 100644 app/src/main/java/campus/tech/kakao/map/MainActivity.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt diff --git a/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt index c707bb46..00f57896 100644 --- a/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt +++ b/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt @@ -3,7 +3,7 @@ package campus.tech.kakao.map import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import campus.tech.kakao.map.data.PlaceRepositoryImpl +import campus.tech.kakao.map.data.PlaceDBHelper import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.util.PlaceContract import org.junit.After @@ -15,14 +15,14 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class RepositoryImplTest { - private lateinit var repository: PlaceRepositoryImpl + private lateinit var repository: PlaceDBHelper private lateinit var context: Context @Before fun setUp() { context = ApplicationProvider.getApplicationContext() context.deleteDatabase(PlaceContract.DATABASE_NAME) - repository = PlaceRepositoryImpl.getInstance(context) + repository = PlaceDBHelper.getInstance(context) } @After diff --git a/app/src/main/java/campus/tech/kakao/map/MainActivity.kt b/app/src/main/java/campus/tech/kakao/map/MainActivity.kt deleted file mode 100644 index 95b43803..00000000 --- a/app/src/main/java/campus/tech/kakao/map/MainActivity.kt +++ /dev/null @@ -1,11 +0,0 @@ -package campus.tech.kakao.map - -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity - -class MainActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - } -} diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt index 1c7d3a1d..f2f5be66 100644 --- a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -4,13 +4,16 @@ import android.app.Application import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities +import campus.tech.kakao.map.data.PlaceDBHelper import campus.tech.kakao.map.data.PlaceRepositoryImpl import campus.tech.kakao.map.domain.repository.PlaceRepository import com.kakao.vectormap.KakaoMapSdk class PlaceApplication: Application() { - val placeRepository: PlaceRepository by lazy { PlaceRepositoryImpl.getInstance(this)} + val placeRepository: PlaceRepository by lazy { + PlaceRepositoryImpl(PlaceDBHelper.getInstance(this)) + } override fun onCreate() { super.onCreate() diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt new file mode 100644 index 00000000..7a5c5420 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt @@ -0,0 +1,125 @@ +package campus.tech.kakao.map.data + +import android.content.ContentValues +import android.content.Context +import android.database.sqlite.SQLiteDatabase +import android.database.sqlite.SQLiteOpenHelper +import campus.tech.kakao.map.BuildConfig +import campus.tech.kakao.map.data.net.KakaoApiClient +import campus.tech.kakao.map.util.PlaceContract +import campus.tech.kakao.map.domain.model.Place +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class PlaceDBHelper(context: Context): + SQLiteOpenHelper(context, PlaceContract.DATABASE_NAME, null, 1){ + + override fun onCreate(db: SQLiteDatabase?) { + db?.execSQL(PlaceContract.CREATE_QUERY) + db?.execSQL(PlaceContract.CREATE_LOG_QUERY) + } + + override fun onUpgrade(db: SQLiteDatabase?, oldVersion: Int, newVersion: Int) { + db?.execSQL(PlaceContract.DROP_QUERY) + db?.execSQL(PlaceContract.DROP_LOG_QUERY) + onCreate(db) + } + + suspend fun getPlaces(keyword: String): List = + withContext(Dispatchers.IO){ + val resultPlaces = mutableListOf() + for (page in 1..3) { + val response = KakaoApiClient.api.getSearchKeyword( + key = BuildConfig.KAKAO_REST_API_KEY, + query = keyword, + size = 15, + page = page + ) + if (response.isSuccessful) { + response.body()?.documents?.let { resultPlaces.addAll(it) } + } else throw RuntimeException("통신 에러 발생") + } + updatePlaces(resultPlaces) + resultPlaces + } + suspend fun updatePlaces(places: List) { + val db = writableDatabase + + db.execSQL(PlaceContract.DELETE_QUERY) + places.forEach { + val values = ContentValues().apply { + put(PlaceContract.COLUMN_ID, it.id) + put(PlaceContract.COLUMN_NAME, it.place) + put(PlaceContract.COLUMN_LOCATION, it.address) + put(PlaceContract.COLUMN_TYPE, it.category) + put(PlaceContract.COLUMN_X_POS, it.xPos) + put(PlaceContract.COLUMN_Y_POS, it.yPos) + } + db.insert(PlaceContract.TABLE_NAME, null, values) + } + } + + fun getPlaceById(id: String): Place? { + val cursor = readableDatabase.query( + PlaceContract.TABLE_NAME, + null, "${PlaceContract.COLUMN_ID} = ?", arrayOf(id), null, null, null + ) + var place: Place? = null + cursor?.use { + if (it.moveToFirst()) { + val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_NAME)) + val address = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOCATION)) + val type = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_TYPE)) + val xPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_X_POS)) + val yPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_Y_POS)) + place = Place(id, name, address, type, xPos, yPos) + } + } + return place + } + + fun updateLogs(logs: List) { + val db = writableDatabase + db.execSQL(PlaceContract.DELETE_LOG_QUERY) + logs.forEach { placeLog -> + val values = ContentValues().apply { + put(PlaceContract.COLUMN_LOG_ID, placeLog.id) + put(PlaceContract.COLUMN_LOG_NAME, placeLog.place) + } + db.insert(PlaceContract.TABLE_LOG_NAME, null, values) + } + } + + fun removeLog(id: String) { + val db = writableDatabase + db.delete(PlaceContract.TABLE_LOG_NAME, "${PlaceContract.COLUMN_LOG_ID}=?", arrayOf(id)) + } + + fun getLogs(): List { + val logs = mutableListOf() + val cursor = readableDatabase.query( + PlaceContract.TABLE_LOG_NAME, + null, null, null, null, null, null + ) + cursor?.use { + while (it.moveToNext()) { + val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_NAME)) + val id = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_ID)) + logs.add(Place(id,name, "", "", "","")) + } + } + return logs + } + + companion object { + + @Volatile + private var INSTANCE: PlaceDBHelper? = null + + fun getInstance(context: Context): PlaceDBHelper { + return INSTANCE ?: synchronized(this) { + INSTANCE ?: PlaceDBHelper(context.applicationContext).also { INSTANCE = it } + } + } + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt index 50315bd2..19052eea 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt @@ -1,130 +1,30 @@ package campus.tech.kakao.map.data -import android.content.ContentValues -import android.content.Context -import android.database.sqlite.SQLiteDatabase -import android.database.sqlite.SQLiteOpenHelper -import androidx.lifecycle.viewModelScope -import campus.tech.kakao.map.BuildConfig -import campus.tech.kakao.map.PlaceApplication -import campus.tech.kakao.map.data.net.KakaoApiClient -import campus.tech.kakao.map.util.PlaceContract import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -class PlaceRepositoryImpl(context: Context): - SQLiteOpenHelper(context, PlaceContract.DATABASE_NAME, null, 1), - PlaceRepository { - - override fun onCreate(db: SQLiteDatabase?) { - db?.execSQL(PlaceContract.CREATE_QUERY) - db?.execSQL(PlaceContract.CREATE_LOG_QUERY) +class PlaceRepositoryImpl(private val dbHelper: PlaceDBHelper):PlaceRepository{ + override suspend fun getPlaces(placeName: String): List { + return dbHelper.getPlaces(placeName) } - override fun onUpgrade(db: SQLiteDatabase?, oldVersion: Int, newVersion: Int) { - db?.execSQL(PlaceContract.DROP_QUERY) - db?.execSQL(PlaceContract.DROP_LOG_QUERY) - onCreate(db) - } - override suspend fun getPlaces(keyword: String): List = - withContext(Dispatchers.IO){ - val resultPlaces = mutableListOf() - for (page in 1..3) { - val response = KakaoApiClient.api.getSearchKeyword( - key = BuildConfig.KAKAO_REST_API_KEY, - query = keyword, - size = 15, - page = page - ) - if (response.isSuccessful) { - response.body()?.documents?.let { resultPlaces.addAll(it) } - } else throw RuntimeException("통신 에러 발생") - } - updatePlaces(resultPlaces) - resultPlaces - } override suspend fun updatePlaces(places: List) { - val db = writableDatabase - - db.execSQL(PlaceContract.DELETE_QUERY) - places.forEach { - val values = ContentValues().apply { - put(PlaceContract.COLUMN_ID, it.id) - put(PlaceContract.COLUMN_NAME, it.place) - put(PlaceContract.COLUMN_LOCATION, it.address) - put(PlaceContract.COLUMN_TYPE, it.category) - put(PlaceContract.COLUMN_X_POS, it.xPos) - put(PlaceContract.COLUMN_Y_POS, it.yPos) - } - db.insert(PlaceContract.TABLE_NAME, null, values) - } + dbHelper.updatePlaces(places) } override fun getPlaceById(id: String): Place? { - val cursor = readableDatabase.query( - PlaceContract.TABLE_NAME, - null, "${PlaceContract.COLUMN_ID} = ?", arrayOf(id), null, null, null - ) - var place: Place? = null - cursor?.use { - if (it.moveToFirst()) { - val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_NAME)) - val address = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOCATION)) - val type = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_TYPE)) - val xPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_X_POS)) - val yPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_Y_POS)) - place = Place(id, name, address, type, xPos, yPos) - } - } - return place - } - - override fun updateLogs(logs: List) { - val db = writableDatabase - db.execSQL(PlaceContract.DELETE_LOG_QUERY) - logs.forEach { placeLog -> - val values = ContentValues().apply { - put(PlaceContract.COLUMN_LOG_ID, placeLog.id) - put(PlaceContract.COLUMN_LOG_NAME, placeLog.place) - } - db.insert(PlaceContract.TABLE_LOG_NAME, null, values) - } - } - - override fun removeLog(id: String) { - val db = writableDatabase - db.delete(PlaceContract.TABLE_LOG_NAME, "${PlaceContract.COLUMN_LOG_ID}=?", arrayOf(id)) + return dbHelper.getPlaceById(id) } override fun getLogs(): List { - val logs = mutableListOf() - val cursor = readableDatabase.query( - PlaceContract.TABLE_LOG_NAME, - null, null, null, null, null, null - ) - cursor?.use { - while (it.moveToNext()) { - val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_NAME)) - val id = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_ID)) - logs.add(Place(id,name, "", "", "","")) - } - } - return logs + return dbHelper.getLogs() } - companion object { - - @Volatile - private var INSTANCE: PlaceRepositoryImpl? = null + override fun updateLogs(placeLog: List) { + dbHelper.updateLogs(placeLog) + } - fun getInstance(context: Context): PlaceRepositoryImpl { - return INSTANCE ?: synchronized(this) { - INSTANCE ?: PlaceRepositoryImpl(context.applicationContext).also { INSTANCE = it } - } - } + override fun removeLog(id: String) { + dbHelper.removeLog(id) } -} +} \ No newline at end of file From eeafb37d8b1d82ddbbb4c7b9c1de9af0347290c7 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Mon, 22 Jul 2024 17:07:37 +0900 Subject: [PATCH 03/22] =?UTF-8?q?refactor:=20=EB=84=A4=ED=8A=B8=EC=9B=8C?= =?UTF-8?q?=ED=81=AC=EC=99=80=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B2=A0?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=9E=91=EC=97=85=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PlaceDBHelper: 로컬 데이터베이스에서 장소 정보를 가져오고 저장하는 기능 유지 --- .../campus/tech/kakao/map/PlaceApplication.kt | 7 ++--- .../tech/kakao/map/data/PlaceDBHelper.kt | 26 ++++++------------- .../tech/kakao/map/data/net/KakaoApiClient.kt | 20 ++++++++++++++ 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt index f2f5be66..2622c831 100644 --- a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -32,11 +32,8 @@ class PlaceApplication: Application() { val actNetwork: NetworkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false - return when { - actNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true - actNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true - else -> false - } + return actNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) || + actNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) } } } diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt index 7a5c5420..25ebd1de 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt @@ -6,6 +6,7 @@ import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteOpenHelper import campus.tech.kakao.map.BuildConfig import campus.tech.kakao.map.data.net.KakaoApiClient +import campus.tech.kakao.map.data.net.KakaoApiClient.api import campus.tech.kakao.map.util.PlaceContract import campus.tech.kakao.map.domain.model.Place import kotlinx.coroutines.Dispatchers @@ -25,24 +26,13 @@ class PlaceDBHelper(context: Context): onCreate(db) } - suspend fun getPlaces(keyword: String): List = - withContext(Dispatchers.IO){ - val resultPlaces = mutableListOf() - for (page in 1..3) { - val response = KakaoApiClient.api.getSearchKeyword( - key = BuildConfig.KAKAO_REST_API_KEY, - query = keyword, - size = 15, - page = page - ) - if (response.isSuccessful) { - response.body()?.documents?.let { resultPlaces.addAll(it) } - } else throw RuntimeException("통신 에러 발생") - } - updatePlaces(resultPlaces) - resultPlaces - } - suspend fun updatePlaces(places: List) { + suspend fun getPlaces(keyword: String): List { + val places = KakaoApiClient.getPlaces(keyword) + updatePlaces(places) + return places + } + + fun updatePlaces(places: List) { val db = writableDatabase db.execSQL(PlaceContract.DELETE_QUERY) diff --git a/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt index e3f34c03..587d3124 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt @@ -2,7 +2,10 @@ package campus.tech.kakao.map.data.net import campus.tech.kakao.map.BuildConfig +import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.model.ResultSearchKeyword +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import retrofit2.Response import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory @@ -17,4 +20,21 @@ object KakaoApiClient { .build() .create(KakaoApi::class.java) } + + suspend fun getPlaces(keyword: String): List = + withContext(Dispatchers.IO) { + val resultPlaces = mutableListOf() + for (page in 1..3) { + val response = api.getSearchKeyword( + key = BuildConfig.KAKAO_REST_API_KEY, + query = keyword, + size = 15, + page = page + ) + if (response.isSuccessful) { + response.body()?.documents?.let { resultPlaces.addAll(it) } + } else throw RuntimeException("통신 에러 발생") + } + resultPlaces + } } \ No newline at end of file From 846345d0617573bf9bb9256ed6043f70f96291df Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Tue, 23 Jul 2024 20:45:42 +0900 Subject: [PATCH 04/22] =?UTF-8?q?refactor:=20=EC=A7=80=EB=8F=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=B7=B0=EB=AA=A8=EB=8D=B8=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tech/kakao/map/data/PlaceDBHelper.kt | 25 +++++++ .../kakao/map/data/PlaceRepositoryImpl.kt | 8 +++ .../map/domain/repository/PlaceRepository.kt | 3 +- .../kakao/map/presentation/MapActivity.kt | 65 ++++++++----------- .../kakao/map/presentation/MapViewModel.kt | 29 +++++++++ .../kakao/map/presentation/SearchActivity.kt | 4 +- .../kakao/map/presentation/SearchViewModel.kt | 12 +--- .../map/presentation/ViewModelFactory.kt | 20 ++++++ 8 files changed, 115 insertions(+), 51 deletions(-) create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt index 25ebd1de..6a547e94 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.withContext class PlaceDBHelper(context: Context): SQLiteOpenHelper(context, PlaceContract.DATABASE_NAME, null, 1){ + private val sharedPreferences = context.getSharedPreferences("LastVisitedPlace", Context.MODE_PRIVATE) override fun onCreate(db: SQLiteDatabase?) { db?.execSQL(PlaceContract.CREATE_QUERY) db?.execSQL(PlaceContract.CREATE_LOG_QUERY) @@ -101,6 +102,30 @@ class PlaceDBHelper(context: Context): return logs } + fun saveLastVisitedPlace(place: Place) { + val editor = sharedPreferences.edit() + editor.putString("placeName", place.place) + editor.putString("roadAddressName", place.address) + editor.putString("categoryName", place.category) + editor.putString("yPos", place.yPos) + editor.putString("xPos", place.xPos) + editor.apply() + } + + fun getLastVisitedPlace(): Place? { + val placeName = sharedPreferences.getString("placeName", null) + val roadAddressName = sharedPreferences.getString("roadAddressName", null) + val categoryName = sharedPreferences.getString("categoryName", null) + val yPos = sharedPreferences.getString("yPos", null) + val xPos = sharedPreferences.getString("xPos", null) + + return if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { + Place("", placeName, roadAddressName, categoryName, xPos, yPos) + } else { + null + } + } + companion object { @Volatile diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt index 19052eea..f7bbf3f2 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt @@ -27,4 +27,12 @@ class PlaceRepositoryImpl(private val dbHelper: PlaceDBHelper):PlaceRepository{ override fun removeLog(id: String) { dbHelper.removeLog(id) } + + override fun saveLastVisitedPlace(place: Place) { + dbHelper.saveLastVisitedPlace(place) + } + + override fun getLastVisitedPlace(): Place? { + return dbHelper.getLastVisitedPlace() + } } \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt index 5b31d557..df4310bf 100644 --- a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt @@ -9,5 +9,6 @@ interface PlaceRepository { fun getLogs(): List fun updateLogs(placeLog: List) fun removeLog(id: String) - + fun saveLastVisitedPlace(place: Place) + fun getLastVisitedPlace(): Place? } \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt index 02700068..8c1a339b 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt @@ -8,6 +8,7 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.ViewModelProvider import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.domain.model.Place @@ -28,17 +29,33 @@ class MapActivity : AppCompatActivity() { private lateinit var mapBottomSheet: MapBottomSheet private lateinit var tvErrorMessage: TextView private lateinit var kakaoMap: KakaoMap + private lateinit var mapViewModel: MapViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_map) - initializeMapView() - initializeSearchView() + initViewModel() + initMapView() + initSearchView() setResultLauncher() + + } + + private fun initViewModel(){ + val placeRepository = (application as PlaceApplication).placeRepository + mapViewModel = ViewModelProvider(this,ViewModelFactory(placeRepository)) + .get(MapViewModel::class.java) + + mapViewModel.lastVisitedPlace.observe(this, { place -> + place?.let { + updateMapWithPlaceData(it) + showBottomSheet(it) + } + }) } - private fun initializeMapView() { + private fun initMapView() { mapView.start(object : MapLifeCycleCallback() { override fun onMapDestroy() {} override fun onMapError(error: Exception) { @@ -46,11 +63,11 @@ class MapActivity : AppCompatActivity() { } }, object : KakaoMapReadyCallback() { override fun onMapReady(map: KakaoMap) { - if(!isNetworkAvailable()){ - showErrorPage(java.lang.Exception("네트워크 연결 오류")) + if (!isNetworkAvailable()) { + showErrorPage(Exception("네트워크 연결 오류")) } kakaoMap = map - initMap() + mapViewModel.loadLastVisitedPlace() } }) } @@ -59,17 +76,17 @@ class MapActivity : AppCompatActivity() { return PlaceApplication.isNetworkActive() } - private fun initializeSearchView() { + private fun initSearchView() { searchView.setOnClickListener { val intent = Intent(this, SearchActivity::class.java) resultLauncher.launch(intent) } } - private fun showErrorPage(error: Exception){ + private fun showErrorPage(error: Exception) { setContentView(R.layout.error_page) tvErrorMessage = findViewById(R.id.tvErrorMessage) - tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n"+ error.message + tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message } private fun setResultLauncher() { @@ -77,9 +94,7 @@ class MapActivity : AppCompatActivity() { if (result.resultCode == Activity.RESULT_OK) { val placeData = result.data?.getSerializableExtra("placeData") as? Place placeData?.let { - updateMapWithPlaceData(it) - saveLastVisitedPlace(it) - showBottomSheet(it) + mapViewModel.saveLastVisitedPlace(it) } } } @@ -107,32 +122,6 @@ class MapActivity : AppCompatActivity() { mapBottomSheet.show(supportFragmentManager, mapBottomSheet.tag) } - private fun initMap() { - val sharedPreferences = getSharedPreferences("LastVisitedPlace", MODE_PRIVATE) - val placeName = sharedPreferences.getString("placeName", null) - val roadAddressName = sharedPreferences.getString("roadAddressName", null) - val categoryName = sharedPreferences.getString("categoryName", null) - val yPos = sharedPreferences.getString("yPos", null) - val xPos = sharedPreferences.getString("xPos", null) - - if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { - val place = Place("", placeName, roadAddressName, categoryName, xPos, yPos) - updateMapWithPlaceData(place) - showBottomSheet(place) - } - } - - private fun saveLastVisitedPlace(place: Place) { - val sharedPreferences = getSharedPreferences("LastVisitedPlace", MODE_PRIVATE) - val editor = sharedPreferences.edit() - editor.putString("placeName", place.place) - editor.putString("roadAddressName", place.address) - editor.putString("categoryName", place.category) - editor.putString("yPos", place.yPos) - editor.putString("xPos", place.xPos) - editor.apply() - } - override fun onResume() { super.onResume() mapView.resume() diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt new file mode 100644 index 00000000..0fcd83f7 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt @@ -0,0 +1,29 @@ +package campus.tech.kakao.map.presentation + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import campus.tech.kakao.map.PlaceApplication +import campus.tech.kakao.map.data.PlaceRepositoryImpl +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.domain.repository.PlaceRepository +import kotlinx.coroutines.launch + +class MapViewModel(private val repository: PlaceRepository): ViewModel() { + + private val _lastVisitedPlace = MutableLiveData() + val lastVisitedPlace: LiveData get() = _lastVisitedPlace + fun loadLastVisitedPlace() { + viewModelScope.launch { + val place = repository.getLastVisitedPlace() + _lastVisitedPlace.value = place + } + } + fun saveLastVisitedPlace(place: Place) { + viewModelScope.launch { + repository.saveLastVisitedPlace(place) + _lastVisitedPlace.value = place + } + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt index 868de2fa..55f18fbb 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt @@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.databinding.ActivityMainBinding import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter @@ -38,7 +39,8 @@ class SearchActivity : AppCompatActivity() { } private fun initViewModel() { - viewModel = ViewModelProvider(this,SearchViewModel.Factory) + val placeRepository = (application as PlaceApplication).placeRepository + viewModel = ViewModelProvider(this,ViewModelFactory(placeRepository)) .get(SearchViewModel::class.java) } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt index 1d1dbbf7..a5172204 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt @@ -42,7 +42,6 @@ class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { }.stateIn(viewModelScope,SharingStarted.Lazily, emptyList()) val searchedPlaces: StateFlow> get() = _searchedPlaces - init { _logList.value = getLogs() } @@ -51,7 +50,7 @@ class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { searchText.value = "" } suspend fun getPlaces(keyword: String): List{ - return withContext(Dispatchers.IO) { repository.getPlaces(keyword) } + return repository.getPlaces(keyword) } fun getPlaceById(id: String): Place?{ @@ -78,13 +77,4 @@ class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { repository.removeLog(id) _logList.value = getLogs() } - - companion object { - val Factory: ViewModelProvider.Factory = viewModelFactory { - initializer { - val placeRepository = (this[APPLICATION_KEY] as PlaceApplication).placeRepository - SearchViewModel(repository = placeRepository) - } - } - } } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt b/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt new file mode 100644 index 00000000..222df999 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt @@ -0,0 +1,20 @@ +package campus.tech.kakao.map.presentation + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import campus.tech.kakao.map.domain.repository.PlaceRepository + + +class ViewModelFactory(private val repository: PlaceRepository) : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + if (modelClass.isAssignableFrom(SearchViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return SearchViewModel(repository) as T + } + if (modelClass.isAssignableFrom(MapViewModel::class.java)) { + @Suppress("UNCHECKED_CAST") + return MapViewModel(repository) as T + } + throw IllegalArgumentException("Unknown ViewModel class") + } +} \ No newline at end of file From d3bce44f5abea00dc66f26fc03a24e1b5c3f8d58 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Tue, 23 Jul 2024 22:04:48 +0900 Subject: [PATCH 05/22] =?UTF-8?q?refactor:=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=91=9C=EC=8B=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 에러 텍스트를 네트워크 상태에 따라 visible/gone으로 처리하는 것으로 변경 --- .../campus/tech/kakao/map/MapActivityTest.kt | 4 ++-- .../tech/kakao/map/SearchActivityTest.kt | 4 ++-- app/src/main/AndroidManifest.xml | 6 +++--- .../map/presentation/ViewModelFactory.kt | 2 ++ .../map/presentation/{ => map}/MapActivity.kt | 19 ++++++++++++++----- .../presentation/{ => map}/MapBottomSheet.kt | 2 +- .../presentation/{ => map}/MapViewModel.kt | 2 +- .../{ => search}/SearchActivity.kt | 6 ++++-- .../{ => search}/SearchUiState.kt | 2 +- .../{ => search}/SearchViewModel.kt | 7 +------ app/src/main/res/layout/activity_main.xml | 4 ++-- app/src/main/res/layout/activity_map.xml | 16 +++++++++++++++- app/src/main/res/layout/error_page.xml | 18 ------------------ 13 files changed, 48 insertions(+), 44 deletions(-) rename app/src/main/java/campus/tech/kakao/map/presentation/{ => map}/MapActivity.kt (87%) rename app/src/main/java/campus/tech/kakao/map/presentation/{ => map}/MapBottomSheet.kt (95%) rename app/src/main/java/campus/tech/kakao/map/presentation/{ => map}/MapViewModel.kt (95%) rename app/src/main/java/campus/tech/kakao/map/presentation/{ => search}/SearchActivity.kt (93%) rename app/src/main/java/campus/tech/kakao/map/presentation/{ => search}/SearchUiState.kt (79%) rename app/src/main/java/campus/tech/kakao/map/presentation/{ => search}/SearchViewModel.kt (88%) delete mode 100644 app/src/main/res/layout/error_page.xml diff --git a/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt index 55428797..152f300a 100644 --- a/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt +++ b/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt @@ -9,8 +9,8 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 -import campus.tech.kakao.map.presentation.MapActivity -import campus.tech.kakao.map.presentation.SearchActivity +import campus.tech.kakao.map.presentation.map.MapActivity +import campus.tech.kakao.map.presentation.search.SearchActivity import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt index cc8ae613..b1c8dda6 100644 --- a/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt +++ b/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt @@ -12,8 +12,8 @@ import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.rules.ActivityScenarioRule -import campus.tech.kakao.map.presentation.MapActivity -import campus.tech.kakao.map.presentation.SearchActivity +import campus.tech.kakao.map.presentation.map.MapActivity +import campus.tech.kakao.map.presentation.search.SearchActivity import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter import org.hamcrest.CoreMatchers.instanceOf import org.junit.After diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e38c414c..04e70f2a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:theme="@style/Theme.Map" tools:targetApi="31"> @@ -25,10 +25,10 @@ diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt b/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt index 222df999..84d027db 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt @@ -3,6 +3,8 @@ package campus.tech.kakao.map.presentation import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import campus.tech.kakao.map.domain.repository.PlaceRepository +import campus.tech.kakao.map.presentation.map.MapViewModel +import campus.tech.kakao.map.presentation.search.SearchViewModel class ViewModelFactory(private val repository: PlaceRepository) : ViewModelProvider.Factory { diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt similarity index 87% rename from app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt rename to app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 8c1a339b..f376fe31 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -1,8 +1,10 @@ -package campus.tech.kakao.map.presentation +package campus.tech.kakao.map.presentation.map import android.app.Activity import android.content.Intent import android.os.Bundle +import android.util.Log +import android.view.View import android.widget.TextView import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts @@ -12,6 +14,8 @@ import androidx.lifecycle.ViewModelProvider import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.presentation.search.SearchActivity +import campus.tech.kakao.map.presentation.ViewModelFactory import com.kakao.vectormap.KakaoMap import com.kakao.vectormap.KakaoMapReadyCallback import com.kakao.vectormap.LatLng @@ -35,6 +39,7 @@ class MapActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_map) + initViewModel() initMapView() initSearchView() @@ -44,7 +49,7 @@ class MapActivity : AppCompatActivity() { private fun initViewModel(){ val placeRepository = (application as PlaceApplication).placeRepository - mapViewModel = ViewModelProvider(this,ViewModelFactory(placeRepository)) + mapViewModel = ViewModelProvider(this, ViewModelFactory(placeRepository)) .get(MapViewModel::class.java) mapViewModel.lastVisitedPlace.observe(this, { place -> @@ -65,9 +70,12 @@ class MapActivity : AppCompatActivity() { override fun onMapReady(map: KakaoMap) { if (!isNetworkAvailable()) { showErrorPage(Exception("네트워크 연결 오류")) + }else{ + kakaoMap = map + tvErrorMessage.visibility = View.GONE + mapView.visibility = View.VISIBLE + mapViewModel.loadLastVisitedPlace() } - kakaoMap = map - mapViewModel.loadLastVisitedPlace() } }) } @@ -84,8 +92,9 @@ class MapActivity : AppCompatActivity() { } private fun showErrorPage(error: Exception) { - setContentView(R.layout.error_page) tvErrorMessage = findViewById(R.id.tvErrorMessage) + tvErrorMessage.visibility = View.VISIBLE + mapView.visibility = View.GONE tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt similarity index 95% rename from app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt rename to app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt index 8eeeb3f3..9fe165e1 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/MapBottomSheet.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt @@ -1,4 +1,4 @@ -package campus.tech.kakao.map.presentation +package campus.tech.kakao.map.presentation.map import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt similarity index 95% rename from app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt rename to app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt index 0fcd83f7..b5aa565d 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/MapViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt @@ -1,4 +1,4 @@ -package campus.tech.kakao.map.presentation +package campus.tech.kakao.map.presentation.map import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt similarity index 93% rename from app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt rename to app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt index 55f18fbb..2db94ddf 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/SearchActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt @@ -1,4 +1,4 @@ -package campus.tech.kakao.map.presentation +package campus.tech.kakao.map.presentation.search import android.content.Intent import android.os.Bundle @@ -17,6 +17,8 @@ import campus.tech.kakao.map.databinding.ActivityMainBinding import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter import campus.tech.kakao.map.presentation.adapter.LogAdapter import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.presentation.ViewModelFactory +import campus.tech.kakao.map.presentation.map.MapActivity import campus.tech.kakao.map.util.PlaceMapper import kotlinx.coroutines.launch @@ -40,7 +42,7 @@ class SearchActivity : AppCompatActivity() { private fun initViewModel() { val placeRepository = (application as PlaceApplication).placeRepository - viewModel = ViewModelProvider(this,ViewModelFactory(placeRepository)) + viewModel = ViewModelProvider(this, ViewModelFactory(placeRepository)) .get(SearchViewModel::class.java) } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchUiState.kt similarity index 79% rename from app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt rename to app/src/main/java/campus/tech/kakao/map/presentation/search/SearchUiState.kt index ed05bfc5..9c3db290 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/SearchUiState.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchUiState.kt @@ -1,4 +1,4 @@ -package campus.tech.kakao.map.presentation +package campus.tech.kakao.map.presentation.search import campus.tech.kakao.map.domain.model.Place diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt similarity index 88% rename from app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt rename to app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt index a5172204..d973a05d 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt @@ -1,13 +1,8 @@ -package campus.tech.kakao.map.presentation +package campus.tech.kakao.map.presentation.search import androidx.lifecycle.* -import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY -import androidx.lifecycle.viewmodel.initializer -import androidx.lifecycle.viewmodel.viewModelFactory -import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository -import kotlinx.coroutines.* import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cc37bc75..9bf12574 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ + type="campus.tech.kakao.map.presentation.search.SearchViewModel" /> + tools:context=".presentation.search.SearchActivity"> + tools:context=".presentation.map.MapActivity"> + diff --git a/app/src/main/res/layout/error_page.xml b/app/src/main/res/layout/error_page.xml deleted file mode 100644 index d93520cc..00000000 --- a/app/src/main/res/layout/error_page.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file From c339be1cd53f47de11e2b48dd8ee9e8e685bc4b5 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Wed, 24 Jul 2024 17:34:22 +0900 Subject: [PATCH 06/22] =?UTF-8?q?refactor:=20room=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 3 + .../campus/tech/kakao/map/PlaceApplication.kt | 6 +- .../campus/tech/kakao/map/data/AppDatabase.kt | 26 ++++ .../java/campus/tech/kakao/map/data/Entity.kt | 20 +++ .../campus/tech/kakao/map/data/PlaceDB.kt | 83 +++++++++++ .../tech/kakao/map/data/PlaceDBHelper.kt | 140 ------------------ .../campus/tech/kakao/map/data/PlaceDao.kt | 32 ++++ .../kakao/map/data/PlaceRepositoryImpl.kt | 30 ++-- .../map/domain/repository/PlaceRepository.kt | 12 +- .../kakao/map/presentation/map/MapActivity.kt | 3 +- .../map/presentation/search/SearchActivity.kt | 30 ++-- .../presentation/search/SearchViewModel.kt | 59 ++++---- 12 files changed, 237 insertions(+), 207 deletions(-) create mode 100644 app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/Entity.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt delete mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4de1ea7b..0ec26980 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -52,6 +52,9 @@ android { } dependencies { + implementation("androidx.room:room-ktx:2.6.1") + implementation("androidx.room:room-runtime:2.6.1") + kapt("androidx.room:room-compiler:2.6.1") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0") diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt index 2622c831..93baec4b 100644 --- a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -4,16 +4,14 @@ import android.app.Application import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities -import campus.tech.kakao.map.data.PlaceDBHelper +import campus.tech.kakao.map.data.PlaceDB import campus.tech.kakao.map.data.PlaceRepositoryImpl import campus.tech.kakao.map.domain.repository.PlaceRepository import com.kakao.vectormap.KakaoMapSdk class PlaceApplication: Application() { - val placeRepository: PlaceRepository by lazy { - PlaceRepositoryImpl(PlaceDBHelper.getInstance(this)) - } + val placeRepository: PlaceRepository by lazy { PlaceRepositoryImpl(PlaceDB(this)) } override fun onCreate() { super.onCreate() diff --git a/app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt b/app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt new file mode 100644 index 00000000..65c8da61 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt @@ -0,0 +1,26 @@ +package campus.tech.kakao.map.data + +import android.content.Context +import androidx.room.* + +@Database(entities = [PlaceEntity::class, PlaceLogEntity::class], version = 1) +abstract class AppDatabase: RoomDatabase(){ + abstract fun placeDao(): PlaceDao + + companion object { + @Volatile + private var INSTANCE: AppDatabase? = null + + fun getDatabase(context: Context): AppDatabase { + return INSTANCE ?: synchronized(this) { + val instance = Room.databaseBuilder( + context.applicationContext, + AppDatabase::class.java, + "place_database" + ).build() + INSTANCE = instance + instance + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/Entity.kt b/app/src/main/java/campus/tech/kakao/map/data/Entity.kt new file mode 100644 index 00000000..a9d51a74 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/Entity.kt @@ -0,0 +1,20 @@ +package campus.tech.kakao.map.data + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "places") +data class PlaceEntity( + @PrimaryKey val id: String, + val place: String, + val address: String, + val type: String, + val xPos: String, + val yPos: String +) + +@Entity(tableName = "logs") +data class PlaceLogEntity( + @PrimaryKey val id: String, + val place: String +) \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt new file mode 100644 index 00000000..9e99537b --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt @@ -0,0 +1,83 @@ +package campus.tech.kakao.map.data + +import android.content.Context +import campus.tech.kakao.map.data.net.KakaoApiClient +import campus.tech.kakao.map.domain.model.Place +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class PlaceDB(private val context: Context) { + + private val placeDao = AppDatabase.getDatabase(context).placeDao() + private val sharedPreferences = context.getSharedPreferences("LastVisitedPlace", Context.MODE_PRIVATE) + + suspend fun getPlaces(keyword: String): List { + val places = KakaoApiClient.getPlaces(keyword) + updatePlaces(places) + return places + } + + suspend fun updatePlaces(places: List) { + withContext(Dispatchers.IO) { + placeDao.deleteAllPlaces() + placeDao.insertPlaces(places.map { + PlaceEntity(it.id, it.place, it.address, it.category, it.xPos, it.yPos) + }) + } + } + + suspend fun getPlaceById(id: String): Place? { + return withContext(Dispatchers.IO) { + placeDao.getPlaceById(id)?.let { + Place(it.id, it.place,it.address, it.type, it.xPos, it.yPos) + } + } + } + + suspend fun updateLogs(logs: List) { + withContext(Dispatchers.IO) { + placeDao.deleteAllLogs() + placeDao.insertLogs(logs.map { + PlaceLogEntity(it.id, it.place) + }) + } + } + + suspend fun removeLog(id: String) { + withContext(Dispatchers.IO) { + placeDao.removeLog(id) + } + } + + suspend fun getLogs(): List { + return withContext(Dispatchers.IO) { + placeDao.getLogs().map { + Place(it.id, it.place, "", "", "", "") + } + } + } + + fun saveLastVisitedPlace(place: Place) { + val editor = sharedPreferences.edit() + editor.putString("placeName", place.place) + editor.putString("roadAddressName", place.address) + editor.putString("categoryName", place.category) + editor.putString("yPos", place.yPos) + editor.putString("xPos", place.xPos) + editor.apply() + } + + fun getLastVisitedPlace(): Place? { + val placeName = sharedPreferences.getString("placeName", null) + val roadAddressName = sharedPreferences.getString("roadAddressName", null) + val categoryName = sharedPreferences.getString("categoryName", null) + val yPos = sharedPreferences.getString("yPos", null) + val xPos = sharedPreferences.getString("xPos", null) + + return if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { + Place("", placeName, roadAddressName, categoryName, xPos, yPos) + } else { + null + } + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt deleted file mode 100644 index 6a547e94..00000000 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceDBHelper.kt +++ /dev/null @@ -1,140 +0,0 @@ -package campus.tech.kakao.map.data - -import android.content.ContentValues -import android.content.Context -import android.database.sqlite.SQLiteDatabase -import android.database.sqlite.SQLiteOpenHelper -import campus.tech.kakao.map.BuildConfig -import campus.tech.kakao.map.data.net.KakaoApiClient -import campus.tech.kakao.map.data.net.KakaoApiClient.api -import campus.tech.kakao.map.util.PlaceContract -import campus.tech.kakao.map.domain.model.Place -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext - -class PlaceDBHelper(context: Context): - SQLiteOpenHelper(context, PlaceContract.DATABASE_NAME, null, 1){ - - private val sharedPreferences = context.getSharedPreferences("LastVisitedPlace", Context.MODE_PRIVATE) - override fun onCreate(db: SQLiteDatabase?) { - db?.execSQL(PlaceContract.CREATE_QUERY) - db?.execSQL(PlaceContract.CREATE_LOG_QUERY) - } - - override fun onUpgrade(db: SQLiteDatabase?, oldVersion: Int, newVersion: Int) { - db?.execSQL(PlaceContract.DROP_QUERY) - db?.execSQL(PlaceContract.DROP_LOG_QUERY) - onCreate(db) - } - - suspend fun getPlaces(keyword: String): List { - val places = KakaoApiClient.getPlaces(keyword) - updatePlaces(places) - return places - } - - fun updatePlaces(places: List) { - val db = writableDatabase - - db.execSQL(PlaceContract.DELETE_QUERY) - places.forEach { - val values = ContentValues().apply { - put(PlaceContract.COLUMN_ID, it.id) - put(PlaceContract.COLUMN_NAME, it.place) - put(PlaceContract.COLUMN_LOCATION, it.address) - put(PlaceContract.COLUMN_TYPE, it.category) - put(PlaceContract.COLUMN_X_POS, it.xPos) - put(PlaceContract.COLUMN_Y_POS, it.yPos) - } - db.insert(PlaceContract.TABLE_NAME, null, values) - } - } - - fun getPlaceById(id: String): Place? { - val cursor = readableDatabase.query( - PlaceContract.TABLE_NAME, - null, "${PlaceContract.COLUMN_ID} = ?", arrayOf(id), null, null, null - ) - var place: Place? = null - cursor?.use { - if (it.moveToFirst()) { - val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_NAME)) - val address = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOCATION)) - val type = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_TYPE)) - val xPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_X_POS)) - val yPos = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_Y_POS)) - place = Place(id, name, address, type, xPos, yPos) - } - } - return place - } - - fun updateLogs(logs: List) { - val db = writableDatabase - db.execSQL(PlaceContract.DELETE_LOG_QUERY) - logs.forEach { placeLog -> - val values = ContentValues().apply { - put(PlaceContract.COLUMN_LOG_ID, placeLog.id) - put(PlaceContract.COLUMN_LOG_NAME, placeLog.place) - } - db.insert(PlaceContract.TABLE_LOG_NAME, null, values) - } - } - - fun removeLog(id: String) { - val db = writableDatabase - db.delete(PlaceContract.TABLE_LOG_NAME, "${PlaceContract.COLUMN_LOG_ID}=?", arrayOf(id)) - } - - fun getLogs(): List { - val logs = mutableListOf() - val cursor = readableDatabase.query( - PlaceContract.TABLE_LOG_NAME, - null, null, null, null, null, null - ) - cursor?.use { - while (it.moveToNext()) { - val name = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_NAME)) - val id = it.getString(it.getColumnIndexOrThrow(PlaceContract.COLUMN_LOG_ID)) - logs.add(Place(id,name, "", "", "","")) - } - } - return logs - } - - fun saveLastVisitedPlace(place: Place) { - val editor = sharedPreferences.edit() - editor.putString("placeName", place.place) - editor.putString("roadAddressName", place.address) - editor.putString("categoryName", place.category) - editor.putString("yPos", place.yPos) - editor.putString("xPos", place.xPos) - editor.apply() - } - - fun getLastVisitedPlace(): Place? { - val placeName = sharedPreferences.getString("placeName", null) - val roadAddressName = sharedPreferences.getString("roadAddressName", null) - val categoryName = sharedPreferences.getString("categoryName", null) - val yPos = sharedPreferences.getString("yPos", null) - val xPos = sharedPreferences.getString("xPos", null) - - return if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { - Place("", placeName, roadAddressName, categoryName, xPos, yPos) - } else { - null - } - } - - companion object { - - @Volatile - private var INSTANCE: PlaceDBHelper? = null - - fun getInstance(context: Context): PlaceDBHelper { - return INSTANCE ?: synchronized(this) { - INSTANCE ?: PlaceDBHelper(context.applicationContext).also { INSTANCE = it } - } - } - } -} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt new file mode 100644 index 00000000..f8c9c79f --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt @@ -0,0 +1,32 @@ +package campus.tech.kakao.map.data + +import androidx.room.* +import androidx.room.Insert +import androidx.room.Query + +@Dao +interface PlaceDao { + @Query("SELECT * FROM places WHERE place LIKE :keyword") + suspend fun getPlaces(keyword: String): List + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertPlaces(places: List) + + @Query("SELECT * FROM places WHERE id = :id") + suspend fun getPlaceById(id: String): PlaceEntity? + + @Query("DELETE FROM places") + suspend fun deleteAllPlaces() + + @Query("SELECT * FROM logs") + suspend fun getLogs(): List + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertLogs(logs: List) + + @Query("DELETE FROM logs WHERE id = :id") + suspend fun removeLog(id: String) + + @Query("DELETE FROM logs") + suspend fun deleteAllLogs() +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt index f7bbf3f2..7621aa52 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt @@ -3,36 +3,36 @@ package campus.tech.kakao.map.data import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository -class PlaceRepositoryImpl(private val dbHelper: PlaceDBHelper):PlaceRepository{ +class PlaceRepositoryImpl(private val placeDB: PlaceDB):PlaceRepository{ override suspend fun getPlaces(placeName: String): List { - return dbHelper.getPlaces(placeName) + return placeDB.getPlaces(placeName) } override suspend fun updatePlaces(places: List) { - dbHelper.updatePlaces(places) + placeDB.updatePlaces(places) } - override fun getPlaceById(id: String): Place? { - return dbHelper.getPlaceById(id) + override suspend fun getPlaceById(id: String): Place? { + return placeDB.getPlaceById(id) } - override fun getLogs(): List { - return dbHelper.getLogs() + override suspend fun getLogs(): List { + return placeDB.getLogs() } - override fun updateLogs(placeLog: List) { - dbHelper.updateLogs(placeLog) + override suspend fun updateLogs(placeLog: List) { + placeDB.updateLogs(placeLog) } - override fun removeLog(id: String) { - dbHelper.removeLog(id) + override suspend fun removeLog(id: String) { + placeDB.removeLog(id) } - override fun saveLastVisitedPlace(place: Place) { - dbHelper.saveLastVisitedPlace(place) + override suspend fun saveLastVisitedPlace(place: Place) { + placeDB.saveLastVisitedPlace(place) } - override fun getLastVisitedPlace(): Place? { - return dbHelper.getLastVisitedPlace() + override suspend fun getLastVisitedPlace(): Place? { + return placeDB.getLastVisitedPlace() } } \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt index df4310bf..296faed0 100644 --- a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt @@ -5,10 +5,10 @@ import campus.tech.kakao.map.domain.model.Place interface PlaceRepository { suspend fun getPlaces(placeName: String): List suspend fun updatePlaces(places:List) - fun getPlaceById(id: String):Place? - fun getLogs(): List - fun updateLogs(placeLog: List) - fun removeLog(id: String) - fun saveLastVisitedPlace(place: Place) - fun getLastVisitedPlace(): Place? + suspend fun getPlaceById(id: String):Place? + suspend fun getLogs(): List + suspend fun updateLogs(placeLog: List) + suspend fun removeLog(id: String) + suspend fun saveLastVisitedPlace(place: Place) + suspend fun getLastVisitedPlace(): Place? } \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index f376fe31..6ec8bcd7 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -39,7 +39,6 @@ class MapActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_map) - initViewModel() initMapView() initSearchView() @@ -72,9 +71,9 @@ class MapActivity : AppCompatActivity() { showErrorPage(Exception("네트워크 연결 오류")) }else{ kakaoMap = map + mapViewModel.loadLastVisitedPlace() tvErrorMessage.visibility = View.GONE mapView.visibility = View.VISIBLE - mapViewModel.loadLastVisitedPlace() } } }) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt index 2db94ddf..9b014054 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt @@ -5,7 +5,6 @@ import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration @@ -20,6 +19,7 @@ import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.presentation.ViewModelFactory import campus.tech.kakao.map.presentation.map.MapActivity import campus.tech.kakao.map.util.PlaceMapper +import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch class SearchActivity : AppCompatActivity() { @@ -72,17 +72,23 @@ class SearchActivity : AppCompatActivity() { } private fun handlePlaceClick(place: Place) { - val intent = Intent(this, MapActivity::class.java).apply { - putExtra("placeData", viewModel.getPlaceById(place.id)) + lifecycleScope.launch { + val selectedPlace = viewModel.getPlaceById(place.id) + val intent = Intent(this@SearchActivity, MapActivity::class.java).apply { + putExtra("placeData", selectedPlace) + } + setResult(RESULT_OK, intent) + finish() } - setResult(RESULT_OK,intent) - finish() } private fun setupLogRecyclerView() { val logRecyclerView = binding.recyclerLog - logAdapter = LogAdapter { id -> viewModel.removeLog(id) } - logAdapter.submitList(viewModel.getLogs()) + logAdapter = LogAdapter { id -> + lifecycleScope.launch { + viewModel.removeLog(id) + } + } logRecyclerView.apply { layoutManager = LinearLayoutManager(this@SearchActivity, RecyclerView.HORIZONTAL, false) @@ -91,16 +97,18 @@ class SearchActivity : AppCompatActivity() { } private fun observeViewModel() { - lifecycleScope.launch { viewModel.searchedPlaces.collect { places -> updateSearchedPlaceList(places) binding.tvHelpMessage.visibility = if (places.isEmpty()) View.VISIBLE else View.GONE } } - viewModel.logList.observe(this, Observer { logList -> - logAdapter.submitList(PlaceMapper.mapPlaces(logList)) - }) + + lifecycleScope.launch { + viewModel.logList.collect { logList -> + logAdapter.submitList(PlaceMapper.mapPlaces(logList)) + } + } } private fun updateSearchedPlaceList(places: List) { diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt index d973a05d..8a957da6 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt @@ -3,25 +3,18 @@ package campus.tech.kakao.map.presentation.search import androidx.lifecycle.* import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.debounce -import kotlinx.coroutines.flow.flatMapLatest -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.* +import kotlinx.coroutines.launch class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { val searchText = MutableLiveData() - private val _uiState = MutableStateFlow(SearchUiState(true,false)) - val UiState: StateFlow = _uiState.asStateFlow() + private val _uiState = MutableStateFlow(SearchUiState(true, false)) + val uiState: StateFlow = _uiState.asStateFlow() - private val _logList = MutableLiveData>() - val logList: LiveData> get() = _logList + private val _logList = MutableStateFlow>(emptyList()) + val logList: StateFlow> get() = _logList.asStateFlow() private val _searchedPlaces = searchText.asFlow() .debounce(500L) @@ -34,42 +27,50 @@ class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { } else { flowOf(emptyList()) } - }.stateIn(viewModelScope,SharingStarted.Lazily, emptyList()) + }.stateIn(viewModelScope, SharingStarted.Lazily, emptyList()) val searchedPlaces: StateFlow> get() = _searchedPlaces init { - _logList.value = getLogs() + viewModelScope.launch { + _logList.value = getLogs() + } } fun clearSearch() { searchText.value = "" } - suspend fun getPlaces(keyword: String): List{ + + suspend fun getPlaces(keyword: String): List { return repository.getPlaces(keyword) } - fun getPlaceById(id: String): Place?{ + suspend fun getPlaceById(id: String): Place? { return repository.getPlaceById(id) } - fun getLogs(): List { + + private suspend fun getLogs(): List { return repository.getLogs() } fun updateLogs(place: Place) { - val updatedList = _logList.value?.toMutableList() ?: mutableListOf() - val existingLog = updatedList.find { it.id == place.id } - if (existingLog != null) { - updatedList.remove(existingLog) - updatedList.add(0, existingLog) - } else { - updatedList.add(0, place) + viewModelScope.launch { + val updatedList = _logList.value.toMutableList() + val existingLog = updatedList.find { it.id == place.id } + if (existingLog != null) { + updatedList.remove(existingLog) + updatedList.add(0, existingLog) + } else { + updatedList.add(0, place) + } + _logList.value = updatedList + repository.updateLogs(updatedList) } - _logList.value = updatedList - repository.updateLogs(updatedList) } fun removeLog(id: String) { - repository.removeLog(id) - _logList.value = getLogs() + viewModelScope.launch { + repository.removeLog(id) + _logList.value = getLogs() + } } } From 2e23dd53ec9c5a7452aaa938c9e688f032ca61bd Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Wed, 24 Jul 2024 18:52:18 +0900 Subject: [PATCH 07/22] =?UTF-8?q?refactor:=20=EC=A7=80=EC=97=AD,=20?= =?UTF-8?q?=EC=9B=90=EA=B2=A9=20repository=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../campus/tech/kakao/map/PlaceApplication.kt | 5 +- .../kakao/map/data/LastVisitedPlaceManager.kt | 33 ++++++++ .../campus/tech/kakao/map/data/PlaceDB.kt | 83 ------------------- .../map/data/PlaceLocalDataRepository.kt | 69 +++++++++++++++ .../map/data/PlaceRemoteDataRepository.kt | 13 +++ .../kakao/map/data/PlaceRepositoryImpl.kt | 38 --------- .../map/domain/repository/PlaceRepository.kt | 2 +- .../map/presentation/map/MapViewModel.kt | 2 - 8 files changed, 118 insertions(+), 127 deletions(-) create mode 100644 app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt delete mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt delete mode 100644 app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt index 93baec4b..99390af5 100644 --- a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -4,14 +4,13 @@ import android.app.Application import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities -import campus.tech.kakao.map.data.PlaceDB -import campus.tech.kakao.map.data.PlaceRepositoryImpl +import campus.tech.kakao.map.data.PlaceRemoteDataRepository import campus.tech.kakao.map.domain.repository.PlaceRepository import com.kakao.vectormap.KakaoMapSdk class PlaceApplication: Application() { - val placeRepository: PlaceRepository by lazy { PlaceRepositoryImpl(PlaceDB(this)) } + val placeRepository: PlaceRepository by lazy { PlaceRemoteDataRepository(this) } override fun onCreate() { super.onCreate() diff --git a/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt b/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt new file mode 100644 index 00000000..9fcbacc5 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt @@ -0,0 +1,33 @@ +package campus.tech.kakao.map.data + +import android.content.Context +import campus.tech.kakao.map.domain.model.Place + +class LastVisitedPlaceManager(context: Context) { + + private val sharedPreferences = context.getSharedPreferences("LastVisitedPlace", Context.MODE_PRIVATE) + + fun saveLastVisitedPlace(place: Place) { + val editor = sharedPreferences.edit() + editor.putString("placeName", place.place) + editor.putString("roadAddressName", place.address) + editor.putString("categoryName", place.category) + editor.putString("yPos", place.yPos) + editor.putString("xPos", place.xPos) + editor.apply() + } + + fun getLastVisitedPlace(): Place? { + val placeName = sharedPreferences.getString("placeName", null) + val roadAddressName = sharedPreferences.getString("roadAddressName", null) + val categoryName = sharedPreferences.getString("categoryName", null) + val yPos = sharedPreferences.getString("yPos", null) + val xPos = sharedPreferences.getString("xPos", null) + + return if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { + Place("", placeName, roadAddressName, categoryName, xPos, yPos) + } else { + null + } + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt deleted file mode 100644 index 9e99537b..00000000 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceDB.kt +++ /dev/null @@ -1,83 +0,0 @@ -package campus.tech.kakao.map.data - -import android.content.Context -import campus.tech.kakao.map.data.net.KakaoApiClient -import campus.tech.kakao.map.domain.model.Place -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext - -class PlaceDB(private val context: Context) { - - private val placeDao = AppDatabase.getDatabase(context).placeDao() - private val sharedPreferences = context.getSharedPreferences("LastVisitedPlace", Context.MODE_PRIVATE) - - suspend fun getPlaces(keyword: String): List { - val places = KakaoApiClient.getPlaces(keyword) - updatePlaces(places) - return places - } - - suspend fun updatePlaces(places: List) { - withContext(Dispatchers.IO) { - placeDao.deleteAllPlaces() - placeDao.insertPlaces(places.map { - PlaceEntity(it.id, it.place, it.address, it.category, it.xPos, it.yPos) - }) - } - } - - suspend fun getPlaceById(id: String): Place? { - return withContext(Dispatchers.IO) { - placeDao.getPlaceById(id)?.let { - Place(it.id, it.place,it.address, it.type, it.xPos, it.yPos) - } - } - } - - suspend fun updateLogs(logs: List) { - withContext(Dispatchers.IO) { - placeDao.deleteAllLogs() - placeDao.insertLogs(logs.map { - PlaceLogEntity(it.id, it.place) - }) - } - } - - suspend fun removeLog(id: String) { - withContext(Dispatchers.IO) { - placeDao.removeLog(id) - } - } - - suspend fun getLogs(): List { - return withContext(Dispatchers.IO) { - placeDao.getLogs().map { - Place(it.id, it.place, "", "", "", "") - } - } - } - - fun saveLastVisitedPlace(place: Place) { - val editor = sharedPreferences.edit() - editor.putString("placeName", place.place) - editor.putString("roadAddressName", place.address) - editor.putString("categoryName", place.category) - editor.putString("yPos", place.yPos) - editor.putString("xPos", place.xPos) - editor.apply() - } - - fun getLastVisitedPlace(): Place? { - val placeName = sharedPreferences.getString("placeName", null) - val roadAddressName = sharedPreferences.getString("roadAddressName", null) - val categoryName = sharedPreferences.getString("categoryName", null) - val yPos = sharedPreferences.getString("yPos", null) - val xPos = sharedPreferences.getString("xPos", null) - - return if (placeName != null && roadAddressName != null && categoryName != null && yPos != null && xPos != null) { - Place("", placeName, roadAddressName, categoryName, xPos, yPos) - } else { - null - } - } -} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt new file mode 100644 index 00000000..648e5760 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt @@ -0,0 +1,69 @@ +package campus.tech.kakao.map.data + +import android.content.Context +import campus.tech.kakao.map.domain.model.Place +import campus.tech.kakao.map.domain.repository.PlaceRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +open class PlaceLocalDataRepository(private val context: Context) : PlaceRepository { + + private val placeDao = AppDatabase.getDatabase(context).placeDao() + private val lastVisitedPlaceManager = LastVisitedPlaceManager(context) + + override suspend fun getPlaces(placeName: String): List { + return withContext(Dispatchers.IO) { + placeDao.getPlaces(placeName).map { + Place(it.id, it.place, it.address, it.type, it.xPos, it.yPos) + } + } + } + + override suspend fun updatePlaces(places: List) { + withContext(Dispatchers.IO) { + placeDao.deleteAllPlaces() + placeDao.insertPlaces(places.map { + PlaceEntity(it.id, it.place, it.address, it.category, it.xPos, it.yPos) + }) + } + } + + override suspend fun getPlaceById(id: String): Place? { + return withContext(Dispatchers.IO) { + placeDao.getPlaceById(id)?.let { + Place(it.id, it.place, it.address, it.type, it.xPos, it.yPos) + } + } + } + + override suspend fun updateLogs(logs: List) { + withContext(Dispatchers.IO) { + placeDao.deleteAllLogs() + placeDao.insertLogs(logs.map { + PlaceLogEntity(it.id, it.place) + }) + } + } + + override suspend fun removeLog(id: String) { + withContext(Dispatchers.IO) { + placeDao.removeLog(id) + } + } + + override suspend fun getLogs(): List { + return withContext(Dispatchers.IO) { + placeDao.getLogs().map { + Place(it.id, it.place, "", "", "", "") + } + } + } + + override suspend fun saveLastVisitedPlace(place: Place) { + lastVisitedPlaceManager.saveLastVisitedPlace(place) + } + + override suspend fun getLastVisitedPlace(): Place? { + return lastVisitedPlaceManager.getLastVisitedPlace() + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt new file mode 100644 index 00000000..a2c7b6ff --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt @@ -0,0 +1,13 @@ +package campus.tech.kakao.map.data + +import android.content.Context +import campus.tech.kakao.map.data.net.KakaoApiClient +import campus.tech.kakao.map.domain.model.Place + +class PlaceRemoteDataRepository(context: Context) : PlaceLocalDataRepository(context){ + override suspend fun getPlaces(placeName: String): List { + val places = KakaoApiClient.getPlaces(placeName) + updatePlaces(places) + return places + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt deleted file mode 100644 index 7621aa52..00000000 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceRepositoryImpl.kt +++ /dev/null @@ -1,38 +0,0 @@ -package campus.tech.kakao.map.data - -import campus.tech.kakao.map.domain.model.Place -import campus.tech.kakao.map.domain.repository.PlaceRepository - -class PlaceRepositoryImpl(private val placeDB: PlaceDB):PlaceRepository{ - override suspend fun getPlaces(placeName: String): List { - return placeDB.getPlaces(placeName) - } - - override suspend fun updatePlaces(places: List) { - placeDB.updatePlaces(places) - } - - override suspend fun getPlaceById(id: String): Place? { - return placeDB.getPlaceById(id) - } - - override suspend fun getLogs(): List { - return placeDB.getLogs() - } - - override suspend fun updateLogs(placeLog: List) { - placeDB.updateLogs(placeLog) - } - - override suspend fun removeLog(id: String) { - placeDB.removeLog(id) - } - - override suspend fun saveLastVisitedPlace(place: Place) { - placeDB.saveLastVisitedPlace(place) - } - - override suspend fun getLastVisitedPlace(): Place? { - return placeDB.getLastVisitedPlace() - } -} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt index 296faed0..808d9d34 100644 --- a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt @@ -7,7 +7,7 @@ interface PlaceRepository { suspend fun updatePlaces(places:List) suspend fun getPlaceById(id: String):Place? suspend fun getLogs(): List - suspend fun updateLogs(placeLog: List) + suspend fun updateLogs(logs: List) suspend fun removeLog(id: String) suspend fun saveLastVisitedPlace(place: Place) suspend fun getLastVisitedPlace(): Place? diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt index b5aa565d..a43edaf9 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt @@ -4,8 +4,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import campus.tech.kakao.map.PlaceApplication -import campus.tech.kakao.map.data.PlaceRepositoryImpl import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository import kotlinx.coroutines.launch From af63296e6ee0362567a7a4b4e2ae391ffa8bc792 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Wed, 24 Jul 2024 19:02:22 +0900 Subject: [PATCH 08/22] =?UTF-8?q?refactor:=20MapViewModel=EC=97=90?= =?UTF-8?q?=EC=84=9C=20LiveData=EB=A5=BC=20Flow=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakao/map/presentation/map/MapActivity.kt | 21 ++++++++++++------- .../map/presentation/map/MapViewModel.kt | 7 +++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 6ec8bcd7..2aca5e8b 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -11,6 +11,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.domain.model.Place @@ -25,6 +26,7 @@ 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 kotlinx.coroutines.launch class MapActivity : AppCompatActivity() { private val mapView by lazy { findViewById(R.id.mapView) } @@ -40,6 +42,7 @@ class MapActivity : AppCompatActivity() { setContentView(R.layout.activity_map) initViewModel() + observeViewModel() initMapView() initSearchView() setResultLauncher() @@ -50,13 +53,6 @@ class MapActivity : AppCompatActivity() { val placeRepository = (application as PlaceApplication).placeRepository mapViewModel = ViewModelProvider(this, ViewModelFactory(placeRepository)) .get(MapViewModel::class.java) - - mapViewModel.lastVisitedPlace.observe(this, { place -> - place?.let { - updateMapWithPlaceData(it) - showBottomSheet(it) - } - }) } private fun initMapView() { @@ -79,6 +75,17 @@ class MapActivity : AppCompatActivity() { }) } + private fun observeViewModel() { + lifecycleScope.launch { + mapViewModel.lastVisitedPlace.collect { place -> + place?.let { + updateMapWithPlaceData(it) + showBottomSheet(it) + } + } + } + } + private fun isNetworkAvailable(): Boolean { return PlaceApplication.isNetworkActive() } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt index a43edaf9..b27da341 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt @@ -6,12 +6,15 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch class MapViewModel(private val repository: PlaceRepository): ViewModel() { - private val _lastVisitedPlace = MutableLiveData() - val lastVisitedPlace: LiveData get() = _lastVisitedPlace + private val _lastVisitedPlace = MutableStateFlow(null) + val lastVisitedPlace: StateFlow get() = _lastVisitedPlace.asStateFlow() fun loadLastVisitedPlace() { viewModelScope.launch { val place = repository.getLastVisitedPlace() From 98b6866d51ff2300539406459a06e938022c8bc0 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Wed, 24 Jul 2024 19:04:26 +0900 Subject: [PATCH 09/22] =?UTF-8?q?delete:=20PlaceContract=20=EB=B0=8F=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../campus/tech/kakao/map/MapActivityTest.kt | 37 --------- .../tech/kakao/map/RepositoryImplTest.kt | 80 ------------------- .../tech/kakao/map/SearchActivityTest.kt | 61 -------------- .../tech/kakao/map/util/PlaceContract.kt | 37 --------- 4 files changed, 215 deletions(-) delete mode 100644 app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt delete mode 100644 app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt delete mode 100644 app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt delete mode 100644 app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt diff --git a/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt deleted file mode 100644 index 152f300a..00000000 --- a/app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt +++ /dev/null @@ -1,37 +0,0 @@ -package campus.tech.kakao.map - -import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.intent.Intents -import androidx.test.espresso.intent.matcher.IntentMatchers -import androidx.test.espresso.matcher.ViewMatchers.isDisplayed -import androidx.test.espresso.matcher.ViewMatchers.withId -import androidx.test.ext.junit.rules.ActivityScenarioRule -import androidx.test.ext.junit.runners.AndroidJUnit4 -import campus.tech.kakao.map.presentation.map.MapActivity -import campus.tech.kakao.map.presentation.search.SearchActivity -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class MapActivityTest { - @get:Rule - var activityScenarioRule = ActivityScenarioRule(MapActivity::class.java) - - @Test - fun testActivityLaunch() { - - onView(withId(R.id.mapView)).check(matches(isDisplayed())) - onView(withId(R.id.searchView)).check(matches(isDisplayed())) - } - - @Test - fun testSearchedResultOnMap() { - Intents.init() - onView(withId(R.id.searchView)).perform(click()) - Intents.intended(IntentMatchers.hasComponent(SearchActivity::class.java.name)) - Intents.release() - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt deleted file mode 100644 index 00f57896..00000000 --- a/app/src/androidTest/java/campus/tech/kakao/map/RepositoryImplTest.kt +++ /dev/null @@ -1,80 +0,0 @@ -package campus.tech.kakao.map - -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import campus.tech.kakao.map.data.PlaceDBHelper -import campus.tech.kakao.map.domain.model.Place -import campus.tech.kakao.map.util.PlaceContract -import org.junit.After -import org.junit.Assert.assertEquals -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class RepositoryImplTest { - - private lateinit var repository: PlaceDBHelper - private lateinit var context: Context - - @Before - fun setUp() { - context = ApplicationProvider.getApplicationContext() - context.deleteDatabase(PlaceContract.DATABASE_NAME) - repository = PlaceDBHelper.getInstance(context) - } - - @After - fun after() { - repository.close() - context.deleteDatabase(PlaceContract.DATABASE_NAME) - } - - @Test - fun testInsertAndGetPlaces() { - val place1 = Place("1", "Place1", "Address1", "Category1", "10.0", "20.0") - val place2 = Place("2", "Place2", "Address2", "Category2", "30.0", "40.0") - val places = listOf(place1, place2) - - repository.updatePlaces(places) - - val result = repository.getAllPlaces() - assertEquals(2, result.size) - assertEquals("Place1", result[0].place) - assertEquals("Place2", result[1].place) - } - - @Test - fun testSearchPlaces() { - val place1 = Place("1", "Gangnam", "Address1", "Category1", "10.0", "20.0") - val place2 = Place("2", "Gangbuk", "Address2", "Category2", "30.0", "40.0") - val places = listOf(place1, place2) - - repository.updatePlaces(places) - - val result = repository.getPlaces("Gang") - assertEquals(2, result.size) - assertEquals("Gangnam", result[0].place) - assertEquals("Gangbuk", result[1].place) - } - - @Test - fun testLogs() { - val log1 = Place("1", "Log1", "", "", "", "") - val log2 = Place("2", "Log2", "", "", "", "") - val logs = listOf(log1, log2) - - repository.updateLogs(logs) - - var result = repository.getLogs() - assertEquals(2, result.size) - assertEquals("Log1", result[0].place) - assertEquals("Log2", result[1].place) - - repository.removeLog("1") - result = repository.getLogs() - assertEquals(1, result.size) - assertEquals("Log2", result[0].place) - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt b/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt deleted file mode 100644 index b1c8dda6..00000000 --- a/app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt +++ /dev/null @@ -1,61 +0,0 @@ -package campus.tech.kakao.map - -import android.content.Context -import android.content.SharedPreferences -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.replaceText -import androidx.test.espresso.contrib.RecyclerViewActions -import androidx.test.espresso.intent.Intents -import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent -import androidx.test.espresso.matcher.ViewMatchers.withId -import androidx.test.ext.junit.rules.ActivityScenarioRule -import campus.tech.kakao.map.presentation.map.MapActivity -import campus.tech.kakao.map.presentation.search.SearchActivity -import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter -import org.hamcrest.CoreMatchers.instanceOf -import org.junit.After -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class SearchActivityTest { - - private lateinit var sharedPreferences: SharedPreferences - private lateinit var context: Context - - @get:Rule - var activityScenarioRule = ActivityScenarioRule(SearchActivity::class.java) - - @Before - fun setUp() { - context = ApplicationProvider.getApplicationContext() - sharedPreferences = context.getSharedPreferences("mockk", Context.MODE_PRIVATE) - Intents.init() - } - - @After - fun after() { - sharedPreferences.edit().clear().apply() - Intents.release() - } - - @Test - fun testSearchAndVerifyMapActivityLaunched() { - onView(withId(R.id.edtSearch)).perform(click()).perform(replaceText("부산대")) - - Thread.sleep(1200L) - onView(withId(R.id.recyclerPlace)) - .perform( - RecyclerViewActions.actionOnHolderItem( - instanceOf(SearchedPlaceAdapter.LocationViewHolder::class.java), click() - ).atPosition(3) - ) - - Intents.intended(hasComponent(MapActivity::class.java.name)) - } -} diff --git a/app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt b/app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt deleted file mode 100644 index 34647795..00000000 --- a/app/src/main/java/campus/tech/kakao/map/util/PlaceContract.kt +++ /dev/null @@ -1,37 +0,0 @@ -package campus.tech.kakao.map.util - -object PlaceContract { - const val DATABASE_NAME = "place.db" - - const val TABLE_NAME: String = "db_place" - const val COLUMN_ID: String = "id" - const val COLUMN_NAME: String = "name" - const val COLUMN_LOCATION: String = "place" - const val COLUMN_TYPE: String = "type" - const val COLUMN_X_POS: String = "x_pos" - const val COLUMN_Y_POS: String = "y_pos" - - const val CREATE_QUERY = "CREATE TABLE $TABLE_NAME (" + - "$COLUMN_ID TEXT NOT NULL, " + - "$COLUMN_NAME TEXT NOT NULL, " + - "$COLUMN_LOCATION TEXT NOT NULL, " + - "$COLUMN_TYPE TEXT, " + - "$COLUMN_X_POS TEXT NOT NULL, " + - "$COLUMN_Y_POS TEXT NOT NULL " + - ");" - - const val DELETE_QUERY = "DELETE FROM $TABLE_NAME" - const val DROP_QUERY = "DROP TABLE IF EXISTS $TABLE_NAME" - - const val TABLE_LOG_NAME = "db_Log" - const val COLUMN_LOG_ID = "log_id" - const val COLUMN_LOG_NAME = "log_name" - - const val CREATE_LOG_QUERY = "CREATE TABLE IF NOT EXISTS $TABLE_LOG_NAME (" + - "$COLUMN_LOG_ID TEXT NOT NULL, " + - "$COLUMN_LOG_NAME TEXT NOT NULL" + - ");" - - const val DELETE_LOG_QUERY = "DELETE FROM $TABLE_LOG_NAME" - const val DROP_LOG_QUERY = "DROP TABLE IF EXISTS $TABLE_LOG_NAME" -} From 60023fe4c567fcfcc2dffd0305aea17e693b87e7 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Wed, 24 Jul 2024 19:10:46 +0900 Subject: [PATCH 10/22] =?UTF-8?q?refactor:=20data=20layer=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../campus/tech/kakao/map/data/PlaceLocalDataRepository.kt | 3 +++ .../java/campus/tech/kakao/map/data/{ => dao}/PlaceDao.kt | 4 +++- .../campus/tech/kakao/map/data/{ => database}/AppDatabase.kt | 5 ++++- .../java/campus/tech/kakao/map/data/{ => entity}/Entity.kt | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) rename app/src/main/java/campus/tech/kakao/map/data/{ => dao}/PlaceDao.kt (85%) rename app/src/main/java/campus/tech/kakao/map/data/{ => database}/AppDatabase.kt (78%) rename app/src/main/java/campus/tech/kakao/map/data/{ => entity}/Entity.kt (89%) diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt index 648e5760..0393bfa8 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt @@ -1,6 +1,9 @@ package campus.tech.kakao.map.data import android.content.Context +import campus.tech.kakao.map.data.database.AppDatabase +import campus.tech.kakao.map.data.entity.PlaceEntity +import campus.tech.kakao.map.data.entity.PlaceLogEntity import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt b/app/src/main/java/campus/tech/kakao/map/data/dao/PlaceDao.kt similarity index 85% rename from app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt rename to app/src/main/java/campus/tech/kakao/map/data/dao/PlaceDao.kt index f8c9c79f..26821b78 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceDao.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/dao/PlaceDao.kt @@ -1,8 +1,10 @@ -package campus.tech.kakao.map.data +package campus.tech.kakao.map.data.dao import androidx.room.* import androidx.room.Insert import androidx.room.Query +import campus.tech.kakao.map.data.entity.PlaceEntity +import campus.tech.kakao.map.data.entity.PlaceLogEntity @Dao interface PlaceDao { diff --git a/app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt b/app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt similarity index 78% rename from app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt rename to app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt index 65c8da61..c34fed98 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/AppDatabase.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt @@ -1,7 +1,10 @@ -package campus.tech.kakao.map.data +package campus.tech.kakao.map.data.database import android.content.Context import androidx.room.* +import campus.tech.kakao.map.data.dao.PlaceDao +import campus.tech.kakao.map.data.entity.PlaceEntity +import campus.tech.kakao.map.data.entity.PlaceLogEntity @Database(entities = [PlaceEntity::class, PlaceLogEntity::class], version = 1) abstract class AppDatabase: RoomDatabase(){ diff --git a/app/src/main/java/campus/tech/kakao/map/data/Entity.kt b/app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt similarity index 89% rename from app/src/main/java/campus/tech/kakao/map/data/Entity.kt rename to app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt index a9d51a74..dbc4f815 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/Entity.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt @@ -1,4 +1,4 @@ -package campus.tech.kakao.map.data +package campus.tech.kakao.map.data.entity import androidx.room.Entity import androidx.room.PrimaryKey From e2eb6816dd12052184d023460d9cf203bb36afd3 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Wed, 24 Jul 2024 19:15:49 +0900 Subject: [PATCH 11/22] =?UTF-8?q?chore:=20hilt=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 5 ++++- build.gradle.kts | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ec26980..4fa32bff 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,7 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("com.google.dagger.hilt.android") id("kotlin-kapt") } @@ -52,9 +53,11 @@ android { } dependencies { + kapt("com.google.dagger:hilt-compiler:2.48.1") + kapt("androidx.room:room-compiler:2.6.1") + implementation("com.google.dagger:hilt-android:2.48.1") implementation("androidx.room:room-ktx:2.6.1") implementation("androidx.room:room-runtime:2.6.1") - kapt("androidx.room:room-compiler:2.6.1") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0") diff --git a/build.gradle.kts b/build.gradle.kts index 6465d171..d6b55841 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("com.android.application") version "8.3.1" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false id("org.jlleitschuh.gradle.ktlint") version "12.1.0" apply false + id("com.google.dagger.hilt.android") version "2.48.1" apply false } allprojects { From e7e129972b4a7692a28501fa06a914baac8bcb04 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 00:49:48 +0900 Subject: [PATCH 12/22] =?UTF-8?q?refactor:=20Hilt=20=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EB=B0=8F=20Module=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 + .../campus/tech/kakao/map/PlaceApplication.kt | 4 +- .../kakao/map/data/LastVisitedPlaceManager.kt | 3 +- .../map/data/PlaceLocalDataRepository.kt | 19 +++------ .../map/data/PlaceRemoteDataRepository.kt | 32 ++++++++++++--- .../kakao/map/data/database/AppDatabase.kt | 29 -------------- .../kakao/map/data/database/PlaceDatabase.kt | 11 +++++ .../tech/kakao/map/data/net/KakaoApiClient.kt | 40 ------------------- .../tech/kakao/map/di/DatabaseModule.kt | 33 +++++++++++++++ .../campus/tech/kakao/map/di/NetworkModule.kt | 30 ++++++++++++++ .../tech/kakao/map/di/ViewModelModule.kt | 37 +++++++++++++++++ .../map/domain/repository/PlaceRepository.kt | 2 - .../map/presentation/ViewModelFactory.kt | 22 ---------- .../kakao/map/presentation/map/MapActivity.kt | 15 ++----- .../map/presentation/map/MapViewModel.kt | 15 ++++--- .../map/presentation/search/SearchActivity.kt | 15 ++----- .../presentation/search/SearchViewModel.kt | 7 +++- 17 files changed, 172 insertions(+), 144 deletions(-) delete mode 100644 app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt delete mode 100644 app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/di/DatabaseModule.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/di/NetworkModule.kt create mode 100644 app/src/main/java/campus/tech/kakao/map/di/ViewModelModule.kt delete mode 100644 app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4fa32bff..941e25c2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,6 +55,8 @@ android { dependencies { kapt("com.google.dagger:hilt-compiler:2.48.1") kapt("androidx.room:room-compiler:2.6.1") + implementation ("androidx.activity:activity-ktx:1.1.0") + implementation ("androidx.fragment:fragment-ktx:1.2.5") implementation("com.google.dagger:hilt-android:2.48.1") implementation("androidx.room:room-ktx:2.6.1") implementation("androidx.room:room-runtime:2.6.1") diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt index 99390af5..eb7a850d 100644 --- a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -7,11 +7,11 @@ import android.net.NetworkCapabilities import campus.tech.kakao.map.data.PlaceRemoteDataRepository import campus.tech.kakao.map.domain.repository.PlaceRepository import com.kakao.vectormap.KakaoMapSdk +import dagger.hilt.android.HiltAndroidApp +@HiltAndroidApp class PlaceApplication: Application() { - val placeRepository: PlaceRepository by lazy { PlaceRemoteDataRepository(this) } - override fun onCreate() { super.onCreate() appInstance = this diff --git a/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt b/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt index 9fcbacc5..96b3832c 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/LastVisitedPlaceManager.kt @@ -2,8 +2,9 @@ package campus.tech.kakao.map.data import android.content.Context import campus.tech.kakao.map.domain.model.Place +import javax.inject.Inject -class LastVisitedPlaceManager(context: Context) { +class LastVisitedPlaceManager @Inject constructor(context: Context) { private val sharedPreferences = context.getSharedPreferences("LastVisitedPlace", Context.MODE_PRIVATE) diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt index 0393bfa8..05c28157 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt @@ -1,18 +1,17 @@ package campus.tech.kakao.map.data -import android.content.Context -import campus.tech.kakao.map.data.database.AppDatabase +import campus.tech.kakao.map.data.dao.PlaceDao import campus.tech.kakao.map.data.entity.PlaceEntity import campus.tech.kakao.map.data.entity.PlaceLogEntity import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import javax.inject.Inject -open class PlaceLocalDataRepository(private val context: Context) : PlaceRepository { - - private val placeDao = AppDatabase.getDatabase(context).placeDao() - private val lastVisitedPlaceManager = LastVisitedPlaceManager(context) +open class PlaceLocalDataRepository @Inject constructor( + private val placeDao: PlaceDao, +) : PlaceRepository { override suspend fun getPlaces(placeName: String): List { return withContext(Dispatchers.IO) { @@ -61,12 +60,4 @@ open class PlaceLocalDataRepository(private val context: Context) : PlaceReposit } } } - - override suspend fun saveLastVisitedPlace(place: Place) { - lastVisitedPlaceManager.saveLastVisitedPlace(place) - } - - override suspend fun getLastVisitedPlace(): Place? { - return lastVisitedPlaceManager.getLastVisitedPlace() - } } diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt index a2c7b6ff..b5ef6485 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceRemoteDataRepository.kt @@ -1,13 +1,35 @@ package campus.tech.kakao.map.data import android.content.Context -import campus.tech.kakao.map.data.net.KakaoApiClient +import campus.tech.kakao.map.BuildConfig +import campus.tech.kakao.map.data.dao.PlaceDao +import campus.tech.kakao.map.data.net.KakaoApi import campus.tech.kakao.map.domain.model.Place +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import javax.inject.Inject -class PlaceRemoteDataRepository(context: Context) : PlaceLocalDataRepository(context){ +class PlaceRemoteDataRepository @Inject constructor( + private val placeDao: PlaceDao, + private val kakaoApi: KakaoApi +) : PlaceLocalDataRepository(placeDao){ override suspend fun getPlaces(placeName: String): List { - val places = KakaoApiClient.getPlaces(placeName) - updatePlaces(places) - return places + return withContext(Dispatchers.IO) { + val resultPlaces = mutableListOf() + for (page in 1..3) { + val response = kakaoApi.getSearchKeyword( + key = BuildConfig.KAKAO_REST_API_KEY, + query = placeName, + size = 15, + page = page + ) + if (response.isSuccessful) { + response.body()?.documents?.let { resultPlaces.addAll(it) } + } else throw RuntimeException("통신 에러 발생") + } + updatePlaces(resultPlaces) + resultPlaces + } } } diff --git a/app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt b/app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt deleted file mode 100644 index c34fed98..00000000 --- a/app/src/main/java/campus/tech/kakao/map/data/database/AppDatabase.kt +++ /dev/null @@ -1,29 +0,0 @@ -package campus.tech.kakao.map.data.database - -import android.content.Context -import androidx.room.* -import campus.tech.kakao.map.data.dao.PlaceDao -import campus.tech.kakao.map.data.entity.PlaceEntity -import campus.tech.kakao.map.data.entity.PlaceLogEntity - -@Database(entities = [PlaceEntity::class, PlaceLogEntity::class], version = 1) -abstract class AppDatabase: RoomDatabase(){ - abstract fun placeDao(): PlaceDao - - companion object { - @Volatile - private var INSTANCE: AppDatabase? = null - - fun getDatabase(context: Context): AppDatabase { - return INSTANCE ?: synchronized(this) { - val instance = Room.databaseBuilder( - context.applicationContext, - AppDatabase::class.java, - "place_database" - ).build() - INSTANCE = instance - instance - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt b/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt new file mode 100644 index 00000000..d5fc6101 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt @@ -0,0 +1,11 @@ +package campus.tech.kakao.map.data.database + +import androidx.room.* +import campus.tech.kakao.map.data.dao.PlaceDao +import campus.tech.kakao.map.data.entity.PlaceEntity +import campus.tech.kakao.map.data.entity.PlaceLogEntity + +@Database(entities = [PlaceEntity::class, PlaceLogEntity::class], version = 1) +abstract class PlaceDatabase: RoomDatabase(){ + abstract fun placeDao(): PlaceDao +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt b/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt deleted file mode 100644 index 587d3124..00000000 --- a/app/src/main/java/campus/tech/kakao/map/data/net/KakaoApiClient.kt +++ /dev/null @@ -1,40 +0,0 @@ -package campus.tech.kakao.map.data.net - - -import campus.tech.kakao.map.BuildConfig -import campus.tech.kakao.map.domain.model.Place -import campus.tech.kakao.map.domain.model.ResultSearchKeyword -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext -import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory - -object KakaoApiClient { - private const val BASE_URL = "https://dapi.kakao.com/" - - val api: KakaoApi by lazy { - Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create()) - .build() - .create(KakaoApi::class.java) - } - - suspend fun getPlaces(keyword: String): List = - withContext(Dispatchers.IO) { - val resultPlaces = mutableListOf() - for (page in 1..3) { - val response = api.getSearchKeyword( - key = BuildConfig.KAKAO_REST_API_KEY, - query = keyword, - size = 15, - page = page - ) - if (response.isSuccessful) { - response.body()?.documents?.let { resultPlaces.addAll(it) } - } else throw RuntimeException("통신 에러 발생") - } - resultPlaces - } -} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/di/DatabaseModule.kt b/app/src/main/java/campus/tech/kakao/map/di/DatabaseModule.kt new file mode 100644 index 00000000..67f817b8 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/di/DatabaseModule.kt @@ -0,0 +1,33 @@ +package campus.tech.kakao.map.di + +import android.content.Context +import androidx.room.Room +import campus.tech.kakao.map.data.dao.PlaceDao +import campus.tech.kakao.map.data.database.PlaceDatabase +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 + +@Module +@InstallIn(SingletonComponent::class) +object DatabaseModule { + + @Provides + @Singleton + fun provideAppDatabase(@ApplicationContext context: Context): PlaceDatabase { + return Room.databaseBuilder( + context.applicationContext, + PlaceDatabase::class.java, + "place_database" + ).build() + } + + @Provides + @Singleton + fun providePlaceDao(placeDatabase: PlaceDatabase): PlaceDao { + return placeDatabase.placeDao() + } +} \ 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..8857152c --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/di/NetworkModule.kt @@ -0,0 +1,30 @@ +package campus.tech.kakao.map.di + +import campus.tech.kakao.map.data.net.KakaoApi +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object NetworkModule { + private const val BASE_URL = "https://dapi.kakao.com/" + @Singleton + @Provides + fun provideRetrofit(): Retrofit { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create()) + .build() + } + + @Singleton + @Provides + fun provideKakaoApi(retrofit: Retrofit): KakaoApi { + return retrofit.create(KakaoApi::class.java) + } +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/di/ViewModelModule.kt b/app/src/main/java/campus/tech/kakao/map/di/ViewModelModule.kt new file mode 100644 index 00000000..d8eec735 --- /dev/null +++ b/app/src/main/java/campus/tech/kakao/map/di/ViewModelModule.kt @@ -0,0 +1,37 @@ +package campus.tech.kakao.map.di + +import android.content.Context +import campus.tech.kakao.map.PlaceApplication +import campus.tech.kakao.map.data.* +import campus.tech.kakao.map.data.dao.PlaceDao +import campus.tech.kakao.map.data.net.KakaoApi +import campus.tech.kakao.map.domain.repository.PlaceRepository +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.components.ViewModelComponent +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Qualifier +import javax.inject.Singleton + +@Module +@InstallIn(ViewModelComponent::class) +object ViewModelModule { + // SearchViewModel + @Provides + fun providePlaceRepository( + placeDao: PlaceDao, kakaoApi: KakaoApi): PlaceRepository { + return if (PlaceApplication.isNetworkActive()) { + PlaceRemoteDataRepository(placeDao,kakaoApi) + } else { + PlaceLocalDataRepository(placeDao) + } + } + + // MapViewModel + @Provides + fun provideLastVisitedPlaceManager(@ApplicationContext context: Context): LastVisitedPlaceManager{ + return LastVisitedPlaceManager(context) + } +} diff --git a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt index 808d9d34..d5426c30 100644 --- a/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/domain/repository/PlaceRepository.kt @@ -9,6 +9,4 @@ interface PlaceRepository { suspend fun getLogs(): List suspend fun updateLogs(logs: List) suspend fun removeLog(id: String) - suspend fun saveLastVisitedPlace(place: Place) - suspend fun getLastVisitedPlace(): Place? } \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt b/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt deleted file mode 100644 index 84d027db..00000000 --- a/app/src/main/java/campus/tech/kakao/map/presentation/ViewModelFactory.kt +++ /dev/null @@ -1,22 +0,0 @@ -package campus.tech.kakao.map.presentation - -import androidx.lifecycle.ViewModel -import androidx.lifecycle.ViewModelProvider -import campus.tech.kakao.map.domain.repository.PlaceRepository -import campus.tech.kakao.map.presentation.map.MapViewModel -import campus.tech.kakao.map.presentation.search.SearchViewModel - - -class ViewModelFactory(private val repository: PlaceRepository) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { - if (modelClass.isAssignableFrom(SearchViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return SearchViewModel(repository) as T - } - if (modelClass.isAssignableFrom(MapViewModel::class.java)) { - @Suppress("UNCHECKED_CAST") - return MapViewModel(repository) as T - } - throw IllegalArgumentException("Unknown ViewModel class") - } -} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 2aca5e8b..3b7248fb 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -3,20 +3,18 @@ package campus.tech.kakao.map.presentation.map import android.app.Activity import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.View import android.widget.TextView 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.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.presentation.search.SearchActivity -import campus.tech.kakao.map.presentation.ViewModelFactory import com.kakao.vectormap.KakaoMap import com.kakao.vectormap.KakaoMapReadyCallback import com.kakao.vectormap.LatLng @@ -26,8 +24,10 @@ 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 val mapView by lazy { findViewById(R.id.mapView) } private val searchView by lazy { findViewById(R.id.searchView) } @@ -35,13 +35,12 @@ class MapActivity : AppCompatActivity() { private lateinit var mapBottomSheet: MapBottomSheet private lateinit var tvErrorMessage: TextView private lateinit var kakaoMap: KakaoMap - private lateinit var mapViewModel: MapViewModel + private val mapViewModel: MapViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_map) - initViewModel() observeViewModel() initMapView() initSearchView() @@ -49,12 +48,6 @@ class MapActivity : AppCompatActivity() { } - private fun initViewModel(){ - val placeRepository = (application as PlaceApplication).placeRepository - mapViewModel = ViewModelProvider(this, ViewModelFactory(placeRepository)) - .get(MapViewModel::class.java) - } - private fun initMapView() { mapView.start(object : MapLifeCycleCallback() { override fun onMapDestroy() {} diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt index b27da341..3451d8ec 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt @@ -1,29 +1,32 @@ package campus.tech.kakao.map.presentation.map -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import campus.tech.kakao.map.data.LastVisitedPlaceManager import campus.tech.kakao.map.domain.model.Place -import campus.tech.kakao.map.domain.repository.PlaceRepository +import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import javax.inject.Inject -class MapViewModel(private val repository: PlaceRepository): ViewModel() { +@HiltViewModel +class MapViewModel +@Inject +constructor(private val manager: LastVisitedPlaceManager): ViewModel() { private val _lastVisitedPlace = MutableStateFlow(null) val lastVisitedPlace: StateFlow get() = _lastVisitedPlace.asStateFlow() fun loadLastVisitedPlace() { viewModelScope.launch { - val place = repository.getLastVisitedPlace() + val place = manager.getLastVisitedPlace() _lastVisitedPlace.value = place } } fun saveLastVisitedPlace(place: Place) { viewModelScope.launch { - repository.saveLastVisitedPlace(place) + manager.saveLastVisitedPlace(place) _lastVisitedPlace.value = place } } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt index 9b014054..193c2d2a 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt @@ -3,30 +3,29 @@ package campus.tech.kakao.map.presentation.search import android.content.Intent import android.os.Bundle import android.view.View +import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.databinding.ActivityMainBinding import campus.tech.kakao.map.presentation.adapter.SearchedPlaceAdapter import campus.tech.kakao.map.presentation.adapter.LogAdapter import campus.tech.kakao.map.domain.model.Place -import campus.tech.kakao.map.presentation.ViewModelFactory import campus.tech.kakao.map.presentation.map.MapActivity import campus.tech.kakao.map.util.PlaceMapper -import kotlinx.coroutines.flow.collect +import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch +@AndroidEntryPoint class SearchActivity : AppCompatActivity() { private lateinit var binding: ActivityMainBinding private lateinit var searchedPlaceAdapter: SearchedPlaceAdapter private lateinit var logAdapter: LogAdapter - private lateinit var viewModel: SearchViewModel + private val viewModel: SearchViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -34,17 +33,11 @@ class SearchActivity : AppCompatActivity() { } private fun init() { - initViewModel() initBinding() setupRecyclerViews() observeViewModel() } - private fun initViewModel() { - val placeRepository = (application as PlaceApplication).placeRepository - viewModel = ViewModelProvider(this, ViewModelFactory(placeRepository)) - .get(SearchViewModel::class.java) - } private fun initBinding() { binding = DataBindingUtil.setContentView(this, R.layout.activity_main) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt index 8a957da6..4c60f276 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt @@ -3,10 +3,15 @@ package campus.tech.kakao.map.presentation.search import androidx.lifecycle.* import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository +import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch +import javax.inject.Inject -class SearchViewModel(private val repository: PlaceRepository) : ViewModel() { +@HiltViewModel +class SearchViewModel +@Inject +constructor( private val repository: PlaceRepository) : ViewModel() { val searchText = MutableLiveData() From 7fb759cc574b9f9dd9614ad502c05d95c5bc64da Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 02:16:03 +0900 Subject: [PATCH 13/22] =?UTF-8?q?feat:=20=EB=84=A4=ED=8A=B8=EC=9B=8C?= =?UTF-8?q?=ED=81=AC=20=EC=97=B0=EA=B2=B0=20=EC=8B=9C=20=EC=A0=95=EC=83=81?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=B2=98=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 지도 화면을 스와이프 하면 네트워크 상태에 따라 화면 갱신 --- app/build.gradle.kts | 1 + .../kakao/map/presentation/map/MapActivity.kt | 59 +++++++----- .../presentation/search/SearchViewModel.kt | 2 +- app/src/main/res/layout/activity_map.xml | 90 ++++++++++--------- 4 files changed, 87 insertions(+), 65 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 941e25c2..e3447cdf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,6 +55,7 @@ android { dependencies { kapt("com.google.dagger:hilt-compiler:2.48.1") kapt("androidx.room:room-compiler:2.6.1") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation ("androidx.activity:activity-ktx:1.1.0") implementation ("androidx.fragment:fragment-ktx:1.2.5") implementation("com.google.dagger:hilt-android:2.48.1") diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 3b7248fb..48655703 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -11,6 +11,7 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.lifecycleScope +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R import campus.tech.kakao.map.domain.model.Place @@ -31,6 +32,7 @@ import kotlinx.coroutines.launch class MapActivity : AppCompatActivity() { private val mapView by lazy { findViewById(R.id.mapView) } private val searchView by lazy { findViewById(R.id.searchView) } + private val swipeRefreshLayout by lazy {findViewById(R.id.swipeRefreshLayout)} private lateinit var resultLauncher: ActivityResultLauncher private lateinit var mapBottomSheet: MapBottomSheet private lateinit var tvErrorMessage: TextView @@ -41,13 +43,30 @@ class MapActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_map) - observeViewModel() + collectViewModel() + initSwipeRefreshLayout() initMapView() initSearchView() setResultLauncher() } + private fun collectViewModel() { + lifecycleScope.launch { + mapViewModel.lastVisitedPlace.collect { place -> + place?.let { + updateMapWithPlaceData(it) + showBottomSheet(it) + } + } + } + } + private fun initSwipeRefreshLayout() { + swipeRefreshLayout.setOnRefreshListener { + showMapPage() + swipeRefreshLayout.isRefreshing = false + } + } private fun initMapView() { mapView.start(object : MapLifeCycleCallback() { override fun onMapDestroy() {} @@ -56,37 +75,24 @@ class MapActivity : AppCompatActivity() { } }, object : KakaoMapReadyCallback() { override fun onMapReady(map: KakaoMap) { - if (!isNetworkAvailable()) { - showErrorPage(Exception("네트워크 연결 오류")) - }else{ - kakaoMap = map - mapViewModel.loadLastVisitedPlace() - tvErrorMessage.visibility = View.GONE - mapView.visibility = View.VISIBLE - } + kakaoMap = map + showMapPage() } }) } - private fun observeViewModel() { - lifecycleScope.launch { - mapViewModel.lastVisitedPlace.collect { place -> - place?.let { - updateMapWithPlaceData(it) - showBottomSheet(it) - } - } - } - } private fun isNetworkAvailable(): Boolean { return PlaceApplication.isNetworkActive() } - private fun initSearchView() { - searchView.setOnClickListener { - val intent = Intent(this, SearchActivity::class.java) - resultLauncher.launch(intent) + private fun showMapPage(){ + if (!isNetworkAvailable()) { + showErrorPage(Exception("네트워크 연결 오류")) + } else { + mapViewModel.loadLastVisitedPlace() + tvErrorMessage.visibility = View.GONE + mapView.visibility = View.VISIBLE } } @@ -97,6 +103,13 @@ class MapActivity : AppCompatActivity() { tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message } + private fun initSearchView() { + searchView.setOnClickListener { + val intent = Intent(this, SearchActivity::class.java) + resultLauncher.launch(intent) + } + } + private fun setResultLauncher() { resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> if (result.resultCode == Activity.RESULT_OK) { diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt index 4c60f276..7e935c3a 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt @@ -45,7 +45,7 @@ constructor( private val repository: PlaceRepository) : ViewModel() { searchText.value = "" } - suspend fun getPlaces(keyword: String): List { + private suspend fun getPlaces(keyword: String): List { return repository.getPlaces(keyword) } diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index 87f5b4b7..920c87d8 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -1,53 +1,61 @@ - - - - + + + + + + + + + - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + From 68187f22a140ff92fbe25d64296429ceca179e35 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 04:38:00 +0900 Subject: [PATCH 14/22] =?UTF-8?q?fix:=20=EC=A7=80=EB=8F=84=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EA=B0=B1=EC=8B=A0=20=EC=8B=9C=20=EA=B0=95=EC=A0=9C?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=20=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakao/map/presentation/map/MapActivity.kt | 33 +++++++++++-------- .../map/presentation/map/MapBottomSheet.kt | 6 ++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 48655703..14e8650d 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -33,9 +33,9 @@ class MapActivity : AppCompatActivity() { private val mapView by lazy { findViewById(R.id.mapView) } private val searchView by lazy { findViewById(R.id.searchView) } private val swipeRefreshLayout by lazy {findViewById(R.id.swipeRefreshLayout)} + private val tvErrorMessage by lazy {findViewById(R.id.tvErrorMessage)} private lateinit var resultLauncher: ActivityResultLauncher private lateinit var mapBottomSheet: MapBottomSheet - private lateinit var tvErrorMessage: TextView private lateinit var kakaoMap: KakaoMap private val mapViewModel: MapViewModel by viewModels() @@ -63,7 +63,12 @@ class MapActivity : AppCompatActivity() { } private fun initSwipeRefreshLayout() { swipeRefreshLayout.setOnRefreshListener { - showMapPage() + if (!isNetworkAvailable()) { + showErrorPage(Exception("네트워크 연결 오류")) + }else{ + showMapPage() + showBottomSheet(mapViewModel.lastVisitedPlace.value) + } swipeRefreshLayout.isRefreshing = false } } @@ -76,28 +81,30 @@ class MapActivity : AppCompatActivity() { }, object : KakaoMapReadyCallback() { override fun onMapReady(map: KakaoMap) { kakaoMap = map - showMapPage() + if (!isNetworkAvailable()) { + showErrorPage(Exception("네트워크 연결 오류")) + }else{ + initMapPage() + } } }) } - private fun isNetworkAvailable(): Boolean { return PlaceApplication.isNetworkActive() } + private fun initMapPage(){ + showMapPage() + mapViewModel.loadLastVisitedPlace() + } + private fun showMapPage(){ - if (!isNetworkAvailable()) { - showErrorPage(Exception("네트워크 연결 오류")) - } else { - mapViewModel.loadLastVisitedPlace() - tvErrorMessage.visibility = View.GONE - mapView.visibility = View.VISIBLE - } + tvErrorMessage.visibility = View.GONE + mapView.visibility = View.VISIBLE } private fun showErrorPage(error: Exception) { - tvErrorMessage = findViewById(R.id.tvErrorMessage) tvErrorMessage.visibility = View.VISIBLE mapView.visibility = View.GONE tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message @@ -138,7 +145,7 @@ class MapActivity : AppCompatActivity() { layer?.addLabel(options) } - private fun showBottomSheet(place: Place) { + private fun showBottomSheet(place: Place?) { mapBottomSheet = MapBottomSheet(place) mapBottomSheet.show(supportFragmentManager, mapBottomSheet.tag) } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt index 9fe165e1..fe652dfd 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt @@ -9,7 +9,7 @@ import campus.tech.kakao.map.R import campus.tech.kakao.map.domain.model.Place import com.google.android.material.bottomsheet.BottomSheetDialogFragment -class MapBottomSheet(private val place: Place) : BottomSheetDialogFragment() { +class MapBottomSheet(private val place: Place?) : BottomSheetDialogFragment() { private lateinit var tvPlaceName : TextView private lateinit var tvPlaceAddress: TextView @@ -20,8 +20,8 @@ class MapBottomSheet(private val place: Place) : BottomSheetDialogFragment() { val view = inflater.inflate(R.layout.bottom_sheet, container, false) tvPlaceName = view.findViewById(R.id.tvPlaceName) tvPlaceAddress = view.findViewById(R.id.tvPlaceAddress) - tvPlaceName.text = place.place - tvPlaceAddress.text = place.place + tvPlaceName.text = place?.place ?: "알림" + tvPlaceAddress.text = place?.place ?: "원하는 장소를 검색해 주세요" return view } } \ No newline at end of file From 6003179be25bba3c4031dec614d9a1224c7a76d4 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 14:37:00 +0900 Subject: [PATCH 15/22] =?UTF-8?q?refactor:=20=EC=A7=80=EB=8F=84=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20binding=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakao/map/presentation/map/MapActivity.kt | 36 ++++++++++--------- app/src/main/res/layout/activity_map.xml | 14 ++++++-- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 14e8650d..ad118306 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -10,10 +10,12 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout +import androidx.databinding.DataBindingUtil import androidx.lifecycle.lifecycleScope import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import campus.tech.kakao.map.PlaceApplication import campus.tech.kakao.map.R +import campus.tech.kakao.map.databinding.ActivityMapBinding import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.presentation.search.SearchActivity import com.kakao.vectormap.KakaoMap @@ -30,10 +32,7 @@ import kotlinx.coroutines.launch @AndroidEntryPoint class MapActivity : AppCompatActivity() { - private val mapView by lazy { findViewById(R.id.mapView) } - private val searchView by lazy { findViewById(R.id.searchView) } - private val swipeRefreshLayout by lazy {findViewById(R.id.swipeRefreshLayout)} - private val tvErrorMessage by lazy {findViewById(R.id.tvErrorMessage)} + private lateinit var binding: ActivityMapBinding private lateinit var resultLauncher: ActivityResultLauncher private lateinit var mapBottomSheet: MapBottomSheet private lateinit var kakaoMap: KakaoMap @@ -41,14 +40,19 @@ class MapActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_map) + initBinding() collectViewModel() initSwipeRefreshLayout() initMapView() initSearchView() setResultLauncher() + } + private fun initBinding(){ + binding = DataBindingUtil.setContentView(this, R.layout.activity_map) + binding.lifecycleOwner = this + binding.viewModel = mapViewModel } private fun collectViewModel() { @@ -62,18 +66,18 @@ class MapActivity : AppCompatActivity() { } } private fun initSwipeRefreshLayout() { - swipeRefreshLayout.setOnRefreshListener { + binding.swipeRefreshLayout.setOnRefreshListener { if (!isNetworkAvailable()) { showErrorPage(Exception("네트워크 연결 오류")) }else{ showMapPage() showBottomSheet(mapViewModel.lastVisitedPlace.value) } - swipeRefreshLayout.isRefreshing = false + binding.swipeRefreshLayout.isRefreshing = false } } private fun initMapView() { - mapView.start(object : MapLifeCycleCallback() { + binding.mapView.start(object : MapLifeCycleCallback() { override fun onMapDestroy() {} override fun onMapError(error: Exception) { showErrorPage(error) @@ -100,18 +104,18 @@ class MapActivity : AppCompatActivity() { } private fun showMapPage(){ - tvErrorMessage.visibility = View.GONE - mapView.visibility = View.VISIBLE + binding.tvErrorMessage.visibility = View.GONE + binding.mapView.visibility = View.VISIBLE } private fun showErrorPage(error: Exception) { - tvErrorMessage.visibility = View.VISIBLE - mapView.visibility = View.GONE - tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message + binding.tvErrorMessage.visibility = View.VISIBLE + binding.mapView.visibility = View.GONE + binding.tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message } private fun initSearchView() { - searchView.setOnClickListener { + binding.searchView.setOnClickListener { val intent = Intent(this, SearchActivity::class.java) resultLauncher.launch(intent) } @@ -152,11 +156,11 @@ class MapActivity : AppCompatActivity() { override fun onResume() { super.onResume() - mapView.resume() + binding.mapView.resume() } override fun onPause() { super.onPause() - mapView.pause() + binding.mapView.pause() } } diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index 920c87d8..bc719f21 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -1,7 +1,16 @@ - + + + + + + + \ No newline at end of file From 05b182ca50bb87ae23f8aa0cc0c1fe34ce02e0d8 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 14:53:38 +0900 Subject: [PATCH 16/22] =?UTF-8?q?feat:=20=EC=A7=80=EB=8F=84=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=EC=84=9C=20=EC=83=88=EB=A1=9C=EA=B3=A0?= =?UTF-8?q?=EC=B9=A8=20=EA=B8=B0=EB=8A=A5=20=EB=B9=84=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/campus/tech/kakao/map/presentation/map/MapActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index ad118306..d8242ed7 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -72,6 +72,7 @@ class MapActivity : AppCompatActivity() { }else{ showMapPage() showBottomSheet(mapViewModel.lastVisitedPlace.value) + binding.swipeRefreshLayout.isEnabled = false } binding.swipeRefreshLayout.isRefreshing = false } @@ -88,6 +89,7 @@ class MapActivity : AppCompatActivity() { if (!isNetworkAvailable()) { showErrorPage(Exception("네트워크 연결 오류")) }else{ + binding.swipeRefreshLayout.isEnabled = false initMapPage() } } From 8edf8668cd871aa156128ba5d6bcf6502f8b92d0 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 15:51:43 +0900 Subject: [PATCH 17/22] =?UTF-8?q?feat:=20=EC=A0=84=EC=B2=B4=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/campus/tech/kakao/map/PlaceApplication.kt | 8 ++++++-- .../tech/kakao/map/presentation/map/MapActivity.kt | 13 +++++++++++++ .../kakao/map/presentation/search/SearchActivity.kt | 9 +++++++++ app/src/main/res/values/themes.xml | 3 ++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt index eb7a850d..3cbf6189 100644 --- a/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt +++ b/app/src/main/java/campus/tech/kakao/map/PlaceApplication.kt @@ -4,11 +4,11 @@ import android.app.Application import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities -import campus.tech.kakao.map.data.PlaceRemoteDataRepository -import campus.tech.kakao.map.domain.repository.PlaceRepository +import android.view.View import com.kakao.vectormap.KakaoMapSdk import dagger.hilt.android.HiltAndroidApp + @HiltAndroidApp class PlaceApplication: Application() { @@ -16,6 +16,10 @@ class PlaceApplication: Application() { super.onCreate() appInstance = this + initKakaoMapSdk() + } + + private fun initKakaoMapSdk(){ val key = getString(R.string.kakao_api_key) KakaoMapSdk.init(this, key) } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index d8242ed7..d3e58438 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -2,8 +2,12 @@ package campus.tech.kakao.map.presentation.map import android.app.Activity import android.content.Intent +import android.graphics.Color +import android.os.Build import android.os.Bundle import android.view.View +import android.view.WindowInsets +import android.view.WindowInsetsController import android.widget.TextView import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts @@ -41,6 +45,7 @@ class MapActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + setStatusBarTransparent() initBinding() collectViewModel() initSwipeRefreshLayout() @@ -49,6 +54,14 @@ class MapActivity : AppCompatActivity() { setResultLauncher() } + private fun setStatusBarTransparent() { + this.window?.apply { + this.statusBarColor = Color.TRANSPARENT + decorView.systemUiVisibility = + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + } + } + private fun initBinding(){ binding = DataBindingUtil.setContentView(this, R.layout.activity_map) binding.lifecycleOwner = this diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt index 193c2d2a..5cdb63e0 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchActivity.kt @@ -1,6 +1,7 @@ package campus.tech.kakao.map.presentation.search import android.content.Intent +import android.graphics.Color import android.os.Bundle import android.view.View import androidx.activity.viewModels @@ -33,11 +34,19 @@ class SearchActivity : AppCompatActivity() { } private fun init() { + setStatusBarTransparent() initBinding() setupRecyclerViews() observeViewModel() } + private fun setStatusBarTransparent() { + this.window?.apply { + this.statusBarColor = Color.TRANSPARENT + decorView.systemUiVisibility = + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + } + } private fun initBinding() { binding = DataBindingUtil.setContentView(this, R.layout.activity_main) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b9ad7b3f..55490cf9 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,7 +2,8 @@ From 657e362437c7e14886c15437dfb8392285794d07 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 16:02:51 +0900 Subject: [PATCH 18/22] =?UTF-8?q?design:=20=EA=B2=80=EC=83=89=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20padding=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_main.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9bf12574..b128ead5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" app:cardCornerRadius="16dp" app:cardElevation="0dp" - android:paddingTop="24dp" + android:paddingTop="48dp" android:paddingHorizontal="16dp" android:paddingBottom="12dp" android:background="#FBFBFB" @@ -49,7 +49,7 @@ From 692a002bdd797723081986b615dfbd1092532f74 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Thu, 25 Jul 2024 19:49:41 +0900 Subject: [PATCH 19/22] =?UTF-8?q?refactor:=20localRepository=20=EA=B0=80?= =?UTF-8?q?=EB=8F=85=EC=84=B1=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/data/PlaceLocalDataRepository.kt | 43 +++++-------------- .../kakao/map/data/database/PlaceDatabase.kt | 2 +- .../tech/kakao/map/data/entity/Entity.kt | 9 +++- .../map/domain/model/ResultSearchKeyword.kt | 9 +--- 4 files changed, 21 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt index 05c28157..417526a6 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/PlaceLocalDataRepository.kt @@ -5,8 +5,6 @@ import campus.tech.kakao.map.data.entity.PlaceEntity import campus.tech.kakao.map.data.entity.PlaceLogEntity import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext import javax.inject.Inject open class PlaceLocalDataRepository @Inject constructor( @@ -14,50 +12,31 @@ open class PlaceLocalDataRepository @Inject constructor( ) : PlaceRepository { override suspend fun getPlaces(placeName: String): List { - return withContext(Dispatchers.IO) { - placeDao.getPlaces(placeName).map { - Place(it.id, it.place, it.address, it.type, it.xPos, it.yPos) - } - } + return placeDao.getPlaces(placeName).map { it.toPlace() } } override suspend fun updatePlaces(places: List) { - withContext(Dispatchers.IO) { - placeDao.deleteAllPlaces() - placeDao.insertPlaces(places.map { - PlaceEntity(it.id, it.place, it.address, it.category, it.xPos, it.yPos) - }) - } + placeDao.deleteAllPlaces() + placeDao.insertPlaces(places.map { + PlaceEntity(it.id, it.place, it.address, it.category, it.xPos, it.yPos) + }) } override suspend fun getPlaceById(id: String): Place? { - return withContext(Dispatchers.IO) { - placeDao.getPlaceById(id)?.let { - Place(it.id, it.place, it.address, it.type, it.xPos, it.yPos) - } - } + return placeDao.getPlaceById(id)?.toPlace() } override suspend fun updateLogs(logs: List) { - withContext(Dispatchers.IO) { - placeDao.deleteAllLogs() - placeDao.insertLogs(logs.map { - PlaceLogEntity(it.id, it.place) - }) - } + placeDao.deleteAllLogs() + placeDao.insertLogs(logs.map { PlaceLogEntity(it.id, it.place) }) } override suspend fun removeLog(id: String) { - withContext(Dispatchers.IO) { - placeDao.removeLog(id) - } + placeDao.removeLog(id) + } override suspend fun getLogs(): List { - return withContext(Dispatchers.IO) { - placeDao.getLogs().map { - Place(it.id, it.place, "", "", "", "") - } - } + return placeDao.getLogs().map { it.toPlace() } } } diff --git a/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt b/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt index d5fc6101..5b0d9a28 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/database/PlaceDatabase.kt @@ -6,6 +6,6 @@ import campus.tech.kakao.map.data.entity.PlaceEntity import campus.tech.kakao.map.data.entity.PlaceLogEntity @Database(entities = [PlaceEntity::class, PlaceLogEntity::class], version = 1) -abstract class PlaceDatabase: RoomDatabase(){ +abstract class PlaceDatabase : RoomDatabase() { abstract fun placeDao(): PlaceDao } \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt b/app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt index dbc4f815..e191bad6 100644 --- a/app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt +++ b/app/src/main/java/campus/tech/kakao/map/data/entity/Entity.kt @@ -2,6 +2,7 @@ package campus.tech.kakao.map.data.entity import androidx.room.Entity import androidx.room.PrimaryKey +import campus.tech.kakao.map.domain.model.Place @Entity(tableName = "places") data class PlaceEntity( @@ -11,10 +12,14 @@ data class PlaceEntity( val type: String, val xPos: String, val yPos: String -) +) { + fun toPlace() = Place(id, place, address, type, xPos, yPos) +} @Entity(tableName = "logs") data class PlaceLogEntity( @PrimaryKey val id: String, val place: String -) \ No newline at end of file +) { + fun toPlace() = Place(id, place, "", "", "", "") +} \ No newline at end of file diff --git a/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt b/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt index 607bd9d4..8fadfa99 100644 --- a/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt +++ b/app/src/main/java/campus/tech/kakao/map/domain/model/ResultSearchKeyword.kt @@ -3,13 +3,8 @@ package campus.tech.kakao.map.domain.model import com.google.gson.annotations.SerializedName data class ResultSearchKeyword( - var documents: List, - val meta: PlaceMeta -) -data class PlaceMeta ( - @SerializedName("total_count") var totalCount: Int, - @SerializedName("pageable_count") var pageableCount: Int, - @SerializedName("is_end") var isEnd: Boolean + var documents: List ) + From 2e55d8285f2e0c5c65f108c77b3dc26e28009239 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Fri, 26 Jul 2024 15:41:36 +0900 Subject: [PATCH 20/22] =?UTF-8?q?refactor:=20=EC=A7=80=EB=8F=84=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20viewBinding=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakao/map/presentation/map/MapActivity.kt | 8 ++++-- .../map/presentation/map/MapBottomSheet.kt | 27 +++++++++++-------- .../presentation/search/SearchViewModel.kt | 7 ++--- .../res/drawable/searchview_background2.xml | 4 +-- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index d3e58438..74b8d03b 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -165,8 +165,12 @@ class MapActivity : AppCompatActivity() { } private fun showBottomSheet(place: Place?) { - mapBottomSheet = MapBottomSheet(place) - mapBottomSheet.show(supportFragmentManager, mapBottomSheet.tag) + val bottomSheet = MapBottomSheet() + place?.let { + val args = Bundle() + args.putSerializable("place", it) + bottomSheet.arguments = args } + bottomSheet.show(supportFragmentManager, bottomSheet.tag) } override fun onResume() { diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt index fe652dfd..7f1acf17 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapBottomSheet.kt @@ -4,24 +4,29 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import campus.tech.kakao.map.R +import campus.tech.kakao.map.databinding.BottomSheetBinding import campus.tech.kakao.map.domain.model.Place import com.google.android.material.bottomsheet.BottomSheetDialogFragment -class MapBottomSheet(private val place: Place?) : BottomSheetDialogFragment() { - private lateinit var tvPlaceName : TextView - private lateinit var tvPlaceAddress: TextView +class MapBottomSheet : BottomSheetDialogFragment() { + + private lateinit var binding: BottomSheetBinding + private var place: Place? = null override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, ): View? { - val view = inflater.inflate(R.layout.bottom_sheet, container, false) - tvPlaceName = view.findViewById(R.id.tvPlaceName) - tvPlaceAddress = view.findViewById(R.id.tvPlaceAddress) - tvPlaceName.text = place?.place ?: "알림" - tvPlaceAddress.text = place?.place ?: "원하는 장소를 검색해 주세요" - return view + binding = BottomSheetBinding.inflate(inflater, container, false) + place = arguments?.getSerializable("place") as? Place + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding.tvPlaceName.text = place?.place ?: "알림" + binding.tvPlaceAddress.text = place?.address ?: "원하는 장소를 검색해 주세요" } -} \ No newline at end of file + +} diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt index 7e935c3a..1667a486 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt @@ -23,16 +23,17 @@ constructor( private val repository: PlaceRepository) : ViewModel() { private val _searchedPlaces = searchText.asFlow() .debounce(500L) - .flatMapLatest { query -> - if (query.isNotBlank()) { + .flatMapLatest { keyword -> + if (keyword.isNotBlank()) { flow { - val places = getPlaces(query) + val places = getPlaces(keyword) emit(places) } } else { flowOf(emptyList()) } }.stateIn(viewModelScope, SharingStarted.Lazily, emptyList()) + val searchedPlaces: StateFlow> get() = _searchedPlaces init { diff --git a/app/src/main/res/drawable/searchview_background2.xml b/app/src/main/res/drawable/searchview_background2.xml index bd5a8698..afcb59cf 100644 --- a/app/src/main/res/drawable/searchview_background2.xml +++ b/app/src/main/res/drawable/searchview_background2.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file From 7dda882972cfc42e99697aecc4a9da302f8fa6fe Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Fri, 26 Jul 2024 17:40:44 +0900 Subject: [PATCH 21/22] =?UTF-8?q?refactor:=20viewmodel=20=EC=BD=94?= =?UTF-8?q?=EB=A3=A8=ED=8B=B4=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20debounce?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakao/map/presentation/map/MapViewModel.kt | 5 +++-- .../map/presentation/search/SearchViewModel.kt | 15 +++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt index 3451d8ec..064b73e0 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapViewModel.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope import campus.tech.kakao.map.data.LastVisitedPlaceManager import campus.tech.kakao.map.domain.model.Place import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -19,13 +20,13 @@ constructor(private val manager: LastVisitedPlaceManager): ViewModel() { private val _lastVisitedPlace = MutableStateFlow(null) val lastVisitedPlace: StateFlow get() = _lastVisitedPlace.asStateFlow() fun loadLastVisitedPlace() { - viewModelScope.launch { + viewModelScope.launch(Dispatchers.IO) { val place = manager.getLastVisitedPlace() _lastVisitedPlace.value = place } } fun saveLastVisitedPlace(place: Place) { - viewModelScope.launch { + viewModelScope.launch(Dispatchers.IO) { manager.saveLastVisitedPlace(place) _lastVisitedPlace.value = place } diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt index 1667a486..f4e314ba 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/search/SearchViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.* import campus.tech.kakao.map.domain.model.Place import campus.tech.kakao.map.domain.repository.PlaceRepository import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import javax.inject.Inject @@ -15,9 +16,6 @@ constructor( private val repository: PlaceRepository) : ViewModel() { val searchText = MutableLiveData() - private val _uiState = MutableStateFlow(SearchUiState(true, false)) - val uiState: StateFlow = _uiState.asStateFlow() - private val _logList = MutableStateFlow>(emptyList()) val logList: StateFlow> get() = _logList.asStateFlow() @@ -25,10 +23,7 @@ constructor( private val repository: PlaceRepository) : ViewModel() { .debounce(500L) .flatMapLatest { keyword -> if (keyword.isNotBlank()) { - flow { - val places = getPlaces(keyword) - emit(places) - } + flowOf(getPlaces(keyword)) } else { flowOf(emptyList()) } @@ -37,7 +32,7 @@ constructor( private val repository: PlaceRepository) : ViewModel() { val searchedPlaces: StateFlow> get() = _searchedPlaces init { - viewModelScope.launch { + viewModelScope.launch(Dispatchers.IO) { _logList.value = getLogs() } } @@ -59,7 +54,7 @@ constructor( private val repository: PlaceRepository) : ViewModel() { } fun updateLogs(place: Place) { - viewModelScope.launch { + viewModelScope.launch(Dispatchers.IO) { val updatedList = _logList.value.toMutableList() val existingLog = updatedList.find { it.id == place.id } if (existingLog != null) { @@ -74,7 +69,7 @@ constructor( private val repository: PlaceRepository) : ViewModel() { } fun removeLog(id: String) { - viewModelScope.launch { + viewModelScope.launch(Dispatchers.IO) { repository.removeLog(id) _logList.value = getLogs() } From e4c2b83f3a58de7750341655b42705a084ad8006 Mon Sep 17 00:00:00 2001 From: Jeong hoon Date: Mon, 29 Jul 2024 01:41:03 +0900 Subject: [PATCH 22/22] =?UTF-8?q?refactor:=20=EC=A7=80=EB=8F=84=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20xml=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - constraintlayout 삭제 --- .../kakao/map/presentation/map/MapActivity.kt | 2 ++ app/src/main/res/drawable/icon_search2.xml | 2 +- .../res/drawable/searchview_background2.xml | 3 +- app/src/main/res/layout/activity_map.xml | 29 ++++++++----------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt index 74b8d03b..57d65e7a 100644 --- a/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt +++ b/app/src/main/java/campus/tech/kakao/map/presentation/map/MapActivity.kt @@ -120,12 +120,14 @@ class MapActivity : AppCompatActivity() { private fun showMapPage(){ binding.tvErrorMessage.visibility = View.GONE + binding.searchView.visibility = View.VISIBLE binding.mapView.visibility = View.VISIBLE } private fun showErrorPage(error: Exception) { binding.tvErrorMessage.visibility = View.VISIBLE binding.mapView.visibility = View.GONE + binding.searchView.visibility = View.GONE binding.tvErrorMessage.text = "지도 인증에 실패했습니다.\n다시 시도해주세요.\n" + error.message } diff --git a/app/src/main/res/drawable/icon_search2.xml b/app/src/main/res/drawable/icon_search2.xml index bd1c6e6e..0c7b81b5 100644 --- a/app/src/main/res/drawable/icon_search2.xml +++ b/app/src/main/res/drawable/icon_search2.xml @@ -5,6 +5,6 @@ android:viewportWidth="16" android:viewportHeight="16"> \ No newline at end of file diff --git a/app/src/main/res/drawable/searchview_background2.xml b/app/src/main/res/drawable/searchview_background2.xml index afcb59cf..780edbb2 100644 --- a/app/src/main/res/drawable/searchview_background2.xml +++ b/app/src/main/res/drawable/searchview_background2.xml @@ -1,7 +1,6 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index bc719f21..0872aad5 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -27,28 +27,23 @@ android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" > - + android:layout_marginStart="24dp" + android:layout_marginTop="36dp" + android:background="@drawable/searchview_background2" + android:elevation="8dp" + android:padding="24dp" + android:src="@drawable/icon_search2" /> + +