Rotation state is now saved in the view model.

Author: therealbluepandabear

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/CanvasActivity+configureSavedInstanceState.kt

@@ -90,24 +90,13 @@ class CanvasActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         onCreate()
-        configureSavedInstanceState(savedInstanceState)
-    }
-
-    override fun onStart() {
-        super.onStart()
-        savePrevOrientationInfo()
     }
 
     override fun onPause() {
         extendedOnPause()
         super.onPause()
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        extendedOnSaveInstanceState(outState)
-        super.onSaveInstanceState(outState)
-    }
-
     override fun onViewLoaded() {
         extendedOnViewLoaded()
     }

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/CanvasActivity+onSaveInstanceState.kt

@@ -21,4 +21,6 @@ fun CanvasActivity.rotate(degrees: Int, clockwise: Boolean = true, animate: Bool
     } else {
         binding.activityCanvasCardView.rotation = rotationAmount
     }
+
+    viewModel.currentRotation = rotationAmount.toInt()
 }

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/CanvasActivity+savePrevOrientationInfo.kt

@@ -5,11 +5,13 @@ import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.lifecycleScope
 import com.therealbluepandabear.pixapencil.R
 import com.therealbluepandabear.pixapencil.activities.canvas.CanvasActivity
+import com.therealbluepandabear.pixapencil.activities.canvas.canvashelpers.rotate
 import com.therealbluepandabear.pixapencil.activities.canvas.canvashelpers.setOnTouchListener
 import com.therealbluepandabear.pixapencil.activities.canvas.oncreate.*
 import com.therealbluepandabear.pixapencil.activities.canvas.oncreate.menu.addMenuProvider
 import com.therealbluepandabear.pixapencil.activities.canvas.showUnsavedChangesDialog
 import com.therealbluepandabear.pixapencil.activities.canvas.startSpotLight
+import com.therealbluepandabear.pixapencil.enums.RotationValue
 import com.therealbluepandabear.pixapencil.extensions.enable
 import com.therealbluepandabear.pixapencil.fragments.tools.ToolsFragment
 import com.therealbluepandabear.pixapencil.utility.constants.StringConstants
@@ -38,6 +40,7 @@ fun CanvasActivity.onCreate() {
     originalY = null
 
     binding.root.post {
+        rotate(viewModel.currentRotation, animate = false)
         binding.activityCanvasColorSwitcherView.setPrimaryColor(viewModel.primaryColor)
         binding.activityCanvasColorSwitcherView.setSecondaryColor(viewModel.secondaryColor)
 

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/CanvasActivity.kt

@@ -26,6 +26,7 @@ class CanvasActivityViewModel : ViewModel() {
     var currentBrush: Brush = BrushesDatabase.toList().first()
     var currentSymmetryMode: SymmetryMode = SymmetryMode.defaultSymmetryMode
     var currentTool: Tool = Tool.defaultTool
+    var currentRotation: Int = 0
 
     var saved = true
     var unsavedChangesDialogShown = false

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/canvashelpers/CanvasActivity+rotate.kt

@@ -48,8 +48,6 @@ object StringConstants {
         const val SHARED_PREFERENCE_SHOW_SHADING_TOOLTIP_IDENTIFIER = "show_shading_tooltip_shared_pref"
         const val SHARED_PREFERENCE_SHOW_DITHER_TOOLTIP_IDENTIFIER = "show_dither_tooltip_shared_pref"
 
-        const val PREV_ORIENTATION_BUNDLE_IDENTIFIER = "prev_orientation_bundle_identifier"
-        const val PREV_ROTATION_BUNDLE_IDENTIFIER = "prev_rotation_bundle_identifier"
         const val PREV_COLOR_PICKER_TAB_BUNDLE_IDENTIFIER = "prev_color_picker_tab_bundle_identifier"
         const val PREV_COLORS_TO_FIND_BUNDLE_IDENTIFIER = "prev_colors_to_find_bundle_identifier"
         const val PREV_TRANSPARENT_BITMAP_SOURCE_BUNDLE_IDENTIFIER = "prev_transparent_bitmap_source_bundle_identifier"