From 302040ec25a3133fc6e23edbf182e878cff470a9 Mon Sep 17 00:00:00 2001 From: Amine Bou Date: Wed, 20 Dec 2017 06:33:10 +0100 Subject: [PATCH] Fixed #160. --- CHANGELOG.md | 2 +- .../amine/bou/readerforselfoss/ReaderActivity.kt | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d28197..88446ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Added an option to use a webview in the article viewer (see #149) -- Fixes (#151 #152 #155 #157) +- Fixes (#151 #152 #155 #157 #160) **1.5.5.x (didn't last long) AND 1.5.6.x** 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 eebbaf0..253f21c 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt @@ -29,15 +29,15 @@ import retrofit2.Response class ReaderActivity : AppCompatActivity() { private var markOnScroll: Boolean = false - + private var debugReadingItems: Boolean = false private var useWebview: Boolean = false + private var currentItem: Int = 0 + private lateinit var userIdentifier: String private lateinit var api: SelfossApi private lateinit var toolbarMenu: Menu - private var currentItem: Int = 0 - private fun showMenuItem(willAddToFavorite: Boolean) { toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite @@ -63,8 +63,8 @@ class ReaderActivity : AppCompatActivity() { val settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE) val sharedPref = PreferenceManager.getDefaultSharedPreferences(this) - val debugReadingItems = sharedPref.getBoolean("read_debug", false) - val userIdentifier = sharedPref.getString("unique_id", "") + debugReadingItems = sharedPref.getBoolean("read_debug", false) + userIdentifier = sharedPref.getString("unique_id", "") markOnScroll = sharedPref.getBoolean("mark_on_scroll", false) useWebview = sharedPref.getBoolean("prefer_webview_in_article_viewer", false) @@ -93,6 +93,11 @@ class ReaderActivity : AppCompatActivity() { var adapter = ScreenSlidePagerAdapter(supportFragmentManager) pager.adapter = adapter pager.currentItem = currentItem + } + + override fun onResume() { + super.onResume() + (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged() pager.setPageTransformer(true, DepthPageTransformer())