From 1660c8dcf3a4d5557e30de0d0ea8f9c68a5452af Mon Sep 17 00:00:00 2001 From: sti1andy Date: Wed, 20 Aug 2025 20:18:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Fix]=20=EC=B6=A9=EB=8F=8C=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 --- app/src/main/java/com/example/onenthapp/HomeFragment.kt | 6 +++--- .../com/example/onenthapp/feature/board/CafeTipsFragment.kt | 3 +-- .../example/onenthapp/feature/board/DiscountTipsFragment.kt | 3 +-- .../onenthapp/feature/item/GroupPurchaseDetailFragment.kt | 4 ++-- .../onenthapp/feature/item/SharingItemDetailFragment.kt | 4 ++-- .../onenthapp/feature/mypost/MyPostProductFragment.kt | 3 +-- .../example/onenthapp/feature/scrap/ScrapProductFragment.kt | 2 +- app/src/main/res/layout/fragment_plus_share.xml | 3 +-- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/example/onenthapp/HomeFragment.kt b/app/src/main/java/com/example/onenthapp/HomeFragment.kt index aea6a93..dcc1f18 100644 --- a/app/src/main/java/com/example/onenthapp/HomeFragment.kt +++ b/app/src/main/java/com/example/onenthapp/HomeFragment.kt @@ -137,7 +137,7 @@ class HomeFragment : Fragment() { LatLng.from( 37.5665, 126.9780 - ), 14 + ), 12 ) ) kakaoMapInstance?.labelManager?.let { lm -> @@ -276,7 +276,7 @@ class HomeFragment : Fragment() { private fun updateMapCenter(latitude: Double, longitude: Double) { val map = kakaoMapInstance ?: return val pos = LatLng.from(latitude, longitude) - map.moveCamera(CameraUpdateFactory.newCenterPosition(pos, 16)) + map.moveCamera(CameraUpdateFactory.newCenterPosition(pos, 15)) } private fun extractDong(full: String?): String? { @@ -299,7 +299,7 @@ class HomeFragment : Fragment() { } override fun getZoomLevel(): Int { - return 14 // 초기 줌 레벨 + return 12 // 초기 줌 레벨 } }) 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 b8742b7..1eb5290 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 @@ -15,7 +15,6 @@ import com.example.onenthapp.data.map.* import com.example.onenthapp.databinding.FragmentTipsCafetipsBinding import com.example.onenthapp.databinding.ItemMarkerDetailBinding import com.example.onenthapp.feature.map.MyRegionActivity -import com.example.onenthapp.LifeTipsDetailActivity import com.example.onenthapp.RetrofitInstance import com.kakao.vectormap.KakaoMap import com.kakao.vectormap.KakaoMapReadyCallback @@ -191,7 +190,7 @@ class CafeTipsFragment : Fragment() { private fun updateMapCenter(latitude: Double, longitude: Double) { val map = kakaoMapInstance ?: return val pos = LatLng.from(latitude, longitude) - map.moveCamera(CameraUpdateFactory.newCenterPosition(pos, 14)) + map.moveCamera(CameraUpdateFactory.newCenterPosition(pos, 15)) } private fun loadRestaurantMarkers(regionId: Long? = null) { 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 cba37ca..17543b5 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 @@ -15,7 +15,6 @@ import com.example.onenthapp.data.map.* import com.example.onenthapp.databinding.FragmentTipsDiscounttipsBinding import com.example.onenthapp.databinding.ItemMarkerDetailBinding import com.example.onenthapp.feature.map.MyRegionActivity -import com.example.onenthapp.LifeTipsDetailActivity import com.example.onenthapp.RetrofitInstance import com.kakao.vectormap.KakaoMap import com.kakao.vectormap.KakaoMapReadyCallback @@ -191,7 +190,7 @@ class DiscountTipsFragment : Fragment() { private fun updateMapCenter(latitude: Double, longitude: Double) { val map = kakaoMapInstance ?: return val pos = LatLng.from(latitude, longitude) - map.moveCamera(CameraUpdateFactory.newCenterPosition(pos, 14)) + map.moveCamera(CameraUpdateFactory.newCenterPosition(pos, 15)) } private fun loadDiscountMarkers(regionId: Long? = null) { diff --git a/app/src/main/java/com/example/onenthapp/feature/item/GroupPurchaseDetailFragment.kt b/app/src/main/java/com/example/onenthapp/feature/item/GroupPurchaseDetailFragment.kt index da0b525..8a46de7 100644 --- a/app/src/main/java/com/example/onenthapp/feature/item/GroupPurchaseDetailFragment.kt +++ b/app/src/main/java/com/example/onenthapp/feature/item/GroupPurchaseDetailFragment.kt @@ -13,8 +13,8 @@ import androidx.navigation.fragment.findNavController import com.bumptech.glide.Glide import com.example.onenthapp.PurchaseSellerProfileActivity import com.example.onenthapp.R -import com.example.onenthapp.ScrapActivity -import com.example.onenthapp.MyPostActivity +import com.example.onenthapp.feature.scrap.ScrapActivity +import com.example.onenthapp.feature.mypost.MyPostActivity import com.example.onenthapp.RetrofitInstance.messageApi import com.example.onenthapp.data.item.BookmarkRepository import com.example.onenthapp.data.item.GroupPurchaseDetailResult diff --git a/app/src/main/java/com/example/onenthapp/feature/item/SharingItemDetailFragment.kt b/app/src/main/java/com/example/onenthapp/feature/item/SharingItemDetailFragment.kt index bdeffde..7afa598 100644 --- a/app/src/main/java/com/example/onenthapp/feature/item/SharingItemDetailFragment.kt +++ b/app/src/main/java/com/example/onenthapp/feature/item/SharingItemDetailFragment.kt @@ -13,8 +13,8 @@ import androidx.navigation.fragment.findNavController import com.bumptech.glide.Glide import com.example.onenthapp.R import com.example.onenthapp.SharingSellerProfileActivity -import com.example.onenthapp.ScrapActivity -import com.example.onenthapp.MyPostActivity +import com.example.onenthapp.feature.scrap.ScrapActivity +import com.example.onenthapp.feature.mypost.MyPostActivity import com.example.onenthapp.RetrofitInstance.messageApi import com.example.onenthapp.data.item.BookmarkRepository import com.example.onenthapp.data.item.PlusRepository diff --git a/app/src/main/java/com/example/onenthapp/feature/mypost/MyPostProductFragment.kt b/app/src/main/java/com/example/onenthapp/feature/mypost/MyPostProductFragment.kt index 22f3972..6e6e1c1 100644 --- a/app/src/main/java/com/example/onenthapp/feature/mypost/MyPostProductFragment.kt +++ b/app/src/main/java/com/example/onenthapp/feature/mypost/MyPostProductFragment.kt @@ -12,9 +12,8 @@ import com.example.onenthapp.R import com.example.onenthapp.RetrofitInstance import com.example.onenthapp.data.MyPostProductItem import com.example.onenthapp.data.post.PostRepository -import com.example.onenthapp.RetrofitInstance import com.example.onenthapp.util.TokenManager -import com.example.onenthapp.MyPostActivity +import com.example.onenthapp.feature.mypost.MyPostActivity import kotlinx.coroutines.launch //import kotlinx.coroutines.runCatching diff --git a/app/src/main/java/com/example/onenthapp/feature/scrap/ScrapProductFragment.kt b/app/src/main/java/com/example/onenthapp/feature/scrap/ScrapProductFragment.kt index 6e206b2..7719516 100644 --- a/app/src/main/java/com/example/onenthapp/feature/scrap/ScrapProductFragment.kt +++ b/app/src/main/java/com/example/onenthapp/feature/scrap/ScrapProductFragment.kt @@ -14,7 +14,7 @@ import com.example.onenthapp.ScrapProductAdapter import com.example.onenthapp.data.MyPostProductItem import com.example.onenthapp.util.TokenManager -import com.example.onenthapp.ScrapActivity +import com.example.onenthapp.feature.scrap.ScrapActivity import com.example.onenthapp.MainActivity import kotlinx.coroutines.launch diff --git a/app/src/main/res/layout/fragment_plus_share.xml b/app/src/main/res/layout/fragment_plus_share.xml index 9e218a2..e1370c7 100644 --- a/app/src/main/res/layout/fragment_plus_share.xml +++ b/app/src/main/res/layout/fragment_plus_share.xml @@ -85,7 +85,6 @@ From b8480ac7432fc919022c25b7148a0ee6d98010b5 Mon Sep 17 00:00:00 2001 From: sti1andy Date: Fri, 22 Aug 2025 21:54:36 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Fix]=20=EC=A7=80=EB=8F=84=20UI=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20apk=EB=B9=8C=EB=93=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 마커 icon 기기와 관계없이d크기 고정 - 텍스트 sp, dp로 설정 - 지역 인증 칩 안보이는 view 수정 - 각자 keystore 값에따라 배포가능하도록 build.gradle 수정 -> local.properties에 경로, 별칭, pw넣고 ./gradlew assembleRelease 하면 build하위에 apk 새로생김 --- app/build.gradle.kts | 10 ++++- .../com/example/onenthapp/HomeFragment.kt | 40 +++++++++---------- .../feature/board/CafeTipsFragment.kt | 12 ++++-- .../feature/board/DiscountTipsFragment.kt | 12 ++++-- .../layout/activity_region_verification.xml | 2 +- 5 files changed, 47 insertions(+), 29 deletions(-) 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..5e69721 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(9.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" From 6fa2176cfcb84ea6fd8cf1bab98310be30cd64dd Mon Sep 17 00:00:00 2001 From: sti1andy Date: Fri, 22 Aug 2025 22:13:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Fix]=20=EB=A9=94=EC=9D=B8=20n=EB=B6=84?= =?UTF-8?q?=EC=9D=981=20=ED=85=8D=EC=8A=A4=ED=8A=B8=209->8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/example/onenthapp/HomeFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/onenthapp/HomeFragment.kt b/app/src/main/java/com/example/onenthapp/HomeFragment.kt index 5e69721..a1b69c3 100644 --- a/app/src/main/java/com/example/onenthapp/HomeFragment.kt +++ b/app/src/main/java/com/example/onenthapp/HomeFragment.kt @@ -152,7 +152,7 @@ class HomeFragment : Fragment() { LabelStyles.from( LabelStyle.from(R.drawable.marker_green_72) .setAnchorPoint(0.5f, 1.0f) - .setTextStyles(9.sp(requireContext()), Color.BLACK, 1.dp(requireContext()), Color.WHITE) + .setTextStyles(8.sp(requireContext()), Color.BLACK, 1.dp(requireContext()), Color.WHITE) .setApplyDpScale(true) ) )