From 37b2c5c2df0fc84d424107627db0b9513acf29d3 Mon Sep 17 00:00:00 2001 From: Amine Date: Mon, 13 Nov 2017 19:35:14 +0100 Subject: [PATCH] Fixed toolbar and fab behavior #113. --- CHANGELOG.md | 4 ++++ .../java/apps/amine/bou/readerforselfoss/ReaderActivity.kt | 2 +- build.gradle | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 065d6c8..5b13be9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +**master** + +- Fixed fab and toolbar issue (#113) + **1.5.4.11** - Hiding FABs on scroll. diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt index a385e4f..197ba64 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt @@ -114,7 +114,7 @@ class ReaderActivity : AppCompatActivity() { if (scrollY > oldScrollY) { fab.hide() } else { - fab.show() + if (mFloatingToolbar.isShowing) mFloatingToolbar.hide() else fab.show() } }) } diff --git a/build.gradle b/build.gradle index 0469910..c1af772 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.51' + ext.kotlin_version = '1.1.60' repositories { jcenter() google()