From 734557d7cd74b63633db146e2ffb5c01747fe0d1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 5 Oct 2016 20:47:58 +0200 Subject: [PATCH] add theartofdev.edmodo:android-image-cropper for image editing --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 ++- .../gallery/activities/EditActivity.kt | 14 +++++++++++++- app/src/main/res/layout/activity_edit.xml | 14 ++++++++++++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 11 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/layout/activity_edit.xml diff --git a/app/build.gradle b/app/build.gradle index bed86433e..d6f193b47 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,6 +40,7 @@ dependencies { compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.jakewharton:butterknife:8.0.1' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0' + compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" apt 'com.jakewharton:butterknife-compiler:8.0.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c9dafe240..e9b855d60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -115,7 +115,8 @@ + android:name=".activities.EditActivity" + android:label="@string/editor"> diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index fa82e43ca..f43178097 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -1,5 +1,17 @@ package com.simplemobiletools.gallery.activities -class EditActivity : SimpleActivity() { +import android.os.Bundle +import com.simplemobiletools.gallery.R +import com.theartofdev.edmodo.cropper.CropImageView +import kotlinx.android.synthetic.main.activity_edit.* +class EditActivity : SimpleActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_edit) + + crop_image_view.apply { + guidelines = CropImageView.Guidelines.OFF + } + } } diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml new file mode 100644 index 000000000..0a2338991 --- /dev/null +++ b/app/src/main/res/layout/activity_edit.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 952d61109..25e3a39d5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -31,6 +31,7 @@ Abbrechen Als Hintergrundbild setzen Setzen des Hintergrundbildes fehlgeschlagen + Editor 1 Ordner gelöscht diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 69499529f..aed54f4c2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -31,6 +31,7 @@ Cancelar Establecer como fondo de pantalla Error al establecer fondo de pantalla + Editor 1 carpeta eliminada diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8ab87c30c..74afb4d86 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -31,6 +31,7 @@ Cancel Set as Wallpaper Setting as Wallpaper failed + Editor 1 cartella eliminata diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c56006f95..9eaeaaded 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -31,6 +31,7 @@ Cancel Set as Wallpaper Setting as Wallpaper failed + Editor 1 フォルダーを削除しました diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 084cb2dc1..122e1db31 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -31,6 +31,7 @@ Cancelar Definir como fundo de ecrã Falha ao definir como fundo de ecrã + Editor 1 pasta eliminada diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6d80191f2..9e11a9bc4 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -31,6 +31,7 @@ Cancel Set as Wallpaper Setting as Wallpaper failed + Editor 1 mapp borttagen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7b1e8c97..f9f120a78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,6 +31,7 @@ Cancel Set as Wallpaper Setting as Wallpaper failed + Editor 1 folder deleted