Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Fixed crash in editor when launched from other apps ([#786])

## [1.9.0] - 2025-11-08
### Changed
Expand Down Expand Up @@ -239,6 +241,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#752]: https://github.com/FossifyOrg/Gallery/issues/752
[#754]: https://github.com/FossifyOrg/Gallery/issues/754
[#759]: https://github.com/FossifyOrg/Gallery/issues/759
[#786]: https://github.com/FossifyOrg/Gallery/issues/786

[Unreleased]: https://github.com/FossifyOrg/Gallery/compare/1.9.0...HEAD
[1.9.0]: https://github.com/FossifyOrg/Gallery/compare/1.8.1...1.9.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.provider.MediaStore
import android.widget.RelativeLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.graphics.scale
import androidx.core.net.toUri
import androidx.exifinterface.media.ExifInterface
Expand Down Expand Up @@ -130,8 +130,15 @@ class EditActivity : BaseCropActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
isCropIntent = intent.extras?.get(CROP) == "true"
setupEdgeToEdge(
padBottomSystem = listOf(binding.bottomEditorPrimaryActions.root)
padBottomSystem = listOf(
if (isCropIntent) {
binding.bottomEditorCropRotateActions.root
} else {
binding.bottomEditorPrimaryActions.root
}
)
)

if (checkAppSideloading()) {
Expand Down Expand Up @@ -210,10 +217,15 @@ class EditActivity : BaseCropActivity() {
else -> uri!!
}

isCropIntent = extras?.get(CROP) == "true"
if (isCropIntent) {
binding.bottomEditorPrimaryActions.root.beGone()
(binding.bottomEditorCropRotateActions.root.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1)

val params = binding.bottomEditorCropRotateActions.root.layoutParams as? ConstraintLayout.LayoutParams
if (params != null) {
params.bottomToBottom = binding.activityEditHolder.id
binding.bottomEditorCropRotateActions.root.layoutParams = params
}

binding.editorToolbar.menu.findItem(R.id.overwrite_original).isVisible = false
}

Expand Down
Loading