diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt index d51b515fe..034721672 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt @@ -32,7 +32,7 @@ import com.simplemobiletools.gallery.pro.dialogs.ResizeDialog import com.simplemobiletools.gallery.pro.dialogs.SaveAsDialog import com.simplemobiletools.gallery.pro.extensions.config import com.simplemobiletools.gallery.pro.extensions.openEditor -import com.simplemobiletools.gallery.pro.helpers.FilterThumbnailsManager +import com.simplemobiletools.gallery.pro.helpers.* import com.simplemobiletools.gallery.pro.models.FilterItem import com.theartofdev.edmodo.cropper.CropImageView import com.zomato.photofilters.FilterPack @@ -55,12 +55,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener private val ASPECT_Y = "aspectY" private val CROP = "crop" - private val ASPECT_RATIO_FREE = 0 - private val ASPECT_RATIO_ONE_ONE = 1 - private val ASPECT_RATIO_FOUR_THREE = 2 - private val ASPECT_RATIO_SIXTEEN_NINE = 3 - private val ASPECT_RATIO_OTHER = 4 - // constants for bottom primary action groups private val PRIMARY_ACTION_NONE = 0 private val PRIMARY_ACTION_FILTER = 1 @@ -136,6 +130,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener loadDefaultImageView() setupBottomActions() + updateAspectRatio(config.lastEditorCropAspectRatio) } override fun onResume() { @@ -411,6 +406,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener private fun updateAspectRatio(aspectRatio: Int) { currAspectRatio = aspectRatio + config.lastEditorCropAspectRatio = aspectRatio updateAspectRatioButtons() crop_image_view.apply { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt index f7d61c0de..34141f32e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt @@ -411,4 +411,8 @@ class Config(context: Context) : BaseConfig(context) { var allowDownGesture: Boolean get() = prefs.getBoolean(ALLOW_DOWN_GESTURE, true) set(allowDownGesture) = prefs.edit().putBoolean(ALLOW_DOWN_GESTURE, allowDownGesture).apply() + + var lastEditorCropAspectRatio: Int + get() = prefs.getInt(LAST_EDITOR_CROP_ASPECT_RATIO, ASPECT_RATIO_FREE) + set(lastEditorCropAspectRatio) = prefs.edit().putInt(LAST_EDITOR_CROP_ASPECT_RATIO, lastEditorCropAspectRatio).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt index 26afc50e8..927881807 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt @@ -68,6 +68,8 @@ const val WAS_SVG_SHOWING_HANDLED = "was_svg_showing_handled" const val LAST_BIN_CHECK = "last_bin_check" const val SHOW_HIGHEST_QUALITY = "show_highest_quality" const val ALLOW_DOWN_GESTURE = "allow_down_gesture" +const val LAST_EDITOR_CROP_ASPECT_RATIO = "last_editor_crop_aspect_ratio" + // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" @@ -162,3 +164,10 @@ const val BOTTOM_ACTION_RENAME = 1024 const val BOTTOM_ACTION_SET_AS = 2048 const val DEFAULT_BOTTOM_ACTIONS = BOTTOM_ACTION_TOGGLE_FAVORITE or BOTTOM_ACTION_EDIT or BOTTOM_ACTION_SHARE or BOTTOM_ACTION_DELETE + +// aspect ratios used at the editor for cropping +const val ASPECT_RATIO_FREE = 0 +const val ASPECT_RATIO_ONE_ONE = 1 +const val ASPECT_RATIO_FOUR_THREE = 2 +const val ASPECT_RATIO_SIXTEEN_NINE = 3 +const val ASPECT_RATIO_OTHER = 4