Skip to content

Commit 6102378

Browse files
author
therealbluepandabear
committed
Orientation bugfix.
1 parent 02cca33 commit 6102378

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,19 @@ fun CanvasActivity.calcCrucialViewDimensions() {
3636

3737
if (index != -1 && viewModel.currentBitmap == null) {
3838
binding.activityCanvasPixelGridView.setExistingBitmap(BitmapConverter.convertStringToBitmap(AppData.pixelArtDB.dao().getAllNoLiveData()[index].bitmap)!!)
39-
} else if (uri != null && viewModel.currentBitmap == null) {
39+
} else if (uri != null) {
4040
val fileHelperUtilities = FileHelperUtilities.createInstance(this)
4141
fileHelperUtilities.getBitmapFromUri(uri!!) { outputCode, bitmap, exceptionMessage ->
4242
if (outputCode == OutputCode.Success && bitmap != null) {
4343
width = bitmap.width
4444
height = bitmap.height
45-
binding.activityCanvasPixelGridView.setExistingBitmap(bitmap)
45+
46+
if (viewModel.currentBitmap == null) {
47+
binding.activityCanvasPixelGridView.setExistingBitmap(bitmap)
48+
viewModel.currentBitmap = bitmap
49+
} else {
50+
binding.activityCanvasPixelGridView.setExistingBitmap(viewModel.currentBitmap!!)
51+
}
4652
} else {
4753
if (exceptionMessage != null) {
4854
binding.activityCanvasCoordinatorLayout.showSnackbarWithAction(getString(R.string.dialog_error_opening_image), SnackbarDuration.Long, getString(

app/src/main/java/com/therealbluepandabear/pixapencil/fragments/newproject/NewProjectFragment+startSpotLight.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fun NewProjectFragment.startSpotLight() {
2626
text.text = getString(R.string.spot_light_new_project_fragment_1)
2727
}
2828
})
29-
.setShape(RoundedRectangle((binding.fragmentNewCanvasProjectTitleTextInputLayout.measuredHeight + 100).toFloat(), (binding.root.measuredWidth ).toFloat(), 20f))
29+
.setShape(RoundedRectangle((binding.fragmentNewCanvasProjectTitleTextInputLayout.measuredHeight + 100).toFloat(), (binding.root.measuredWidth).toFloat(), 20f))
3030
.setOverlay(lyt)
3131
.build()
3232

0 commit comments

Comments
 (0)