Fix reader state restoration

.idea/misc.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../../../layout/custom_preview.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -124,11 +124,6 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 		}
 	}
 
-	override fun onPause() {
-		viewModel.saveCurrentState(reader?.getCurrentState())
-		super.onPause()
-	}
-
 	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
 		menuInflater.inflate(R.menu.opt_reader_top, menu)
 		return super.onCreateOptionsMenu(menu)

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReader.kt

@@ -18,29 +18,34 @@ abstract class BaseReader<B : ViewBinding> : BaseFragment<B>() {
 	protected val loader by lazy(LazyThreadSafetyMode.NONE) {
 		PageLoader(lifecycleScope, get(), get())
 	}
-	private var lastReaderState: ReaderState? = null
+	private var stateToSave: ReaderState? = null
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		lastReaderState = savedInstanceState?.getParcelable(KEY_STATE) ?: lastReaderState
+		var restoredState = savedInstanceState?.getParcelable<ReaderState?>(KEY_STATE)
 
 		viewModel.content.observe(viewLifecycleOwner) {
-			onPagesChanged(it.pages, lastReaderState ?: it.state)
+			onPagesChanged(it.pages, restoredState ?: it.state)
-			lastReaderState = null
+			restoredState = null
 		}
 	}
 
+	override fun onPause() {
+		super.onPause()
+		viewModel.saveCurrentState(getCurrentState())
+	}
+
 	override fun onDestroyView() {
-		lastReaderState = getCurrentState()
+		stateToSave = getCurrentState()
 		super.onDestroyView()
 	}
 
 	override fun onSaveInstanceState(outState: Bundle) {
 		super.onSaveInstanceState(outState)
 		getCurrentState()?.let {
-			lastReaderState = it
+			stateToSave = it
 		}
-		outState.putParcelable(KEY_STATE, lastReaderState)
+		outState.putParcelable(KEY_STATE, stateToSave)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) = Unit