From 2c48df109ac033983d32cea8597d2aa863ec010b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 19 Mar 2017 19:02:59 +0100 Subject: [PATCH] minor edits --- .../simplemobiletools/gallery/models/Directory.kt | 14 +++++++------- app/src/main/res/values/donottranslate.xml | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt index 671ea34c6..6101f80fd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt @@ -18,25 +18,25 @@ data class Directory(val path: String, val thumbnail: String, val name: String, } override fun compareTo(other: Directory): Int { - var res: Int + var result: Int if (sorting and SORT_BY_NAME != 0) { - res = name.toLowerCase().compareTo(other.name.toLowerCase()) + result = name.toLowerCase().compareTo(other.name.toLowerCase()) } else if (sorting and SORT_BY_SIZE != 0) { - res = if (size == other.size) + result = if (size == other.size) 0 else if (size > other.size) 1 else -1 } else if (sorting and SORT_BY_DATE_MODIFIED != 0) { - res = if (date_modified == other.date_modified) + result = if (date_modified == other.date_modified) 0 else if (date_modified > other.date_modified) 1 else -1 } else { - res = if (date_taken == other.date_taken) + result = if (date_taken == other.date_taken) 0 else if (date_taken > other.date_taken) 1 @@ -45,8 +45,8 @@ data class Directory(val path: String, val thumbnail: String, val name: String, } if (sorting and SORT_DESCENDING != 0) { - res *= -1 + result *= -1 } - return res + return result } } diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 1a25756e8..618fc3cf5 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -34,7 +34,8 @@ Added an option to loop videos automatically Added more color customization options\n - Your settings have been cleared, please reset them + Your settings have been cleared, please reset them + Allow changing the column count with pinch gestures Added an option to display images or videos only Added a Select all button at selecting media and folders