From 212af3f6dcd4d935fbecda1ec55e5a38447cc49f Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 12 Jan 2019 16:26:09 +0100 Subject: [PATCH] force an editor app chooser at pressing Edit at the editor --- app/build.gradle | 2 +- .../simplemobiletools/gallery/pro/activities/EditActivity.kt | 2 +- .../com/simplemobiletools/gallery/pro/extensions/Activity.kt | 4 ++-- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-id/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-ko-rKR/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 35 files changed, 4 insertions(+), 36 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c1b8df75a..8e1c23607 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.6.6' + implementation 'com.simplemobiletools:commons:5.6.7' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1' 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 f665296be..64784c34c 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 @@ -633,7 +633,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } private fun editWith() { - openEditor(uri.toString()) + openEditor(uri.toString(), true) isEditingWithThirdParty = true } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt index 8e767320e..c09eab78b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt @@ -51,8 +51,8 @@ fun Activity.openPath(path: String, forceChooser: Boolean) { openPathIntent(path, forceChooser, BuildConfig.APPLICATION_ID) } -fun Activity.openEditor(path: String) { - openEditorIntent(path, BuildConfig.APPLICATION_ID) +fun Activity.openEditor(path: String, forceChooser: Boolean = false) { + openEditorIntent(path, forceChooser, BuildConfig.APPLICATION_ID) } fun Activity.launchCamera() { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5539e8daa..32abae374 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -91,7 +91,6 @@ قلب قلب أفقيا قلب عموديا - تعديل باستخدام Free Other diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 5d0127a54..3bdaebe63 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -87,7 +87,6 @@ Flip Flip horizontally Flip vertically - Edit with Free Other diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 5aecb3b14..0d0b95fca 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -87,7 +87,6 @@ Girar Horizontalment Verticalment - Editar amb Lliure Altres diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5b5a6c2ea..95e4d8461 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -87,7 +87,6 @@ Překlopit Překlopit vodorovně Překlopit svisle - Upravit s Volný Other diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c62cf2f59..563dc982c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -87,7 +87,6 @@ Spejlvend Spejlvend vandret Spejlvend lodret - Rediger med Fri Andet diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 126a75875..10ada1d9e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -87,7 +87,6 @@ Spiegeln Horizontal spiegeln Vertikal spiegeln - Bearbeiten mit: Beliebiges Anderes diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 548e81e92..d16504c99 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -87,7 +87,6 @@ Αναποδογύρισμα Οριζόντιο αναποδογύρισμα Κατακόρυφο αναποδογύρισμα - Επεξεργασία με Ελεύθερο Other diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e8fd073d5..447cf75d3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -87,7 +87,6 @@ Girar Horizontalmente Verticalmente - Editar con Libre Otros diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 493216b5b..7797ad5b3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -87,7 +87,6 @@ Pyöräytä Pyöräytä vaakasuoraan Pyöräytä pystysuoraan - Muokkaa sovelluksella Free Other diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c959b4bd9..4cfead64c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -87,7 +87,6 @@ Retourner Retourner horizontalement Retourner verticalement - Modifier avec Libre Other diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 447df0d6f..ae37ddc62 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -87,7 +87,6 @@ Voltear Voltear horizontalmente Voltear verticalmente - Editar con Free Other diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 743618779..f0506cfc5 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -87,7 +87,6 @@ Okreni Okreni horizontalno Okreni vertikalno - Uredi pomoću Slobodan odabir Ostalo diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ae5fd9159..94dfdbcea 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -87,7 +87,6 @@ Tükrözés Tükrözés vízszintesen Tükrözés függőlegesen - Szerkesztés ezzel Kötetlen Egyéb diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 04cfb8b77..a55722a1f 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -87,7 +87,6 @@ Balik Balik horizontal Balik vertikal - Edit dengan Bebas Lainnya diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 84f82b05b..f270482ff 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -87,7 +87,6 @@ Capovolgi Capovolgi orizzontalmente Capovolgi verticalmente - Modifica con Libero Altro diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8a0afae34..99bd75f9b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -87,7 +87,6 @@ 反転 水平方向に反転 垂直方向に反転 - 他のアプリで編集 Free Other diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 215adb08d..5a59f85bc 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -87,7 +87,6 @@ 반전 가로 반전 세로 반전 - 이미지편집 프로그램 연결 Free Other diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index ff5b194f4..d0f476c46 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -87,7 +87,6 @@ Apversti Apversti horizontaliai Apversti vertikaliai - Redaguoti su Free Other diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 68fa4c2fa..5074b2de6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -87,7 +87,6 @@ Speilvend Speilvend horisontalt Speilvend vertikalt - Rediger med Fri Annen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2e31c9414..5ec563bd8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -87,7 +87,6 @@ Kantelen Horizontaal kantelen Verticaal kantelen - Bewerken met Vrij Anders diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e8476b18f..95f49e24c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -87,7 +87,6 @@ Przewróć Przewróć w poziomie Przewróć w pionie - Edytuj w: Wolne Inny diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d8a851774..6d8e9f2a2 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -87,7 +87,6 @@ Inverter Horizontalmente Verticalmente - Editar com Free Other diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 75d6606f4..53e07cc76 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -87,7 +87,6 @@ Inverter Horizontalmente Verticalmente - Editar com Livre Outro diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2efd74004..3b2ffee29 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -87,7 +87,6 @@ Отразить По горизонтали По вертикали - Редактировать в… Произвольно Другое diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 4cda1a495..74525c719 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -87,7 +87,6 @@ Preklopiť Preklopiť vodorovne Preklopiť zvisle - Upraviť s Voľný Iný diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index e464954c2..fbac0d951 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -87,7 +87,6 @@ Zrcaljenje Zrcali horizontalno Zrcali vertikalno - Uredi z Prosto Drugo diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ca7384748..0df7472c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -87,7 +87,6 @@ Vänd Vänd horisontellt Vänd vertikalt - Redigera med Fritt Other diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c37323182..3c3117768 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -87,7 +87,6 @@ Çevir Yatay olarak çevir Dikey olarak çevir - Şununla düzenle Serbest Other diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0db30482d..d74d51e0b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -87,7 +87,6 @@ Віддзеркалити Віддзеркалити горизонтально Віддзеркалити вертикально - Редагувати за допомогою Вільне Інше diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ccefe19ab..42dd3cf22 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -87,7 +87,6 @@ 翻转 水平翻转 垂直翻转 - 编辑方式 自由 其他 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fe66f62b5..0d86c7021 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -87,7 +87,6 @@ 翻轉 水平翻轉 垂直翻轉 - 用其他程式編輯 自由 其它 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0439c91dc..f2ebe7283 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,7 +87,6 @@ Flip Flip horizontally Flip vertically - Edit with Free Other