-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #256 from naz013/feature/REM-900_Fix_global_search
REM-900 - Fix global search
- Loading branch information
Showing
1 changed file
with
32 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,45 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:id="@+id/container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent"> | ||
|
|
||
| <androidx.coordinatorlayout.widget.CoordinatorLayout | ||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="0dp" | ||
| app:layout_constraintBottom_toTopOf="@+id/bottom_navigation" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
| android:layout_height="match_parent"> | ||
|
|
||
| <androidx.fragment.app.FragmentContainerView | ||
| android:id="@+id/mainNavigationFragment" | ||
| android:name="androidx.navigation.fragment.NavHostFragment" | ||
| <androidx.coordinatorlayout.widget.CoordinatorLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| app:defaultNavHost="true" | ||
| app:navGraph="@navigation/home_nav" /> | ||
| android:layout_height="0dp" | ||
| app:layout_constraintBottom_toTopOf="@+id/bottom_navigation" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| </androidx.coordinatorlayout.widget.CoordinatorLayout> | ||
| <androidx.fragment.app.FragmentContainerView | ||
| android:id="@+id/mainNavigationFragment" | ||
| android:name="androidx.navigation.fragment.NavHostFragment" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| app:defaultNavHost="true" | ||
| app:navGraph="@navigation/home_nav" /> | ||
|
|
||
| <com.google.android.material.bottomnavigation.BottomNavigationView | ||
| android:id="@+id/bottom_navigation" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="bottom" | ||
| app:labelVisibilityMode="labeled" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:menu="@menu/activity_bottom_nav" | ||
| tools:visibility="gone" /> | ||
| </androidx.coordinatorlayout.widget.CoordinatorLayout> | ||
|
|
||
| <com.google.android.material.bottomnavigation.BottomNavigationView | ||
| android:id="@+id/bottom_navigation" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="bottom" | ||
| app:labelVisibilityMode="labeled" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:menu="@menu/activity_bottom_nav" | ||
| tools:visibility="gone" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| </androidx.coordinatorlayout.widget.CoordinatorLayout> |