Merge pull request #35 from dgngulcan/bookmark-icon-dissaperance

fix toolbar menu item visibilities
dgngulcan · Mar 3, 2019 · 1d2221a · 1d2221a
2 parents e442882 + d12e33c
commit 1d2221a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/droidfeed/ui/module/main/MainViewModel.kt b/app/src/main/java/com/droidfeed/ui/module/main/MainViewModel.kt
@@ -122,13 +122,13 @@ class MainViewModel @Inject constructor(
     fun onMenuClicked() {
         val isCurrentlyVisible = isMenuVisible.value ?: false
         isMenuVisible.postValue(!isCurrentlyVisible)
-        isBookmarksButtonVisible.postValue(!isCurrentlyVisible)
     }
 
     fun onBookmarksEvent() {
         val isCurrentlySelected = (isBookmarksButtonSelected.value ?: false)
         isBookmarksShown.postValue(!isCurrentlySelected)
         isBookmarksButtonSelected.postValue(!isCurrentlySelected)
+        isFilterButtonVisible.postValue(isCurrentlySelected)
     }
 
     fun onToolbarTitleClicked() {

diff --git a/app/src/main/res/layout/activity_main_app_bar.xml b/app/src/main/res/layout/activity_main_app_bar.xml
@@ -76,7 +76,7 @@
                     android:onClick="@{(v)->viewModel.onBookmarksEvent()}"
                     android:src="@drawable/sl_menu_bookmark_drawable"
                     app:isSelected="@{viewModel.isBookmarksButtonSelected}"
-                    app:isVisible="@{viewModel.isBookmarksButtonVisible}"
+                    app:isVisible="@{viewModel.isBookmarksButtonVisible &amp;&amp; !viewModel.isMenuVisible()}"
                     app:layout_constraintBottom_toBottomOf="@+id/btnFilter"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/btnFilter" />
@@ -87,7 +87,7 @@
                     android:layout_marginEnd="@dimen/spacing_small"
                     android:onClick="@{(v)->viewModel.onSourceFilterClicked()}"
                     android:src="@drawable/ic_filter_list_accent_24dp"
-                    app:isVisible="@{viewModel.isFilterButtonVisible}"
+                    app:isVisible="@{viewModel.isFilterButtonVisible &amp;&amp; !viewModel.isMenuVisible()}"
                     app:layout_constraintBottom_toBottomOf="@+id/txtToolbarTitle"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/txtToolbarTitle" />