Skip to content

Commit 9a5b8cc

Browse files
wjswnsdkwjshim2003
andauthored
Scroll fix (#141)
* ๋ฐ”ํ…€์‹œํŠธ ์Šคํฌ๋กค * ๋ฐ”ํ…€์‹œํŠธ ์Šคํฌ๋กค ์ˆ˜์ • * ๋ฐ”ํ…€์‹œํŠธ ์Šคํฌ๋กค ์ˆ˜์ • * ๋น ์กŒ๋˜๊ฑฐ? * ๋ฐ”ํ…€์‹œํŠธ ์Šคํฌ๋กค ์ˆ˜์ • * fix typo * Delete .idea/appInsightsSettings.xml * Delete .idea/deploymentTargetDropDown.xml * fix gitignore * fix typo * ํ•ธ๋“ค ์ถ”๊ฐ€ * ์Šคํฌ๋กค ์ˆ˜์ • * ๋‚ ์•„๊ฐ„ ํฐํŠธ/์—ฌ๋ฐฑ ๋ณต๊ตฌ * lint --------- Co-authored-by: Shim Woojin <wjshim@snu.ac.kr>
1 parent e06a7b0 commit 9a5b8cc

File tree

4 files changed

+465
-410
lines changed

4 files changed

+465
-410
lines changed

โ€Žapp/src/main/java/com/wafflestudio/siksha2/ui/main/restaurant/FilterDialogFragment.ktโ€Ž

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ import com.google.android.material.slider.RangeSlider
2828
import com.wafflestudio.siksha2.R
2929
import com.wafflestudio.siksha2.databinding.DialogFilterBinding
3030
import kotlinx.coroutines.launch
31+
import android.widget.FrameLayout
32+
import android.widget.LinearLayout
33+
import com.google.android.material.bottomsheet.BottomSheetBehavior
3134

3235
class FilterDialogFragment(
3336
private val mode: FilterMode
@@ -46,10 +49,11 @@ class FilterDialogFragment(
4649
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
4750

4851
dialog.setOnShowListener {
49-
val bottomSheet = (dialog as BottomSheetDialog).findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
50-
bottomSheet?.let {
52+
val bottomSheet = (dialog as BottomSheetDialog).findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout
53+
val behavior = BottomSheetBehavior.from(bottomSheet)
54+
55+
bottomSheet.let {
5156
val layoutParams = it.layoutParams
52-
layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT // ๋†’์ด ํฌ๊ฒŒ ์„ค์ •
5357
it.layoutParams = layoutParams
5458
}
5559
}
@@ -65,6 +69,12 @@ class FilterDialogFragment(
6569
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
6670
super.onViewCreated(view, savedInstanceState)
6771

72+
setupScrollViewParams()
73+
val bottomSheet = view.parent as View
74+
val behavior = BottomSheetBehavior.from(bottomSheet)
75+
behavior.state = BottomSheetBehavior.STATE_EXPANDED
76+
77+
setupVisibility()
6878
setupObservers()
6979

7080
setupDistanceSelection()
@@ -73,9 +83,23 @@ class FilterDialogFragment(
7383
setupOperatingSelection()
7484
setupReviewSelection()
7585
setupCategorySelection()
76-
7786
setupButtons()
78-
setupVisibility()
87+
}
88+
89+
private fun setupScrollViewParams() {
90+
if (mode == FilterMode.FULL) {
91+
binding.scrollableContent.layoutParams = LinearLayout.LayoutParams(
92+
LinearLayout.LayoutParams.MATCH_PARENT,
93+
0,
94+
1f
95+
)
96+
} else {
97+
binding.scrollableContent.layoutParams = LinearLayout.LayoutParams(
98+
LinearLayout.LayoutParams.MATCH_PARENT,
99+
LinearLayout.LayoutParams.WRAP_CONTENT,
100+
0f
101+
)
102+
}
79103
}
80104

81105
override fun getTheme(): Int {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="46dp"
3+
android:height="4dp"
4+
android:viewportWidth="46"
5+
android:viewportHeight="4">
6+
<path
7+
android:pathData="M2,2H44"
8+
android:strokeWidth="4"
9+
android:fillColor="#00000000"
10+
android:strokeColor="#E5E6E9"
11+
android:strokeLineCap="round"/>
12+
</vector>

0 commit comments

Comments
ย (0)