Merge pull request #85 from team-JMT/fix/webview_bridge

웹뷰 및 네비게이션 크기 수정
team-JMT · Sep 27, 2023 · b0f8505 · b0f8505
2 parents 91c577b + 8d7ee51
commit b0f8505
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/presentation/src/main/java/org/gdsc/presentation/view/MainActivity.kt b/presentation/src/main/java/org/gdsc/presentation/view/MainActivity.kt
@@ -69,10 +69,20 @@ class MainActivity : BaseActivity() {
         navController.addOnDestinationChangedListener { controller, destination, arguments ->
 
             // bottomNavigationView Control
-            if (destination.id == R.id.home_fragment || destination.id == R.id.my_page_fragment)
-                slideUpBottomNavigationView()
-            else
-                slideDownBottomNavigationView()
+            when (destination.id) {
+                R.id.home_fragment ->  {
+                    slideUpBottomNavigationView()
+                    binding.navHostFragment.setPadding(0, 0, 0, 0)
+                }
+                R.id.my_page_fragment -> {
+                    slideUpBottomNavigationView()
+                    binding.navHostFragment.setPadding(0, 0, 0, binding.bottomNavigationView.measuredHeight)
+                }
+                else -> {
+                    slideDownBottomNavigationView()
+                    binding.navHostFragment.setPadding(0, 0, 0, 0)
+                }
+            }
 
             // toolbar visibility Control
             when(destination.id) {

diff --git a/presentation/src/main/res/layout/activity_main.xml b/presentation/src/main/res/layout/activity_main.xml
@@ -30,14 +30,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tool_bar"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation_view"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:defaultNavHost="true"
         app:navGraph="@navigation/main_nav_graph"/>
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation_view"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_navigation_height"
+        android:paddingBottom="25dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/presentation/src/main/res/values/dimens.xml b/presentation/src/main/res/values/dimens.xml
@@ -13,6 +13,8 @@
     <dimen name="bottom_sheet_bottom_padding">36dp</dimen>
     <dimen name="alert_width">335dp</dimen>
 
+    <dimen name="bottom_navigation_height">80dp</dimen>
+
     <dimen name="content_radius">24dp</dimen>
 
     <dimen name="none">0dp</dimen>