New reader menu (#368)

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -18,7 +18,7 @@ class PreferenceKeys(context: Context) {
 
     val showPageNumber = context.getString(R.string.pref_show_page_number_key)
 
-    val hideStatusBar = context.getString(R.string.pref_hide_status_bar_key)
+    val fullscreen = context.getString(R.string.pref_fullscreen_key)
 
     val keepScreenOn = context.getString(R.string.pref_keep_screen_on_key)
 

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -42,7 +42,7 @@ class PreferencesHelper(context: Context) {
 
     fun showPageNumber() = rxPrefs.getBoolean(keys.showPageNumber, true)
 
-    fun hideStatusBar() = rxPrefs.getBoolean(keys.hideStatusBar, true)
+    fun fullscreen() = rxPrefs.getBoolean(keys.fullscreen, true)
 
     fun keepScreenOn() = rxPrefs.getBoolean(keys.keepScreenOn, true)
 

app/src/main/java/eu/kanade/tachiyomi/data/source/model/Page.kt

@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.data.source.model
 
 import eu.kanade.tachiyomi.data.network.ProgressListener
 import eu.kanade.tachiyomi.ui.reader.ReaderChapter
-import rx.subjects.PublishSubject
+import rx.subjects.Subject
 
 class Page(
         val pageNumber: Int,
@@ -21,13 +21,13 @@ class Page(
 
     @Transient @Volatile var progress: Int = 0
 
-    @Transient private var statusSubject: PublishSubject<Int>? = null
+    @Transient private var statusSubject: Subject<Int, Int>? = null
 
     override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
         progress = (100 * bytesRead / contentLength).toInt()
     }
 
-    fun setStatusSubject(subject: PublishSubject<Int>?) {
+    fun setStatusSubject(subject: Subject<Int, Int>?) {
         this.statusSubject = subject
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -1,16 +1,16 @@
 package eu.kanade.tachiyomi.ui.reader
 
-import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Build
+import android.os.Build.VERSION_CODES.KITKAT
 import android.os.Bundle
 import android.support.v4.content.ContextCompat
 import android.view.*
-import android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+import android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.SeekBar
@@ -33,11 +33,13 @@ import eu.kanade.tachiyomi.util.toast
 import eu.kanade.tachiyomi.widget.SimpleAnimationListener
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
 import kotlinx.android.synthetic.main.activity_reader.*
-import kotlinx.android.synthetic.main.reader_menu.*
+import me.zhanghai.android.systemuihelper.SystemUiHelper
+import me.zhanghai.android.systemuihelper.SystemUiHelper.*
 import nucleus.factory.RequiresPresenter
 import rx.Subscription
 import rx.subscriptions.CompositeSubscription
 import timber.log.Timber
+import uy.kohesive.injekt.injectLazy
 import java.text.DecimalFormat
 
 @RequiresPresenter(ReaderPresenter::class)
@@ -62,8 +64,6 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
 
     private var viewer: BaseReader? = null
 
-    private var uiFlags: Int = 0
-
     lateinit var subscriptions: CompositeSubscription
         private set
 
@@ -77,16 +77,13 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
 
     private val decimalFormat = DecimalFormat("#.###")
 
-    private var popupMenu: ReaderPopupMenu? = null
-
-    private var nextChapterBtn: MenuItem? = null
-
-    private var prevChapterBtn: MenuItem? = null
-
     private val volumeKeysEnabled by lazy { preferences.readWithVolumeKeys().getOrDefault() }
 
-    val preferences: PreferencesHelper
-        get() = presenter.prefs
+    val preferences by injectLazy<PreferencesHelper>()
+
+    private var systemUi: SystemUiHelper? = null
+
+    private var menuVisible = false
 
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
@@ -100,47 +97,56 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         setupToolbar(toolbar)
         subscriptions = CompositeSubscription()
 
-        initializeMenu()
         initializeSettings()
+        initializeBottomMenu()
 
         if (savedState != null) {
-            setMenuVisibility(savedState.getBoolean(MENU_VISIBLE), animate = false)
+            menuVisible = savedState.getBoolean(MENU_VISIBLE)
         }
 
-        maxBitmapSize = GLUtil.getMaxTextureSize()
-    }
+        setMenuVisibility(menuVisible)
 
-    override fun onResume() {
-        super.onResume()
-        setSystemUiVisibility()
+        maxBitmapSize = GLUtil.getMaxTextureSize()
+
+        left_chapter.setOnClickListener {
+            if (viewer != null) {
+                if (viewer is RightToLeftReader)
+                    requestNextChapter()
+                else
+                    requestPreviousChapter()
+            }
+        }
+        right_chapter.setOnClickListener {
+            if (viewer != null) {
+                if (viewer is RightToLeftReader)
+                    requestPreviousChapter()
+                else
+                    requestNextChapter()
+            }
+        }
     }
 
     override fun onDestroy() {
         subscriptions.unsubscribe()
-        popupMenu?.dismiss()
         viewer = null
         super.onDestroy()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
-        nextChapterBtn = menu.findItem(R.id.action_next_chapter)
-        prevChapterBtn = menu.findItem(R.id.action_previous_chapter)
-        setAdjacentChaptersVisibility()
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_previous_chapter -> requestPreviousChapter()
-            R.id.action_next_chapter -> requestNextChapter()
+            R.id.action_settings -> ReaderSettingsDialog().show(supportFragmentManager, "settings")
             else -> return super.onOptionsItemSelected(item)
         }
         return true
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(MENU_VISIBLE, reader_menu.visibility == View.VISIBLE)
+        outState.putBoolean(MENU_VISIBLE, menuVisible)
         super.onSaveInstanceState(outState)
     }
 
@@ -148,7 +154,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         val chapterToUpdate = presenter.getMangaSyncChapterToUpdate()
 
         if (chapterToUpdate > 0) {
-            if (presenter.prefs.askUpdateMangaSync()) {
+            if (preferences.askUpdateMangaSync()) {
                 MaterialDialog.Builder(this)
                         .content(getString(R.string.confirm_update_manga_sync, chapterToUpdate))
                         .positiveText(android.R.string.yes)
@@ -165,13 +171,6 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         }
     }
 
-    override fun onWindowFocusChanged(hasFocus: Boolean) {
-        super.onWindowFocusChanged(hasFocus)
-        if (hasFocus) {
-            setSystemUiVisibility()
-        }
-    }
-
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
         if (!isFinishing) {
             when (event.keyCode) {
@@ -270,16 +269,19 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         viewer?.onPageListAppendReady(chapter)
     }
 
-    @Suppress("UNUSED_PARAMETER")
     fun onAdjacentChapters(previous: Chapter?, next: Chapter?) {
-        setAdjacentChaptersVisibility()
-    }
+        val isInverted = viewer is RightToLeftReader
 
-    private fun setAdjacentChaptersVisibility() {
-        prevChapterBtn?.isVisible = presenter.hasPreviousChapter()
-        nextChapterBtn?.isVisible = presenter.hasNextChapter()
-    }
+        // Chapters are inverted for the right to left reader
+        val hasRightChapter = (if (isInverted) previous else next) != null
+        val hasLeftChapter = (if (isInverted) next else previous) != null
 
+        right_chapter.isEnabled = hasRightChapter
+        right_chapter.alpha = if (hasRightChapter) 1f else 0.4f
+
+        left_chapter.isEnabled = hasLeftChapter
+        left_chapter.alpha = if (hasLeftChapter) 1f else 0.4f
+    }
 
     private fun getOrCreateViewer(manga: Manga): BaseReader {
         val mangaViewer = if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer
@@ -323,7 +325,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
     }
 
     fun toggleMenu() {
-        setMenuVisibility(reader_menu.visibility == View.GONE)
+        setMenuVisibility(!menuVisible)
     }
 
     fun requestNextChapter() {
@@ -338,34 +340,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         }
     }
 
-    private fun setMenuVisibility(visible: Boolean, animate: Boolean = true) {
-        if (visible) {
-            reader_menu.visibility = View.VISIBLE
-
-            if (animate) {
-                val toolbarAnimation = AnimationUtils.loadAnimation(this, R.anim.enter_from_top)
-                toolbar.startAnimation(toolbarAnimation)
-
-                val bottomMenuAnimation = AnimationUtils.loadAnimation(this, R.anim.enter_from_bottom)
-                reader_menu_bottom.startAnimation(bottomMenuAnimation)
-            }
-        } else {
-            val toolbarAnimation = AnimationUtils.loadAnimation(this, R.anim.exit_to_top)
-            toolbarAnimation.setAnimationListener(object : SimpleAnimationListener() {
-                override fun onAnimationEnd(animation: Animation) {
-                    reader_menu.visibility = View.GONE
-                }
-            })
-            toolbar.startAnimation(toolbarAnimation)
-
-            val bottomMenuAnimation = AnimationUtils.loadAnimation(this, R.anim.exit_to_bottom)
-            reader_menu_bottom.startAnimation(bottomMenuAnimation)
-
-            popupMenu?.dismiss()
-        }
-    }
-
-    private fun initializeMenu() {
+    private fun initializeBottomMenu() {
         // Intercept all events in this layout
         reader_menu_bottom.setOnTouchListener { v, event -> true }
 
@@ -376,94 +351,17 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
                 }
             }
         })
-
-        lock_orientation.setOnClickListener { v ->
-            showImmersiveDialog(MaterialDialog.Builder(this)
-                    .title(R.string.pref_rotation_type)
-                    .items(R.array.rotation_type)
-                    .itemsCallbackSingleChoice(preferences.rotation().getOrDefault() - 1,
-                            { d, itemView, which, text ->
-                                preferences.rotation().set(which + 1)
-                                true
-                            })
-                    .build())
-        }
-
-        reader_zoom_selector.setOnClickListener { v ->
-            showImmersiveDialog(MaterialDialog.Builder(this)
-                    .title(R.string.pref_zoom_start)
-                    .items(R.array.zoom_start)
-                    .itemsCallbackSingleChoice(preferences.zoomStart().getOrDefault() - 1,
-                            { d, itemView, which, text ->
-                                preferences.zoomStart().set(which + 1)
-                                true
-                            })
-                    .build())
-        }
-
-        reader_scale_type_selector.setOnClickListener { v ->
-            showImmersiveDialog(MaterialDialog.Builder(this)
-                    .title(R.string.pref_image_scale_type)
-                    .items(R.array.image_scale_type)
-                    .itemsCallbackSingleChoice(preferences.imageScaleType().getOrDefault() - 1,
-                            { d, itemView, which, text ->
-                                preferences.imageScaleType().set(which + 1)
-                                true
-                            })
-                    .build())
-        }
-
-        reader_selector.setOnClickListener { v ->
-            showImmersiveDialog(MaterialDialog.Builder(this)
-                    .title(R.string.pref_viewer_type)
-                    .items(R.array.viewers_selector)
-                    .itemsCallbackSingleChoice(presenter.manga.viewer,
-                            { d, itemView, which, text ->
-                                presenter.updateMangaViewer(which)
-                                recreate()
-                                true
-                            })
-                    .build())
-        }
-
-        val popupView = layoutInflater.inflate(R.layout.reader_popup, null)
-        popupMenu = ReaderPopupMenu(this, popupView)
-
-        reader_extra_settings.setOnClickListener {
-            popupMenu?.let {
-                if (!it.isShowing)
-                    it.showAtLocation(reader_extra_settings,
-                            Gravity.BOTTOM or Gravity.RIGHT, 0, reader_menu_bottom.height)
-                else
-                    it.dismiss()
-            }
-
-        }
-
     }
 
     private fun initializeSettings() {
+        subscriptions += preferences.rotation().asObservable()
+                .subscribe { setRotation(it) }
+
         subscriptions += preferences.showPageNumber().asObservable()
                 .subscribe { setPageNumberVisibility(it) }
 
-        subscriptions += preferences.rotation().asObservable()
-                .subscribe {
-                    setRotation(it)
-
-                    val isPortrait = resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
-
-                    val resourceId = if (it == 1)
-                        R.drawable.ic_screen_rotation_white_24dp
-                    else if (isPortrait)
-                        R.drawable.ic_screen_lock_portrait_white_24dp
-                    else
-                        R.drawable.ic_screen_lock_landscape_white_24dp
-
-                    lock_orientation.setImageResource(resourceId)
-                }
-
-        subscriptions += preferences.hideStatusBar().asObservable()
-                .subscribe { setStatusBarVisibility(it) }
+        subscriptions += preferences.fullscreen().asObservable()
+                .subscribe { setFullscreen(it) }
 
         subscriptions += preferences.keepScreenOn().asObservable()
                 .subscribe { setKeepScreenOn(it) }
@@ -496,6 +394,16 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         page_number.visibility = if (visible) View.VISIBLE else View.INVISIBLE
     }
 
+    private fun setFullscreen(enabled: Boolean) {
+        systemUi = if (enabled) {
+            val level = if (Build.VERSION.SDK_INT >= KITKAT) LEVEL_IMMERSIVE else LEVEL_HIDE_STATUS_BAR
+            val flags = FLAG_IMMERSIVE_STICKY or FLAG_LAYOUT_IN_SCREEN_OLDER_DEVICES
+            SystemUiHelper(this, level, flags)
+        } else {
+            null
+        }
+    }
+
     private fun setKeepScreenOn(enabled: Boolean) {
         if (enabled) {
             window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -523,29 +431,6 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         window.attributes = window.attributes.apply { screenBrightness = value }
     }
 
-    private fun setStatusBarVisibility(hidden: Boolean) {
-        createUiHideFlags(hidden)
-        setSystemUiVisibility()
-    }
-
-    private fun createUiHideFlags(statusBarHidden: Boolean) {
-        uiFlags = 0
-        uiFlags = uiFlags or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-        if (statusBarHidden) {
-            uiFlags = uiFlags or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-                    View.SYSTEM_UI_FLAG_FULLSCREEN
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            uiFlags = uiFlags or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        }
-    }
-
-    fun setSystemUiVisibility() {
-        window.decorView.systemUiVisibility = uiFlags
-    }
-
     private fun applyTheme(theme: Int) {
         readerTheme = theme
         val rootView = window.decorView.rootView
@@ -560,12 +445,38 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         }
     }
 
-    private fun showImmersiveDialog(dialog: Dialog) {
-        // Hack to not leave immersive mode
-        dialog.window.setFlags(FLAG_NOT_FOCUSABLE, FLAG_NOT_FOCUSABLE)
-        dialog.show()
-        dialog.window.decorView.systemUiVisibility = window.decorView.systemUiVisibility
-        dialog.window.clearFlags(FLAG_NOT_FOCUSABLE)
+    private fun setMenuVisibility(visible: Boolean) {
+        menuVisible = visible
+        if (visible) {
+            systemUi?.show()
+            reader_menu.visibility = View.VISIBLE
+
+            val toolbarAnimation = AnimationUtils.loadAnimation(this, R.anim.enter_from_top)
+            toolbarAnimation.setAnimationListener(object : SimpleAnimationListener() {
+                override fun onAnimationStart(animation: Animation) {
+                    // Fix status bar being translucent the first time it's opened.
+                    if (Build.VERSION.SDK_INT >= 21) {
+                        window.addFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+                    }
+                }
+            })
+            toolbar.startAnimation(toolbarAnimation)
+
+            val bottomMenuAnimation = AnimationUtils.loadAnimation(this, R.anim.enter_from_bottom)
+            reader_menu_bottom.startAnimation(bottomMenuAnimation)
+        } else {
+            systemUi?.hide()
+            val toolbarAnimation = AnimationUtils.loadAnimation(this, R.anim.exit_to_top)
+            toolbarAnimation.setAnimationListener(object : SimpleAnimationListener() {
+                override fun onAnimationEnd(animation: Animation) {
+                    reader_menu.visibility = View.GONE
+                }
+            })
+            toolbar.startAnimation(toolbarAnimation)
+
+            val bottomMenuAnimation = AnimationUtils.loadAnimation(this, R.anim.exit_to_bottom)
+            reader_menu_bottom.startAnimation(bottomMenuAnimation)
+        }
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPopupMenu.kt

@@ -1,108 +0,0 @@
-package eu.kanade.tachiyomi.ui.reader
-
-import android.app.Dialog
-import android.view.View
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-import android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-import android.widget.PopupWindow
-import android.widget.SeekBar
-import com.afollestad.materialdialogs.MaterialDialog
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
-import kotlinx.android.synthetic.main.reader_popup.view.*
-import java.lang.ref.WeakReference
-
-class ReaderPopupMenu(activity: ReaderActivity, val view: View) : PopupWindow(view, WRAP_CONTENT, WRAP_CONTENT) {
-
-    val activity = WeakReference(activity)
-
-    init {
-        animationStyle = R.style.reader_settings_popup_animation
-        setValues(activity.preferences)
-    }
-
-    private fun setValues(preferences: PreferencesHelper) = with(view) {
-        enable_transitions.isChecked = preferences.enableTransitions().getOrDefault()
-        show_page_number.isChecked = preferences.showPageNumber().getOrDefault()
-        hide_status_bar.isChecked = preferences.hideStatusBar().getOrDefault()
-        keep_screen_on.isChecked = preferences.keepScreenOn().getOrDefault()
-        reader_theme.isChecked = preferences.readerTheme().getOrDefault() == 1
-
-        setDecoderInitial(preferences.imageDecoder().getOrDefault())
-
-        // Add a listener to change the corresponding setting
-        enable_transitions.setOnCheckedChangeListener { v, isChecked ->
-            preferences.enableTransitions().set(isChecked)
-        }
-
-        show_page_number.setOnCheckedChangeListener { v, isChecked ->
-            preferences.showPageNumber().set(isChecked)
-        }
-
-        hide_status_bar.setOnCheckedChangeListener { v, isChecked ->
-            preferences.hideStatusBar().set(isChecked)
-        }
-
-        keep_screen_on.setOnCheckedChangeListener { v, isChecked ->
-            preferences.keepScreenOn().set(isChecked)
-        }
-
-        reader_theme.setOnCheckedChangeListener { v, isChecked ->
-            preferences.readerTheme().set(if (isChecked) 1 else 0)
-        }
-
-        image_decoder_container.setOnClickListener { v ->
-            showImmersiveDialog(MaterialDialog.Builder(view.context)
-                    .title(R.string.pref_image_decoder)
-                    .items(R.array.image_decoders)
-                    .itemsCallbackSingleChoice(preferences.imageDecoder().getOrDefault(), { dialog, itemView, which, text ->
-                        preferences.imageDecoder().set(which)
-                        setDecoderInitial(which)
-                        true
-                    })
-                    .build())
-        }
-
-        activity.get().subscriptions.add(preferences.customBrightness().asObservable()
-                .subscribe { isEnabled ->
-                    custom_brightness.isChecked = isEnabled
-                    brightness_seekbar.isEnabled = isEnabled
-                })
-
-        custom_brightness.setOnCheckedChangeListener { v, isChecked ->
-            preferences.customBrightness().set(isChecked)
-        }
-
-        brightness_seekbar.max = 100
-        brightness_seekbar.progress = Math.round(
-                preferences.customBrightnessValue().getOrDefault() * brightness_seekbar.max)
-        brightness_seekbar.setOnSeekBarChangeListener(object : SimpleSeekBarListener() {
-            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-                if (fromUser) {
-                    preferences.customBrightnessValue().set(progress.toFloat() / seekBar.max)
-                }
-            }
-        })
-    }
-
-    private fun setDecoderInitial(decoder: Int) {
-        val initial: String
-        when (decoder) {
-            0 -> initial = "R"
-            1 -> initial = "S"
-            else -> initial = ""
-        }
-        view.image_decoder_initial.text = initial
-    }
-
-    private fun showImmersiveDialog(dialog: Dialog) {
-        // Hack to not leave immersive mode
-        dialog.window.setFlags(FLAG_NOT_FOCUSABLE, FLAG_NOT_FOCUSABLE)
-        dialog.show()
-        dialog.window.decorView.systemUiVisibility = activity.get().window.decorView.systemUiVisibility
-        dialog.window.clearFlags(FLAG_NOT_FOCUSABLE)
-    }
-
-}

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsDialog.kt

@@ -0,0 +1,129 @@
+package eu.kanade.tachiyomi.ui.reader
+
+import android.app.Dialog
+import android.os.Bundle
+import android.support.v4.app.DialogFragment
+import android.view.View
+import android.widget.SeekBar
+import com.afollestad.materialdialogs.MaterialDialog
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.util.plusAssign
+import eu.kanade.tachiyomi.widget.SimpleItemSelectedListener
+import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
+import kotlinx.android.synthetic.main.dialog_reader_settings.view.*
+import rx.Observable
+import rx.android.schedulers.AndroidSchedulers
+import rx.subscriptions.CompositeSubscription
+import uy.kohesive.injekt.injectLazy
+import java.util.concurrent.TimeUnit.MILLISECONDS
+
+class ReaderSettingsDialog : DialogFragment() {
+
+    private val preferences by injectLazy<PreferencesHelper>()
+
+    private lateinit var subscriptions: CompositeSubscription
+
+    override fun onCreateDialog(savedState: Bundle?): Dialog {
+        val dialog = MaterialDialog.Builder(activity)
+                .title(R.string.label_settings)
+                .customView(R.layout.dialog_reader_settings, true)
+                .positiveText(android.R.string.ok)
+                .build()
+
+        subscriptions = CompositeSubscription()
+        onViewCreated(dialog.view, savedState)
+
+        return dialog
+    }
+
+    override fun onViewCreated(view: View, savedState: Bundle?) = with(view) {
+        viewer.setSelection((activity as ReaderActivity).presenter.manga.viewer, false)
+        viewer.onItemSelectedListener = SimpleItemSelectedListener { position ->
+            subscriptions += Observable.timer(250, MILLISECONDS)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe {
+                        (activity as ReaderActivity).presenter.updateMangaViewer(position)
+                        activity.recreate()
+                    }
+        }
+
+        rotation_mode.setSelection(preferences.rotation().getOrDefault() - 1, false)
+        rotation_mode.onItemSelectedListener = SimpleItemSelectedListener { position ->
+            subscriptions += Observable.timer(250, MILLISECONDS)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe {
+                        preferences.rotation().set(position + 1)
+                    }
+        }
+
+        scale_type.setSelection(preferences.imageScaleType().getOrDefault() - 1, false)
+        scale_type.onItemSelectedListener = SimpleItemSelectedListener { position ->
+            preferences.imageScaleType().set(position + 1)
+        }
+
+        zoom_start.setSelection(preferences.zoomStart().getOrDefault() - 1, false)
+        zoom_start.onItemSelectedListener = SimpleItemSelectedListener { position ->
+            preferences.zoomStart().set(position + 1)
+        }
+
+        image_decoder.setSelection(preferences.imageDecoder().getOrDefault(), false)
+        image_decoder.onItemSelectedListener = SimpleItemSelectedListener { position ->
+            preferences.imageDecoder().set(position)
+        }
+
+        background_color.setSelection(preferences.readerTheme().getOrDefault(), false)
+        background_color.onItemSelectedListener = SimpleItemSelectedListener { position ->
+            preferences.readerTheme().set(position)
+        }
+
+        enable_transitions.isChecked = preferences.enableTransitions().getOrDefault()
+        enable_transitions.setOnCheckedChangeListener { v, isChecked ->
+            preferences.enableTransitions().set(isChecked)
+        }
+
+        show_page_number.isChecked = preferences.showPageNumber().getOrDefault()
+        show_page_number.setOnCheckedChangeListener { v, isChecked ->
+            preferences.showPageNumber().set(isChecked)
+        }
+
+        fullscreen.isChecked = preferences.fullscreen().getOrDefault()
+        fullscreen.setOnCheckedChangeListener { v, isChecked ->
+            preferences.fullscreen().set(isChecked)
+        }
+
+        keep_screen_on.isChecked = preferences.keepScreenOn().getOrDefault()
+        keep_screen_on.setOnCheckedChangeListener { v, isChecked ->
+            preferences.keepScreenOn().set(isChecked)
+        }
+
+        subscriptions += preferences.customBrightness().asObservable()
+                .subscribe { isEnabled ->
+                    custom_brightness.isChecked = isEnabled
+                    brightness_seekbar.isEnabled = isEnabled
+                }
+
+        custom_brightness.setOnCheckedChangeListener { v, isChecked ->
+            preferences.customBrightness().set(isChecked)
+        }
+
+        brightness_seekbar.max = 100
+        brightness_seekbar.progress = Math.round(
+                preferences.customBrightnessValue().getOrDefault() * brightness_seekbar.max)
+        brightness_seekbar.setOnSeekBarChangeListener(object : SimpleSeekBarListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    preferences.customBrightnessValue().set(progress.toFloat() / seekBar.max)
+                }
+            }
+        })
+
+    }
+
+    override fun onDestroyView() {
+        subscriptions.unsubscribe()
+        super.onDestroyView()
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderFragment.kt

@@ -23,6 +23,7 @@ import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
 import rx.subjects.PublishSubject
+import rx.subjects.SerializedSubject
 import java.io.File
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
@@ -150,7 +151,7 @@ class PagerReaderFragment : BaseFragment() {
      */
     private fun observeStatus() {
         page?.let { page ->
-            val statusSubject = PublishSubject.create<Int>()
+            val statusSubject = SerializedSubject(PublishSubject.create<Int>())
             page.setStatusSubject(statusSubject)
 
             statusSubscription?.unsubscribe()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonHolder.kt

@@ -14,6 +14,7 @@ import kotlinx.android.synthetic.main.item_webtoon_reader.view.*
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.subjects.PublishSubject
+import rx.subjects.SerializedSubject
 import java.io.File
 
 /**
@@ -56,7 +57,7 @@ class WebtoonHolder(private val view: View, private val adapter: WebtoonAdapter)
             setOnImageEventListener(object : SubsamplingScaleImageView.DefaultOnImageEventListener() {
                 override fun onImageLoaded() {
                     // When the image is loaded, reset the minimum height to avoid gaps
-                    view.frame_container.minimumHeight = 0
+                    view.frame_container.minimumHeight = 30
                 }
 
                 override fun onImageLoadError(e: Exception) {
@@ -106,7 +107,7 @@ class WebtoonHolder(private val view: View, private val adapter: WebtoonAdapter)
      */
     private fun observeStatus() {
         page?.let { page ->
-            val statusSubject = PublishSubject.create<Int>()
+            val statusSubject = SerializedSubject(PublishSubject.create<Int>())
             page.setStatusSubject(statusSubject)
 
             statusSubscription?.unsubscribe()

app/src/main/java/eu/kanade/tachiyomi/widget/SimpleItemSelectedListener.kt

@@ -0,0 +1,16 @@
+package eu.kanade.tachiyomi.widget
+
+import android.view.View
+import android.widget.AdapterView
+import android.widget.AdapterView.OnItemSelectedListener
+
+class SimpleItemSelectedListener(private val callback: (Int) -> Unit): OnItemSelectedListener {
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        callback(position)
+    }
+}