diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 50c03ff..f4f1e0a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -50,7 +50,14 @@ android { // abiFilters.add("x86_64") } } - + signingConfigs { + create("release") { + storeFile = file(properties.getProperty("RELEASE_STORE_FILE")) + storePassword = properties.getProperty("RELEASE_STORE_PASSWORD") + keyAlias = properties.getProperty("RELEASE_KEY_ALIAS") + keyPassword = properties.getProperty("RELEASE_KEY_PASSWORD") + } + } buildTypes { release { isMinifyEnabled = false @@ -58,6 +65,7 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) + signingConfig = signingConfigs.getByName("release") } } compileOptions { diff --git a/app/src/main/java/com/example/onenthapp/HomeFragment.kt b/app/src/main/java/com/example/onenthapp/HomeFragment.kt index dcc1f18..a1b69c3 100644 --- a/app/src/main/java/com/example/onenthapp/HomeFragment.kt +++ b/app/src/main/java/com/example/onenthapp/HomeFragment.kt @@ -145,15 +145,15 @@ class HomeFragment : Fragment() { LabelStyles.from( LabelStyle.from(R.drawable.marker_gray_64) .setAnchorPoint(0.5f, 1.0f) - .setApplyDpScale(false) + .setApplyDpScale(true) ) ) selectedStyles = lm.addLabelStyles( LabelStyles.from( LabelStyle.from(R.drawable.marker_green_72) .setAnchorPoint(0.5f, 1.0f) - .setTextStyles(32, Color.BLACK, 2, Color.WHITE) - .setApplyDpScale(false) + .setTextStyles(8.sp(requireContext()), Color.BLACK, 1.dp(requireContext()), Color.WHITE) + .setApplyDpScale(true) ) ) } @@ -177,12 +177,6 @@ class HomeFragment : Fragment() { private fun handleLabelClick(label: Label) { val g = label2Group[label] ?: return - val currentSelectedTab = sharedViewModel.currentHomeTab.value - - // currentMarkerType 설정 (loadMarkersByTab의 로직과 유사하게) -// currentMarkerType = if (currentSelectedTab == HomeTabType.BUY) { -// "PURCHASEITEM" -// } else "SHARINGITEM" // 1) 선택 표시: 이전 선택 복원, 현재 선택 하이라이트 + 텍스트(첫 제목) highlightSelectedLabel(label, g) @@ -466,18 +460,18 @@ class HomeFragment : Fragment() { //binding.expandedContainerFragment.isVisible = false } - BottomSheetBehavior.STATE_EXPANDED -> { - // full: 툴바+리스트 -// childFragmentManager.beginTransaction() -// .replace( -// R.id.expandedContainerFragment, -// MapItemPreviewFragment.newInstance(lastResults) -// ) -// .commitNowAllowingStateLoss() - binding.scrollBar.isVisible = false - binding.midContainer.isVisible = false - //binding.expandedContainerFragment.isVisible = false - } +// BottomSheetBehavior.STATE_EXPANDED -> { +// // full: 툴바+리스트 +//// childFragmentManager.beginTransaction() +//// .replace( +//// R.id.expandedContainerFragment, +//// MapItemPreviewFragment.newInstance(lastResults) +//// ) +//// .commitNowAllowingStateLoss() +// binding.scrollBar.isVisible = false +// binding.midContainer.isVisible = false +// //binding.expandedContainerFragment.isVisible = false +// } } } @@ -527,6 +521,10 @@ class HomeFragment : Fragment() { } } +private fun Int.dp(context: Context)= (this * context.resources.displayMetrics.density).toInt() +private fun Int.sp(context: Context) = + (this * context.resources.displayMetrics.scaledDensity).toInt() + fun ItemSearchResultBinding.bind( item: MapItemPreview, diff --git a/app/src/main/java/com/example/onenthapp/feature/board/CafeTipsFragment.kt b/app/src/main/java/com/example/onenthapp/feature/board/CafeTipsFragment.kt index 1eb5290..459b585 100644 --- a/app/src/main/java/com/example/onenthapp/feature/board/CafeTipsFragment.kt +++ b/app/src/main/java/com/example/onenthapp/feature/board/CafeTipsFragment.kt @@ -1,5 +1,6 @@ package com.example.onenthapp.feature.board +import android.content.Context import android.content.Intent import android.graphics.Color import android.os.Bundle @@ -152,15 +153,15 @@ class CafeTipsFragment : Fragment() { LabelStyles.from( LabelStyle.from(R.drawable.marker_gray_64) .setAnchorPoint(0.5f, 1.0f) // 마커 아래에 텍스트 표시 - .setApplyDpScale(false) + .setApplyDpScale(true) ) ) selectedStyles = lm.addLabelStyles( LabelStyles.from( LabelStyle.from(R.drawable.marker_green_72) .setAnchorPoint(0.5f, 1.0f) // 마커 아래에 텍스트 표시 - .setTextStyles(32, Color.BLACK, 2, Color.WHITE) // 텍스트 스타일 설정 - .setApplyDpScale(false) + .setTextStyles(7.sp(requireContext()), Color.BLACK, 1.dp(requireContext()), Color.WHITE) // 텍스트 스타일 설정 + .setApplyDpScale(true) ) ) } @@ -478,3 +479,8 @@ class CafeTipsFragment : Fragment() { } } + +private fun Int.dp(context: Context)= (this * context.resources.displayMetrics.density).toInt() +private fun Int.sp(context: Context) = + (this * context.resources.displayMetrics.scaledDensity).toInt() + diff --git a/app/src/main/java/com/example/onenthapp/feature/board/DiscountTipsFragment.kt b/app/src/main/java/com/example/onenthapp/feature/board/DiscountTipsFragment.kt index 17543b5..2ff9ef9 100644 --- a/app/src/main/java/com/example/onenthapp/feature/board/DiscountTipsFragment.kt +++ b/app/src/main/java/com/example/onenthapp/feature/board/DiscountTipsFragment.kt @@ -1,5 +1,6 @@ package com.example.onenthapp.feature.board +import android.content.Context import android.content.Intent import android.graphics.Color import android.os.Bundle @@ -152,15 +153,15 @@ class DiscountTipsFragment : Fragment() { LabelStyles.from( LabelStyle.from(R.drawable.marker_gray_64) .setAnchorPoint(0.5f, 1.0f) // 마커 아래에 텍스트 표시 - .setApplyDpScale(false) + .setApplyDpScale(true) ) ) selectedStyles = lm.addLabelStyles( LabelStyles.from( LabelStyle.from(R.drawable.marker_green_72) .setAnchorPoint(0.5f, 1.0f) // 마커 아래에 텍스트 표시 - .setTextStyles(32, Color.BLACK, 2, Color.WHITE) // 텍스트 스타일 설정 - .setApplyDpScale(false) + .setTextStyles(7.sp(requireContext()), Color.BLACK, 1.dp(requireContext()), Color.WHITE) // 텍스트 스타일 설정 + .setApplyDpScale(true) ) ) } @@ -477,3 +478,8 @@ class DiscountTipsFragment : Fragment() { label2Group.clear() } } + + +private fun Int.dp(context: Context)= (this * context.resources.displayMetrics.density).toInt() +private fun Int.sp(context: Context) = + (this * context.resources.displayMetrics.scaledDensity).toInt() diff --git a/app/src/main/res/layout/activity_region_verification.xml b/app/src/main/res/layout/activity_region_verification.xml index e948b52..d889367 100644 --- a/app/src/main/res/layout/activity_region_verification.xml +++ b/app/src/main/res/layout/activity_region_verification.xml @@ -93,7 +93,7 @@ android:id="@+id/flexSelected" android:layout_width="0dp" android:layout_height="50dp" - android:layout_marginHorizontal="50dp" + android:layout_marginStart="50dp" android:layout_marginTop="25dp" app:flexWrap="wrap" app:justifyContent="flex_start"