atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #99 from kirmanak/disable-search-lift

Browse Source 
Disable liftOnScroll effect for search bar
This commit is contained in:
Kirill Kamakin
2022-11-21 19:54:07 +01:00
committed by GitHub
parent 1947de99db 9180aa5068
commit 1fb6ab5654
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -17,8 +17,8 @@ plugins {
android {
defaultConfig {
applicationId = "gq.kirmanak.mealient"
versionCode = 20
versionName = "0.3.5"
versionCode = 21
versionName = "0.3.6"
}
signingConfigs {

5
app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
View File

@@ -125,15 +125,14 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
binding.toolbar.isSearchVisible = uiState.searchVisible
if (uiState.searchVisible) {
binding.toolbarHolder.setBackgroundResource(R.drawable.bg_toolbar)
binding.toolbar.setBackgroundResource(R.drawable.bg_toolbar)
} else {
binding.toolbarHolder.background = null
binding.toolbar.background = null
}
}
private fun navigateTo(directions: NavDirections) {
logger.v { "navigateTo() called with: directions = $directions" }
binding.toolbarHolder.setExpanded(true)
binding.drawer.close()
navController.navigate(directions)
}

34
app/src/main/res/layout/main_activity.xml
View File

@@ -6,37 +6,35 @@
style="?drawerLayoutStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activity.MainActivity"
tools:openDrawer="start">
tools:context=".ui.activity.MainActivity">
<androidx.coordinatorlayout.widget.CoordinatorLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar_holder"
android:layout_width="match_parent"
<gq.kirmanak.mealient.ui.activity.ToolbarView
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_medium"
android:background="@drawable/bg_toolbar"
app:liftOnScroll="true">
<gq.kirmanak.mealient.ui.activity.ToolbarView
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|snap|enterAlways" />
</com.google.android.material.appbar.AppBarLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/margin_small"
app:defaultNavHost="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar"
tools:layout="@layout/fragment_recipes_list" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.navigation.NavigationView
android:id="@+id/navigation_view"