Skip to content

[Fix] 지도 UI 수정, apk빌드 설정 #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Miiings wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[Fix] 지도 UI 수정, apk빌드 설정 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1660c8d
[Fix] 충돌 수정
Miiings Aug 20, 2025
bc15721
Merge branch 'develop' into feature/mings
Miiings Aug 22, 2025
b8480ac
[Fix] 지도 UI 수정, apk빌드 설정
Miiings Aug 22, 2025
6fa2176
[Fix] 메인 n분의1 텍스트 9->8
Miiings Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,22 @@ 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
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig = signingConfigs.getByName("release")
}
}
compileOptions {
Expand Down
40 changes: 19 additions & 21 deletions app/src/main/java/com/example/onenthapp/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
)
}
Expand All @@ -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)

Expand Down Expand Up @@ -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
// }
}
}

Expand Down Expand Up @@ -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,
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/java/com/example/onenthapp/feature/board/CafeTipsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
)
)
}
Expand Down Expand Up @@ -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()

12 changes: 9 additions & 3 deletions app/src/main/java/com/example/onenthapp/feature/board/DiscountTipsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
)
)
}
Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_region_verification.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down