properly remember the Other aspect ratio at cropping too
This commit is contained in:
parent
c2f9b3e700
commit
e92b708e4d
3 changed files with 16 additions and 1 deletions
|
@ -130,6 +130,10 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
|
||||||
|
|
||||||
loadDefaultImageView()
|
loadDefaultImageView()
|
||||||
setupBottomActions()
|
setupBottomActions()
|
||||||
|
|
||||||
|
if (config.lastEditorCropAspectRatio == ASPECT_RATIO_OTHER) {
|
||||||
|
lastOtherAspectRatio = Pair(config.lastEditorCropOtherAspectRatioX, config.lastEditorCropOtherAspectRatioY)
|
||||||
|
}
|
||||||
updateAspectRatio(config.lastEditorCropAspectRatio)
|
updateAspectRatio(config.lastEditorCropAspectRatio)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -330,6 +334,8 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
|
||||||
bottom_aspect_ratio_other.setOnClickListener {
|
bottom_aspect_ratio_other.setOnClickListener {
|
||||||
OtherAspectRatioDialog(this, lastOtherAspectRatio) {
|
OtherAspectRatioDialog(this, lastOtherAspectRatio) {
|
||||||
lastOtherAspectRatio = it
|
lastOtherAspectRatio = it
|
||||||
|
config.lastEditorCropOtherAspectRatioX = it.first
|
||||||
|
config.lastEditorCropOtherAspectRatioY = it.second
|
||||||
updateAspectRatio(ASPECT_RATIO_OTHER)
|
updateAspectRatio(ASPECT_RATIO_OTHER)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -415,4 +415,12 @@ class Config(context: Context) : BaseConfig(context) {
|
||||||
var lastEditorCropAspectRatio: Int
|
var lastEditorCropAspectRatio: Int
|
||||||
get() = prefs.getInt(LAST_EDITOR_CROP_ASPECT_RATIO, ASPECT_RATIO_FREE)
|
get() = prefs.getInt(LAST_EDITOR_CROP_ASPECT_RATIO, ASPECT_RATIO_FREE)
|
||||||
set(lastEditorCropAspectRatio) = prefs.edit().putInt(LAST_EDITOR_CROP_ASPECT_RATIO, lastEditorCropAspectRatio).apply()
|
set(lastEditorCropAspectRatio) = prefs.edit().putInt(LAST_EDITOR_CROP_ASPECT_RATIO, lastEditorCropAspectRatio).apply()
|
||||||
|
|
||||||
|
var lastEditorCropOtherAspectRatioX: Int
|
||||||
|
get() = prefs.getInt(LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_X, 2)
|
||||||
|
set(lastEditorCropOtherAspectRatioX) = prefs.edit().putInt(LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_X, lastEditorCropOtherAspectRatioX).apply()
|
||||||
|
|
||||||
|
var lastEditorCropOtherAspectRatioY: Int
|
||||||
|
get() = prefs.getInt(LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_Y, 1)
|
||||||
|
set(lastEditorCropOtherAspectRatioY) = prefs.edit().putInt(LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_Y, lastEditorCropOtherAspectRatioY).apply()
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,8 @@ const val LAST_BIN_CHECK = "last_bin_check"
|
||||||
const val SHOW_HIGHEST_QUALITY = "show_highest_quality"
|
const val SHOW_HIGHEST_QUALITY = "show_highest_quality"
|
||||||
const val ALLOW_DOWN_GESTURE = "allow_down_gesture"
|
const val ALLOW_DOWN_GESTURE = "allow_down_gesture"
|
||||||
const val LAST_EDITOR_CROP_ASPECT_RATIO = "last_editor_crop_aspect_ratio"
|
const val LAST_EDITOR_CROP_ASPECT_RATIO = "last_editor_crop_aspect_ratio"
|
||||||
|
const val LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_X = "last_editor_crop_other_aspect_ratio_x"
|
||||||
|
const val LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_Y = "last_editor_crop_other_aspect_ratio_y"
|
||||||
|
|
||||||
// slideshow
|
// slideshow
|
||||||
const val SLIDESHOW_INTERVAL = "slideshow_interval"
|
const val SLIDESHOW_INTERVAL = "slideshow_interval"
|
||||||
|
|
Loading…
Reference in a new issue