Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2025-01-19 06:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

show the editor draw canvas only when appropriate

Browse source
This commit is contained in:
tibbi 2019-01-12 17:34:00 +01:00
parent 8f3ddfffa9
commit c44a884a95
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt
View file

@ -180,6 +180,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
private fun loadDefaultImageView() { private fun loadDefaultImageView() {
default_image_view.beVisible() default_image_view.beVisible()
crop_image_view.beGone() crop_image_view.beGone()
editor_draw_canvas.beGone()
val options = RequestOptions() val options = RequestOptions()
.skipMemoryCache(true) .skipMemoryCache(true)
@ -219,6 +220,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
private fun loadCropImageView() { private fun loadCropImageView() {
default_image_view.beGone() default_image_view.beGone()
editor_draw_canvas.beGone()
crop_image_view.apply { crop_image_view.apply {
beVisible() beVisible()
setOnCropImageCompleteListener(this@EditActivity) setOnCropImageCompleteListener(this@EditActivity)
@ -233,6 +235,12 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
} }
} }
private fun loadDrawCanvas() {
default_image_view.beGone()
crop_image_view.beGone()
editor_draw_canvas.beVisible()
}
@TargetApi(Build.VERSION_CODES.N) @TargetApi(Build.VERSION_CODES.N)
private fun saveImage() { private fun saveImage() {
var inputStream: InputStream? = null var inputStream: InputStream? = null
@ -388,6 +396,8 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
loadCropImageView() loadCropImageView()
} else if (default_image_view.isGone() && currPrimaryAction == PRIMARY_ACTION_FILTER) { } else if (default_image_view.isGone() && currPrimaryAction == PRIMARY_ACTION_FILTER) {
loadDefaultImageView() loadDefaultImageView()
} else if (editor_draw_canvas.isGone() && currPrimaryAction == PRIMARY_ACTION_DRAW) {
loadDrawCanvas()
} }
arrayOf(bottom_primary_filter, bottom_primary_crop_rotate, bottom_primary_draw).forEach { arrayOf(bottom_primary_filter, bottom_primary_crop_rotate, bottom_primary_draw).forEach {

9
app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/EditorDrawCanvas.kt Normal file
View file

@ -0,0 +1,9 @@
package com.simplemobiletools.gallery.pro.views
import android.content.Context
import android.util.AttributeSet
import android.view.View
class EditorDrawCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
}

9
app/src/main/res/layout/activity_edit.xml
View file

@ -23,6 +23,15 @@
app:cropBackgroundColor="@color/crop_image_view_background" app:cropBackgroundColor="@color/crop_image_view_background"
app:cropInitialCropWindowPaddingRatio="0"/> app:cropInitialCropWindowPaddingRatio="0"/>
<com.simplemobiletools.gallery.pro.views.EditorDrawCanvas
android:id="@+id/editor_draw_canvas"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_editor_crop_rotate_actions"
android:layout_marginBottom="@dimen/activity_margin"
android:background="@android:color/transparent"
android:visibility="gone"/>
<RelativeLayout <RelativeLayout
android:id="@+id/bottom_editor_actions_background" android:id="@+id/bottom_editor_actions_background"
android:layout_width="match_parent" android:layout_width="match_parent"