Louvorg/ReaderforSelfoss
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #160.

Browse Source
This commit is contained in:
Amine Bou 2017-12-20 06:33:10 +01:00
parent e177c22032
commit 302040ec25
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,7 +4,7 @@
- Added an option to use a webview in the article viewer (see #149) - 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** **1.5.5.x (didn't last long) AND 1.5.6.x**

15
app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
View File

@ -29,15 +29,15 @@ import retrofit2.Response
class ReaderActivity : AppCompatActivity() { class ReaderActivity : AppCompatActivity() {
private var markOnScroll: Boolean = false private var markOnScroll: Boolean = false
private var debugReadingItems: Boolean = false
private var useWebview: 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 api: SelfossApi
private lateinit var toolbarMenu: Menu private lateinit var toolbarMenu: Menu
private var currentItem: Int = 0
private fun showMenuItem(willAddToFavorite: Boolean) { private fun showMenuItem(willAddToFavorite: Boolean) {
toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
toolbarMenu.findItem(R.id.unsave).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 settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
val sharedPref = PreferenceManager.getDefaultSharedPreferences(this) val sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
val debugReadingItems = sharedPref.getBoolean("read_debug", false) debugReadingItems = sharedPref.getBoolean("read_debug", false)
val userIdentifier = sharedPref.getString("unique_id", "") userIdentifier = sharedPref.getString("unique_id", "")
markOnScroll = sharedPref.getBoolean("mark_on_scroll", false) markOnScroll = sharedPref.getBoolean("mark_on_scroll", false)
useWebview = sharedPref.getBoolean("prefer_webview_in_article_viewer", false) useWebview = sharedPref.getBoolean("prefer_webview_in_article_viewer", false)
@ -93,6 +93,11 @@ class ReaderActivity : AppCompatActivity() {
var adapter = ScreenSlidePagerAdapter(supportFragmentManager) var adapter = ScreenSlidePagerAdapter(supportFragmentManager)
pager.adapter = adapter pager.adapter = adapter
pager.currentItem = currentItem pager.currentItem = currentItem
}
override fun onResume() {
super.onResume()
(pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged() (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
pager.setPageTransformer(true, DepthPageTransformer()) pager.setPageTransformer(true, DepthPageTransformer())