From 8c72bebe72e2e381ec3fa95e3208008d9fac23b4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Jul 2018 21:11:41 +0200 Subject: [PATCH 01/24] catch out of memory errors at saving images with filters --- .../gallery/activities/EditActivity.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index 3aca45b31..82be5a8ee 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -228,9 +228,13 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener bottom_actions_filter_list.beGone() Thread { - val originalBitmap = Glide.with(applicationContext).asBitmap().load(uri).submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() - currentFilter.filter.processFilter(originalBitmap) - saveBitmapToFile(originalBitmap, it, false) + 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) + } }.start() } } From ef40875d7221d8abfb308ff474eeb19a004b751b Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Jul 2018 21:39:50 +0200 Subject: [PATCH 02/24] remove the side margin of the Editor --- app/src/main/res/layout/activity_edit.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index a6b77522b..986ece8ee 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -2,21 +2,19 @@ + android:layout_height="match_parent"/> From f8cf95991f73a3f96648dc3e15c8e0307ddda186 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Jul 2018 21:55:17 +0200 Subject: [PATCH 03/24] use bottom actions at Set Wallpaper intent too --- .../activities/SetWallpaperActivity.kt | 24 +++++++----- .../res/layout/activity_set_wallpaper.xml | 21 ++++++++--- .../layout/bottom_set_wallpaper_actions.xml | 37 +++++++++++++++++++ app/src/main/res/menu/menu_set_wallpaper.xml | 15 -------- 4 files changed, 67 insertions(+), 30 deletions(-) create mode 100644 app/src/main/res/layout/bottom_set_wallpaper_actions.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt index 25070a812..5f02df853 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt @@ -16,7 +16,8 @@ import com.simplemobiletools.commons.helpers.isNougatPlus import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.R import com.theartofdev.edmodo.cropper.CropImageView -import kotlinx.android.synthetic.main.activity_edit.* +import kotlinx.android.synthetic.main.activity_set_wallpaper.* +import kotlinx.android.synthetic.main.bottom_set_wallpaper_actions.* class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener { private val PICK_IMAGE = 1 @@ -39,6 +40,7 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete } handleImage(intent) + setupBottomActions() } private fun handleImage(intent: Intent) { @@ -58,27 +60,30 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete setupAspectRatio() } + private fun setupBottomActions() { + bottom_set_wallpaper_aspect_ratio.setOnClickListener { + changeAspectRatio(!isLandscapeRatio) + } + + bottom_set_wallpaper_rotate.setOnClickListener { + crop_image_view.rotateImage(90) + } + } + private fun setupAspectRatio() { val wallpaperWidth = if (isLandscapeRatio) wallpaperManager.desiredMinimumWidth else wallpaperManager.desiredMinimumWidth / 2 crop_image_view.setAspectRatio(wallpaperWidth, wallpaperManager.desiredMinimumHeight) + bottom_set_wallpaper_aspect_ratio.setImageResource(if (isLandscapeRatio) R.drawable.ic_minimize else R.drawable.ic_maximize) } override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_set_wallpaper, menu) - - menu.apply { - findItem(R.id.portrait_aspect_ratio).isVisible = isLandscapeRatio - findItem(R.id.landscape_aspect_ratio).isVisible = !isLandscapeRatio - } return true } override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.save -> confirmWallpaper() - R.id.rotate -> crop_image_view.rotateImage(90) - R.id.portrait_aspect_ratio -> changeAspectRatio(false) - R.id.landscape_aspect_ratio -> changeAspectRatio(true) else -> return super.onOptionsItemSelected(item) } return true @@ -87,7 +92,6 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete private fun changeAspectRatio(isLandscape: Boolean) { isLandscapeRatio = isLandscape setupAspectRatio() - invalidateOptionsMenu() } @SuppressLint("InlinedApi") diff --git a/app/src/main/res/layout/activity_set_wallpaper.xml b/app/src/main/res/layout/activity_set_wallpaper.xml index a956b2213..7acb21c69 100644 --- a/app/src/main/res/layout/activity_set_wallpaper.xml +++ b/app/src/main/res/layout/activity_set_wallpaper.xml @@ -1,9 +1,20 @@ - + android:layout_height="match_parent"> + + + + + + diff --git a/app/src/main/res/layout/bottom_set_wallpaper_actions.xml b/app/src/main/res/layout/bottom_set_wallpaper_actions.xml new file mode 100644 index 000000000..1c8015458 --- /dev/null +++ b/app/src/main/res/layout/bottom_set_wallpaper_actions.xml @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/app/src/main/res/menu/menu_set_wallpaper.xml b/app/src/main/res/menu/menu_set_wallpaper.xml index 59328d99d..82547aaa2 100644 --- a/app/src/main/res/menu/menu_set_wallpaper.xml +++ b/app/src/main/res/menu/menu_set_wallpaper.xml @@ -6,19 +6,4 @@ android:icon="@drawable/ic_check" android:title="@string/save" app:showAsAction="ifRoom"/> - - - From 51a36e5d850d5e0bc438165638181a73587169c1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Jul 2018 22:07:11 +0200 Subject: [PATCH 04/24] always initialize the Editor in crop_rotate mode --- .../simplemobiletools/gallery/activities/EditActivity.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index 82be5a8ee..3697a9f31 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -177,6 +177,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener override fun onResourceReady(bitmap: Bitmap?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { val currentFilter = getFiltersAdapter()?.getCurrentFilter() + if (initialBitmap == null) { + loadCropImageView() + bottomCropRotateClicked() + } + if (initialBitmap != null && currentFilter != null && currentFilter.filter.name != getString(R.string.none)) { default_image_view.onGlobalLayout { applyFilter(currentFilter) @@ -186,9 +191,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } if (isCropIntent) { - loadCropImageView() bottom_primary_filter.beGone() - bottomCropRotateClicked() } return false From 1c89721292814e0d7d998adc9f6b09738b900476 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Jul 2018 23:35:20 +0200 Subject: [PATCH 05/24] add some bottom margin to the image in the editor --- app/src/main/res/layout/activity_edit.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 986ece8ee..6a635b08c 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -9,12 +9,14 @@ + android:layout_height="match_parent" + android:layout_marginBottom="@dimen/bottom_filters_thumbnail_height"/> From d848f0b3056c70bb4857dcd8daf37f10d5ee3fa4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 00:13:46 +0200 Subject: [PATCH 06/24] scroll the editor filters list horizontally when we reach an edge --- .../gallery/activities/EditActivity.kt | 14 +++++++++++--- .../gallery/adapters/FiltersAdapter.kt | 9 +++++---- .../gallery/interfaces/FilterAdapterListener.kt | 2 +- app/src/main/res/layout/activity_edit.xml | 4 ++-- app/src/main/res/layout/editor_filter_item.xml | 4 ++-- app/src/main/res/values/dimens.xml | 2 +- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index 3697a9f31..129655165 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -9,6 +9,7 @@ import android.graphics.Point import android.net.Uri import android.os.Bundle import android.provider.MediaStore +import android.support.v7.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.widget.RelativeLayout @@ -353,8 +354,8 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener if (currPrimaryAction == PRIMARY_ACTION_FILTER && bottom_actions_filter_list.adapter == null) { Thread { - val size = resources.getDimension(R.dimen.bottom_filters_thumbnail_height).toInt() - val bitmap = Glide.with(this).asBitmap().load(uri).submit(size, size).get() + val thumbnailSize = resources.getDimension(R.dimen.bottom_filters_thumbnail_size).toInt() + val bitmap = Glide.with(this).asBitmap().load(uri).submit(thumbnailSize, thumbnailSize).get() runOnUiThread { val filterThumbnailsManager = FilterThumbnailsManager() filterThumbnailsManager.clearThumbs() @@ -369,7 +370,14 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener val filterItems = filterThumbnailsManager.processThumbs() val adapter = FiltersAdapter(applicationContext, filterItems) { - applyFilter(it) + 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 diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt index e8dfd83ef..782412a94 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt @@ -12,7 +12,7 @@ import com.simplemobiletools.gallery.models.FilterItem import kotlinx.android.synthetic.main.editor_filter_item.view.* import java.util.* -class FiltersAdapter(val context: Context, val filterItems: ArrayList, val itemClick: (FilterItem) -> Unit) : RecyclerView.Adapter(), +class FiltersAdapter(val context: Context, val filterItems: ArrayList, val itemClick: (Int) -> Unit) : RecyclerView.Adapter(), FilterAdapterListener { private var currentSelection = filterItems.first() @@ -31,11 +31,12 @@ class FiltersAdapter(val context: Context, val filterItems: ArrayList + android:layout_marginBottom="@dimen/bottom_filters_thumbnail_size"/> diff --git a/app/src/main/res/layout/editor_filter_item.xml b/app/src/main/res/layout/editor_filter_item.xml index ff20581f1..31f6bb51d 100644 --- a/app/src/main/res/layout/editor_filter_item.xml +++ b/app/src/main/res/layout/editor_filter_item.xml @@ -8,8 +8,8 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 14367ad1f..b671eac3e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,6 +11,6 @@ 30dp 72dp 64dp - 76dp + 76dp 90dp From 624a0d5ca3fb23dcaad38664fbec710cd0ee97f8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 11:28:04 +0200 Subject: [PATCH 07/24] adding Android Photo Filters license --- app/build.gradle | 2 +- .../kotlin/com/simplemobiletools/gallery/extensions/Activity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8ff84d38f..f02837fe2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.5.3' + implementation 'com.simplemobiletools:commons:4.5.5' implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0' implementation 'com.android.support:multidex:1.0.3' implementation 'it.sephiroth.android.exif:library:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt index 6da9f30e3..43e51d825 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt @@ -76,7 +76,7 @@ fun SimpleActivity.launchAbout() { startAboutActivity(R.string.app_name, LICENSE_GLIDE or LICENSE_CROPPER or LICENSE_MULTISELECT or LICENSE_RTL or LICENSE_SUBSAMPLING or LICENSE_PATTERN or LICENSE_REPRINT or LICENSE_GIF_DRAWABLE or LICENSE_PHOTOVIEW or LICENSE_EXOPLAYER or - LICENSE_PANORAMA_VIEW or LICENSE_SANSELAN, BuildConfig.VERSION_NAME, faqItems) + LICENSE_PANORAMA_VIEW or LICENSE_SANSELAN or LICENSE_FILTERS, BuildConfig.VERSION_NAME, faqItems) } fun AppCompatActivity.showSystemUI(toggleActionBarVisibility: Boolean) { From b93ab8973106f345bd4b2aa2c35283c95da60eb1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 11:36:00 +0200 Subject: [PATCH 08/24] add an extra check to remove the empty "Favorites" folder if necessary --- .../simplemobiletools/gallery/activities/MediaActivity.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt index e16f0bfc6..5dc69d41e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt @@ -572,6 +572,13 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { deleteDirectoryIfEmpty() deleteDBDirectory() } + + if (mPath == FAVORITES) { + Thread { + galleryDB.DirectoryDao().deleteDirPath(FAVORITES) + }.start() + } + finish() true } else { From be743c1d7f86c4acbe2e7ca32528dc5f198b13cd Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 12:14:20 +0200 Subject: [PATCH 09/24] update commons to 4.5.6 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f02837fe2..bac72cccf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.5.5' + implementation 'com.simplemobiletools:commons:4.5.6' implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0' implementation 'com.android.support:multidex:1.0.3' implementation 'it.sephiroth.android.exif:library:1.0.1' From 7b2a181942ecc07eda4b7dd65eb5e9b08109b265 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 13:09:14 +0200 Subject: [PATCH 10/24] use a background thread for setting video surface --- .../com/simplemobiletools/gallery/fragments/VideoFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt index 27342d095..0cfeec9f5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt @@ -506,7 +506,9 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S } override fun onSurfaceTextureAvailable(surface: SurfaceTexture?, width: Int, height: Int) { - mExoPlayer?.setVideoSurface(Surface(mTextureView!!.surfaceTexture)) + Thread { + mExoPlayer?.setVideoSurface(Surface(mTextureView!!.surfaceTexture)) + }.start() } @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) From e4df3a0cbec7140a41d3ba64254bbe959c2e95bf Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 13:25:06 +0200 Subject: [PATCH 11/24] enable writeAheadLogging at the gallery database --- .../com/simplemobiletools/gallery/databases/GalleryDatabase.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt index 8f8df8e23..a787d3a4d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt @@ -26,6 +26,7 @@ abstract class GalleryDatabase : RoomDatabase() { db = Room.databaseBuilder(context.applicationContext, GalleryDatabase::class.java, "gallery.db") .fallbackToDestructiveMigration() .build() + db!!.openHelper.setWriteAheadLoggingEnabled(true) } } } From cce033f89ccfa7f915e2a65352865c65f0963121 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 13:27:37 +0200 Subject: [PATCH 12/24] catch out of memory exceptions at checking if image is a panorama --- .../com/simplemobiletools/gallery/fragments/PhotoFragment.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt index b181e4ebc..735b9d81e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt @@ -365,6 +365,8 @@ class PhotoFragment : ViewPagerFragment() { imageParser.contains("GPano:UsePanoramaViewer=\"True\"", true) || imageParser.contains("True", true) } catch (e: Exception) { false + } catch (e: OutOfMemoryError) { + false } view.panorama_outline.beVisibleIf(isPanorama && isLollipopPlus()) From ca5cd986f3412f04cdeaa53310952a0fdea8680e Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 14:29:51 +0200 Subject: [PATCH 13/24] catch OutOfMemoryError at getting image orientation --- .../com/simplemobiletools/gallery/fragments/PhotoFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt index 735b9d81e..4faa99247 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt @@ -389,6 +389,7 @@ class PhotoFragment : ViewPagerFragment() { orient = exif2.getTag(ExifInterface.TAG_ORIENTATION)?.getValueAsInt(defaultOrientation) ?: defaultOrientation } } catch (ignored: Exception) { + } catch (ignored: OutOfMemoryError) { } return orient } From 93751546669f2740041efdb139f157773e970723 Mon Sep 17 00:00:00 2001 From: chris-w89 <37019071+chris-w89@users.noreply.github.com> Date: Tue, 24 Jul 2018 16:06:32 +0200 Subject: [PATCH 14/24] Update german strings --- app/src/main/res/values-de/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 04c5d88e5..f099a60cf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,7 +5,7 @@ Bearbeiten Kamera öffnen (versteckt) - (ausgenohmen) + (ausgenommen) Ordner anheften Ordner loslösen Oben anheften @@ -24,7 +24,7 @@ Helligkeit Bildschirmausrichtung sperren Bildschirmausrichtung entsperren - Change orientation + Bildschirmausrichtung ändern Hochkant erzwingen Breitbild erzwingen Standard Ausrichtung benutzen @@ -84,7 +84,7 @@ Horizontal spiegeln Vertikal spiegeln Bearbeiten mit - Free + Frei Schlichter Hintergrund @@ -124,7 +124,7 @@ Ordner Zuletzt geändert Erstelldatum - Dateitype + Dateityp Extension @@ -153,19 +153,19 @@ Stark zoombare Bilder durch Bilder mit hoher Qualität ersetzen Erweiterte Details nicht anzeigen, wenn die Systemleiste versteckt ist Zusätzliche Überprüfung, um ungültige Dateien nicht anzuzeigen - Show some action buttons at the bottom of the screen - Show the Recycle Bin at the folders screen + Einige Aktionstasten am unteren Bildschirmrand anzeigen + Papierkorb auf dem Ordnerbildschirm anzeigen Thumbnails Vollbild-Medien Erweiterte Details - Bottom actions + Untere Aktionen - Manage visible bottom actions - Toggle favorite - Toggle file visibility + Sichtbare untere Aktionen verwalten + Favoriten umschalten + Schaltet die Sichtbarkeit von Dateien um Wie kann ich Schlichte Galerie als Standardanwendung auswählen? @@ -190,8 +190,8 @@ Ja, es gibt einen Schalter in den Einstellungen gekennzeichnet mit \"Stark zoombare Bilder durch Bilder mit hoher Qualität ersetzen\". Dieser wird die Bildqualität verbessern, aber sie werden bei sehr hoher Zoomstufe unscharf. Kann ich mit dieser App Bilder zuschneiden? Ja, du kannst Bilder über das Ziehen der Bildecken im Editor zuschneiden. Du gelangst zum Editor indem du lange auf ein Vorschaubild drückst und Bearbeiten auswählst oder durch Auswählen von Bearbeiten in der Vollbildansicht. - Can I somehow group media file thumbnails? - Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Kann ich Mediendatei-Thumbnails irgendwie gruppieren? + Verwenden Sie einfach den Menüeintrag "Gruppieren nach" in der Miniaturansicht. Sie können Dateien nach mehreren Kriterien gruppieren, einschließlich Aufnahmedatum. Wenn Sie die Funktion "Alle Ordnerinhalte anzeigen" verwenden, können Sie sie auch nach Ordnern gruppieren. From 81f0228c06ae8ed6bfccf54d0a2226a4deb8347d Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Tue, 24 Jul 2018 16:44:04 +0200 Subject: [PATCH 15/24] escaping some quotes --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f099a60cf..9b7608cee 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -191,7 +191,7 @@ Kann ich mit dieser App Bilder zuschneiden? Ja, du kannst Bilder über das Ziehen der Bildecken im Editor zuschneiden. Du gelangst zum Editor indem du lange auf ein Vorschaubild drückst und Bearbeiten auswählst oder durch Auswählen von Bearbeiten in der Vollbildansicht. Kann ich Mediendatei-Thumbnails irgendwie gruppieren? - Verwenden Sie einfach den Menüeintrag "Gruppieren nach" in der Miniaturansicht. Sie können Dateien nach mehreren Kriterien gruppieren, einschließlich Aufnahmedatum. Wenn Sie die Funktion "Alle Ordnerinhalte anzeigen" verwenden, können Sie sie auch nach Ordnern gruppieren. + Verwenden Sie einfach den Menüeintrag \"Gruppieren nach\" in der Miniaturansicht. Sie können Dateien nach mehreren Kriterien gruppieren, einschließlich Aufnahmedatum. Wenn Sie die Funktion "Alle Ordnerinhalte anzeigen" verwenden, können Sie sie auch nach Ordnern gruppieren. From abc267dc5c48898593db491f09e60252f4bc70fc Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Jul 2018 20:01:37 +0200 Subject: [PATCH 16/24] escaping some more quotes --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9b7608cee..80248d833 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -191,7 +191,7 @@ Kann ich mit dieser App Bilder zuschneiden? Ja, du kannst Bilder über das Ziehen der Bildecken im Editor zuschneiden. Du gelangst zum Editor indem du lange auf ein Vorschaubild drückst und Bearbeiten auswählst oder durch Auswählen von Bearbeiten in der Vollbildansicht. Kann ich Mediendatei-Thumbnails irgendwie gruppieren? - Verwenden Sie einfach den Menüeintrag \"Gruppieren nach\" in der Miniaturansicht. Sie können Dateien nach mehreren Kriterien gruppieren, einschließlich Aufnahmedatum. Wenn Sie die Funktion "Alle Ordnerinhalte anzeigen" verwenden, können Sie sie auch nach Ordnern gruppieren. + Verwenden Sie einfach den Menüeintrag \"Gruppieren nach\" in der Miniaturansicht. Sie können Dateien nach mehreren Kriterien gruppieren, einschließlich Aufnahmedatum. Wenn Sie die Funktion \"Alle Ordnerinhalte anzeigen\" verwenden, können Sie sie auch nach Ordnern gruppieren. From 452bcdbe4adc1b64af8587a7533907ecb0470c31 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 25 Jul 2018 22:11:01 +0200 Subject: [PATCH 17/24] add a menu item for fixing file Date Taken value --- .../gallery/adapters/MediaAdapter.kt | 47 +++++++++++++++++++ .../gallery/extensions/Activity.kt | 1 + app/src/main/res/menu/cab_media.xml | 4 ++ app/src/main/res/values-ar/strings.xml | 5 ++ app/src/main/res/values-ca/strings.xml | 9 +++- app/src/main/res/values-cs/strings.xml | 5 ++ app/src/main/res/values-da/strings.xml | 5 ++ app/src/main/res/values-de/strings.xml | 5 ++ app/src/main/res/values-el/strings.xml | 5 ++ app/src/main/res/values-es/strings.xml | 5 ++ app/src/main/res/values-fi/strings.xml | 5 ++ app/src/main/res/values-fr/strings.xml | 5 ++ app/src/main/res/values-gl/strings.xml | 5 ++ app/src/main/res/values-hr/strings.xml | 5 ++ app/src/main/res/values-hu/strings.xml | 5 ++ app/src/main/res/values-it/strings.xml | 5 ++ app/src/main/res/values-ja/strings.xml | 5 ++ app/src/main/res/values-ko-rKR/strings.xml | 5 ++ app/src/main/res/values-lt/strings.xml | 5 ++ app/src/main/res/values-nb/strings.xml | 5 ++ app/src/main/res/values-nl/strings.xml | 5 ++ app/src/main/res/values-pl/strings.xml | 5 ++ app/src/main/res/values-pt-rBR/strings.xml | 5 ++ app/src/main/res/values-pt/strings.xml | 5 ++ app/src/main/res/values-ru/strings.xml | 5 ++ app/src/main/res/values-sk/strings.xml | 5 ++ app/src/main/res/values-sv/strings.xml | 5 ++ app/src/main/res/values-tr/strings.xml | 5 ++ app/src/main/res/values-zh-rCN/strings.xml | 5 ++ app/src/main/res/values-zh-rTW/strings.xml | 5 ++ app/src/main/res/values/strings.xml | 5 ++ 31 files changed, 194 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt index 94b93fb71..780552920 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt @@ -1,7 +1,10 @@ package com.simplemobiletools.gallery.adapters +import android.content.ContentProviderOperation +import android.media.ExifInterface import android.os.Handler import android.os.Looper +import android.provider.MediaStore import android.view.Menu import android.view.View import android.view.ViewGroup @@ -25,6 +28,9 @@ import com.simplemobiletools.gallery.models.ThumbnailItem import com.simplemobiletools.gallery.models.ThumbnailSection import kotlinx.android.synthetic.main.photo_video_item_grid.view.* import kotlinx.android.synthetic.main.thumbnail_section.view.* +import java.lang.Exception +import java.text.SimpleDateFormat +import java.util.* class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList, val listener: MediaOperationsListener?, val isAGetIntent: Boolean, val allowMultiplePicks: Boolean, recyclerView: MyRecyclerView, fastScroller: FastScroller? = null, itemClick: (Any) -> Unit) : @@ -32,6 +38,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList copyMoveTo(false) R.id.cab_select_all -> selectAll() R.id.cab_open_with -> activity.openPath(getCurrentPath(), true) + R.id.cab_fix_date_taken -> fixDateTaken() R.id.cab_set_as -> activity.setAs(getCurrentPath()) R.id.cab_delete -> checkDeleteConfirmation() } @@ -279,6 +287,45 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList() + val paths = getSelectedPaths() + for (path in paths) { + val dateTime = ExifInterface(path).getAttribute(ExifInterface.TAG_DATETIME) ?: continue + val format = "yyyy:MM:dd kk:mm:ss" + val formatter = SimpleDateFormat(format, Locale.getDefault()) + val timestamp = formatter.parse(dateTime).time + + val uri = activity.getFileUri(path) + ContentProviderOperation.newUpdate(uri).apply { + val selection = "${MediaStore.Images.Media.DATA} = ?" + val selectionArgs = arrayOf(path) + withSelection(selection, selectionArgs) + withValue(MediaStore.Images.Media.DATE_TAKEN, timestamp) + operations.add(build()) + } + + if (operations.size % BATCH_SIZE == 0) { + activity.contentResolver.applyBatch(MediaStore.AUTHORITY, operations) + operations.clear() + } + } + + activity.contentResolver.applyBatch(MediaStore.AUTHORITY, operations) + activity.toast(R.string.dates_fixed_successfully) + activity.runOnUiThread { + listener?.refreshItems() + finishActMode() + } + } catch (e: Exception) { + activity.showErrorToast(e) + } + }.start() + } + private fun checkDeleteConfirmation() { if (config.tempSkipDeleteConfirmation || config.skipDeleteConfirmation) { deleteFiles() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt index 43e51d825..47dbf2d84 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt @@ -72,6 +72,7 @@ fun SimpleActivity.launchAbout() { FAQItem(R.string.faq_9_title, R.string.faq_9_text), FAQItem(R.string.faq_10_title, R.string.faq_10_text), FAQItem(R.string.faq_11_title, R.string.faq_11_text), + FAQItem(R.string.faq_12_title, R.string.faq_12_text), FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)) startAboutActivity(R.string.app_name, LICENSE_GLIDE or LICENSE_CROPPER or LICENSE_MULTISELECT or LICENSE_RTL diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml index bda7d9e31..26033fad3 100644 --- a/app/src/main/res/menu/cab_media.xml +++ b/app/src/main/res/menu/cab_media.xml @@ -60,6 +60,10 @@ android:id="@+id/cab_restore_recycle_bin_files" android:title="@string/restore_selected_files" app:showAsAction="never"/> + Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully فلتر الميديا @@ -194,6 +197,8 @@ نعم ، يمكنك اقتصاص الصور في المحرر ، عن طريق سحب زوايا الصورة. يمكنك الوصول إلى المحرر إما عن طريق الضغط لفترة طويلة على صورة مصغرة وتحديد تحرير ، أو تحديد تحرير من العرض بملء الشاشة. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 4bc9dd3ae..88597b80a 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -28,6 +28,9 @@ Forçar vertical Forçar horitzontal Fer servir la orientació per defecte + Fix Date Taken value + Fixing… + Dates fixed successfully Filtre d\'arxius @@ -192,6 +195,8 @@ Sí, pots retallar imatges a l\'editor, arrossegant les cantonades de la imatge. Pots accedir a l\'editor prement una miniatura d\'imatge i seleccionant Edita o seleccionant Edita des de la visualització de pantalla completa. Puc agrupar d\'alguna manera les miniatures del fitxer multimèdia? Si, només heu d\'utilitzar l\'ítem del menú \"Agrupar per\" mentre es troba a la vista en miniatura. Podeu agrupar fitxers amb diversos criteris, inclòs data de presa. Si utilitzeu la funció \"Mostra el contingut de totes les carpetes\", també podeu agrupar-les per carpetes. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". @@ -199,9 +204,9 @@ Una eina senzilla que es pot fer servir per veure imatges i vídeos. Els elements es poden ordenar per data, mida o nom, tant ascendent com descendent. Es pot fer zoom a les imatges. Els arxius de mitjans es mostren en múltiples columnes depenent de la mida de la pantalla i es pot canviar el número de columnes mitjançant gestos. Permet canviar el nom, compartir, esborrar, i moure. Les imatges també es poden retalla, rotar o utilitzar com a fons de pantalla directament des de l\'aplicació. - Gallery també s'ofereix per us de tercers, per visualitzar imatges/vídeos, agregar adjunts a clients de correu, etc. Es perfecta per l\'ús diari. + Gallery també s\'ofereix per us de tercers, per visualitzar imatges/vídeos, agregar adjunts a clients de correu, etc. Es perfecta per l\'ús diari. - El permís d\'empremtes dactilars és necessari per bloquejar la visibilitat d'elements ocults o tota l\'aplicació. + El permís d\'empremtes dactilars és necessari per bloquejar la visibilitat d\'elements ocults o tota l\'aplicació. No conté ni publicitat ni permisos innecessaris. Es totalment Lliure i proporciona colors personalitzables. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f6d433af3..f6884c948 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filter media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0615f60e3..7caf6d01a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrer medier @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 80248d833..53bf36786 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -28,6 +28,9 @@ Hochkant erzwingen Breitbild erzwingen Standard Ausrichtung benutzen + Fix Date Taken value + Fixing… + Dates fixed successfully Filter @@ -192,6 +195,8 @@ Ja, du kannst Bilder über das Ziehen der Bildecken im Editor zuschneiden. Du gelangst zum Editor indem du lange auf ein Vorschaubild drückst und Bearbeiten auswählst oder durch Auswählen von Bearbeiten in der Vollbildansicht. Kann ich Mediendatei-Thumbnails irgendwie gruppieren? Verwenden Sie einfach den Menüeintrag \"Gruppieren nach\" in der Miniaturansicht. Sie können Dateien nach mehreren Kriterien gruppieren, einschließlich Aufnahmedatum. Wenn Sie die Funktion \"Alle Ordnerinhalte anzeigen\" verwenden, können Sie sie auch nach Ordnern gruppieren. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 43e7d8ef8..35b67555f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Φιλτράρισμα πολυμέσων @@ -191,6 +194,8 @@ Ναι. Υπάρχει ένας διακόπτης στις Ρυθμίσεις με το κείμενο \"Αντικατάσταση των φωτογραφιών που απαιτούν ζούμ με άλλες καλύτερης ποιότητας\". Μπορείτε να χρησιμοποιήσετε αυτό. Θα βελτιώσει την ποιότητα των φωτογραφιών, αλλά θα θολώσουν στο μεγάλο ζουμ. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 31f612e1f..0fff9f75a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -28,6 +28,9 @@ Forzar retrato Forzar paisaje Usar la orientación por defecto + Fix Date Taken value + Fixing… + Dates fixed successfully Filtro de medios @@ -192,6 +195,8 @@ Sí, puede recortar imágenes en el editor arrastrando las esquinas de la imagen. Puede acceder al editor pulsando prolongadamente una imagen en miniatura y seleccionando Editar, o seleccionando Editar en la vista de pantalla completa. ¿Puedo de alguna manera agrupar miniaturas de archivos multimedia? Claro, solo use el elemento de menú \"Agrupar por \" mientras esté en la vista de miniaturas. Puede agrupar archivos según varios criterios, incluida la Fecha de toma. Si usa la función \"Mostrar todo el contenido de las carpetas\" también puede agruparlas por carpetas. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b9c3fd0ce..de53e5492 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Suodata media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f846d815c..dc5f31733 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrer les médias @@ -191,6 +194,8 @@ Oui, vous pouvez recadrer les images dans l\'éditeur en faisant glisser les coins de l\'image. Vous pouvez accéder à l\'éditeur en appuyant longuement sur une vignette d\'image et en sélectionnant Modifier, ou en sélectionnant Modifier en mode plein écran. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index fb3ea2570..70490384b 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrar medios @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 922a3ce86..15180ae8e 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtriranje medija @@ -192,6 +195,8 @@ Da, možete obrezati slike u uređivaču povlačenjem uglova. Možete doći do uređivača dugim pritiskom na minijaturu slike i odabirom Uređivanje ili odabirom Uredi iz prikaza preko cijelog zaslona. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index fb4eb29db..994b4544e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filter media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index df170a074..15dfb6bc3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -28,6 +28,9 @@ Forza verticale Forza orizzontale Usa l\'orientamento predefinito + Fix Date Taken value + Fixing… + Dates fixed successfully Filtra i media @@ -192,6 +195,8 @@ Sì, puoi ritagliare le immagini nell\'editor, trascinando gli angoli dell\'immagine. Puoi usare l\'editor sia premendo a lungo la miniatura di un\'immagine e selezionando Modifica, o selezionando Modifica mentre la vedi a schermo intero. Posso raggruppare in qualche modo le miniature dei file? Certo, usa il menu \"Raggruppa per\" mentre visualizzi le miniature. Puoi raggruppare i file con diversi criteri, incluso la data di creazione. Se utilizzi la funzione \"Mostra tutti i contenuti\" puoi anche raggrupparli per cartelle. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a9b209b0d..87ac44d5a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -28,6 +28,9 @@ 縦で固定 横で固定 デフォルト仕様 + Fix Date Taken value + Fixing… + Dates fixed successfully 表示する形式 @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 9d4cc89fe..b1f627ab9 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully 미디어 필터 설정 @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 44d6f6ac0..4252465cd 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtruoti mediją @@ -192,6 +195,8 @@ Taip, redaguodami vaizdus, galite juos apkarpyti, vilkdami vaizdo kampus. Galite patekti į redaktorių ilgai paspaudę vaizdo miniatiūrą ir pasirinkę "Redaguoti" arba iš viso ekrano rodinio pasirinkę "Redaguoti". Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2d21ba305..412809ce1 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrer media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cad80158a..cc848c5e3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -28,6 +28,9 @@ Portretmodus forceren Landschapsmodus forceren Standaardmodus gebruiken + Fix Date Taken value + Fixing… + Dates fixed successfully Media filteren @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ed6d9d6d9..f6c38477f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -28,6 +28,9 @@ Wymuś pionową Wymuś poziomą Używaj systemowej + Fix Date Taken value + Fixing… + Dates fixed successfully Filtruj multimedia @@ -190,6 +193,8 @@ Tak, możesz to zrobić w edytorze, przeciągając krawędzie obrazu. Edytor otworzysz przytrzymując miniaturę obrazu i wybierając opcję \'Edytuj\', bądź wybierając tą samą opcję w menu pełnoekranowym. Czy mogę jakoś grupować miniatury plików? Tak. Użyj opcji \'Grupuj według\', gdy jesteś w widoku miniatur. Grupować je możesz według wielu kryteriów, włącznie z datą ich utworzenia. Ponadto, jeśli użyjesz opcji \'Pokazuj całą zawartość folderów\', możesz je także grupować według folderów. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index fee389a29..44028df83 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrar mídia @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 539afb935..23226010d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrar multimédia @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4f2e66c6a..832a53da5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -28,6 +28,9 @@ Всегда портретная Всегда альбомная Не менять ориентацию + Fix Date Taken value + Fixing… + Dates fixed successfully Фильтр медиа @@ -192,6 +195,8 @@ Да, вы можете обрезать изображения в редакторе, перетаскивая за углы. К редактированию можно перейти, выбрав соответсвующий пункт в меню, открывающемуся длительным нажатием на миниатюру или изображение в полноэкранном режиме. Могу ли я как-то сгруппировать миниатюры медиафайлов? Конечно, просто используйте пункт меню \"Группировать по…\" во время просмотра миниатюр. Вы можете группировать файлы по нескольким критериям, включая дату съёмки. Если вы используете функцию \"Отобразить все медиафайлы\", то также можете группировать их по папкам. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 8a599c80a..5bb5d7536 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -28,6 +28,9 @@ Vynútiť orientáciu na výšku Vynútiť orientáciu na šírku Použiť predvolenú orientáciu + Opraviť dátum vytvorenia + Opravuje sa… + Dátumy boli úspešne opravené Filter médií @@ -192,6 +195,8 @@ Áno, orezanie je možné v editore, potiahnutím rohov obrázkov. Do editoru sa môžete dostať buď dlhým podržaním náhľadu obrázku a zvolením menu položky Upraviť, alebo zvolením Upraviť pri celoobrazovkovom režime. Viem nejakým spôsobom zoskupiť náhľady súborov? Áno, použitím funkcie \"Zoskupiť podľa\" na menu obrazovky s náhľadmi. Zoskupenie je možné na základe rozličných kritérií vrátane Dátumu vytvorenia. Ak použijete funkciu \"Zobraziť obsah všetkých priečinkov\", viete ich zoskupiť aj podľa priečinkov. + Radenie podľa dátumu vytvorenia nefunguje správne, ako ho viem opraviť? + Je to pravdepodobne spôsobené kopírovaním súborov. Viete to opraviť označením jednotlivých náhľadov súborov a zvoliť \"Opraviť dátum vytvorenia\". diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 47c17d58e..fc4b4e294 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filtrera media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ea4a9b010..9bf18310a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filter media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fcc89dda8..32b143cba 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully 要显示的媒体文件 @@ -190,6 +193,8 @@ 当然，通过长按图片缩略图并选择编辑，或在全屏视图中选择编辑来打开编辑器。你可以通过拖动图片边角来剪裁图像。 我能将媒体文件缩略图分组吗？ 当然，只需在缩略图视图中使用\"分组依据\"菜单项即可。您可以依据多个条件对文件进行分组，包括拍摄日期。如果您使用了\"显示所有文件夹内容\"功能，则可以按文件夹对它们进行分组。 + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f46e200a7..21415b300 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -28,6 +28,9 @@ 強制直向 強制橫向 使用預設方向 + Fix Date Taken value + Fixing… + Dates fixed successfully 篩選媒體檔案 @@ -192,6 +195,8 @@ 是的，你能夠在編輯器內拉動圖片角落來裁剪圖片。要進入編輯器，你可以長按圖片縮圖然後選擇[編輯]，或是在全螢幕檢視下選擇[編輯]。 我可以歸類媒體檔案的縮圖嗎? 當然，只要在縮圖瀏覽中使用[歸類]選單項目就可以了。你能依多種條件歸類檔案，包含拍照日期。如果你使用了[資料夾內容全部顯示]功能，你還能以資料夾來歸類。 + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6ea4fa6b4..79e076e58 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,6 +28,9 @@ Force portrait Force landscape Use default orientation + Fix Date Taken value + Fixing… + Dates fixed successfully Filter media @@ -192,6 +195,8 @@ Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. Can I somehow group media file thumbnails? Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. + Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? + It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". From 6e62039ae473b48600b224aca83655cfa7f8d76e Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 25 Jul 2018 22:29:14 +0200 Subject: [PATCH 18/24] do not update the directories arraylist right after deleting items --- .../com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt index 37de4495f..8eb2f8e39 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt @@ -423,7 +423,6 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Wed, 25 Jul 2018 23:45:08 +0200 Subject: [PATCH 19/24] update commons to 4.5.10 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index bac72cccf..5e9dc165b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.5.6' + implementation 'com.simplemobiletools:commons:4.5.10' implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0' implementation 'com.android.support:multidex:1.0.3' implementation 'it.sephiroth.android.exif:library:1.0.1' From 8d7366d22890c88c7c75c8871c056ed8add12cd6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 26 Jul 2018 12:56:14 +0200 Subject: [PATCH 20/24] fix #870, do not release exoPlayer on surface destroy --- .../com/simplemobiletools/gallery/fragments/VideoFragment.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt index 0cfeec9f5..5b5ce0d04 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt @@ -500,10 +500,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S override fun onSurfaceTextureUpdated(surface: SurfaceTexture?) {} - override fun onSurfaceTextureDestroyed(surface: SurfaceTexture?): Boolean { - releaseExoPlayer() - return false - } + override fun onSurfaceTextureDestroyed(surface: SurfaceTexture?) = false override fun onSurfaceTextureAvailable(surface: SurfaceTexture?, width: Int, height: Int) { Thread { From a8ea2ddbd885877e0e560903f84a71f829c820ce Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 26 Jul 2018 13:04:24 +0200 Subject: [PATCH 21/24] fix #837, add an extra check to make sure bin files are restoring properly --- .../com/simplemobiletools/gallery/extensions/Activity.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt index 47dbf2d84..7ea8421e2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt @@ -236,7 +236,9 @@ fun BaseSimpleActivity.restoreRecycleBinPaths(paths: ArrayList, callback out = getFileOutputStreamSync(destination, source.getMimeType()) inputStream = getFileInputStreamSync(source)!! inputStream.copyTo(out!!) - mediumDao.updateDeleted(destination, 0) + if (File(source).length() == File(destination).length()) { + mediumDao.updateDeleted(destination, 0) + } } catch (e: Exception) { showErrorToast(e) } finally { From 61d83750aa714637b5244c15227c7f79aebcce44 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 26 Jul 2018 14:01:51 +0200 Subject: [PATCH 22/24] disable recycle bin showing if the user tries to hide or exclude it --- .../gallery/adapters/DirectoryAdapter.kt | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt index 8eb2f8e39..d10ee9244 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt @@ -192,7 +192,16 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList Date: Thu, 26 Jul 2018 14:06:50 +0200 Subject: [PATCH 23/24] update version to 4.4.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5e9dc165b..41d150111 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.simplemobiletools.gallery" minSdkVersion 16 targetSdkVersion 27 - versionCode 187 - versionName "4.3.5" + versionCode 188 + versionName "4.4.0" multiDexEnabled true setProperty("archivesBaseName", "gallery") } From 64f27e155c7ecc0e29824961ae518881b11f8ea3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 26 Jul 2018 14:06:56 +0200 Subject: [PATCH 24/24] updating changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c72acc511..9337e8609 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ Changelog ========== +Version 4.4.0 *(2018-07-26)* +---------------------------- + + * Reworked the editor, added some filters + * Allow hiding the Recycle Bin from the main screen folders + * Added a menu item for fixing file Date Taken + * Fixed some glitches around recycle bin item restoring + * Fixed some issues with video playback on resume + * Many other UX and stability improvements + Version 4.3.5 *(2018-07-17)* ----------------------------