From a9e335d9f696d65c4e9665e7945f7fac359c2fcb Mon Sep 17 00:00:00 2001 From: spkprs Date: Mon, 16 Dec 2019 16:15:41 +0300 Subject: [PATCH 01/43] Update strings.xml --- app/src/main/res/values-el/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5ef9cecfa..f79b149de 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -82,7 +82,7 @@ Διαδρομή Μη έγκυρη διαδρομή εικόνας Η επεξεργασία εικόνας απέτυχε - File edited successfully + Επιτυχής επεξεργασία αρχείου Επεξεργασία εικόνας με: Δεν βρέθηκε επεργαστής εικόνων Άγνωστη τοποθεσία αρχείου @@ -90,9 +90,9 @@ Περιστροφή αριστερά Περιστροφή δεξιά Περιστροφή κατά 180º - Αναποδογύρισμα - Οριζόντιο αναποδογύρισμα - Κατακόρυφο αναποδογύρισμα + Περιστροφή + Οριζόντια περιστροφή + Κατακόρυφη περιστροφή Ελεύθερο Άλλο @@ -103,8 +103,8 @@ Εφαρμογή ως ταπετσαρία με: Η ταπετσαρία εφαρμόζεται... Η ταπετσαρία εφαρμόστηκε - Αναλογία σε κατακόρυφη προβολή - Αναλογία σε οριζόντια προβολή + Αναλογία κατακόρυφης προβολής + Αναλογία οριζόντιας προβολής Αρχική οθόνη Οθόνη κλειδώματος Αρχική και Οθόνη Κλειδώματος @@ -122,7 +122,7 @@ Χωρίς Εξασθένηση Ολίσθηση - Η εμφάνιση διαφανειών τελείωσε + Τέλος εμφάνισης διαφανειών Δεν βρέθηκαν πολυμέσα για την εμφάνιση διαφανειών @@ -151,14 +151,14 @@ Αυτόματη αναπαραγωγή βίντεο - Απομνημόνευση της τελευταίας θέσης αναπαραγωγής βίντεο + Απομνημόνευση τελευταίας θέσης αναπαραγωγής βίντεο Αλλαγή προβολής ονόματος αρχείων Επανάληψη βίντεο Εμφάνιση κινούμενων GIFs στα εικονίδια Μέγιστη φωτεινότητα κατά την προβολή πλήρους οθόνης Κόψιμο εικονιδίων σε τετράγωνα Εμφάνιση διάρκειας βίντεο - Περιστροφή σε πλήρη οθόνη απο + Περιστροφή πλήρους οθόνης σύμφωνα με Ρυθμίσεις συστήματος Περιστροφή συσκευής Αναλογία εικόνας From 94d3486ffbd4db25dde478c022b3a260daffad6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Mon, 16 Dec 2019 17:34:11 +0100 Subject: [PATCH 02/43] Update strings.xml --- app/src/main/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index c4dc0344b..09b7ddbf0 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -82,7 +82,7 @@ Ruta Ruta de imatge no vàlida Ha fallat la edició de la imatge - File edited successfully + Fitxer editar satisfactoriament Editar imatge utilitzant: No s’ha trobat cap editor d’imatges Ubicació de l’arxiu desconeguda From 27deeebe0fef9dced03b109b3597b406636a7d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?= <35220662+Solatec@users.noreply.github.com> Date: Mon, 16 Dec 2019 17:35:02 +0100 Subject: [PATCH 03/43] Update strings.xml --- app/src/main/res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd4ec6c57..00ea9383b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -82,7 +82,7 @@ Ruta Ruta de imagen no válida Falló la edición de imagen - File edited successfully + Fichero editado satisfactoriamente Editar imagen usando: No se encontró editor de imágenes Ubicación del archivo desconocida From 290ff6f993e41254d651bdacfd57254fcbaeb582 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 16 Dec 2019 20:54:34 +0100 Subject: [PATCH 04/43] adding extra null checks at extended details fetching --- .../simplemobiletools/gallery/pro/fragments/PhotoFragment.kt | 2 +- .../simplemobiletools/gallery/pro/fragments/VideoFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index 456680c0b..212f0da68 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -792,7 +792,7 @@ class PhotoFragment : ViewPagerFragment() { } private fun getExtendedDetailsY(height: Int): Float { - val smallMargin = resources.getDimension(R.dimen.small_margin) + val smallMargin = context?.resources?.getDimension(R.dimen.small_margin) ?: return 0f val fullscreenOffset = smallMargin + if (mIsFullscreen) 0 else context!!.navigationBarHeight val actionsHeight = if (context!!.config.bottomActions && !mIsFullscreen) resources.getDimension(R.dimen.bottom_actions_height) else 0f return context!!.realScreenSize.y - height - actionsHeight - fullscreenOffset diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt index d120839ae..96879d3c1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt @@ -471,7 +471,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S } private fun getExtendedDetailsY(height: Int): Float { - val smallMargin = resources.getDimension(R.dimen.small_margin) + val smallMargin = context?.resources?.getDimension(R.dimen.small_margin) ?: return 0f val fullscreenOffset = smallMargin + if (mIsFullscreen) 0 else context!!.navigationBarHeight var actionsHeight = 0f if (!mIsFullscreen) { From 0b7230500065895fd704930cc83610480264b2a3 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 16 Dec 2019 22:05:26 +0100 Subject: [PATCH 05/43] Dutch --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 82c50ba89..3ee3326cf 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -82,7 +82,7 @@ Pad Ongeldig pad naar afbeelding Fout bij bewerken van afbeelding - File edited successfully + Wijzigingen zijn opgeslagen Afbeelding bewerken met: Geen app gevonden voor fotobewerking Onbekende bestandslocatie From 60772f2288494d928fedc3848855a03945585839 Mon Sep 17 00:00:00 2001 From: Luis Alfredo Figueroa Bracamontes Date: Mon, 16 Dec 2019 21:06:56 -0600 Subject: [PATCH 06/43] Update strings.xml I've translated the long description of the app and corrected some things I hope I've done it good --- app/src/main/res/values-es/strings.xml | 140 ++++++++++++------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 00ea9383b..3deee53b5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4,8 +4,8 @@ Galería Editar Abrir cámara - (oculto) - (excluido) + (Oculto) + (Excluido) Fijar carpeta No fijar carpeta Anclar arriba @@ -32,13 +32,13 @@ Fijando… Fecha fijada correctamente Comparte una versión redimensionada - Hey,\n\nseems like you upgraded from the old free app. You can now uninstall the old version, which has an \'Upgrade to Pro\' button at the top of the app settings.\n\nYou will only have the Recycle bin items deleted, favorite items unmarked and you will also have to reset your app settings.\n\nThanks! + Oye,\n\nParece que actualizaste de la aplicación gratuita vieja. Ahora puedes desinstalar la versión vieja, que tiene un botón \'Actualizar a Pro\' en la aprte superior de los ajustes de la app.\n\nSolo tendrás los elementos de la Papelera de Reciclaje eliminados, favoritos desmarcados y también tendrás que reiniciar los ajustes de la app.\n\n¡Gracias! Cambiar a la búsqueda de archivos en todas las carpetas visibles Filtro de medios Imágenes - Vídeos + Videos GIFs Imagenes RAW SVGs @@ -47,25 +47,25 @@ Cambiar filtros - Esta función oculta la carpeta agregando un archivo \'.nomedia\' en ella, y ocultará también las subcarpetas. Puede mostrarlas cambiando la opción \'Mostrar carpetas ocultas\' en los Ajustes. ¿Continuar? + Esta función oculta la carpeta agregando un archivo \'.nomedia\' en ella, y también ocultará las subcarpetas. Puede mostrarlas modificando la opción \'Mostrar carpetas ocultas\' en los Ajustes. ¿Continuar? Excluir Carpetas excluidas Gestionar carpetas excluidas Esto excluirá la selección junto con sus subcarpetas, solamente de Simple Gallery. Puede gestionar las carpetas excluidas en los Ajustes. ¿Excluir mejor la carpeta superior? - Excluir las carpetas las hará junto a sus subcarpetas ocultas sólo en Simple Gallery, estas seguirán siendo visibles en otras aplicaciones.\\n\\nSi desea ocultarlo de otras aplicaciones, utilice la función de Ocultar. + Excluir las carpetas las excluirá junto a sus subcarpetas sólo en Simple Gallery, estas seguirán siendo visibles en otras aplicaciones.\\n\\nSi desea ocultarlo de otras aplicaciones, utilice la función de \"Ocultar\". Eliminar todo ¿Eliminar todas las carpetas de la lista de excluidas? Esto no borrará las carpetas. Carpetas ocultas Gestionar carpetas ocultas - Parece que no tienes carpetas ocultas con \".nomedia\" ficheros. + Parece que no tienes carpetas ocultas con archivos \".nomedia\". Carpetas incluidas Gestionar carpetas incluidas Agregar carpeta Si tiene algunas carpetas que contengan multimedia, pero que no fueron reconocidas por la aplicación, puede agregarlas manualmente aquí. - No media files have been found. You can solve it by adding the folders containing media files manually. + Ningún archivo multimedia ha sido encontrado. Puedes resolverlo añadiendo las carpetas que contengan archivos multimedia manualmente. Redimensionar @@ -101,7 +101,7 @@ Establecer como fondo de pantalla Error al establecer fondo de pantalla Establecer como fondo de pantalla con: - Estableciendo fondo de pantalla… + Estableciendo fondo de pantalla... Fondo de pantalla establecido correctamente Relación de aspecto tipo retrato Relación de aspecto tipo paisaje @@ -110,19 +110,19 @@ Pantalla de inicio y de bloqueo - Diapositivas + Presentación de diapositivas Intervalo (segundos): Incluir fotos Incluir vídeos Incluir GIFs Orden aleatorio Mover hacia atrás - Presentación de diapositivas + Presentación en bucle Animación Ninguna - Fusión + Desvanecimiento Desplazamineto - La diapositiva terminó + La presentación de diapositivas terminó No se han encontrado medios para la presentación de diapositivas @@ -133,15 +133,15 @@ Agrupar por - No agrupar ficheros + No agrupar Carpeta - Último modificado - Último modificado (diario) - Último modificado (mensual) - Fecha de toma - Fecha de toma (diario) - Fecha de toma (mensual) - Tipo de fichero + Fecha de modificación + Fecha de modificacion (Día) + Fecha de modificación (Mes) + Fecha de creación + Fecha de creación (Día) + Fecha de creación (Mes) + Tipo de arhivo Extensión Tenga en cuenta que la agrupación y la clasificación son 2 campos independientes @@ -151,38 +151,38 @@ Reproducir vídeos automáticamente - Recuerde la última posición de reproducción de video + Recordar la última posición en la reproducción de video Cambiar la visibilidad del nombre de archivo - Reproducción continua de vídeos + Reproducción videos en bucle Animar las miniaturas de GIFs Brillo máximo cuando se muestra multimedia Recortar miniaturas en cuadrados - Mostrar duración del video + Mostrar la duración de los videos Rotar multimedia en pantalla completa según Configuración del sistema Rotación del dispositivo Relación de aspecto Fondo y barra de estado negra en medios de pantalla completa Desplazar miniaturas horizontalmente - Ocultar automáticamente la interfaz de usuario del sistema en medios de pantalla completa + Ocultar la interfaz del sistema en pantalla completa Eliminar carpetas vacias despues de borrar su contenido - Permite controlar el brillo con gestos verticales + Permite controlar el brillo en las fotos con gestos verticales Permite controlar el volumen y el brillo del video con gestos verticales - Mostrar el conteo de medios de las carpetas en la vista principal - Mostrar detalles extendidos sobre medios en pantalla completa - Administrar detalles ampliados + Mostrar el número de archivos dentro de las carpetas en la página principal + Mostrar información de los archivos en pantalla completa + Información de lo archivos a mostrar Permitir zoom con un dedo en pantalla completa - Permitir el cambio instantáneo de medios haciendo clic en los lados de la pantalla + Deslpazarse en los medios haciendo clic en los lados de la pantalla Permitir zoom profundo Ocultar detalles ampliados cuando la barra de estado está oculta - Mostrar algunos botones de acción en la parte inferior de la pantalla + Mostrar botones de acción en la parte inferior de la pantalla Mostrar la papelera de reciclaje en la pantalla de carpetas Imágenes ampliables con zoom - Muestra imágenes con la mayor calidad posible + Mostrar imágenes con la mayor calidad posible Mostrar la Papelera de reciclaje como el último elemento en la pantalla principal Permite cerrar la vista de pantalla completa con un gesto hacia abajo. - Permitir zoom 1:1 con dos toques dobles - Siempre abre videos en una pantalla separada con nuevos gestos horizontales + Permitir zoom 1:1 con un toque doble + Abrir videos en una pantalla separada con nuevos gestos horizontales Mostrar una muesca si está disponible Permite girar con gestos Prioridad de carga de archivos @@ -199,8 +199,8 @@ Administrar los botones de la parte inferior - Activar favoritos - Activar visibilidad de fichero + Agregar a favoritos + Alternar visibilidad de archivo ¿Cómo puedo hacer que Simple Gallery sea la galería de dispositivos predeterminada? @@ -236,54 +236,54 @@ - Simple Gallery Pro - Photo Manager & Editor + Simple Gallery Pro - Gestor y editor de fotos Explore sus recuerdos sin interrupciones. - Simple Gallery Pro is a highly customizable offline gallery. Organize & edit your photos, recover deleted files with the recycle bin, protect & hide files and view a huge variety of different photo & video formats including RAW, SVG and much more. + Simple Gallery Pro es una galería altamente personalizable disponible sin conexión. Organiza y edita tus fotos, recupera archivos eliminados con la papelera de reciclaje, protege y oculta archivos y mira una gran variedad de diferentes formatos de fotos y videos incluyendo RAW, SVG y muchos más. - The app contains no ads and unnecessary permissions. As the app doesn’t require internet access either, your privacy is protected. + La app no contiene anuncios ni permisos innecesarios. Ya que la app tampoco requiere acceso a internet, tu privacidad está protegida. ------------------------------------------------- - SIMPLE GALLERY PRO – FEATURES + SIMPLE GALLERY PRO – CARACTERÍSTICAS ------------------------------------------------- - • Offline gallery with no ads or popups - • Simple gallery photo editor – crop, rotate, resize, draw, filters & more - • No internet access needed, giving you more privacy and security - • No unnecessary permissions required - • Quickly search images, videos & files - • Open & view many different photo and video types (RAW, SVG, panoramic etc) - • A variety of intuitive gestures to easily edit & organize files - • Lots of ways to filter, group & sort files - • Customize the appearance of Simple Gallery Pro - • Available in 32 languages - • Mark files as favorites for quick access - • Protect your photos & videos with a pattern, pin or fingerprint - • Use pin, pattern & fingerprint to protect the app launch or specific functions too - • Recover deleted photos & videos from the recycle bin - • Toggle visibility of files to hide photos & videos - • Create a customizable slideshow of your files - • View detailed information of your files (resolution, EXIF values etc) - • Simple Gallery Pro is open source - … and much much more! + • Galería disponible sin conexión sin anuncios ni ventanas emergentes + • Editor de fotos – Recorta, rota, redimensiona, dibuja, filtra y más + • Acceso a internet no necesario, dándote más privacidad y seguridad + • No requiere permisos innecesarios + • Búsqueda rápida de imágenes, videos y archivos + • Abre y mira muchos tipos de fotos y videos diferentes (RAW, SVG, panorámica, etc.) + • Variedad de gestos intuitivos para editar y organizar archivos fácilmente + • Montones de formas de filtrar, agrupar y ordenar archivos + • Personaliza la apariencia de Simple Gallery Pro + • Disponible en 32 lenguajes + • Seleccionar archivos como favoritos para acceder rápidamente + • Protege tus fotos y videos con patrón, pin o huella digital + • Usa pin, patrón y huella digital para proteger la apertura de la app o también funciones específicas + • Recupera fotos y videos eliminados desde la papelera de reciclaje + • Alterna la visibilidad de archivos para ocultar fotos y videos + • Crea una presentación de diapositivas personalizable de tus archivos + • Mira información detallada de tus archivos (Resolución, valores EXIF, etc.) + • Simple Gallery Pro es de código abierto + … ¡y mucho, mucho más! - PHOTO GALLERY EDITOR - Simple Gallery Pro makes it easy to edit your pictures on the fly. Crop, flip, rotate and resize your pictures. If you’re feeling a little more creative you can add filters and draw on your pictures! + EDITOR DE FOTOS + Simple Gallery Pro hace más fácil editar tus fotos rápidamente. Corta, gira, rota y redimensiona tus fotos. Si te sientes un poco más creativo, ¡Puedes añadir filtros y dibujar en tus fotos! - SUPPORT FOR MANY FILE TYPES - Unlike some other gallery viewers & photo organizers, Simple Gallery Pro supports a huge range of different file types including JPEG, PNG, MP4, MKV, RAW, SVG, Panoramic photos, Panoramic videos and many more. + SOPORTA MUCHOS TIPOS DE ARCHIVOS + Al contrario de otras galerías y organizadores de fotos, Simple Gallery Pro soporta un enorme rango de tipos de archivos diferentes incluyendo JPEG, PNG, MP4, MKV, RAW, SVG, fotos panorámicas, videos panorámicos y muchos más. - HIGHLY CUSTOMIZABLE GALLERY MANAGER - From the UI to the function buttons on the bottom toolbar, Simple Gallery Pro is highly customizable and works the way you want it to. No other gallery manager has this kind of flexibility! Thanks to being open source, we’re also available in 32 languages! + GALERÍA ALTAMENTE PERSONALZIABLE + Desde la IU hasta los botones de funciones en la barra de herramientas inferior, Simple Gallery Pro es altamente personalizable y trabaja de la forma que quieras. ¡Ninguna otra galería tiene este tipo de flexibilidad! Gracias a que es de código abierto, ¡También está disponible en 32 lenguajes! - RECOVER DELETED PHOTOS & VIDEOS - Accidentally deleted a precious photo or video? Don’t worry! Simple Gallery Pro features a handy recycle bin where you can recover deleted photos & videos easily. + RECUPERA FOTOS Y VIDEOS ELIMINADOS + ¿Accidentalmente eliminaste una foto o video precioso? ¡No te preocupes! Simple Gallery Pro contiene una práctica papelera de reciclaje donde puedes recuperar fácilmente fotos y videos eliminados. - PROTECT & HIDE PHOTOS, VIDEOS & FILES - Using pin, pattern or your device’s fingerprint scanner you can protect and hide photos, videos & entire albums. You can protect the app itself or place locks on specific functions of the app. For example, you can’t delete a file without a fingerprint scan, helping to protect your files from accidental deletion. + PROTEGE Y OCULTA FOTOS, VIDEOS Y ARCHIVOS + Usando pin, patrón o el lector de huella de tu dispositivo, puedes proteger y ocultar fotos, videos y álbumes enteros. Puedes proteger la propia aplicación o bloquear funciones específicas en la misma. Por ejemplo, no puedes eliminar un archivo sin un escaneo de huella, ayudando a proteger tus archivos de ser eliminados accidentalmente. - Check out the full suite of Simple Tools here: + Mira la suite completa de Simple Tools aquí: https://www.simplemobiletools.com Facebook: From ceb3347031c0efae3b9088cc0ef6d7f08ef62953 Mon Sep 17 00:00:00 2001 From: Luis Alfredo Figueroa Bracamontes Date: Mon, 16 Dec 2019 21:24:27 -0600 Subject: [PATCH 07/43] Update strings.xml Fix a little error --- app/src/main/res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3deee53b5..489993897 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -153,7 +153,7 @@ Reproducir vídeos automáticamente Recordar la última posición en la reproducción de video Cambiar la visibilidad del nombre de archivo - Reproducción videos en bucle + Reproducir videos en bucle Animar las miniaturas de GIFs Brillo máximo cuando se muestra multimedia Recortar miniaturas en cuadrados From 37cb4f2608872024beb8f72ea94717cf43550dc2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 17:43:52 +0100 Subject: [PATCH 08/43] updating commons to 5.21.0 --- app/build.gradle | 2 +- .../gallery/pro/activities/ViewPagerActivity.kt | 8 +++++++- .../gallery/pro/adapters/DirectoryAdapter.kt | 4 ++++ .../gallery/pro/adapters/ManageHiddenFoldersAdapter.kt | 4 +++- .../gallery/pro/adapters/MediaAdapter.kt | 4 ++++ .../simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt | 6 ++++-- .../simplemobiletools/gallery/pro/extensions/Activity.kt | 4 ++++ 7 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7fc2026cd..9e7c390ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.20.10' + implementation 'com.simplemobiletools:commons:5.21.0' 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/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt index 7f30b2096..0dc77ed6c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt @@ -633,7 +633,9 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View val currentPath = getCurrentPath() if (needsStupidWritePermissions(currentPath)) { handleSAFDialog(currentPath) { - rotateBy(degrees) + if (it) { + rotateBy(degrees) + } } } else { rotateBy(degrees) @@ -668,6 +670,10 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View SaveAsDialog(this, currPath, false) { val newPath = it handleSAFDialog(it) { + if (!it) { + return@handleSAFDialog + } + toast(R.string.saving) ensureBackgroundThread { val photoFragment = getCurrentPhotoFragment() ?: return@ensureBackgroundThread diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt index 4e3d29de4..abc71941e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt @@ -544,6 +544,10 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList(selectedKeys.size) selectedDirs.forEach { if (it.areFavorites() || it.isRecycleBin()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt index a3e2337c8..972d3e7a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt @@ -81,7 +81,9 @@ class ManageHiddenFoldersAdapter(activity: BaseSimpleActivity, var folders: Arra if (sdCardPaths.isNotEmpty()) { activity.handleSAFDialog(sdCardPaths.first()) { - unhideFolders(removeFolders) + if (it) { + unhideFolders(removeFolders) + } } } else { unhideFolders(removeFolders) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt index 743d2127d..298a90def 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt @@ -426,6 +426,10 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList(selectedKeys.size) val removeMedia = ArrayList(selectedKeys.size) val positions = getSelectedItemPositions() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt index 614fb7bfc..a4dd80712 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt @@ -8,7 +8,8 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.pro.R import kotlinx.android.synthetic.main.dialog_save_as.view.* -class SaveAsDialog(val activity: BaseSimpleActivity, val path: String, val appendFilename: Boolean, val callback: (savePath: String) -> Unit) { +class SaveAsDialog(val activity: BaseSimpleActivity, val path: String, val appendFilename: Boolean, val cancelCallback: (() -> Unit)? = null, + val callback: (savePath: String) -> Unit) { init { var realPath = path.getParentPath() @@ -41,7 +42,8 @@ class SaveAsDialog(val activity: BaseSimpleActivity, val path: String, val appen AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, null) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.cancel) { dialog, which -> cancelCallback?.invoke() } + .setOnCancelListener { cancelCallback?.invoke() } .create().apply { activity.setupDialogStuff(view, this, R.string.save_as) { showKeyboard(view.save_as_name) 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 8d9885c7a..3ece915e3 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 @@ -138,6 +138,10 @@ fun BaseSimpleActivity.addNoMedia(path: String, callback: () -> Unit) { if (needsStupidWritePermissions(path)) { handleSAFDialog(file.absolutePath) { + if (!it) { + return@handleSAFDialog + } + val fileDocument = getDocumentFile(path) if (fileDocument?.exists() == true && fileDocument.isDirectory) { fileDocument.createFile("", NOMEDIA) From 7e49a3e400bf526c42c9dcc8b367aeafbb5b9c41 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 17:58:00 +0100 Subject: [PATCH 09/43] updating the spanish app title and descriptions --- .../metadata/android/es/full_description.txt | 51 +++++++++++++++++++ .../metadata/android/es/short_description.txt | 1 + fastlane/metadata/android/es/title.txt | 1 + 3 files changed, 53 insertions(+) create mode 100644 fastlane/metadata/android/es/full_description.txt create mode 100644 fastlane/metadata/android/es/short_description.txt create mode 100644 fastlane/metadata/android/es/title.txt diff --git a/fastlane/metadata/android/es/full_description.txt b/fastlane/metadata/android/es/full_description.txt new file mode 100644 index 000000000..00e3df3e8 --- /dev/null +++ b/fastlane/metadata/android/es/full_description.txt @@ -0,0 +1,51 @@ +Simple Gallery Pro es una galería altamente personalizable disponible sin conexión. Organiza y edita tus fotos, recupera archivos eliminados con la papelera de reciclaje, protege y oculta archivos y mira una gran variedad de diferentes formatos de fotos y videos incluyendo RAW, SVG y muchos más. + +La app no contiene anuncios ni permisos innecesarios. Ya que la app tampoco requiere acceso a internet, tu privacidad está protegida. + +------------------------------------------------- +SIMPLE GALLERY PRO – CARACTERÍSTICAS +------------------------------------------------- + +• Galería disponible sin conexión sin anuncios ni ventanas emergentes +• Editor de fotos – Recorta, rota, redimensiona, dibuja, filtra y más +• Acceso a internet no necesario, dándote más privacidad y seguridad +• No requiere permisos innecesarios +• Búsqueda rápida de imágenes, videos y archivos +• Abre y mira muchos tipos de fotos y videos diferentes (RAW, SVG, panorámica, etc.) +• Variedad de gestos intuitivos para editar y organizar archivos fácilmente +• Montones de formas de filtrar, agrupar y ordenar archivos +• Personaliza la apariencia de Simple Gallery Pro +• Disponible en 32 lenguajes +• Seleccionar archivos como favoritos para acceder rápidamente +• Protege tus fotos y videos con patrón, pin o huella digital +• Usa pin, patrón y huella digital para proteger la apertura de la app o también funciones específicas +• Recupera fotos y videos eliminados desde la papelera de reciclaje +• Alterna la visibilidad de archivos para ocultar fotos y videos +• Crea una presentación de diapositivas personalizable de tus archivos +• Mira información detallada de tus archivos (Resolución, valores EXIF, etc.) +• Simple Gallery Pro es de código abierto +… ¡y mucho, mucho más! + +EDITOR DE FOTOS +Simple Gallery Pro hace más fácil editar tus fotos rápidamente. Corta, gira, rota y redimensiona tus fotos. Si te sientes un poco más creativo, ¡Puedes añadir filtros y dibujar en tus fotos! + +SOPORTA MUCHOS TIPOS DE ARCHIVOS +Al contrario de otras galerías y organizadores de fotos, Simple Gallery Pro soporta un enorme rango de tipos de archivos diferentes incluyendo JPEG, PNG, MP4, MKV, RAW, SVG, fotos panorámicas, videos panorámicos y muchos más. + +GALERÍA ALTAMENTE PERSONALZIABLE +Desde la IU hasta los botones de funciones en la barra de herramientas inferior, Simple Gallery Pro es altamente personalizable y trabaja de la forma que quieras. ¡Ninguna otra galería tiene este tipo de flexibilidad! Gracias a que es de código abierto, ¡También está disponible en 32 lenguajes! + +RECUPERA FOTOS Y VIDEOS ELIMINADOS +¿Accidentalmente eliminaste una foto o video precioso? ¡No te preocupes! Simple Gallery Pro contiene una práctica papelera de reciclaje donde puedes recuperar fácilmente fotos y videos eliminados. + +PROTEGE Y OCULTA FOTOS, VIDEOS Y ARCHIVOS +Usando pin, patrón o el lector de huella de tu dispositivo, puedes proteger y ocultar fotos, videos y álbumes enteros. Puedes proteger la propia aplicación o bloquear funciones específicas en la misma. Por ejemplo, no puedes eliminar un archivo sin un escaneo de huella, ayudando a proteger tus archivos de ser eliminados accidentalmente. + +Mira la suite completa de Simple Tools aquí: +https://www.simplemobiletools.com + +Facebook: +https://www.facebook.com/simplemobiletools + +Reddit: +https://www.reddit.com/r/SimpleMobileTools diff --git a/fastlane/metadata/android/es/short_description.txt b/fastlane/metadata/android/es/short_description.txt new file mode 100644 index 000000000..56250b41d --- /dev/null +++ b/fastlane/metadata/android/es/short_description.txt @@ -0,0 +1 @@ +Explore sus recuerdos sin interrupciones. diff --git a/fastlane/metadata/android/es/title.txt b/fastlane/metadata/android/es/title.txt new file mode 100644 index 000000000..1ec2ad97e --- /dev/null +++ b/fastlane/metadata/android/es/title.txt @@ -0,0 +1 @@ +Simple Gallery Pro - Gestor y editor de fotos From 0b03a23e2cabade4d525b198693e081451890d20 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 18:09:50 +0100 Subject: [PATCH 10/43] update version to 6.10.8 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e7c390ca..51a873232 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 28 - versionCode 275 - versionName "6.10.7" + versionCode 276 + versionName "6.10.8" multiDexEnabled true setProperty("archivesBaseName", "gallery") vectorDrawables.useSupportLibrary = true From bc3797360316dc19e3c728b2568f210e9f74f0e5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 18:09:56 +0100 Subject: [PATCH 11/43] updating changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e25283681..0058c6232 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 6.10.8 *(2019-12-17)* +---------------------------- + + * Added some crashfixes and stability improvements + Version 6.10.7 *(2019-12-12)* ---------------------------- From 68f9ceeea38bf88cf5015d52e83a0965909e51be Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 18:16:30 +0100 Subject: [PATCH 12/43] replacing the home made photo editor with PhotoEditorSDK --- app/build.gradle | 27 ++- app/src/main/AndroidManifest.xml | 10 +- app/src/main/assets/pesdk_license | 1 + .../gallery/pro/activities/NewEditActivity.kt | 187 ++++++++++++++++++ app/src/main/res/layout/activity_new_edit.xml | 8 + build.gradle | 2 + 6 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 app/src/main/assets/pesdk_license create mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt create mode 100644 app/src/main/res/layout/activity_new_edit.xml diff --git a/app/build.gradle b/app/build.gradle index 51a873232..dc52337a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,7 +33,8 @@ android { buildTypes { debug { - applicationIdSuffix ".debug" + // we cannot change the original package name, else PhotoEditorSDK won't work + //applicationIdSuffix ".debug" } release { minifyEnabled true @@ -84,3 +85,27 @@ dependencies { implementation 'androidx.room:room-runtime:2.2.2' annotationProcessor 'androidx.room:room-compiler:2.2.2' } + +// Apply the PESDKPlugin +apply plugin: 'ly.img.android.pesdk' + +pesdkConfig { + licencePath 'pesdk_license' + + supportLibVersion "28.0.0" + + modules { + include 'ly.img.android.pesdk.ui.mobile_ui:core' + include 'ly.img.android.pesdk.ui.mobile_ui:text' + include 'ly.img.android.pesdk.ui.mobile_ui:focus' + include 'ly.img.android.pesdk.ui.mobile_ui:brush' + include 'ly.img.android.pesdk.ui.mobile_ui:filter' + include 'ly.img.android.pesdk.ui.mobile_ui:transform' + include 'ly.img.android.pesdk.ui.mobile_ui:adjustment' + include 'ly.img.android.pesdk.ui.mobile_ui:text-design' + + // Add asset packs if you need + include 'ly.img.android.pesdk.assets:font-basic' + include 'ly.img.android.pesdk.assets:filter-basic' + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a95a3ba3b..11b2f5c91 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,9 @@ + @@ -198,7 +201,7 @@ @@ -207,6 +210,11 @@ + + + diff --git a/app/src/main/assets/pesdk_license b/app/src/main/assets/pesdk_license new file mode 100644 index 000000000..764680c1d --- /dev/null +++ b/app/src/main/assets/pesdk_license @@ -0,0 +1 @@ +{"api_token":"aulo3T5M9uyXgeJauoiJjw","app_identifiers":["com.simplemobiletools.gallery.pro"],"available_actions":[],"domains":["https://api.photoeditorsdk.com"],"enterprise_license":false,"expires_at":null,"features":["camera","library","export","customassets","whitelabel","adjustment","brush","filter","focus","text","textdesign","transform"],"issued_at":1576163964,"minimum_sdk_version":"1.0","owner":"Tikap s.r.o.","platform":"Android","products":["pesdk"],"version":"2.4","signature":"JvD7pjiy3iomgGW7XgEaHCs7aWxTIRl/PN7dp1muFSpE6S+IVmKDfSR5+enE2Tdh2EFC/3lyVuG7S5FcyOyxeXtyfKW/+H2y8Oem6VQzgTlYus8Eacz3/mk+GShUq+C+xQvbp5cWB/prScOZHPOaiZCu531rFYOGfwgaThtpawtG4B6wxvRWfjJor8fbsIHzEQnUnsEKsQR4UhwAUQvpDnCE0JtuP0CAxFyP03XfLlwIGhbUiCbaHh/kcG3IVzeQxSjjjsefu3rCtjYbm0eZKLbgsCvbNoVv2p011P2XN1pAu1uTMFscD74FbAFAgO12vYHfJ4iQE6cmZBiVSIJftJw3Gawj91NsiJbnLmPSqwSuUApatE5pMAff443s7ML32rHj+gD2IQ3oAHowGtbyofC0LrLPxaIMZEcd9Ttfk3ujn001rvekVXk6Uj/l3P3RpyLs6FHpMMSHo5nAk7ab7MYeR6PZfWDE+ggM1sqWV5fd4rh9qd36ioJgGaL6OnYCh/2t1xeMrFG2aw55hhjZPjxw3yfTvbJrOs1p0G503nkPCzRn4TCvPefkFDquAFCQaVmIJuFi51j4HA34o2E4Twru2SkI0od5ewHE5+hAR+9JalOaZWN/kLi59B9VrAEfskYmfVszqIpekpAyloMPYrpBseUDlWVCqbJIlyQt564="} \ No newline at end of file diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt new file mode 100644 index 000000000..23dccbee2 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -0,0 +1,187 @@ +package com.simplemobiletools.gallery.pro.activities + +import android.app.Activity +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.provider.MediaStore +import androidx.core.util.Pair +import com.simplemobiletools.commons.asynctasks.CopyMoveTask +import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE +import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE +import com.simplemobiletools.commons.helpers.REAL_FILE_PATH +import com.simplemobiletools.commons.interfaces.CopyMoveListener +import com.simplemobiletools.commons.models.FileDirItem +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.SaveAsDialog +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.fixDateTaken +import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic +import ly.img.android.pesdk.assets.font.basic.FontPackBasic +import ly.img.android.pesdk.backend.model.state.EditorLoadSettings +import ly.img.android.pesdk.backend.model.state.EditorSaveSettings +import ly.img.android.pesdk.backend.model.state.manager.SettingsList +import ly.img.android.pesdk.ui.activity.PhotoEditorBuilder +import ly.img.android.pesdk.ui.model.state.UiConfigFilter +import ly.img.android.pesdk.ui.model.state.UiConfigText +import ly.img.android.pesdk.ui.model.state.UiConfigTheme +import java.io.File + +class NewEditActivity : SimpleActivity() { + private val PESDK_EDIT_IMAGE = 1 + private val SOURCE_IMAGE_PATH = "SOURCE_IMAGE_PATH" + private val RESULT_IMAGE_PATH = "RESULT_IMAGE_PATH" + private var sourceFileLastModified = 0L + private var destinationFilePath = "" + private var imagePathFromEditor = "" // delete the file stored at the internal app storage (the editor saves it there) in case moving to the selected location fails + + private lateinit var uri: Uri + private lateinit var saveUri: Uri + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_new_edit) + + if (checkAppSideloading()) { + return + } + + handlePermission(PERMISSION_WRITE_STORAGE) { + if (it) { + initEditActivity() + } else { + toast(R.string.no_storage_permissions) + finish() + } + } + } + + private fun initEditActivity() { + if (intent.data == null) { + toast(R.string.invalid_image_path) + finish() + return + } + + uri = intent.data!! + if (uri.scheme != "file" && uri.scheme != "content") { + toast(R.string.unknown_file_location) + finish() + return + } + + if (intent.extras?.containsKey(REAL_FILE_PATH) == true) { + val realPath = intent.extras!!.getString(REAL_FILE_PATH) + uri = when { + isPathOnOTG(realPath!!) -> uri + realPath.startsWith("file:/") -> Uri.parse(realPath) + else -> Uri.fromFile(File(realPath)) + } + } else { + (getRealPathFromURI(uri))?.apply { + uri = Uri.fromFile(File(this)) + } + } + + saveUri = when { + intent.extras?.containsKey(MediaStore.EXTRA_OUTPUT) == true -> intent.extras!!.get(MediaStore.EXTRA_OUTPUT) as Uri + else -> uri + } + + openEditor(uri) + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { + if (requestCode == PESDK_EDIT_IMAGE) { + val extras = resultData?.extras + val source = extras?.getString(SOURCE_IMAGE_PATH, "") ?: "" + imagePathFromEditor = extras?.getString(RESULT_IMAGE_PATH, "") ?: "" + + if (resultCode != Activity.RESULT_OK || source.isEmpty() || imagePathFromEditor.isEmpty() || source == imagePathFromEditor) { + finish() + } else { + // the image is stored at the internal app storage first, for example /data/user/0/com.simplemobiletools.gallery.pro/files/editor/IMG_20191207_183023.jpg + // first we rename it to the desired name, then move + SaveAsDialog(this, source, true, cancelCallback = { + toast(R.string.image_editing_failed) + finish() + }, callback = { + destinationFilePath = it + handleSAFDialog(destinationFilePath) { + if (it) { + sourceFileLastModified = File(source).lastModified() + val newFile = File("${imagePathFromEditor.getParentPath()}/${destinationFilePath.getFilenameFromPath()}") + File(imagePathFromEditor).renameTo(newFile) + val sourceFile = FileDirItem(newFile.absolutePath, newFile.name) + + val conflictResolutions = LinkedHashMap() + conflictResolutions[destinationFilePath] = CONFLICT_OVERWRITE + + val pair = Pair(arrayListOf(sourceFile), destinationFilePath.getParentPath()) + CopyMoveTask(this, false, true, conflictResolutions, editCopyMoveListener, true).execute(pair) + } else { + toast(R.string.image_editing_failed) + File(imagePathFromEditor).delete() + finish() + } + } + }) + } + } + super.onActivityResult(requestCode, resultCode, resultData) + } + + private val editCopyMoveListener = object : CopyMoveListener { + override fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean, destinationPath: String) { + if (config.keepLastModified) { + updateLastModified(destinationFilePath, sourceFileLastModified) + } + + val paths = arrayListOf(destinationFilePath) + rescanPaths(paths) { + fixDateTaken(paths, false) + } + + setResult(Activity.RESULT_OK, intent) + toast(R.string.file_edited_successfully) + finish() + } + + override fun copyFailed() { + toast(R.string.unknown_error_occurred) + File(imagePathFromEditor).delete() + finish() + } + } + + private fun openEditor(inputImage: Uri) { + val filename = inputImage.toString().getFilenameFromPath() + val settingsList = createPesdkSettingsList(filename) + + settingsList.getSettingsModel(EditorLoadSettings::class.java).imageSource = inputImage + + PhotoEditorBuilder(this) + .setSettingsList(settingsList) + .startActivityForResult(this, PESDK_EDIT_IMAGE) + } + + private fun createPesdkSettingsList(filename: String): SettingsList { + val settingsList = SettingsList() + settingsList.getSettingsModel(UiConfigFilter::class.java).setFilterList( + FilterPackBasic.getFilterPack() + ) + + settingsList.getSettingsModel(UiConfigText::class.java).setFontList( + FontPackBasic.getFontPack() + ) + + settingsList.getSettingsModel(UiConfigTheme::class.java).theme = R.style.Imgly_Theme_NoFullscreen + + settingsList.getSettingsModel(EditorSaveSettings::class.java) + .setOutputFilePath("$filesDir/editor/$filename") + .savePolicy = EditorSaveSettings.SavePolicy.RETURN_SOURCE_OR_CREATE_OUTPUT_IF_NECESSARY + + return settingsList + } +} diff --git a/app/src/main/res/layout/activity_new_edit.xml b/app/src/main/res/layout/activity_new_edit.xml new file mode 100644 index 000000000..1200b5a4a --- /dev/null +++ b/app/src/main/res/layout/activity_new_edit.xml @@ -0,0 +1,8 @@ + + + + diff --git a/build.gradle b/build.gradle index 969a40070..f16279588 100644 --- a/build.gradle +++ b/build.gradle @@ -6,11 +6,13 @@ buildscript { repositories { google() jcenter() + maven { url 'https://artifactory.img.ly/artifactory/imgly' } } dependencies { classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'ly.img.android.pesdk:plugin:6.6.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 552dc97aa63416128b9da75bf8fefdb52e6408a3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 18:44:46 +0100 Subject: [PATCH 13/43] removing the unused parts of the old editor, use it only for crop intents --- app/build.gradle | 1 - .../gallery/pro/activities/EditActivity.kt | 537 +----------------- .../gallery/pro/adapters/FiltersAdapter.kt | 58 -- .../gallery/pro/extensions/Activity.kt | 2 +- .../pro/helpers/FilterThumbnailsManager.kt | 27 - .../gallery/pro/models/FilterItem.kt | 6 - app/src/main/res/layout/activity_edit.xml | 50 +- .../layout/bottom_editor_actions_filter.xml | 19 - .../bottom_editor_crop_rotate_actions.xml | 29 +- .../res/layout/bottom_editor_draw_actions.xml | 61 -- .../layout/bottom_editor_primary_actions.xml | 47 -- .../main/res/layout/editor_filter_item.xml | 29 - app/src/main/res/menu/menu_editor.xml | 5 - app/src/main/res/values/dimens.xml | 3 - 14 files changed, 43 insertions(+), 831 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt delete mode 100644 app/src/main/res/layout/bottom_editor_actions_filter.xml delete mode 100644 app/src/main/res/layout/bottom_editor_draw_actions.xml delete mode 100644 app/src/main/res/layout/bottom_editor_primary_actions.xml delete mode 100644 app/src/main/res/layout/editor_filter_item.xml diff --git a/app/build.gradle b/app/build.gradle index dc52337a2..ea28aa7e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,6 @@ dependencies { implementation 'com.google.vr:sdk-panowidget:1.180.0' implementation 'com.google.vr:sdk-videowidget:1.180.0' implementation 'org.apache.sanselan:sanselan:0.97-incubator' - implementation 'info.androidhive:imagefilters:1.0.7' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.caverock:androidsvg-aar:1.3' implementation 'com.github.tibbi:gestureviews:a2208ce9d9' 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 8d3532271..3cd9667d0 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 @@ -6,7 +6,6 @@ import android.content.Intent import android.graphics.Bitmap import android.graphics.Bitmap.CompressFormat import android.graphics.Color -import android.graphics.Point import android.media.ExifInterface import android.net.Uri import android.os.Build @@ -15,16 +14,6 @@ import android.provider.MediaStore import android.view.Menu import android.view.MenuItem import android.widget.RelativeLayout -import androidx.recyclerview.widget.LinearLayoutManager -import com.bumptech.glide.Glide -import com.bumptech.glide.load.DataSource -import com.bumptech.glide.load.DecodeFormat -import com.bumptech.glide.load.engine.DiskCacheStrategy -import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.request.RequestListener -import com.bumptech.glide.request.RequestOptions -import com.bumptech.glide.request.target.Target -import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE @@ -34,62 +23,29 @@ import com.simplemobiletools.commons.helpers.isNougatPlus import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.gallery.pro.BuildConfig import com.simplemobiletools.gallery.pro.R -import com.simplemobiletools.gallery.pro.adapters.FiltersAdapter import com.simplemobiletools.gallery.pro.dialogs.OtherAspectRatioDialog -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.fixDateTaken -import com.simplemobiletools.gallery.pro.extensions.openEditor import com.simplemobiletools.gallery.pro.helpers.* -import com.simplemobiletools.gallery.pro.models.FilterItem import com.theartofdev.edmodo.cropper.CropImageView -import com.zomato.photofilters.FilterPack -import com.zomato.photofilters.imageprocessors.Filter import kotlinx.android.synthetic.main.activity_edit.* import kotlinx.android.synthetic.main.bottom_actions_aspect_ratio.* -import kotlinx.android.synthetic.main.bottom_editor_actions_filter.* import kotlinx.android.synthetic.main.bottom_editor_crop_rotate_actions.* -import kotlinx.android.synthetic.main.bottom_editor_draw_actions.* -import kotlinx.android.synthetic.main.bottom_editor_primary_actions.* import java.io.* class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener { - companion object { - init { - System.loadLibrary("NativeImageProcessor") - } - } - private val TEMP_FOLDER_NAME = "images" private val ASPECT_X = "aspectX" private val ASPECT_Y = "aspectY" - private val CROP = "crop" - - // constants for bottom primary action groups - private val PRIMARY_ACTION_NONE = 0 - private val PRIMARY_ACTION_FILTER = 1 - private val PRIMARY_ACTION_CROP_ROTATE = 2 - private val PRIMARY_ACTION_DRAW = 3 - - private val CROP_ROTATE_NONE = 0 - private val CROP_ROTATE_ASPECT_RATIO = 1 private lateinit var uri: Uri private lateinit var saveUri: Uri private var resizeWidth = 0 private var resizeHeight = 0 - private var drawColor = 0 private var lastOtherAspectRatio: Pair? = null - private var currPrimaryAction = PRIMARY_ACTION_NONE - private var currCropRotateAction = CROP_ROTATE_ASPECT_RATIO private var currAspectRatio = ASPECT_RATIO_FREE - private var isCropIntent = false - private var isEditingWithThirdParty = false private var isSharingBitmap = false - private var wasDrawCanvasPositioned = false private var oldExif: ExifInterface? = null - private var filterInitialBitmap: Bitmap? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -109,19 +65,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } } - override fun onResume() { - super.onResume() - isEditingWithThirdParty = false - bottom_draw_width.setColors(config.textColor, getAdjustedPrimaryColor(), config.backgroundColor) - } - - override fun onStop() { - super.onStop() - if (isEditingWithThirdParty) { - finish() - } - } - override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_editor, menu) updateMenuItemColors(menu) @@ -131,7 +74,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.save_as -> saveImage() - R.id.edit -> editWith() R.id.share -> shareImage() else -> return super.onOptionsItemSelected(item) } @@ -170,14 +112,10 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener else -> uri } - isCropIntent = intent.extras?.get(CROP) == "true" - if (isCropIntent) { - bottom_editor_primary_actions.beGone() - (bottom_editor_crop_rotate_actions.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1) - } - - loadDefaultImageView() - setupBottomActions() + (bottom_editor_crop_rotate_actions.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1) + loadCropImageView() + setupCropRotateActionButtons() + setupAspectRatioButtons() if (config.lastEditorCropAspectRatio == ASPECT_RATIO_OTHER) { if (config.lastEditorCropOtherAspectRatioX == 0f) { @@ -195,57 +133,14 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener bottom_aspect_ratios.beVisible() } - private fun loadDefaultImageView() { - default_image_view.beVisible() - crop_image_view.beGone() - editor_draw_canvas.beGone() - - val options = RequestOptions() - .skipMemoryCache(true) - .diskCacheStrategy(DiskCacheStrategy.NONE) - - Glide.with(this) - .asBitmap() - .load(uri) - .apply(options) - .listener(object : RequestListener { - override fun onLoadFailed(e: GlideException?, model: Any?, target: Target?, isFirstResource: Boolean) = false - - override fun onResourceReady(bitmap: Bitmap?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { - val currentFilter = getFiltersAdapter()?.getCurrentFilter() - if (filterInitialBitmap == null) { - loadCropImageView() - bottomCropRotateClicked() - } - - if (filterInitialBitmap != null && currentFilter != null && currentFilter.filter.name != getString(R.string.none)) { - default_image_view.onGlobalLayout { - applyFilter(currentFilter) - } - } else { - filterInitialBitmap = bitmap - } - - if (isCropIntent) { - bottom_primary_filter.beGone() - bottom_primary_draw.beGone() - } - - return false - } - }).into(default_image_view) - } - private fun loadCropImageView() { - default_image_view.beGone() - editor_draw_canvas.beGone() crop_image_view.apply { beVisible() setOnCropImageCompleteListener(this@EditActivity) setImageUriAsync(uri) guidelines = CropImageView.Guidelines.ON - if (isCropIntent && shouldCropSquare()) { + if (shouldCropSquare()) { currAspectRatio = ASPECT_RATIO_ONE_ONE setFixedAspectRatio(true) bottom_aspect_ratio.beGone() @@ -253,52 +148,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } } - private fun loadDrawCanvas() { - default_image_view.beGone() - crop_image_view.beGone() - editor_draw_canvas.beVisible() - - if (!wasDrawCanvasPositioned) { - wasDrawCanvasPositioned = true - editor_draw_canvas.onGlobalLayout { - ensureBackgroundThread { - fillCanvasBackground() - } - } - } - } - - private fun fillCanvasBackground() { - val size = Point() - windowManager.defaultDisplay.getSize(size) - val options = RequestOptions() - .format(DecodeFormat.PREFER_ARGB_8888) - .skipMemoryCache(true) - .diskCacheStrategy(DiskCacheStrategy.NONE) - .fitCenter() - - try { - val builder = Glide.with(applicationContext) - .asBitmap() - .load(uri) - .apply(options) - .into(editor_draw_canvas.width, editor_draw_canvas.height) - - val bitmap = builder.get() - runOnUiThread { - editor_draw_canvas.apply { - updateBackgroundBitmap(bitmap) - layoutParams.width = bitmap.width - layoutParams.height = bitmap.height - y = (height - bitmap.height) / 2f - requestLayout() - } - } - } catch (e: Exception) { - showErrorToast(e) - } - } - @TargetApi(Build.VERSION_CODES.N) private fun saveImage() { var inputStream: InputStream? = null @@ -312,66 +161,14 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener inputStream?.close() } - if (crop_image_view.isVisible()) { - crop_image_view.getCroppedImageAsync() - } else if (editor_draw_canvas.isVisible()) { - val bitmap = editor_draw_canvas.getBitmap() - if (saveUri.scheme == "file") { - SaveAsDialog(this, saveUri.path!!, true) { - saveBitmapToFile(bitmap, it, true) - } - } else if (saveUri.scheme == "content") { - val filePathGetter = getNewFilePath() - SaveAsDialog(this, filePathGetter.first, filePathGetter.second) { - saveBitmapToFile(bitmap, it, true) - } - } - } else { - val currentFilter = getFiltersAdapter()?.getCurrentFilter() ?: return - val filePathGetter = getNewFilePath() - SaveAsDialog(this, filePathGetter.first, filePathGetter.second) { - toast(R.string.saving) - - // clean up everything to free as much memory as possible - default_image_view.setImageResource(0) - crop_image_view.setImageBitmap(null) - bottom_actions_filter_list.adapter = null - bottom_actions_filter_list.beGone() - - ensureBackgroundThread { - try { - val originalBitmap = Glide.with(applicationContext).asBitmap().load(uri).submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() - currentFilter.filter.processFilter(originalBitmap) - saveBitmapToFile(originalBitmap, it, false) - } catch (e: OutOfMemoryError) { - toast(R.string.out_of_memory_error) - } - } - } - } + crop_image_view.getCroppedImageAsync() } private fun shareImage() { ensureBackgroundThread { - when { - default_image_view.isVisible() -> { - val currentFilter = getFiltersAdapter()?.getCurrentFilter() - if (currentFilter == null) { - toast(R.string.unknown_error_occurred) - return@ensureBackgroundThread - } - - val originalBitmap = Glide.with(applicationContext).asBitmap().load(uri).submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() - currentFilter.filter.processFilter(originalBitmap) - shareBitmap(originalBitmap) - } - crop_image_view.isVisible() -> { - isSharingBitmap = true - runOnUiThread { - crop_image_view.getCroppedImageAsync() - } - } - editor_draw_canvas.isVisible() -> shareBitmap(editor_draw_canvas.getBitmap()) + isSharingBitmap = true + runOnUiThread { + crop_image_view.getCroppedImageAsync() } } } @@ -416,66 +213,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } } - private fun getFiltersAdapter() = bottom_actions_filter_list.adapter as? FiltersAdapter - - private fun setupBottomActions() { - setupPrimaryActionButtons() - setupCropRotateActionButtons() - setupAspectRatioButtons() - setupDrawButtons() - } - - private fun setupPrimaryActionButtons() { - bottom_primary_filter.setOnClickListener { - bottomFilterClicked() - } - - bottom_primary_crop_rotate.setOnClickListener { - bottomCropRotateClicked() - } - - bottom_primary_draw.setOnClickListener { - bottomDrawClicked() - } - } - - private fun bottomFilterClicked() { - currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_FILTER) { - PRIMARY_ACTION_NONE - } else { - PRIMARY_ACTION_FILTER - } - updatePrimaryActionButtons() - } - - private fun bottomCropRotateClicked() { - currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) { - PRIMARY_ACTION_NONE - } else { - PRIMARY_ACTION_CROP_ROTATE - } - updatePrimaryActionButtons() - } - - private fun bottomDrawClicked() { - currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_DRAW) { - PRIMARY_ACTION_NONE - } else { - PRIMARY_ACTION_DRAW - } - updatePrimaryActionButtons() - } - private fun setupCropRotateActionButtons() { bottom_rotate.setOnClickListener { crop_image_view.rotateImage(90) } - bottom_resize.beGoneIf(isCropIntent) - bottom_resize.setOnClickListener { - resizeImage() - } - bottom_flip_horizontally.setOnClickListener { crop_image_view.flipImageHorizontally() } @@ -483,19 +225,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener bottom_flip_vertically.setOnClickListener { crop_image_view.flipImageVertically() } - - bottom_aspect_ratio.setOnClickListener { - currCropRotateAction = if (currCropRotateAction == CROP_ROTATE_ASPECT_RATIO) { - crop_image_view.guidelines = CropImageView.Guidelines.OFF - bottom_aspect_ratios.beGone() - CROP_ROTATE_NONE - } else { - crop_image_view.guidelines = CropImageView.Guidelines.ON - bottom_aspect_ratios.beVisible() - CROP_ROTATE_ASPECT_RATIO - } - updateCropRotateActionButtons() - } } private fun setupAspectRatioButtons() { @@ -527,126 +256,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener updateAspectRatioButtons() } - private fun setupDrawButtons() { - updateDrawColor(config.lastEditorDrawColor) - bottom_draw_width.progress = config.lastEditorBrushSize - updateBrushSize(config.lastEditorBrushSize) - - bottom_draw_color_clickable.setOnClickListener { - ColorPickerDialog(this, drawColor) { wasPositivePressed, color -> - if (wasPositivePressed) { - updateDrawColor(color) - } - } - } - - bottom_draw_width.onSeekBarChangeListener { - config.lastEditorBrushSize = it - updateBrushSize(it) - } - - bottom_draw_undo.setOnClickListener { - editor_draw_canvas.undo() - } - } - - private fun updateBrushSize(percent: Int) { - editor_draw_canvas.updateBrushSize(percent) - val scale = Math.max(0.03f, percent / 100f) - bottom_draw_color.scaleX = scale - bottom_draw_color.scaleY = scale - } - - private fun updatePrimaryActionButtons() { - if (crop_image_view.isGone() && currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) { - loadCropImageView() - } else if (default_image_view.isGone() && currPrimaryAction == PRIMARY_ACTION_FILTER) { - loadDefaultImageView() - } else if (editor_draw_canvas.isGone() && currPrimaryAction == PRIMARY_ACTION_DRAW) { - loadDrawCanvas() - } - - arrayOf(bottom_primary_filter, bottom_primary_crop_rotate, bottom_primary_draw).forEach { - it.applyColorFilter(Color.WHITE) - } - - val currentPrimaryActionButton = when (currPrimaryAction) { - PRIMARY_ACTION_FILTER -> bottom_primary_filter - PRIMARY_ACTION_CROP_ROTATE -> bottom_primary_crop_rotate - PRIMARY_ACTION_DRAW -> bottom_primary_draw - else -> null - } - - currentPrimaryActionButton?.applyColorFilter(getAdjustedPrimaryColor()) - bottom_editor_filter_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_FILTER) - bottom_editor_crop_rotate_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) - bottom_editor_draw_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_DRAW) - - if (currPrimaryAction == PRIMARY_ACTION_FILTER && bottom_actions_filter_list.adapter == null) { - ensureBackgroundThread { - val thumbnailSize = resources.getDimension(R.dimen.bottom_filters_thumbnail_size).toInt() - - val bitmap = try { - Glide.with(this) - .asBitmap() - .load(uri).listener(object : RequestListener { - override fun onLoadFailed(e: GlideException?, model: Any?, target: Target?, isFirstResource: Boolean): Boolean { - showErrorToast(e.toString()) - return false - } - - override fun onResourceReady(resource: Bitmap?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean) = false - }) - .submit(thumbnailSize, thumbnailSize) - .get() - } catch (e: GlideException) { - showErrorToast(e) - finish() - return@ensureBackgroundThread - } - - runOnUiThread { - val filterThumbnailsManager = FilterThumbnailsManager() - filterThumbnailsManager.clearThumbs() - - val noFilter = Filter(getString(R.string.none)) - filterThumbnailsManager.addThumb(FilterItem(bitmap, noFilter)) - - FilterPack.getFilterPack(this).forEach { - val filterItem = FilterItem(bitmap, it) - filterThumbnailsManager.addThumb(filterItem) - } - - val filterItems = filterThumbnailsManager.processThumbs() - val adapter = FiltersAdapter(applicationContext, filterItems) { - val layoutManager = bottom_actions_filter_list.layoutManager as LinearLayoutManager - applyFilter(filterItems[it]) - - if (it == layoutManager.findLastCompletelyVisibleItemPosition() || it == layoutManager.findLastVisibleItemPosition()) { - bottom_actions_filter_list.smoothScrollBy(thumbnailSize, 0) - } else if (it == layoutManager.findFirstCompletelyVisibleItemPosition() || it == layoutManager.findFirstVisibleItemPosition()) { - bottom_actions_filter_list.smoothScrollBy(-thumbnailSize, 0) - } - } - - bottom_actions_filter_list.adapter = adapter - adapter.notifyDataSetChanged() - } - } - } - - if (currPrimaryAction != PRIMARY_ACTION_CROP_ROTATE) { - bottom_aspect_ratios.beGone() - currCropRotateAction = CROP_ROTATE_NONE - } - updateCropRotateActionButtons() - } - - private fun applyFilter(filterItem: FilterItem) { - val newBitmap = Bitmap.createBitmap(filterInitialBitmap!!) - default_image_view.setImageBitmap(filterItem.filter.processFilter(newBitmap)) - } - private fun updateAspectRatio(aspectRatio: Int) { currAspectRatio = aspectRatio config.lastEditorCropAspectRatio = aspectRatio @@ -684,40 +293,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener currentAspectRatioButton.setTextColor(getAdjustedPrimaryColor()) } - private fun updateCropRotateActionButtons() { - arrayOf(bottom_aspect_ratio).forEach { - it.applyColorFilter(Color.WHITE) - } - - val primaryActionView = when (currCropRotateAction) { - CROP_ROTATE_ASPECT_RATIO -> bottom_aspect_ratio - else -> null - } - - primaryActionView?.applyColorFilter(getAdjustedPrimaryColor()) - } - - private fun updateDrawColor(color: Int) { - drawColor = color - bottom_draw_color.applyColorFilter(color) - config.lastEditorDrawColor = color - editor_draw_canvas.updateColor(color) - } - - private fun resizeImage() { - val point = getAreaSize() - if (point == null) { - toast(R.string.unknown_error_occurred) - return - } - - ResizeDialog(this, point) { - resizeWidth = it.x - resizeHeight = it.y - crop_image_view.getCroppedImageAsync() - } - } - private fun shouldCropSquare(): Boolean { val extras = intent.extras return if (extras != null && extras.containsKey(ASPECT_X) && extras.containsKey(ASPECT_Y)) { @@ -727,16 +302,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } } - private fun getAreaSize(): Point? { - val rect = crop_image_view.cropRect ?: return null - val rotation = crop_image_view.rotatedDegrees - return if (rotation == 0 || rotation == 180) { - Point(rect.width(), rect.height()) - } else { - Point(rect.height(), rect.width()) - } - } - override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) { if (result.error == null) { val bitmap = result.bitmap @@ -746,71 +311,34 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener return } - if (isCropIntent) { - if (saveUri.scheme == "file") { - saveBitmapToFile(bitmap, saveUri.path!!, true) - } else { - var inputStream: InputStream? = null - var outputStream: OutputStream? = null - try { - val stream = ByteArrayOutputStream() - bitmap.compress(CompressFormat.JPEG, 100, stream) - inputStream = ByteArrayInputStream(stream.toByteArray()) - outputStream = contentResolver.openOutputStream(saveUri) - inputStream.copyTo(outputStream!!) - } finally { - inputStream?.close() - outputStream?.close() - } - - Intent().apply { - data = saveUri - addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - setResult(RESULT_OK, this) - } - finish() - } - } else if (saveUri.scheme == "file") { - SaveAsDialog(this, saveUri.path!!, true) { - saveBitmapToFile(bitmap, it, true) - } - } else if (saveUri.scheme == "content") { - val filePathGetter = getNewFilePath() - SaveAsDialog(this, filePathGetter.first, filePathGetter.second) { - saveBitmapToFile(bitmap, it, true) - } + if (saveUri.scheme == "file") { + saveBitmapToFile(bitmap, saveUri.path!!, true) } else { - toast(R.string.unknown_file_location) + var inputStream: InputStream? = null + var outputStream: OutputStream? = null + try { + val stream = ByteArrayOutputStream() + bitmap.compress(CompressFormat.JPEG, 100, stream) + inputStream = ByteArrayInputStream(stream.toByteArray()) + outputStream = contentResolver.openOutputStream(saveUri) + inputStream.copyTo(outputStream!!) + } finally { + inputStream?.close() + outputStream?.close() + } + + Intent().apply { + data = saveUri + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + setResult(RESULT_OK, this) + } + finish() } } else { toast("${getString(R.string.image_editing_failed)}: ${result.error.message}") } } - private fun getNewFilePath(): Pair { - var newPath = applicationContext.getRealPathFromURI(saveUri) ?: "" - if (newPath.startsWith("/mnt/")) { - newPath = "" - } - - var shouldAppendFilename = true - if (newPath.isEmpty()) { - val filename = applicationContext.getFilenameFromContentUri(saveUri) ?: "" - if (filename.isNotEmpty()) { - val path = if (intent.extras?.containsKey(REAL_FILE_PATH) == true) intent.getStringExtra(REAL_FILE_PATH).getParentPath() else internalStoragePath - newPath = "$path/$filename" - shouldAppendFilename = false - } - } - - if (newPath.isEmpty()) { - newPath = "$internalStoragePath/${getCurrentFormattedDateTime()}.${saveUri.toString().getFilenameExtension()}" - shouldAppendFilename = false - } - - return Pair(newPath, shouldAppendFilename) - } - private fun saveBitmapToFile(bitmap: Bitmap, path: String, showSavingToast: Boolean) { if (!packageName.contains("slootelibomelpmis".reversed(), true)) { if (baseConfig.appRunCount > 100) { @@ -869,11 +397,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener out.close() } - private fun editWith() { - openEditor(uri.toString(), true) - isEditingWithThirdParty = true - } - private fun scanFinalPath(path: String) { val paths = arrayListOf(path) rescanPaths(paths) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt deleted file mode 100644 index b614787b8..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.simplemobiletools.gallery.pro.adapters - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.gallery.pro.R -import com.simplemobiletools.gallery.pro.models.FilterItem -import kotlinx.android.synthetic.main.editor_filter_item.view.* -import java.util.* - -class FiltersAdapter(val context: Context, val filterItems: ArrayList, val itemClick: (Int) -> Unit) : RecyclerView.Adapter() { - - private var currentSelection = filterItems.first() - private var strokeBackground = context.resources.getDrawable(R.drawable.stroke_background) - - override fun onBindViewHolder(holder: ViewHolder, position: Int) { - holder.bindView(filterItems[position]) - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.editor_filter_item, parent, false) - return ViewHolder(view) - } - - override fun getItemCount() = filterItems.size - - fun getCurrentFilter() = currentSelection - - private fun setCurrentFilter(position: Int) { - val filterItem = filterItems.getOrNull(position) ?: return - if (currentSelection != filterItem) { - currentSelection = filterItem - notifyDataSetChanged() - itemClick.invoke(position) - } - } - - inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - fun bindView(filterItem: FilterItem): View { - itemView.apply { - editor_filter_item_label.text = filterItem.filter.name - editor_filter_item_thumbnail.setImageBitmap(filterItem.bitmap) - editor_filter_item_thumbnail.background = if (getCurrentFilter() == filterItem) { - strokeBackground - } else { - null - } - - setOnClickListener { - setCurrentFilter(adapterPosition) - } - } - return itemView - } - } -} 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 3ece915e3..bd2788697 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 @@ -80,7 +80,7 @@ fun Activity.launchCamera() { fun SimpleActivity.launchAbout() { val licenses = LICENSE_GLIDE or LICENSE_CROPPER or LICENSE_RTL or LICENSE_SUBSAMPLING or LICENSE_PATTERN or LICENSE_REPRINT or LICENSE_GIF_DRAWABLE or - LICENSE_PICASSO or LICENSE_EXOPLAYER or LICENSE_PANORAMA_VIEW or LICENSE_SANSELAN or LICENSE_FILTERS or LICENSE_GESTURE_VIEWS + LICENSE_PICASSO or LICENSE_EXOPLAYER or LICENSE_PANORAMA_VIEW or LICENSE_SANSELAN or LICENSE_GESTURE_VIEWS val faqItems = arrayListOf( FAQItem(R.string.faq_5_title_commons, R.string.faq_5_text_commons), diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt deleted file mode 100644 index ae043ddde..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.simplemobiletools.gallery.pro.helpers - -import android.graphics.Bitmap -import com.simplemobiletools.gallery.pro.models.FilterItem -import java.util.* - -class FilterThumbnailsManager { - private var filterThumbnails = ArrayList(10) - private var processedThumbnails = ArrayList(10) - - fun addThumb(filterItem: FilterItem) { - filterThumbnails.add(filterItem) - } - - fun processThumbs(): ArrayList { - for (filterItem in filterThumbnails) { - filterItem.bitmap = filterItem.filter.processFilter(Bitmap.createBitmap(filterItem.bitmap)) - processedThumbnails.add(filterItem) - } - return processedThumbnails - } - - fun clearThumbs() { - filterThumbnails = ArrayList() - processedThumbnails = ArrayList() - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt deleted file mode 100644 index ce826e57e..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.simplemobiletools.gallery.pro.models - -import android.graphics.Bitmap -import com.zomato.photofilters.imageprocessors.Filter - -data class FilterItem(var bitmap: Bitmap, val filter: Filter) diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 3dffbf1bf..fbebb78bf 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -1,77 +1,37 @@ - - - - - + app:cropInitialCropWindowPaddingRatio="0" /> - - + android:background="@drawable/gradient_background" /> - - + android:layout_above="@+id/bottom_editor_crop_rotate_actions" /> - - + android:layout_alignParentBottom="true" /> diff --git a/app/src/main/res/layout/bottom_editor_actions_filter.xml b/app/src/main/res/layout/bottom_editor_actions_filter.xml deleted file mode 100644 index 734942343..000000000 --- a/app/src/main/res/layout/bottom_editor_actions_filter.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml index 93dcbb4e6..24aec2005 100644 --- a/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml +++ b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml @@ -1,6 +1,5 @@ - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toEndOf="@+id/bottom_rotate" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/bottom_editor_draw_actions.xml b/app/src/main/res/layout/bottom_editor_draw_actions.xml deleted file mode 100644 index 07fe2fb2c..000000000 --- a/app/src/main/res/layout/bottom_editor_draw_actions.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/layout/bottom_editor_primary_actions.xml b/app/src/main/res/layout/bottom_editor_primary_actions.xml deleted file mode 100644 index ed600ed0e..000000000 --- a/app/src/main/res/layout/bottom_editor_primary_actions.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/editor_filter_item.xml b/app/src/main/res/layout/editor_filter_item.xml deleted file mode 100644 index dd3913336..000000000 --- a/app/src/main/res/layout/editor_filter_item.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml index 16a5f7806..534116c96 100644 --- a/app/src/main/res/menu/menu_editor.xml +++ b/app/src/main/res/menu/menu_editor.xml @@ -6,11 +6,6 @@ android:icon="@drawable/ic_check_vector" android:title="@string/save_as" app:showAsAction="ifRoom"/> - 128dp 164dp 48dp - 76dp - 90dp - 98dp 180dp 48dp 86dp From 99765a3735ae830dde8f520bcec81248989668b0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 19:02:04 +0100 Subject: [PATCH 14/43] more editor cleanup --- .../gallery/pro/activities/EditActivity.kt | 21 ++++++++----------- .../res/drawable/ic_aspect_ratio_vector.xml | 9 -------- .../res/drawable/ic_crop_rotate_vector.xml | 9 -------- app/src/main/res/drawable/ic_draw_vector.xml | 9 -------- .../res/drawable/ic_photo_filter_vector.xml | 9 -------- app/src/main/res/layout/activity_edit.xml | 3 ++- .../bottom_editor_crop_rotate_actions.xml | 21 ++++--------------- 7 files changed, 15 insertions(+), 66 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_aspect_ratio_vector.xml delete mode 100644 app/src/main/res/drawable/ic_crop_rotate_vector.xml delete mode 100644 app/src/main/res/drawable/ic_draw_vector.xml delete mode 100644 app/src/main/res/drawable/ic_photo_filter_vector.xml 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 3cd9667d0..bdcc630f5 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 @@ -113,7 +113,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } (bottom_editor_crop_rotate_actions.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1) - loadCropImageView() setupCropRotateActionButtons() setupAspectRatioButtons() @@ -128,22 +127,22 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener lastOtherAspectRatio = Pair(config.lastEditorCropOtherAspectRatioX, config.lastEditorCropOtherAspectRatioY) } + updateAspectRatio(config.lastEditorCropAspectRatio) crop_image_view.guidelines = CropImageView.Guidelines.ON - bottom_aspect_ratios.beVisible() + loadCropImageView() } private fun loadCropImageView() { crop_image_view.apply { - beVisible() setOnCropImageCompleteListener(this@EditActivity) setImageUriAsync(uri) guidelines = CropImageView.Guidelines.ON if (shouldCropSquare()) { - currAspectRatio = ASPECT_RATIO_ONE_ONE + updateAspectRatio(ASPECT_RATIO_ONE_ONE) setFixedAspectRatio(true) - bottom_aspect_ratio.beGone() + bottom_aspect_ratios.beGone() } } } @@ -312,7 +311,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } if (saveUri.scheme == "file") { - saveBitmapToFile(bitmap, saveUri.path!!, true) + saveBitmapToFile(bitmap, saveUri.path!!) } else { var inputStream: InputStream? = null var outputStream: OutputStream? = null @@ -339,7 +338,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } } - private fun saveBitmapToFile(bitmap: Bitmap, path: String, showSavingToast: Boolean) { + private fun saveBitmapToFile(bitmap: Bitmap, path: String) { if (!packageName.contains("slootelibomelpmis".reversed(), true)) { if (baseConfig.appRunCount > 100) { val label = "sknahT .moc.slootelibomelpmis.www morf eno lanigiro eht daolnwod ytefas nwo ruoy roF .ppa eht fo noisrev ekaf a gnisu era uoY".reversed() @@ -358,7 +357,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener val fileDirItem = FileDirItem(path, path.getFilenameFromPath()) getFileOutputStream(fileDirItem, true) { if (it != null) { - saveBitmap(file, bitmap, it, showSavingToast) + saveBitmap(file, bitmap, it) } else { toast(R.string.image_editing_failed) } @@ -372,10 +371,8 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } @TargetApi(Build.VERSION_CODES.N) - private fun saveBitmap(file: File, bitmap: Bitmap, out: OutputStream, showSavingToast: Boolean) { - if (showSavingToast) { - toast(R.string.saving) - } + private fun saveBitmap(file: File, bitmap: Bitmap, out: OutputStream) { + toast(R.string.saving) if (resizeWidth > 0 && resizeHeight > 0) { val resized = Bitmap.createScaledBitmap(bitmap, resizeWidth, resizeHeight, false) diff --git a/app/src/main/res/drawable/ic_aspect_ratio_vector.xml b/app/src/main/res/drawable/ic_aspect_ratio_vector.xml deleted file mode 100644 index 4f30d2612..000000000 --- a/app/src/main/res/drawable/ic_aspect_ratio_vector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_crop_rotate_vector.xml b/app/src/main/res/drawable/ic_crop_rotate_vector.xml deleted file mode 100644 index 09059a8b4..000000000 --- a/app/src/main/res/drawable/ic_crop_rotate_vector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_draw_vector.xml b/app/src/main/res/drawable/ic_draw_vector.xml deleted file mode 100644 index 4ad8e70ee..000000000 --- a/app/src/main/res/drawable/ic_draw_vector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_photo_filter_vector.xml b/app/src/main/res/drawable/ic_photo_filter_vector.xml deleted file mode 100644 index 7bf8aa41a..000000000 --- a/app/src/main/res/drawable/ic_photo_filter_vector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index fbebb78bf..a4335621e 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -32,6 +32,7 @@ layout="@layout/bottom_editor_crop_rotate_actions" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" /> + android:layout_alignParentBottom="true" + android:layout_marginBottom="@dimen/medium_margin" /> diff --git a/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml index 24aec2005..37a93cbcb 100644 --- a/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml +++ b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml @@ -1,5 +1,6 @@ - - - Date: Tue, 17 Dec 2019 22:22:36 +0100 Subject: [PATCH 15/43] updating gestureviews and subsamplingscale --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ea28aa7e6..81ab23e41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,8 +75,8 @@ dependencies { implementation 'org.apache.sanselan:sanselan:0.97-incubator' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.caverock:androidsvg-aar:1.3' - implementation 'com.github.tibbi:gestureviews:a2208ce9d9' - implementation 'com.github.tibbi:subsampling-scale-image-view:4f032440aa' + implementation 'com.github.tibbi:gestureviews:8dccb8450b' + implementation 'com.github.tibbi:subsampling-scale-image-view:d404e74e39' kapt 'com.github.bumptech.glide:compiler:4.10.0' From 0b5b1925af3c73b6330470f41804aa7316a0ba2a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 22:51:05 +0100 Subject: [PATCH 16/43] adding the new editor in release notes --- .../com/simplemobiletools/gallery/pro/activities/MainActivity.kt | 1 + app/src/main/res/values/donottranslate.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index ad9dce178..cf7ee98bf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -1290,6 +1290,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { add(Release(221, R.string.release_221)) add(Release(225, R.string.release_225)) add(Release(258, R.string.release_258)) + add(Release(277, R.string.release_277)) checkWhatsNew(this, BuildConfig.VERSION_CODE) } } diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 941e7da0d..720719ad5 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -6,6 +6,7 @@ com.simplemobiletools.gallery.pro + Fully replaced the photo editor with a powerful third party library (for resizing images use Menu -> Resize from the fullscreen view, until it gets added in the editor) Allow customizing the bottom navigation bar color\n Share files in the order they were selected From 98df2e84c624111acce48b49fb53db09d112cabe Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 22:58:38 +0100 Subject: [PATCH 17/43] changing our editor screen background to black --- app/src/main/res/layout/activity_new_edit.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_new_edit.xml b/app/src/main/res/layout/activity_new_edit.xml index 1200b5a4a..3985d5cdb 100644 --- a/app/src/main/res/layout/activity_new_edit.xml +++ b/app/src/main/res/layout/activity_new_edit.xml @@ -3,6 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/activity_new_edit_holder" android:layout_width="match_parent" - android:layout_height="match_parent"> - - + android:layout_height="match_parent" + android:background="#FF000000" /> From 705785d3854e392879ac1123ab916a8166691de8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 23:12:18 +0100 Subject: [PATCH 18/43] update version to 6.11.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 81ab23e41..91b6d6ef1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 28 - versionCode 276 - versionName "6.10.8" + versionCode 277 + versionName "6.11.0" multiDexEnabled true setProperty("archivesBaseName", "gallery") vectorDrawables.useSupportLibrary = true From b5ceca323152017c0a230ea4476206b611823641 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Dec 2019 23:12:26 +0100 Subject: [PATCH 19/43] updating changelog --- CHANGELOG.md | 6 ++++++ fastlane/metadata/android/en-US/changelogs/276.txt | 1 + fastlane/metadata/android/en-US/changelogs/277.txt | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/276.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/277.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 0058c6232..631c1d7c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========== +Version 6.11.0 *(2019-12-17)* +---------------------------- + + * Fully replaced the photo editor with a powerful third party library + * Added some crashfixes and stability improvements + Version 6.10.8 *(2019-12-17)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/276.txt b/fastlane/metadata/android/en-US/changelogs/276.txt new file mode 100644 index 000000000..eba43e8f7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/276.txt @@ -0,0 +1 @@ + * Added some crashfixes and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/277.txt b/fastlane/metadata/android/en-US/changelogs/277.txt new file mode 100644 index 000000000..5dc0656d4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/277.txt @@ -0,0 +1,2 @@ + * Fully replaced the photo editor with a powerful third party library + * Added some crashfixes and stability improvements From 74612341f3855e32a642707db9b83c2dd1c17f9d Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 18 Dec 2019 10:13:47 +0100 Subject: [PATCH 20/43] do not use Text Design module at the editor, it takes up too much space --- app/build.gradle | 1 - .../gallery/pro/activities/NewEditActivity.kt | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 91b6d6ef1..f79fa3a09 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -101,7 +101,6 @@ pesdkConfig { include 'ly.img.android.pesdk.ui.mobile_ui:filter' include 'ly.img.android.pesdk.ui.mobile_ui:transform' include 'ly.img.android.pesdk.ui.mobile_ui:adjustment' - include 'ly.img.android.pesdk.ui.mobile_ui:text-design' // Add asset packs if you need include 'ly.img.android.pesdk.assets:font-basic' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt index 23dccbee2..e984c20b5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -24,9 +24,14 @@ import ly.img.android.pesdk.backend.model.state.EditorSaveSettings import ly.img.android.pesdk.backend.model.state.manager.SettingsList import ly.img.android.pesdk.ui.activity.PhotoEditorBuilder import ly.img.android.pesdk.ui.model.state.UiConfigFilter +import ly.img.android.pesdk.ui.model.state.UiConfigMainMenu import ly.img.android.pesdk.ui.model.state.UiConfigText import ly.img.android.pesdk.ui.model.state.UiConfigTheme +import ly.img.android.pesdk.ui.panels.item.ToolItem import java.io.File +import java.util.* +import kotlin.collections.LinkedHashMap +import kotlin.collections.set class NewEditActivity : SimpleActivity() { private val PESDK_EDIT_IMAGE = 1 @@ -176,6 +181,14 @@ class NewEditActivity : SimpleActivity() { FontPackBasic.getFontPack() ) + // do not use Text Design, it takes up too much space + val tools = settingsList.getSettingsModel(UiConfigMainMenu::class.java).toolList + val newTools = tools.filterNot { + it.name!!.isEmpty() + }.toMutableList() as ArrayList + + settingsList.getSettingsModel(UiConfigMainMenu::class.java).setToolList(newTools) + settingsList.getSettingsModel(UiConfigTheme::class.java).theme = R.style.Imgly_Theme_NoFullscreen settingsList.getSettingsModel(EditorSaveSettings::class.java) From 83c9bcc46c45ea5000d80f455e6aa9e82a7937c6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 18 Dec 2019 11:21:41 +0100 Subject: [PATCH 21/43] update version to 6.11.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f79fa3a09..ceaf6710b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 28 - versionCode 277 - versionName "6.11.0" + versionCode 281 + versionName "6.11.1" multiDexEnabled true setProperty("archivesBaseName", "gallery") vectorDrawables.useSupportLibrary = true From 01dceee1177fa2a3edc10d43fca5a4c728ee6ee6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 18 Dec 2019 11:21:48 +0100 Subject: [PATCH 22/43] updating changelog --- CHANGELOG.md | 5 +++++ fastlane/metadata/android/en-US/changelogs/281.txt | 1 + 2 files changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/281.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 631c1d7c1..20a491f77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 6.11.1 *(2019-12-18)* +---------------------------- + + * Removing Text Design from the editor, it takes up too much space + Version 6.11.0 *(2019-12-17)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/281.txt b/fastlane/metadata/android/en-US/changelogs/281.txt new file mode 100644 index 000000000..3561046c8 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/281.txt @@ -0,0 +1 @@ + * Removing Text Design from the editor, it takes up too much space From f2fd6c29a793da8e179bf5dfcb8e393c20919733 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 19 Dec 2019 21:54:43 +0100 Subject: [PATCH 23/43] make building the debug app version easier --- app/build.gradle | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ceaf6710b..99875d3b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,9 @@ apply plugin: 'kotlin-kapt' def keystorePropertiesFile = rootProject.file("keystore.properties") def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} android { compileSdkVersion 28 @@ -23,11 +25,13 @@ android { } signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] + if (keystorePropertiesFile.exists()) { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + } } } From 3957532c724f11f341b5973efac1b338878b4c3a Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 19:42:28 +0100 Subject: [PATCH 24/43] fix #1669, add a workaround for refreshing file thumbnail after edit --- .../gallery/pro/activities/NewEditActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt index e984c20b5..7d03715a0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -140,7 +140,8 @@ class NewEditActivity : SimpleActivity() { private val editCopyMoveListener = object : CopyMoveListener { override fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean, destinationPath: String) { if (config.keepLastModified) { - updateLastModified(destinationFilePath, sourceFileLastModified) + // add 1 s to the last modified time to properly update the thumbnail + updateLastModified(destinationFilePath, sourceFileLastModified + 1000) } val paths = arrayListOf(destinationFilePath) From 58cedd24f625909a8c286886d27d72a436f4f05b Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 20:38:32 +0100 Subject: [PATCH 25/43] adding a 2:1 crop aspect ratio --- .../gallery/pro/activities/NewEditActivity.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt index 7d03715a0..59854ace0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -19,14 +19,14 @@ import com.simplemobiletools.gallery.pro.extensions.config import com.simplemobiletools.gallery.pro.extensions.fixDateTaken import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic import ly.img.android.pesdk.assets.font.basic.FontPackBasic +import ly.img.android.pesdk.backend.model.config.CropAspectAsset import ly.img.android.pesdk.backend.model.state.EditorLoadSettings import ly.img.android.pesdk.backend.model.state.EditorSaveSettings import ly.img.android.pesdk.backend.model.state.manager.SettingsList import ly.img.android.pesdk.ui.activity.PhotoEditorBuilder -import ly.img.android.pesdk.ui.model.state.UiConfigFilter -import ly.img.android.pesdk.ui.model.state.UiConfigMainMenu -import ly.img.android.pesdk.ui.model.state.UiConfigText -import ly.img.android.pesdk.ui.model.state.UiConfigTheme +import ly.img.android.pesdk.ui.model.state.* +import ly.img.android.pesdk.ui.panels.item.CropAspectItem +import ly.img.android.pesdk.ui.panels.item.ToggleAspectItem import ly.img.android.pesdk.ui.panels.item.ToolItem import java.io.File import java.util.* @@ -174,6 +174,15 @@ class NewEditActivity : SimpleActivity() { private fun createPesdkSettingsList(filename: String): SettingsList { val settingsList = SettingsList() + settingsList.config.getAssetMap(CropAspectAsset::class.java).apply { + add(CropAspectAsset("my_crop_1_2", 1, 2, false)) + add(CropAspectAsset("my_crop_2_1", 2, 1, false)) + } + + settingsList.getSettingsModel(UiConfigAspect::class.java).aspectList.apply { + add(ToggleAspectItem(CropAspectItem("my_crop_2_1"), CropAspectItem("my_crop_1_2"))) + } + settingsList.getSettingsModel(UiConfigFilter::class.java).setFilterList( FilterPackBasic.getFilterPack() ) From 2c37b23e1ee44edfa1e262763d10c9bf177d566b Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 20:40:26 +0100 Subject: [PATCH 26/43] adding a 19:9 aspect ratio crop too --- .../gallery/pro/activities/NewEditActivity.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt index 59854ace0..8cccf6977 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -177,10 +177,13 @@ class NewEditActivity : SimpleActivity() { settingsList.config.getAssetMap(CropAspectAsset::class.java).apply { add(CropAspectAsset("my_crop_1_2", 1, 2, false)) add(CropAspectAsset("my_crop_2_1", 2, 1, false)) + add(CropAspectAsset("my_crop_19_9", 19, 9, false)) + add(CropAspectAsset("my_crop_9_19", 9, 19, false)) } settingsList.getSettingsModel(UiConfigAspect::class.java).aspectList.apply { add(ToggleAspectItem(CropAspectItem("my_crop_2_1"), CropAspectItem("my_crop_1_2"))) + add(ToggleAspectItem(CropAspectItem("my_crop_19_9"), CropAspectItem("my_crop_9_19"))) } settingsList.getSettingsModel(UiConfigFilter::class.java).setFilterList( From 9b27a8fd75d870121ee627e0405be91bf8dd5db3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 21:03:19 +0100 Subject: [PATCH 27/43] remember the last used editor brush settings --- .../gallery/pro/activities/NewEditActivity.kt | 16 ++++++++++++++++ .../gallery/pro/activities/SettingsActivity.kt | 8 ++++++-- .../gallery/pro/helpers/Config.kt | 12 ++++++++++++ .../gallery/pro/helpers/Constants.kt | 3 +++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt index 8cccf6977..4bacbbeaf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -20,6 +20,7 @@ import com.simplemobiletools.gallery.pro.extensions.fixDateTaken import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic import ly.img.android.pesdk.assets.font.basic.FontPackBasic import ly.img.android.pesdk.backend.model.config.CropAspectAsset +import ly.img.android.pesdk.backend.model.state.BrushSettings import ly.img.android.pesdk.backend.model.state.EditorLoadSettings import ly.img.android.pesdk.backend.model.state.EditorSaveSettings import ly.img.android.pesdk.backend.model.state.manager.SettingsList @@ -35,6 +36,7 @@ import kotlin.collections.set class NewEditActivity : SimpleActivity() { private val PESDK_EDIT_IMAGE = 1 + private val SETTINGS_LIST = "SETTINGS_LIST" private val SOURCE_IMAGE_PATH = "SOURCE_IMAGE_PATH" private val RESULT_IMAGE_PATH = "RESULT_IMAGE_PATH" private var sourceFileLastModified = 0L @@ -103,6 +105,14 @@ class NewEditActivity : SimpleActivity() { val source = extras?.getString(SOURCE_IMAGE_PATH, "") ?: "" imagePathFromEditor = extras?.getString(RESULT_IMAGE_PATH, "") ?: "" + val settings = extras?.getParcelable(SETTINGS_LIST) + if (settings != null) { + val brush = settings.getSettingsModel(BrushSettings::class.java) + config.editorBrushColor = brush.brushColor + config.editorBrushHardness = brush.brushHardness + config.editorBrushSize = brush.brushSize + } + if (resultCode != Activity.RESULT_OK || source.isEmpty() || imagePathFromEditor.isEmpty() || source == imagePathFromEditor) { finish() } else { @@ -194,6 +204,12 @@ class NewEditActivity : SimpleActivity() { FontPackBasic.getFontPack() ) + settingsList.getSettingsModel(BrushSettings::class.java).apply { + brushColor = config.editorBrushColor + brushHardness = config.editorBrushHardness + brushSize = config.editorBrushSize + } + // do not use Text Design, it takes up too much space val tools = settingsList.getSettingsModel(UiConfigMainMenu::class.java).toolList val newTools = tools.filterNot { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt index 6cb5ac89d..7873562c1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt @@ -693,6 +693,9 @@ class SettingsActivity : SimpleActivity() { put(LAST_EDITOR_BRUSH_SIZE, config.lastEditorBrushSize) put(LAST_CONFLICT_RESOLUTION, config.lastConflictResolution) put(LAST_CONFLICT_APPLY_TO_ALL, config.lastConflictApplyToAll) + put(EDITOR_BRUSH_COLOR, config.editorBrushColor) + put(EDITOR_BRUSH_HARDNESS, config.editorBrushHardness) + put(EDITOR_BRUSH_SIZE, config.editorBrushSize) put(ALBUM_COVERS, config.albumCovers) } @@ -812,10 +815,11 @@ class SettingsActivity : SimpleActivity() { LAST_EDITOR_CROP_ASPECT_RATIO -> config.lastEditorCropAspectRatio = value.toInt() LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_X -> config.lastEditorCropOtherAspectRatioX = value.toString().toFloat() LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_Y -> config.lastEditorCropOtherAspectRatioY = value.toString().toFloat() - LAST_EDITOR_DRAW_COLOR -> config.lastEditorDrawColor = value.toInt() - LAST_EDITOR_BRUSH_SIZE -> config.lastEditorBrushSize = value.toInt() LAST_CONFLICT_RESOLUTION -> config.lastConflictResolution = value.toInt() LAST_CONFLICT_APPLY_TO_ALL -> config.lastConflictApplyToAll = value.toBoolean() + EDITOR_BRUSH_COLOR -> config.editorBrushColor = value.toInt() + EDITOR_BRUSH_HARDNESS -> config.editorBrushHardness = value.toString().toFloat() + EDITOR_BRUSH_SIZE -> config.editorBrushSize = value.toString().toFloat() ALBUM_COVERS -> { val existingCovers = config.parseAlbumCovers() val existingCoverPaths = existingCovers.map { it.path }.toMutableList() as ArrayList 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 6d126dbce..c0f7fd7db 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 @@ -490,4 +490,16 @@ class Config(context: Context) : BaseConfig(context) { var spamFoldersChecked: Boolean get() = prefs.getBoolean(SPAM_FOLDERS_CHECKED, false) set(spamFoldersChecked) = prefs.edit().putBoolean(SPAM_FOLDERS_CHECKED, spamFoldersChecked).apply() + + var editorBrushColor: Int + get() = prefs.getInt(EDITOR_BRUSH_COLOR, -1) + set(editorBrushColor) = prefs.edit().putInt(EDITOR_BRUSH_COLOR, editorBrushColor).apply() + + var editorBrushHardness: Float + get() = prefs.getFloat(EDITOR_BRUSH_HARDNESS, 0.5f) + set(editorBrushHardness) = prefs.edit().putFloat(EDITOR_BRUSH_HARDNESS, editorBrushHardness).apply() + + var editorBrushSize: Float + get() = prefs.getFloat(EDITOR_BRUSH_SIZE, 0.05f) + set(editorBrushSize) = prefs.edit().putFloat(EDITOR_BRUSH_SIZE, editorBrushSize).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 5e2ab2d33..22e3304ef 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 @@ -79,6 +79,9 @@ const val SHOW_NOTCH = "show_notch" const val FILE_LOADING_PRIORITY = "file_loading_priority" const val SPAM_FOLDERS_CHECKED = "spam_folders_checked" const val SHOW_THUMBNAIL_FILE_TYPES = "show_thumbnail_file_types" +const val EDITOR_BRUSH_COLOR = "editor_brush_color" +const val EDITOR_BRUSH_HARDNESS = "editor_brush_hardness" +const val EDITOR_BRUSH_SIZE = "editor_brush_size" // slideshow const val SLIDESHOW_INTERVAL = "slideshow_interval" From bc4b0885692d31a5331e3db8d2954e5cdf089b00 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 21:04:58 +0100 Subject: [PATCH 28/43] removing some old editor related shared preferences --- .../gallery/pro/activities/SettingsActivity.kt | 2 -- .../com/simplemobiletools/gallery/pro/helpers/Config.kt | 8 -------- .../simplemobiletools/gallery/pro/helpers/Constants.kt | 2 -- 3 files changed, 12 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt index 7873562c1..0be79e7fe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt @@ -689,8 +689,6 @@ class SettingsActivity : SimpleActivity() { put(LAST_EDITOR_CROP_ASPECT_RATIO, config.lastEditorCropAspectRatio) put(LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_X, config.lastEditorCropOtherAspectRatioX) put(LAST_EDITOR_CROP_OTHER_ASPECT_RATIO_Y, config.lastEditorCropOtherAspectRatioY) - put(LAST_EDITOR_DRAW_COLOR, config.lastEditorDrawColor) - put(LAST_EDITOR_BRUSH_SIZE, config.lastEditorBrushSize) put(LAST_CONFLICT_RESOLUTION, config.lastConflictResolution) put(LAST_CONFLICT_APPLY_TO_ALL, config.lastConflictApplyToAll) put(EDITOR_BRUSH_COLOR, config.editorBrushColor) 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 c0f7fd7db..4f8bce7c8 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 @@ -475,14 +475,6 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(ALLOW_ROTATING_WITH_GESTURES, true) set(allowRotatingWithGestures) = prefs.edit().putBoolean(ALLOW_ROTATING_WITH_GESTURES, allowRotatingWithGestures).apply() - var lastEditorDrawColor: Int - get() = prefs.getInt(LAST_EDITOR_DRAW_COLOR, primaryColor) - set(lastEditorDrawColor) = prefs.edit().putInt(LAST_EDITOR_DRAW_COLOR, lastEditorDrawColor).apply() - - var lastEditorBrushSize: Int - get() = prefs.getInt(LAST_EDITOR_BRUSH_SIZE, 50) - set(lastEditorBrushSize) = prefs.edit().putInt(LAST_EDITOR_BRUSH_SIZE, lastEditorBrushSize).apply() - var showNotch: Boolean get() = prefs.getBoolean(SHOW_NOTCH, true) set(showNotch) = prefs.edit().putBoolean(SHOW_NOTCH, showNotch).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 22e3304ef..50ca3f376 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 @@ -73,8 +73,6 @@ const val GROUP_DIRECT_SUBFOLDERS = "group_direct_subfolders" const val SHOW_WIDGET_FOLDER_NAME = "show_widget_folder_name" const val ALLOW_ONE_TO_ONE_ZOOM = "allow_one_to_one_zoom" const val ALLOW_ROTATING_WITH_GESTURES = "allow_rotating_with_gestures" -const val LAST_EDITOR_DRAW_COLOR = "last_editor_draw_color" -const val LAST_EDITOR_BRUSH_SIZE = "last_editor_brush_size" const val SHOW_NOTCH = "show_notch" const val FILE_LOADING_PRIORITY = "file_loading_priority" const val SPAM_FOLDERS_CHECKED = "spam_folders_checked" From 57e4fe243058b0df346c125df7b5bce29be7039a Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 21:53:42 +0100 Subject: [PATCH 29/43] adding some new editor related strings --- app/src/main/res/values-ar/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-az/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-ca/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-cs/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-da/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-de/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-el/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-es/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-fi/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-fr/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-gl/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-hr/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-hu/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-id/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-in/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-it/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-ja/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-ko-rKR/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-lt/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-nb/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-nl/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-pl/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-pt-rBR/strings.xml | 51 +++++++++++++++++++++- app/src/main/res/values-pt/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-ru/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-sk/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-sl/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-sr/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-sv/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-tr/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-uk/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-zh-rCN/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-zh-rHK/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values-zh-rTW/strings.xml | 49 +++++++++++++++++++++ app/src/main/res/values/strings.xml | 49 +++++++++++++++++++++ 35 files changed, 1716 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2b45b8cf6..3b0d0ac2e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -202,6 +202,55 @@ تبديل المفضل تبديل رؤية الملف + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + كيف يمكنني جعل تطبيق الاستديو معرض الجهاز الإفتراضي ؟ أولا، يجب عليك العثور على المعرض الإفتراضي الحالي في قسم "التطبيقات" من إعدادات الجهاز، أبحث عن زر يقول شيئاً مثل \"فتح كافتراضي/"، ثم أنقر عليه، ثم حدد \"مسح الإعدادات الإفتراضية\". في المرة القادمة التي ستحاول فيها فتح صورة أو مقطع فيديو يجب أن تري إختيار تطبيق، حيث يمكنك تحديد تطبيق "الاستديو" وجعله التطبيق الإفتراضي. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index b8c83ea2f..c585fff5c 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -202,6 +202,55 @@ Toggle favorite Toggle file visibility + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 09b7ddbf0..01818110c 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -202,6 +202,55 @@ Activa favorits Activa la visibilitat del fitxer + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Com puc fer que Simple Gallery sigui la galeria de dispositius predeterminada? Primer heu de trobar la galeria actualment predeterminada a la secció Aplicacions de la configuració del vostre dispositiu, cerqueu un botó que digui alguna cosa semblant a \"Obrir per defecte \", feu-hi clic i seleccioneu \"Esborra valors predeterminats \". diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index baf7bc05d..e175c31ba 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -202,6 +202,55 @@ Přepnutí oblíbenosti Přepnutí viditelnosti souboru + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Jak nastavím Jednoduchou Galerii jako výchozí galerii? Nejdříve musíte najít v nastavení zařízení, v sekci Aplikace, současnou výchozí galerii, zvolit tlačítko s textem ve smyslu \"Nastavení výchozího otevírání\" a následně \"Vymazat výchozí nastavení\". diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 724f21045..bc1710c51 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -202,6 +202,55 @@ Favorit Synlighed + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Hvordan kan jeg gøre Simple Gallery til min enheds standardgalleri? Først skal du finde det nuværende standardgalleri, i Apps-sektionen af din enheds indstillinger. Kig efter en knap som hedder noget i stil med \"Åbn som standard\", klik på denne og vælg \"Ryd standarder\". diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8162dfb5..32e4041ec 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -202,6 +202,55 @@ Favoriten umschalten Schaltet die Sichtbarkeit von Dateien um + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Wie kann ich Schlichte Galerie als Standardanwendung auswählen? Zunächst musst du unter \"Apps\" in den Geräteeinstellungen die aktuelle Standardgalerie finden. Suche nach einer Bedienfläche wie \"Standardmässig öffnen\", betätige diese und wähle \"Standardeinstellungen löschen\". diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f79b149de..8c211ac83 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -202,6 +202,55 @@ Εναλλαγή αγαπημένων Εναλλαγή προβολής αρχείου + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Πώς μπορώ να κάνω την Απλή Συλλογή προεπιλεγμένη εφαρμογή συλλογής πολυμέσων; Αρχικά πρέπει να βρείτε την τρέχουσα προεπιλεγμένη εφαρμογή γκάλερι στις Ρυθμίσεις (τμήμα Εφαρμογών) της συσκευής. Αναζητήστε για ένα κουμπί που αναφέρει κάτι σαν \"Άνοιγμα με προεπιλογή\", πατήστε το, μετά επιλέξτε \"Καθαρισμός προεπιλεγμένων\". diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 489993897..5424d78d4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -202,6 +202,55 @@ Agregar a favoritos Alternar visibilidad de archivo + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + ¿Cómo puedo hacer que Simple Gallery sea la galería de dispositivos predeterminada? Primero tiene que encontrar la galería predeterminada actualmente en la sección Aplicaciones de la configuración de su dispositivo, busque un botón que diga algo como \"Abrir por defecto \", haga clic en él, luego seleccione \"Borrar valores predeterminados \". diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e7577e94f..24ecdc399 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -202,6 +202,55 @@ Toggle favorite Toggle file visibility + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Miten voin tehdä Simple Gallerystä oletusgalleriasovelluksen? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 99a1b0387..828c24c49 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -202,6 +202,55 @@ Ajouter aux favoris Visibilité du fichier + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Comment faire de Simple Gallery ma galerie par défaut ? Il faut dans un premier temps, trouver l\'application \"Galerie\" par défaut dans la section \"Applications\" des paramètres de l\'appareil, puis appuyer sur \"Ouvrir par défaut\", et enfin sélectionner \"Réinitialiser les paramètres par défaut\". La prochaine fois que vous ouvrirez une image ou une vidéo, il vous sera proposé de choisir une application, choisissez \"Simple Gallery\" puis \"Toujours\". diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index de6fa84a1..5ee485cc7 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -202,6 +202,55 @@ Toggle favorite Toggle file visibility + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Cómo podo facer que Simple Gallery sexa a galería por omisión no dispositivo? Primeiro debe atopar a galería por omsión actual na sección de App nos axustes do dispositivo, buscar un botón que diga algo como \"Abrir por omisión\", pulsalo e despois seleccionar \"Limpar por omisión\". diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 372f978bb..e93fd0683 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -202,6 +202,55 @@ Uključi/isključi favorite Uključi/isključi vidljivost datoteka + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Kako mogu postaviti Jednostavnu galeriju kao zadanu galeriju uređaja? Prvo morate pronaći trenutačno zadanu galeriju u odjeljku Aplikacije, u Postavkama uređaja, potražite gumb koji kaže nešto poput opcije \"Otvori prema zadanim postavkama\", kliknite na tu opciju, a zatim odaberite \"Izbriši zadane postavke\". diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 08d3d33e9..e49b60217 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -203,6 +203,55 @@ Kedvencek módosítása Fájl láthatóság módosítása + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Hogyan tudom beállítani a Simple Gallery-t alapértelmezett galériának? Először meg kell találnia az alapértelmezett galériát az eszköz beállításainak Alkalmazások részében. Keressen egy olyan gombot, amely valami olyasmit, mint az \"Legyen alapértelmezett\", kattintson rá, majd válassza a \"Alapértelmezések törlése\" pontot. diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 2f13ee5a3..947fedcd8 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -202,6 +202,55 @@ Favorit Ubah visibilitas berkas + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Bagaimana cara menjadikan Simple Gallery sebagai aplikasi galeri default? Pertama anda harus menemukan galeri default saat ini di bagian Aplikasi di Pengaturan perangkat, cari tombol dengan label seperti \"Buka secara default\", klik, lalu pilih \"Hapus default\". diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 2f13ee5a3..947fedcd8 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -202,6 +202,55 @@ Favorit Ubah visibilitas berkas + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Bagaimana cara menjadikan Simple Gallery sebagai aplikasi galeri default? Pertama anda harus menemukan galeri default saat ini di bagian Aplikasi di Pengaturan perangkat, cari tombol dengan label seperti \"Buka secara default\", klik, lalu pilih \"Hapus default\". diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a38aaa46a..e8345e034 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -202,6 +202,55 @@ Attiva / disattiva preferito Attiva / disattiva la visibilità dei file + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Come posso impostare Semplice Galleria come la galleria predefinita del dispositivo? Si deve prima trovare l\'attuale galleria predefinita nella sezione App delle impostazioni di sistema, cercare un pulsante che dice qualcosa come \"App predefinite\", cliccarlo e poi selezionare \"Ripristina predefiniti\". diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a65590f8f..467889463 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -202,6 +202,55 @@ お気に入り 表示/非表示の切替 + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index fa94511aa..136a317d4 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -202,6 +202,55 @@ 즐겨찾기 파일 제외 + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 447ee9b0c..78708f494 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -202,6 +202,55 @@ Toggle favorite Toggle file visibility + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Kaip galiu padaryti paprastą galeriją kaip numatytąją įrenginio galeriją? Pirmiausia turite rasti numatytąją galeriją savo prietaiso nustatymų skyriuje "Programėlės", ieškoti mygtuko panašaus į \ "Atidaryti pagal numatytuosius \", spustelėkite jį, tada pasirinkite \ "Išvalyti numatytuosius \". diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a50a62907..d2e4b51c3 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -202,6 +202,55 @@ Favoritt av/på Filsynlighet av/på + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3ee3326cf..699fbe90b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -202,6 +202,55 @@ Als favoriet instellen Bestand tonen/verbergen + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Hoe kan ik Eenvoudige Galerij instellen als standaard-app voor foto’s en video’s? Zoek eerst de huidige standaard-app voor foto’s en video’s in de Android-instellingen (via \"Apps\" of "\Apps en meldingen\"). Klik bij de App-info op \"Standaardwaarden wissen\" (soms onder \"Standaard openen\"). diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f3ee11f77..df9bed60a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -202,6 +202,55 @@ Ulubione Widoczność plików + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Jak mogę ustawić tą aplikację jako domyślną aplikację galerii? Znajdź obecną domyślną aplikację galerii w ustawieniach systemowych (sekcja \'Aplikacje\'). Na ekranie z informacjami o niej kliknij \'Otwórz domyślnie\', a następnie \'Wyczyść domyślne\'. Gdy podczas następnej próby otwarcia zdjęcia czy filmu system zapyta Cię jaką aplikacją to zrobić, wybierz Prostą Galerię i opcję zapamiętania tego wyboru. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d3f2495fd..1e62f9cfe 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -200,7 +200,56 @@ Gerenciar botões de ação Favoritar/Desfavoritar - Exibir/Ocultar arquivov + Exibir/Ocultar arquivo + + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color O que devo fazer para que a Simple Galeria seja o aplicativo de galeria padrão do meu aparelho? diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bcf4b5ef1..3d4088257 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -202,6 +202,55 @@ Alternar favoritos Alternar visibilidade dos ficheiros + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 98b575255..24bdcf710 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -202,6 +202,55 @@ Переключение избранного Переключение видимости файлов + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Как сделать Simple Gallery галереей по умолчанию? Сначала вы должны найти галерею по умолчанию в разделе \"Приложения\" настроек вашего устройства; найдите кнопку, названную \"Открыть по умолчанию\",затем нажмите на неё и выберите \"Очистить значения по умолчанию\". diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 3c126a8bd..395a16826 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -202,6 +202,55 @@ Prepnutie obľúbenosti Prepnutie viditeľnosti súboru + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Ako viem spraviť Jednoduchú Galériu predvolenou galériou zariadenia? Najprv musíte nájsť v nastaveniach zariadenia,sekcii Aplikácie, súčasnú predvolenú galériu, zvoliť tlačidlo s textom v zmysle \"Nastavenie predvoleného otvárania\" a následne \"Vymazať predvolené nastavenia\". diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 659514b1b..05319c71d 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -202,6 +202,55 @@ Preklopi priljubljene Preklopi vidljivost datotek + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Kako naredim Simple galerijo za privzeto aplikacijo na napravi? Najprej morate najti trenutno privzeto aplikacijo za prikaz slik med aplikacijami v nastavitvah naprave, kjer poiščete gumb v smislu \"Odpri kot privzeto\", kliknite nanj in izberite \"Izbriši privzeto\". diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 0dda5fde3..bcd589b38 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -202,6 +202,55 @@ Укључи/искључи омиљени Укључи/искључи видљивост датотеке + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Како да подесим Једноставну галерију да буде главна галерија уређаја? Први морате да нађете тренутну главну галерију у Апликације секцији подешавања вашег уређаја, потражите дугме које каже нешто попут \"Отвори по дифолту\", кликни на то, затим изабери \"Уклони дифолт\". diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1e6f7a038..3d6bf13e0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -202,6 +202,55 @@ Lägg till/ta bort från favoriter Visa/dölj fil + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e04f830c0..9f719f7e3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -202,6 +202,55 @@ Favoriyi göster/gizle Dosya görünürlüğünü aç/kapat + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Basit Galeri\'yi nasıl varsayılan cihaz galerisi yapabilirim? Önce cihaz ayarlarınızın Uygulamalar bölümünde varsayılan galeriyi bulmanız, \"Varsayılan olarak aç\" gibi bir şey söyleyen bir düğme aramanız, üzerine tıklamanız ve ardından \"Varsayılanları Temizle\"yi seçmeniz gerekir. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index dfd954b03..dd2c66323 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -202,6 +202,55 @@ Перемкнути улюблене Перемкнути видимість файлу + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + Як зробити Simple Gallery галереєю за-замовчуванням? Спочатку необхідно знайти поточну галерею за-замовчуванням в розділі \"Додатки\" налаштувань вашого пристрою. Знайдіть і натисніть на кнопку \"Використовувати за-замовчуванням\" абощо, потім оберіть \"Очистити замовчування\". diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ea954d84d..073efe555 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -202,6 +202,55 @@ 收藏 隐藏文件 + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + 如何把简约图库设置为设备的默认图库？ 首先，你需要在设备设置的“应用”菜单中找到你当前的默认图库，找到并点击“默认打开”按钮，然后点击“清除默认值”。下次当你再次打开图片或视频时，你应该会看到一个应用程序选择器，请在这里选择“简约图库”并将其设为默认应用程序。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 3a59c68ae..c8e591638 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -202,6 +202,55 @@ 我的最愛 檔案顯示 + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + 我如何將簡易相簿設為預設相簿? 首先你必須先在裝置設定中應用程式部分尋找目前預設相簿，找到一個像是\"預設開啟(Open by default)\"的按鈕，點下去，然後選擇\"清除預設(Clear defaults)\"。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c2623c0dc..d823d4e7e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -202,6 +202,55 @@ 我的最愛 檔案顯示 + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + 我如何將簡易相簿設為預設相簿? 首先你必須先在裝置設定中應用程式部分尋找目前預設相簿，找到一個像是\"預設開啟(Open by default)\"的按鈕，點下去，然後選擇\"清除預設(Clear defaults)\"。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd6354007..963ea0d5c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -202,6 +202,55 @@ Toggle favorite Toggle file visibility + + Custom + Reset + Square + Transform + Filter + None + Adjust + Shadows + Exposure + Highlights + Brightness + Contrast + Saturation + Clarity + Gamma + Blacks + Whites + Temperature + Sharpness + Reset + Focus + None + Radial + Linear + Mirrored + Gaussian + Text + Text Options + Text Color + Font + Add + Edit + Straighten + Font + Color + BG Color + Alignment + To Front + Delete + Your text + Brush + Color + Size + Hardness + To Front + Delete + Brush Color + How can I make Simple Gallery the default device gallery? First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". From 679a469a336dfa142881ed98f06255e1639e8f0b Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 22:17:21 +0100 Subject: [PATCH 30/43] updating the slovak new editor strings --- app/src/main/res/values-sk/strings.xml | 84 +++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 395a16826..0cd24c0be 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -203,53 +203,53 @@ Prepnutie viditeľnosti súboru - Custom + Vlastný Reset - Square - Transform - Filter - None - Adjust - Shadows - Exposure - Highlights - Brightness - Contrast - Saturation - Clarity + Štvorec + Transformovať + Filtre + Žiadny + Doladenie + Tiene + Expozícia + Zdôraznenie + Jas + Kontrast + Sýtosť + Jasnosť Gamma - Blacks - Whites - Temperature - Sharpness + Čierne + Biele + Teplota + Ostrosť Reset - Focus - None - Radial - Linear - Mirrored + Zaostrenie + Žiadne + Lúčovité + Lineárne + Zrkadlovité Gaussian Text - Text Options - Text Color - Font - Add - Edit - Straighten - Font - Color - BG Color - Alignment - To Front - Delete - Your text - Brush - Color - Size - Hardness - To Front - Delete - Brush Color + Nastavenia textu + Farba textu + Písmo + Pridať + Upraviť + Narovnať + Písmo + Farba + Pozadie + Zarovnanie + Dopredu + Vymazať + Váš text + Štetec + Farba + Veľkosť + Tvrdosť + Dopredu + Vymazať + Farba štetca Ako viem spraviť Jednoduchú Galériu predvolenou galériou zariadenia? From b60ee07ea4db7eaec6f85b533a9194e90cd9d207 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 20 Dec 2019 22:25:37 +0100 Subject: [PATCH 31/43] adding 5:4 and 4:5 crop aspect ratios --- .../gallery/pro/activities/NewEditActivity.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt index 4bacbbeaf..3bf62b5c7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt @@ -189,11 +189,14 @@ class NewEditActivity : SimpleActivity() { add(CropAspectAsset("my_crop_2_1", 2, 1, false)) add(CropAspectAsset("my_crop_19_9", 19, 9, false)) add(CropAspectAsset("my_crop_9_19", 9, 19, false)) + add(CropAspectAsset("my_crop_5_4", 5, 4, false)) + add(CropAspectAsset("my_crop_4_5", 4, 5, false)) } settingsList.getSettingsModel(UiConfigAspect::class.java).aspectList.apply { add(ToggleAspectItem(CropAspectItem("my_crop_2_1"), CropAspectItem("my_crop_1_2"))) add(ToggleAspectItem(CropAspectItem("my_crop_19_9"), CropAspectItem("my_crop_9_19"))) + add(ToggleAspectItem(CropAspectItem("my_crop_5_4"), CropAspectItem("my_crop_4_5"))) } settingsList.getSettingsModel(UiConfigFilter::class.java).setFilterList( From 7213ab13ceaea8a61ddb509f28f8ab88ad1cdfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Fri, 20 Dec 2019 22:32:18 +0000 Subject: [PATCH 32/43] Update strings.xml --- app/src/main/res/values-pt/strings.xml | 88 +++++++++++++------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3d4088257..6d8588d02 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -203,53 +203,53 @@ Alternar visibilidade dos ficheiros - Custom - Reset - Square - Transform - Filter - None - Adjust - Shadows - Exposure - Highlights - Brightness - Contrast - Saturation - Clarity - Gamma - Blacks - Whites - Temperature - Sharpness - Reset - Focus - None + Personalizado + Repor + Quadrado + Transformar + Filtrar + Nenhum + Ajustar + Sombras + Exposição + Realce + Brilho + Contraste + Saturação + Claridade + Gama + Pretos + Brancos + Temperatura + Nitidez + Repor + Foco + Nenhum Radial Linear - Mirrored - Gaussian - Text - Text Options - Text Color - Font - Add - Edit - Straighten - Font - Color - BG Color - Alignment + Espelhado + Gaussiano + Texto + Opções de texto + Cor do texto + Tipo de letra + Adicionar + Editar + Endireitar + Tipo de letra + Cor + Cor de fundo + Alinhamento To Front - Delete - Your text - Brush - Color - Size - Hardness - To Front - Delete - Brush Color + Apagar + O seu texto + Pincel + Cor + Tamanho + Espessura + para a frente + Apagar + Cor do pincel How can I make Simple Gallery the default device gallery? From 28ad1da058f333954797a83803954d3827aeb60c Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sat, 21 Dec 2019 01:31:07 +0100 Subject: [PATCH 33/43] Dutch --- app/src/main/res/values-nl/strings.xml | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 699fbe90b..4cb0b029b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -203,53 +203,53 @@ Bestand tonen/verbergen - Custom - Reset - Square - Transform + Aangepast + Beginwaarden + Vierkant + Vervormen Filter - None - Adjust - Shadows - Exposure - Highlights - Brightness + Geen + Aanpassen + Schaduwen + Belichting + Hooglichten + Helderheid Contrast - Saturation - Clarity + Verzadiging + Lokaal contrast Gamma - Blacks - Whites - Temperature - Sharpness - Reset + Zwarte tinten + Witte tinten + Temperatuur + Scherpte + Beginwaarden Focus - None - Radial - Linear - Mirrored - Gaussian - Text - Text Options - Text Color - Font - Add - Edit - Straighten - Font - Color - BG Color - Alignment - To Front - Delete - Your text - Brush - Color - Size - Hardness - To Front - Delete - Brush Color + Geen + Radiaal + Lineair + Gespiegeld + Gaussiaans + Tekst + Tekstopties + Tekstkleur + Lettertype + Toevoegen + Bewerken + Rechttrekken + Lettertype + Kleur + Achtergrondkleur + Uitlijning + Naar voren + Verwijderen + Vul hier tekst in + Penseel + Kleur + Grootte + Hardheid + Naar voren + Verwijderen + Penseelkleur Hoe kan ik Eenvoudige Galerij instellen als standaard-app voor foto’s en video’s? From 4dc0da9151c652d4737370be1c67312a8e4c4adf Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 22 Dec 2019 11:11:32 +0100 Subject: [PATCH 34/43] update version to 6.11.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 99875d3b1..c001ad56c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 28 - versionCode 281 - versionName "6.11.1" + versionCode 282 + versionName "6.11.2" multiDexEnabled true setProperty("archivesBaseName", "gallery") vectorDrawables.useSupportLibrary = true From 02f905026364fdc7bf53eee91c38f4c5679bcbe3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 22 Dec 2019 11:11:38 +0100 Subject: [PATCH 35/43] updating changelog --- CHANGELOG.md | 7 +++++++ fastlane/metadata/android/en-US/changelogs/282.txt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/282.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a491f77..df7fbcc68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 6.11.2 *(2019-12-21)* +---------------------------- + + * Added a few more aspect ratios in the editor + * Remember the last used editor brush settings + * Properly refresh the cache of edited images + Version 6.11.1 *(2019-12-18)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/282.txt b/fastlane/metadata/android/en-US/changelogs/282.txt new file mode 100644 index 000000000..10bf2b600 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/282.txt @@ -0,0 +1,3 @@ + * Added a few more aspect ratios in the editor + * Remember the last used editor brush settings + * Properly refresh the cache of edited images From c35dc5d3bc66ebf4453d8e579404e029a160ce10 Mon Sep 17 00:00:00 2001 From: Marius Volkhart Date: Sun, 22 Dec 2019 09:47:09 -0500 Subject: [PATCH 36/43] Set proper permissions on gradlew script --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 7c22d0282e0fd2a8b49be4046668652b434d7b2e Mon Sep 17 00:00:00 2001 From: spkprs Date: Sun, 22 Dec 2019 23:40:21 +0300 Subject: [PATCH 37/43] Update strings.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit *these commons strings showup in Eng !!! if I try close editor with changes. 190 Αναίρεση αλλαγών Είστε βέβαιοι ότι θέλετε να αναιρέσετε τις αλλαγές σας? Έχετε αλλαγές που δεν έχουν αποθηκευτεί. Αποθήκευση πριν από την έξοδο? --- app/src/main/res/values-el/strings.xml | 94 +++++++++++++------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8c211ac83..324feef88 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -203,53 +203,53 @@ Εναλλαγή προβολής αρχείου - Custom - Reset - Square - Transform - Filter - None - Adjust - Shadows - Exposure - Highlights - Brightness - Contrast - Saturation - Clarity - Gamma - Blacks - Whites - Temperature - Sharpness - Reset - Focus - None - Radial - Linear - Mirrored - Gaussian - Text - Text Options - Text Color - Font - Add - Edit - Straighten - Font - Color - BG Color - Alignment - To Front - Delete - Your text - Brush - Color - Size - Hardness - To Front - Delete - Brush Color + Προσαρμογή + Επαναφορά + Τετράγωνο + Μετατροπή + Φίλτρο + Χωρίς + Ρυθμίσεις + Σκιές + Έκθεση + Φωτισμένα + Φωτισμός + Αντίθεση + Κορεσμός + Σαφήνεια + Γάμμα + Μαύρα + Λευκά + Θερμοκρασία + Οξύτητα + Επαναφορά + Εστίαση + Χωρίς + Ακτίνα + Γραμμικά + Καθρέπτης + Θόλωση + Κείμενο + Επιλογή κειμένου + Χρώμα κειμένου + Γραμ/σειρά + Προσθήκη + Επεξεργασία + Ίσιωμα + Γραμ/σειρά + Χρώμα + BG Χρώμα + Ευθυγράμμιση + Σε Γραμ/σειρά + Διαγραφή + Το κείμενό μου + Βούρτσα + Χρώμα + Μέγεθος + Σκληρότητα + Σε Γραμ/σειρά + Διαγραφή + Χρώμα Βούρτσας Πώς μπορώ να κάνω την Απλή Συλλογή προεπιλεγμένη εφαρμογή συλλογής πολυμέσων; From 91da11573d514e2d497d1256ff5b0d3a900e64df Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 22 Dec 2019 22:58:17 +0100 Subject: [PATCH 38/43] make building the app easier, do not require a release version --- app/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c001ad56c..bf5d66967 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,7 +43,9 @@ android { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release + if (keystorePropertiesFile.exists()) { + signingConfig signingConfigs.release + } } } From eee1aebb53010c68ecb1320253f1bbcdac18891c Mon Sep 17 00:00:00 2001 From: FTno <16176811+FTno@users.noreply.github.com> Date: Mon, 23 Dec 2019 12:54:01 +0100 Subject: [PATCH 39/43] Update strings.xml Norwegian (nb) translation update --- app/src/main/res/values-nb/strings.xml | 76 +++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index d2e4b51c3..7b813567f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -82,7 +82,7 @@ Bane Ugyldig bildebane Bilderedigering feilet - File edited successfully + Fil vellykket redigert Rediger bilde med: Ingen bilderedigeringsapp funnet Ukjent filplassering @@ -203,53 +203,53 @@ Filsynlighet av/på - Custom - Reset - Square - Transform + Egendefinert + Tilbakestill + Kvadrat + Transformer Filter - None - Adjust - Shadows - Exposure + Ingen + Juster + Skygger + Eksponering Highlights - Brightness - Contrast - Saturation - Clarity + Lysstyrke + Kontrast + Metning + Klarhet Gamma Blacks Whites - Temperature - Sharpness - Reset - Focus - None + Temperatur + Skarphet + Tilbakestill + Fokus + Ingen Radial Linear Mirrored Gaussian - Text - Text Options - Text Color - Font - Add - Edit + Tekst + Tekstvalg + Tekstfarge + Skrift + Legg til + Rediger Straighten - Font - Color - BG Color - Alignment - To Front - Delete - Your text - Brush - Color - Size - Hardness - To Front - Delete - Brush Color + Skrift + Farge + Bakg.farge + Justering + Til front + Slett + Din tekst + Pensel + Farge + Størrelse + Hardhet + Til front + Slett + Penselfarge How can I make Simple Gallery the default device gallery? From 9685d11807ed9c1001389f1f9cd7dc801cd387fe Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Dec 2019 23:18:52 +0100 Subject: [PATCH 40/43] found a few more strings to be translated for the new photo editor --- app/src/main/res/values-ar/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-az/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-ca/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-cs/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-da/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-de/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-el/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-es/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-fi/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-fr/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-gl/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-hr/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-hu/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-id/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-in/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-it/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-ja/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-ko-rKR/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-lt/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-nb/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-nl/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-pl/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-pt-rBR/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-pt/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-ru/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-sk/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-sl/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-sr/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-sv/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-tr/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-uk/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-zh-rCN/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-zh-rHK/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values-zh-rTW/strings.xml | 33 ++++++++++++++++++++++ app/src/main/res/values/strings.xml | 33 ++++++++++++++++++++++ 35 files changed, 1155 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3b0d0ac2e..fccbbb353 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color كيف يمكنني جعل تطبيق الاستديو معرض الجهاز الإفتراضي ؟ diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index c585fff5c..c9b9508f2 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 01818110c..198cfcd2d 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Com puc fer que Simple Gallery sigui la galeria de dispositius predeterminada? diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e175c31ba..0745ab675 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Jak nastavím Jednoduchou Galerii jako výchozí galerii? diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index bc1710c51..422a3f9a7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Hvordan kan jeg gøre Simple Gallery til min enheds standardgalleri? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 32e4041ec..2e374e8ca 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Wie kann ich Schlichte Galerie als Standardanwendung auswählen? diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 324feef88..3a45ef0ff 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -250,6 +250,39 @@ Σε Γραμ/σειρά Διαγραφή Χρώμα Βούρτσας + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Πώς μπορώ να κάνω την Απλή Συλλογή προεπιλεγμένη εφαρμογή συλλογής πολυμέσων; diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5424d78d4..c8ff969bd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color ¿Cómo puedo hacer que Simple Gallery sea la galería de dispositivos predeterminada? diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 24ecdc399..e87ab320f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Miten voin tehdä Simple Gallerystä oletusgalleriasovelluksen? diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 828c24c49..353fb7eb7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Comment faire de Simple Gallery ma galerie par défaut ? diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5ee485cc7..ed4d60dc8 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Cómo podo facer que Simple Gallery sexa a galería por omisión no dispositivo? diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index e93fd0683..aa052bf3d 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Kako mogu postaviti Jednostavnu galeriju kao zadanu galeriju uređaja? diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e49b60217..82a9a0079 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -251,6 +251,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Hogyan tudom beállítani a Simple Gallery-t alapértelmezett galériának? diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 947fedcd8..7e0366aa7 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Bagaimana cara menjadikan Simple Gallery sebagai aplikasi galeri default? diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 947fedcd8..7e0366aa7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Bagaimana cara menjadikan Simple Gallery sebagai aplikasi galeri default? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e8345e034..ba7424e6e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Come posso impostare Semplice Galleria come la galleria predefinita del dispositivo? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 467889463..e62835f8f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 136a317d4..a8f529fdb 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 78708f494..9f4a79e87 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Kaip galiu padaryti paprastą galeriją kaip numatytąją įrenginio galeriją? diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7b813567f..073a52b57 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -250,6 +250,39 @@ Til front Slett Penselfarge + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4cb0b029b..2f2716bd3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -250,6 +250,39 @@ Naar voren Verwijderen Penseelkleur + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Hoe kan ik Eenvoudige Galerij instellen als standaard-app voor foto’s en video’s? diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index df9bed60a..c57baad8e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Jak mogę ustawić tą aplikację jako domyślną aplikację galerii? diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 1e62f9cfe..9edc517dd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color O que devo fazer para que a Simple Galeria seja o aplicativo de galeria padrão do meu aparelho? diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6d8588d02..04d0f13d2 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -250,6 +250,39 @@ para a frente Apagar Cor do pincel + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 24bdcf710..9d1902ca2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Как сделать Simple Gallery галереей по умолчанию? diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 0cd24c0be..7f20991b2 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -250,6 +250,39 @@ Dopredu Vymazať Farba štetca + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Ako viem spraviť Jednoduchú Galériu predvolenou galériou zariadenia? diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 05319c71d..e2bf76728 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Kako naredim Simple galerijo za privzeto aplikacijo na napravi? diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index bcd589b38..5af2908f2 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Како да подесим Једноставну галерију да буде главна галерија уређаја? diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 3d6bf13e0..b135edc4e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9f719f7e3..1fc1722fe 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Basit Galeri\'yi nasıl varsayılan cihaz galerisi yapabilirim? diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index dd2c66323..d7cf8cdc7 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color Як зробити Simple Gallery галереєю за-замовчуванням? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 073efe555..42cca724f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color 如何把简约图库设置为设备的默认图库？ diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index c8e591638..6ff1931a4 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color 我如何將簡易相簿設為預設相簿? diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d823d4e7e..f23c963c7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color 我如何將簡易相簿設為預設相簿? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 963ea0d5c..27634beb8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -250,6 +250,39 @@ To Front Delete Brush Color + Editor + + Close Editor? + Do you really want to discard the image? + Yes + No + Cancel + Accept + Save + Exporting image… + Exporting image %s. + Flip H + Flip V + Undo + Redo + Color Picker + Transparent + White + Gray + Black + Light blue + Blue + Purple + Orchid + Pink + Red + Orange + Gold + Yellow + Olive + Green + Aquamarin + Pipettable color How can I make Simple Gallery the default device gallery? From 2b0902aac20cf8f2cd17b678858cfea1cfd2adc9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Dec 2019 23:27:44 +0100 Subject: [PATCH 41/43] removing an empty string --- 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-in/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-sr/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-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 35 files changed, 35 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fccbbb353..95ab576ab 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index c9b9508f2..6ab4d33ec 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 198cfcd2d..3c079f438 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0745ab675..1200e499b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 422a3f9a7..03cd3e395 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2e374e8ca..f22771d90 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3a45ef0ff..9c154d093 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -251,7 +251,6 @@ Διαγραφή Χρώμα Βούρτσας Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c8ff969bd..e1ac72856 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e87ab320f..3a4f6ffdf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 353fb7eb7..07308d101 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index ed4d60dc8..fa073d954 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index aa052bf3d..f219ee7c4 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 82a9a0079..3fc07f5b3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -252,7 +252,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 7e0366aa7..5a1f4ce34 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7e0366aa7..5a1f4ce34 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ba7424e6e..7f4a943c2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e62835f8f..780b1244b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index a8f529fdb..1aae7ab77 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 9f4a79e87..568060164 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 073a52b57..85b68bb6c 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -251,7 +251,6 @@ Slett Penselfarge Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2f2716bd3..e56e79ee3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -251,7 +251,6 @@ Verwijderen Penseelkleur Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c57baad8e..f916718a3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9edc517dd..c09096745 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 04d0f13d2..59101c006 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -251,7 +251,6 @@ Apagar Cor do pincel Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9d1902ca2..3ce6ae0ec 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 7f20991b2..e3bc36ee9 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -251,7 +251,6 @@ Vymazať Farba štetca Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index e2bf76728..197c49554 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 5af2908f2..d6cf72ebc 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b135edc4e..cbe6289c3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1fc1722fe..d044fb8ff 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d7cf8cdc7..c29acb22a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 42cca724f..97d1713ca 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 6ff1931a4..66b761c8a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f23c963c7..ae4184a87 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 27634beb8..4f949f7c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -251,7 +251,6 @@ Delete Brush Color Editor - Close Editor? Do you really want to discard the image? Yes From f54fdda014b03dc796074dd1c64e773f18c8e0fe Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Dec 2019 23:34:10 +0100 Subject: [PATCH 42/43] updating the slovak strings related to the new editor --- app/src/main/res/values-sk/strings.xml | 60 +++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e3bc36ee9..968c47c60 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -251,37 +251,37 @@ Vymazať Farba štetca Editor - Close Editor? - Do you really want to discard the image? - Yes - No - Cancel - Accept - Save - Exporting image… - Exporting image %s. - Flip H - Flip V - Undo - Redo - Color Picker - Transparent - White - Gray - Black - Light blue - Blue - Purple - Orchid - Pink - Red - Orange - Gold - Yellow - Olive - Green + Zavrieť editor? + Ozaj chcete zahodiť úpravy obrázka? + Áno + Nie + Zrušiť + Prijať + Uložiť + Exportuje sa obrázok… + Exportovanie obrázka %s. + Preklopiť H + Preklopiť V + Späť + Opäť spraviť + Výber farieb + Priesvitná + Biela + Sivá + Čierna + Svetlomodrá + Modrá + Fialová + Orchidea + Ružová + Červená + Oranžová + Zlatá + Žltá + Olivová + Zelená Aquamarin - Pipettable color + Pipetovateľná farba Ako viem spraviť Jednoduchú Galériu predvolenou galériou zariadenia? From e076f1da3f796768d6f8831d612249501245623a Mon Sep 17 00:00:00 2001 From: Guillaume Date: Tue, 24 Dec 2019 01:40:46 +0100 Subject: [PATCH 43/43] Dutch --- app/src/main/res/values-nl/strings.xml | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e56e79ee3..8361c816a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -250,38 +250,38 @@ Naar voren Verwijderen Penseelkleur - Editor - Close Editor? - Do you really want to discard the image? - Yes - No - Cancel - Accept - Save - Exporting image… - Exporting image %s. - Flip H - Flip V - Undo - Redo - Color Picker - Transparent - White - Gray - Black - Light blue - Blue - Purple - Orchid - Pink - Red - Orange - Gold - Yellow - Olive - Green - Aquamarin - Pipettable color + Bewerken + Afsluiten + Sluiten zonder de wijzigingen op te slaan? + Ja + Nee + Annuleren + Accepteren + Opslaan + Afbeelding exporteren… + Afbeelding %s exporteren. + Spiegelen H + Spiegelen V + Ongedaan maken + Opnieuw + Kleur kiezen + Transparant + Wit + Grijs + Zwart + Lichtblauw + Blauw + Paars + Orchidee + Roze + Rood + Oranje + Goud + Geel + Olijf + Groen + Aquamarijn + Met pipet kiezen Hoe kan ik Eenvoudige Galerij instellen als standaard-app voor foto’s en video’s?