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 e4aaa8ad2..e8d13e7fb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -157,6 +157,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
menu.apply {
findItem(R.id.hide_folder).isVisible = !isFolderHidden && !mShowAll
findItem(R.id.unhide_folder).isVisible = isFolderHidden && !mShowAll
+ findItem(R.id.exclude_folder).isVisible = !mShowAll
findItem(R.id.folder_view).isVisible = mShowAll
findItem(R.id.open_camera).isVisible = mShowAll
@@ -262,7 +263,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
}
private fun setupAdapter() {
- if (isDirEmpty()) {
+ if (!mShowAll && isDirEmpty()) {
return
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index 6a32c732a..ad9dc2043 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -57,6 +57,7 @@ class SettingsActivity : SimpleActivity() {
setupShowMediaCount()
setupKeepLastModified()
setupShowInfoBubble()
+ setupOneFingerZoom()
setupShowExtendedDetails()
setupManageExtendedDetails()
updateTextColors(settings_holder)
@@ -272,27 +273,14 @@ class SettingsActivity : SimpleActivity() {
}
}
- private fun setupScreenRotation() {
- settings_screen_rotation.text = getScreenRotationText()
- settings_screen_rotation_holder.setOnClickListener {
- val items = arrayListOf(
- RadioItem(ROTATE_BY_SYSTEM_SETTING, res.getString(R.string.screen_rotation_system_setting)),
- RadioItem(ROTATE_BY_DEVICE_ROTATION, res.getString(R.string.screen_rotation_device_rotation)),
- RadioItem(ROTATE_BY_ASPECT_RATIO, res.getString(R.string.screen_rotation_aspect_ratio)))
-
- RadioGroupDialog(this@SettingsActivity, items, config.screenRotation) {
- config.screenRotation = it as Int
- settings_screen_rotation.text = getScreenRotationText()
- }
+ private fun setupOneFingerZoom() {
+ settings_one_finger_zoom.isChecked = config.oneFingerZoom
+ settings_one_finger_zoom_holder.setOnClickListener {
+ settings_one_finger_zoom.toggle()
+ config.oneFingerZoom = settings_one_finger_zoom.isChecked
}
}
- private fun getScreenRotationText() = getString(when (config.screenRotation) {
- ROTATE_BY_SYSTEM_SETTING -> R.string.screen_rotation_system_setting
- ROTATE_BY_DEVICE_ROTATION -> R.string.screen_rotation_device_rotation
- else -> R.string.screen_rotation_aspect_ratio
- })
-
private fun setupShowExtendedDetails() {
settings_show_extended_details.isChecked = config.showExtendedDetails
settings_show_extended_details_holder.setOnClickListener {
@@ -312,4 +300,25 @@ class SettingsActivity : SimpleActivity() {
}
}
}
+
+ private fun setupScreenRotation() {
+ settings_screen_rotation.text = getScreenRotationText()
+ settings_screen_rotation_holder.setOnClickListener {
+ val items = arrayListOf(
+ RadioItem(ROTATE_BY_SYSTEM_SETTING, res.getString(R.string.screen_rotation_system_setting)),
+ RadioItem(ROTATE_BY_DEVICE_ROTATION, res.getString(R.string.screen_rotation_device_rotation)),
+ RadioItem(ROTATE_BY_ASPECT_RATIO, res.getString(R.string.screen_rotation_aspect_ratio)))
+
+ RadioGroupDialog(this@SettingsActivity, items, config.screenRotation) {
+ config.screenRotation = it as Int
+ settings_screen_rotation.text = getScreenRotationText()
+ }
+ }
+ }
+
+ private fun getScreenRotationText() = getString(when (config.screenRotation) {
+ ROTATE_BY_SYSTEM_SETTING -> R.string.screen_rotation_system_setting
+ ROTATE_BY_DEVICE_ROTATION -> R.string.screen_rotation_device_rotation
+ else -> R.string.screen_rotation_aspect_ratio
+ })
}
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 eecaff05c..7bdff57d6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -246,7 +246,7 @@ class PhotoFragment : ViewPagerFragment() {
view.subsampling_view.apply {
maxScale = 10f
beVisible()
- isQuickScaleEnabled = false
+ isQuickScaleEnabled = context.config.oneFingerZoom
setImage(ImageSource.uri(medium.path))
orientation = if (orient == -1) SubsamplingScaleImageView.ORIENTATION_USE_EXIF else degreesForRotation(orient)
setOnImageEventListener(object : SubsamplingScaleImageView.OnImageEventListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index e54d51918..e294f6da1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -168,6 +168,10 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(getDirectoryColumnsField(), getDefaultDirectoryColumnCount())
set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply()
+ var oneFingerZoom: Boolean
+ get() = prefs.getBoolean(ONE_FINGER_ZOOM, false)
+ set(oneFingerZoom) = prefs.edit().putBoolean(ONE_FINGER_ZOOM, oneFingerZoom).apply()
+
private fun getDirectoryColumnsField(): String {
val isPortrait = context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
return if (isPortrait) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
index 7318c6d9e..cf5bd0fa3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -43,6 +43,7 @@ val VIEW_TYPE_FILES = "view_type_files"
val SHOW_EXTENDED_DETAILS = "show_extended_details"
val EXTENDED_DETAILS = "extended_details"
val LAST_FILE_CLEANUP = "last_file_cleanup"
+val ONE_FINGER_ZOOM = "one_finger_zoom"
// slideshow
val SLIDESHOW_INTERVAL = "slideshow_interval"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 8ec33b33f..9dfdfacac 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -447,6 +447,26 @@
+
+
+
+
+
+
-
استبدال خيار المشاركة مع خيار تدوير في القائمة ملء الشاشة
عرض تفاصيل موسعة على وسائط ملء الشاشة
إدارة المجلدات المستبعدة
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6fbfd736d..4fdbd20e9 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -131,6 +131,7 @@
Reemplaçar Compartir per Girar al menú de pantalla complerta
Mostrar detalls estesos sobre mitjans a pantalla complerta
Gestioneu els detalls ampliats
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e81d248ca..a21f7f1cc 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -131,6 +131,7 @@
Replace Share with Rotate at fullscreen menu
Show extended details over fullscreen media
Manage extended details
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8eb02ea43..fe08c5670 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -131,6 +131,7 @@
Teilen/Drehen im Vollbild-Menü vertauschen
Eigenschaften anzeigen im Vollbild
Eigenschaften auswählen
+ Erlaube Ein-Finger-Zoom im Vollbild
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ff2b8cc85..bd2951f78 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -131,6 +131,7 @@
Reemplazar Compartir con Girar en el menú de pantalla completa
Mostrar detalles extendidos sobre medios en pantalla completa
Administrar detalles ampliados
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 85e95f0bc..a30a45fc7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -131,6 +131,7 @@
Korvaa jakaminen kääntämisellä koko näytön tilassa
Show extended details over fullscreen media
Manage extended details
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 752ad5b36..8397e54da 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -131,6 +131,7 @@
Remplacer Partager par Pivoter si menu en plein écran
Afficher les détails supplémentaires par dessus le média en plein écran
Gérer les détails supplémentaires
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 495ef8805..f21816bec 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -131,6 +131,7 @@
Substituír Compartir con Rotar no menú de pantalla completa
Mostrar información pormenorizada sobre medios a pantalla completa
Xestionar información polo miúdo
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 1daa0f95c..9eb2d8e13 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -131,6 +131,7 @@
Zamjeni Dijeli s Rotiraj pri pregledu datoteka
Prikaži detaljne informacije pri pregledu datoteka
Upravljaj detaljnim informacijama
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 27062d5f2..ea1320d45 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -131,6 +131,7 @@
Replace Share with Rotate at fullscreen menu
Show extended details over fullscreen media
Manage extended details
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c7c9de3a2..ec978160c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -131,6 +131,7 @@
Sostituisci Condividi con Ruota a schermo intero
Mostra informazioni estese su media a schermo intero
Gestisci le informazioni estese
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c60664609..6fb2c015a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -131,6 +131,7 @@
フルスクリーンメニューの「共有」を「回転」に置き換える
Show extended details over fullscreen media
Manage extended details
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 234beda2e..d07e4c6a5 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -131,6 +131,7 @@
전체화면 메뉴의 공유 아이콘을 회전 아이콘으로 변경
전체화면 모드에서 세부정보 표시
확장된 세부정보 관리
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 1bc8a79e2..df73c1423 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -131,6 +131,7 @@
Erstatt Del med Roter i meny ved mediavisning
Vis flere detaljer i mediavisningen
Velg detaljer
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8d20e5487..b7259b32f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -131,6 +131,7 @@
Menu-item Draaien vastzetten in volledige weergave (in plaats van Delen)
Uitgebreide informatie tonen in volledige weergave
Uitgebreide informatie
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ff8e14e79..f86a8195c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -131,6 +131,7 @@
Zamień funkcję udostępniania na obracanie w menu pełnoekranowym
Dodatkowe szczegóły przy podglądzie pełnoekranowym
Zarządzaj dodatkowymi szczegółami
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fc4889351..2ba181d63 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -131,6 +131,7 @@
Substituir botão "Compartilhar" por "Rotação de tela" quando em tela cheia
Exibir detalhes extendidos quando em tela cheia
Gerenciar detalhes extendidos
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 539dcfedc..cb9013d1c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -131,6 +131,7 @@
Substituir a opção Partilhar pela opção Rodar se em ecrã completo
Mostrar detalhes se em ecrã completo
Gerir detalhes exibidos
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 00b1485d9..bbaebfbcf 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -131,6 +131,7 @@
Заменить \"Поделиться\" на \"Повернуть\" в меню полноэкранного режима
Показывать детали файла
Выбрать детали файла
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 585018d33..c99b6ecfc 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -131,6 +131,7 @@
Nahradiť Zdieľanie s Otočením v celoobrazovkovom menu
Zobraziť rozšírené vlastnosti ponad celoobrazovkové médiá
Spravovať rozšírené vlastnosti
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f6543ede7..743b21321 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -131,6 +131,7 @@
Ersätt Dela med Rotera i helskärmsmenyn
Visa utökad information över media i helskärmsläge
Hantera utökad information
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d4110b108..32195d8be 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -131,6 +131,7 @@
Replace Share with Rotate at fullscreen menu
Show extended details over fullscreen media
Manage extended details
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 941581760..c08640744 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -7,7 +7,7 @@
(隐藏)
锁定目录
解除锁定目录
- Pin to the top
+ 锁定到顶部
文件视图
所有目录
目录视图
@@ -131,6 +131,7 @@
替换全屏时菜单栏的“分享”为“旋转”
全屏浏览媒体时显示详细信息
要显示的详细信息项目
+ 单指缩放
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 19550daf9..91fc82f8d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -131,6 +131,7 @@
將全螢幕選單的分享取代為旋轉
全螢幕時顯示詳細資訊
管理詳細資訊
+ Allow one finger zoom at fullscreen media
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d241e4961..29d275ace 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -131,6 +131,7 @@
Replace Share with Rotate at fullscreen menu
Show extended details over fullscreen media
Manage extended details
+ Allow one finger zoom at fullscreen media
diff --git a/screenshots/app.jpg b/screenshots/app.jpg
index b94084498..6ad6c5a78 100644
Binary files a/screenshots/app.jpg and b/screenshots/app.jpg differ
diff --git a/screenshots/app_2.jpg b/screenshots/app_2.jpg
index 684f3d19e..9c3f1883c 100644
Binary files a/screenshots/app_2.jpg and b/screenshots/app_2.jpg differ
diff --git a/screenshots/app_3.jpg b/screenshots/app_3.jpg
index 9be7f39f4..4d8bd9a12 100644
Binary files a/screenshots/app_3.jpg and b/screenshots/app_3.jpg differ
diff --git a/screenshots/app_4.jpg b/screenshots/app_4.jpg
index ef66891d0..30c7aec25 100644
Binary files a/screenshots/app_4.jpg and b/screenshots/app_4.jpg differ
diff --git a/screenshots/app_5.jpg b/screenshots/app_5.jpg
index 061aa7e6f..f4298c2fa 100644
Binary files a/screenshots/app_5.jpg and b/screenshots/app_5.jpg differ
diff --git a/screenshots/app_6.jpg b/screenshots/app_6.jpg
index 984381c01..0507ca9db 100644
Binary files a/screenshots/app_6.jpg and b/screenshots/app_6.jpg differ
diff --git a/screenshots/tablet-10.jpg b/screenshots/tablet-10.jpg
index 2ad593ae0..ac60bce67 100644
Binary files a/screenshots/tablet-10.jpg and b/screenshots/tablet-10.jpg differ
diff --git a/screenshots/tablet-7.jpg b/screenshots/tablet-7.jpg
index ffa5183b7..a17c6e5e9 100644
Binary files a/screenshots/tablet-7.jpg and b/screenshots/tablet-7.jpg differ