diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index bef563799..9bad22a9b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ github: [tibbi] patreon: tiborkaputa -custom: ["https://www.paypal.me/SimpleMobileTools", "https://www.simplemobiletools.com/donate"] +custom: ["https://www.paypal.com/paypalme/simplemobiletools", "https://www.simplemobiletools.com/donate"] diff --git a/CHANGELOG.md b/CHANGELOG.md index 38dadd51b..d75fcddde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ Changelog ========== +Version 6.17.3 *(2020-11-10)* +---------------------------- + + * Properly update the folder thumbnail text colors + +Version 6.17.2 *(2020-11-09)* +---------------------------- + + * Adding some folder thumbnail customization at the app settings + * Allow setting a default folder to be opened at app launch (by roland-kister) + * Updated the photo editor to fix some glitches + Version 6.17.1 *(2020-11-03)* ---------------------------- diff --git a/app/build.gradle b/app/build.gradle index f8424da7e..f234f2bf7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 326 - versionName "6.17.1" + versionCode 328 + versionName "6.17.3" setProperty("archivesBaseName", "gallery-$versionCode") vectorDrawables.useSupportLibrary = true } @@ -77,11 +77,11 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.31.19' + implementation 'com.simplemobiletools:commons:5.31.29' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' implementation 'com.google.vr:sdk-panowidget:1.180.0' implementation 'com.google.vr:sdk-videowidget:1.180.0' 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 42ef17836..90d71645a 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 @@ -82,9 +82,9 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private var mStoredAnimateGifs = true private var mStoredCropThumbnails = true private var mStoredScrollHorizontally = true - private var mStoredShowMediaCount = true private var mStoredTextColor = 0 private var mStoredPrimaryColor = 0 + private var mStoredStyleString = "" override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -92,6 +92,8 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { appLaunched(BuildConfig.APPLICATION_ID) if (savedInstanceState == null) { + openDefaultFolder() + config.temporarilyShowHidden = false config.tempSkipDeleteConfirmation = false removeTempFolder() @@ -174,10 +176,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { getRecyclerAdapter()?.updateCropThumbnails(config.cropThumbnails) } - if (mStoredShowMediaCount != config.showMediaCount) { - getRecyclerAdapter()?.updateShowMediaCount(config.showMediaCount) - } - if (mStoredScrollHorizontally != config.scrollHorizontally) { mLoadedInitialPhotos = false directories_grid.adapter = null @@ -194,6 +192,11 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { directories_horizontal_fastscroller.updatePrimaryColor() } + val styleString = "${config.folderStyle}${config.showFolderMediaCount}${config.limitFolderTitle}" + if (mStoredStyleString != styleString) { + setupAdapter(mDirs, forceRecreate = true) + } + directories_horizontal_fastscroller.updateBubbleColors() directories_vertical_fastscroller.updateBubbleColors() directories_refresh_layout.isEnabled = config.enablePullToRefresh @@ -283,6 +286,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { findItem(R.id.reduce_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt > 1 findItem(R.id.hide_the_recycle_bin).isVisible = useBin && config.showRecycleBinAtFolders findItem(R.id.show_the_recycle_bin).isVisible = useBin && !config.showRecycleBinAtFolders + findItem(R.id.set_as_default_folder).isVisible = !config.defaultFolder.isEmpty() setupSearch(this) } } @@ -308,6 +312,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { R.id.hide_the_recycle_bin -> toggleRecycleBin(false) R.id.increase_column_count -> increaseColumnCount() R.id.reduce_column_count -> reduceColumnCount() + R.id.set_as_default_folder -> setAsDefaultFolder() R.id.settings -> launchSettings() R.id.about -> launchAbout() else -> return super.onOptionsItemSelected(item) @@ -332,9 +337,9 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { mStoredAnimateGifs = animateGifs mStoredCropThumbnails = cropThumbnails mStoredScrollHorizontally = scrollHorizontally - mStoredShowMediaCount = showMediaCount mStoredTextColor = textColor mStoredPrimaryColor = primaryColor + mStoredStyleString = "$folderStyle$showFolderMediaCount$limitFolderTitle" } } @@ -660,16 +665,36 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private fun calculateContentWidth(directories: ArrayList) { val layoutManager = directories_grid.layoutManager as MyGridLayoutManager - val thumbnailWidth = layoutManager.getChildAt(0)?.width ?: 0 - val fullWidth = ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailWidth + + val fullWidth = if (config.folderStyle == FOLDER_STYLE_SQUARE) { + val thumbnailWidth = layoutManager.getChildAt(0)?.width ?: 0 + ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailWidth + } else { + val thumbnailWidth = (layoutManager.getChildAt(0)?.width ?: 0) + resources.getDimension(R.dimen.medium_margin).toInt() * 2 + val columnCount = (directories.size - 1) / layoutManager.spanCount + 1 + columnCount * thumbnailWidth + } + directories_horizontal_fastscroller.setContentWidth(fullWidth) directories_horizontal_fastscroller.setScrollToX(directories_grid.computeHorizontalScrollOffset()) } private fun calculateContentHeight(directories: ArrayList) { val layoutManager = directories_grid.layoutManager as MyGridLayoutManager - val thumbnailHeight = layoutManager.getChildAt(0)?.height ?: 0 - val fullHeight = ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailHeight + + val fullHeight = if (config.folderStyle == FOLDER_STYLE_SQUARE) { + val thumbnailHeight = layoutManager.getChildAt(0)?.height ?: 0 + ((directories.size - 1) / layoutManager.spanCount + 1) * thumbnailHeight + } else { + var thumbnailHeight = (layoutManager.getChildAt(0)?.height ?: 0) + if (config.viewTypeFolders == VIEW_TYPE_GRID) { + thumbnailHeight += resources.getDimension(R.dimen.medium_margin).toInt() * 2 + } + + val rowCount = (directories.size - 1) / layoutManager.spanCount + 1 + rowCount * thumbnailHeight + } + directories_vertical_fastscroller.setContentHeight(fullHeight) directories_vertical_fastscroller.setScrollToY(directories_grid.computeVerticalScrollOffset()) } @@ -1098,6 +1123,29 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { mDirs = dirs.clone() as ArrayList } + private fun setAsDefaultFolder() { + config.defaultFolder = "" + invalidateOptionsMenu() + } + + private fun openDefaultFolder() { + if (config.defaultFolder.isEmpty()) { + return + } + + val defaultDir = File(config.defaultFolder) + + if ((!defaultDir.exists() || !defaultDir.isDirectory) && (config.defaultFolder != RECYCLE_BIN && config.defaultFolder != FAVORITES)) { + config.defaultFolder = "" + return + } + + Intent(this, MediaActivity::class.java).apply { + putExtra(DIRECTORY, config.defaultFolder) + handleMediaIntent(this) + } + } + private fun checkPlaceholderVisibility(dirs: ArrayList) { directories_empty_placeholder.beVisibleIf(dirs.isEmpty() && mLoadedInitialPhotos) directories_empty_placeholder_2.beVisibleIf(dirs.isEmpty() && mLoadedInitialPhotos) @@ -1127,13 +1175,13 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { directories_grid.beVisibleIf(directories_empty_placeholder.isGone()) } - private fun setupAdapter(dirs: ArrayList, textToSearch: String = "") { + private fun setupAdapter(dirs: ArrayList, textToSearch: String = "", forceRecreate: Boolean = false) { val currAdapter = directories_grid.adapter val distinctDirs = dirs.distinctBy { it.path.getDistinctPath() }.toMutableList() as ArrayList val sortedDirs = getSortedDirectories(distinctDirs) var dirsToShow = getDirsToShow(sortedDirs, mDirs, mCurrentPathPrefix).clone() as ArrayList - if (currAdapter == null) { + if (currAdapter == null || forceRecreate) { initZoomListener() val fastscroller = if (config.scrollHorizontally) directories_horizontal_fastscroller else directories_vertical_fastscroller DirectoryAdapter(this, dirsToShow, this, directories_grid, isPickIntent(intent) || isGetAnyContentIntent(intent), fastscroller) { @@ -1384,6 +1432,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { add(Release(258, R.string.release_258)) add(Release(277, R.string.release_277)) add(Release(295, R.string.release_295)) + add(Release(327, R.string.release_327)) checkWhatsNew(this, BuildConfig.VERSION_CODE) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt index 532af9486..31275b592 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt @@ -219,6 +219,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_media, menu) + val isDefaultFolder = !config.defaultFolder.isEmpty() && File(config.defaultFolder).compareTo(File(mPath)) == 0 + menu.apply { findItem(R.id.group).isVisible = !config.scrollHorizontally @@ -234,6 +236,9 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { findItem(R.id.temporarily_show_hidden).isVisible = !config.shouldShowHidden findItem(R.id.stop_showing_hidden).isVisible = config.temporarilyShowHidden + findItem(R.id.set_as_default_folder).isVisible = !isDefaultFolder + findItem(R.id.unset_as_default_folder).isVisible = isDefaultFolder + val viewType = config.getFolderViewType(if (mShowAll) SHOW_ALL else mPath) findItem(R.id.increase_column_count).isVisible = viewType == VIEW_TYPE_GRID && config.mediaColumnCnt < MAX_COLUMN_COUNT findItem(R.id.reduce_column_count).isVisible = viewType == VIEW_TYPE_GRID && config.mediaColumnCnt > 1 @@ -262,6 +267,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() R.id.increase_column_count -> increaseColumnCount() R.id.reduce_column_count -> reduceColumnCount() + R.id.set_as_default_folder -> setAsDefaultFolder() + R.id.unset_as_default_folder -> unsetAsDefaultFolder() R.id.slideshow -> startSlideshow() R.id.settings -> launchSettings() R.id.about -> launchAbout() @@ -937,4 +944,14 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { } finish() } + + private fun setAsDefaultFolder() { + config.defaultFolder = mPath + invalidateOptionsMenu() + } + + private fun unsetAsDefaultFolder() { + config.defaultFolder = "" + invalidateOptionsMenu() + } } 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 b53113727..84e089a88 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 @@ -12,9 +12,13 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.ChangeThumbnailStyleDialog import com.simplemobiletools.gallery.pro.dialogs.ManageBottomActionsDialog import com.simplemobiletools.gallery.pro.dialogs.ManageExtendedDetailsDialog -import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.emptyTheRecycleBin +import com.simplemobiletools.gallery.pro.extensions.mediaDB +import com.simplemobiletools.gallery.pro.extensions.showRecycleBinEmptyingDialog import com.simplemobiletools.gallery.pro.helpers.* import com.simplemobiletools.gallery.pro.models.AlbumCover import kotlinx.android.synthetic.main.activity_settings.* @@ -68,7 +72,7 @@ class SettingsActivity : SimpleActivity() { setupBottomActions() setupThumbnailVideoDuration() setupThumbnailFileTypes() - setupShowMediaCount() + setupFolderThumbnailStyle() setupKeepLastModified() setupEnablePullToRefresh() setupAllowZoomingImages() @@ -107,8 +111,8 @@ class SettingsActivity : SimpleActivity() { private fun setupSectionColors() { val adjustedPrimaryColor = getAdjustedPrimaryColor() arrayListOf(visibility_label, videos_label, thumbnails_label, scrolling_label, fullscreen_media_label, security_label, - file_operations_label, deep_zoomable_images_label, extended_details_label, bottom_actions_label, recycle_bin_label, - migrating_label).forEach { + file_operations_label, deep_zoomable_images_label, extended_details_label, bottom_actions_label, recycle_bin_label, + migrating_label).forEach { it.setTextColor(adjustedPrimaryColor) } } @@ -139,9 +143,9 @@ class SettingsActivity : SimpleActivity() { settings_file_loading_priority.text = getFileLoadingPriorityText() settings_file_loading_priority_holder.setOnClickListener { val items = arrayListOf( - RadioItem(PRIORITY_SPEED, getString(R.string.speed)), - RadioItem(PRIORITY_COMPROMISE, getString(R.string.compromise)), - RadioItem(PRIORITY_VALIDITY, getString(R.string.avoid_showing_invalid_files))) + RadioItem(PRIORITY_SPEED, getString(R.string.speed)), + RadioItem(PRIORITY_COMPROMISE, getString(R.string.compromise)), + RadioItem(PRIORITY_VALIDITY, getString(R.string.avoid_showing_invalid_files))) RadioGroupDialog(this@SettingsActivity, items, config.fileLoadingPriority) { config.fileLoadingPriority = it as Int @@ -411,14 +415,20 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupShowMediaCount() { - settings_show_media_count.isChecked = config.showMediaCount - settings_show_media_count_holder.setOnClickListener { - settings_show_media_count.toggle() - config.showMediaCount = settings_show_media_count.isChecked + private fun setupFolderThumbnailStyle() { + settings_folder_thumbnail_style.text = getFolderStyleText() + settings_folder_thumbnail_style_holder.setOnClickListener { + ChangeThumbnailStyleDialog(this) { + settings_folder_thumbnail_style.text = getFolderStyleText() + } } } + private fun getFolderStyleText() = getString(when (config.folderStyle) { + FOLDER_STYLE_SQUARE -> R.string.square + else -> R.string.rounded_corners + }) + private fun setupKeepLastModified() { settings_keep_last_modified.isChecked = config.keepLastModified settings_keep_last_modified_holder.setOnClickListener { @@ -517,9 +527,9 @@ class SettingsActivity : SimpleActivity() { settings_screen_rotation.text = getScreenRotationText() settings_screen_rotation_holder.setOnClickListener { val items = arrayListOf( - RadioItem(ROTATE_BY_SYSTEM_SETTING, getString(R.string.screen_rotation_system_setting)), - RadioItem(ROTATE_BY_DEVICE_ROTATION, getString(R.string.screen_rotation_device_rotation)), - RadioItem(ROTATE_BY_ASPECT_RATIO, getString(R.string.screen_rotation_aspect_ratio))) + RadioItem(ROTATE_BY_SYSTEM_SETTING, getString(R.string.screen_rotation_system_setting)), + RadioItem(ROTATE_BY_DEVICE_ROTATION, getString(R.string.screen_rotation_device_rotation)), + RadioItem(ROTATE_BY_ASPECT_RATIO, getString(R.string.screen_rotation_aspect_ratio))) RadioGroupDialog(this@SettingsActivity, items, config.screenRotation) { config.screenRotation = it as Int @@ -640,7 +650,6 @@ class SettingsActivity : SimpleActivity() { put(ANIMATE_GIFS, config.animateGifs) put(CROP_THUMBNAILS, config.cropThumbnails) put(SHOW_THUMBNAIL_VIDEO_DURATION, config.showThumbnailVideoDuration) - put(SHOW_MEDIA_COUNT, config.showMediaCount) put(SCROLL_HORIZONTALLY, config.scrollHorizontally) put(ENABLE_PULL_TO_REFRESH, config.enablePullToRefresh) put(MAX_BRIGHTNESS, config.maxBrightness) @@ -694,6 +703,9 @@ class SettingsActivity : SimpleActivity() { put(EDITOR_BRUSH_HARDNESS, config.editorBrushHardness) put(EDITOR_BRUSH_SIZE, config.editorBrushSize) put(ALBUM_COVERS, config.albumCovers) + put(FOLDER_THUMBNAIL_STYLE, config.folderStyle) + put(FOLDER_MEDIA_COUNT, config.showFolderMediaCount) + put(LIMIT_FOLDER_TITLE, config.limitFolderTitle) } exportSettings(configItems) @@ -775,7 +787,6 @@ class SettingsActivity : SimpleActivity() { ANIMATE_GIFS -> config.animateGifs = value.toBoolean() CROP_THUMBNAILS -> config.cropThumbnails = value.toBoolean() SHOW_THUMBNAIL_VIDEO_DURATION -> config.showThumbnailVideoDuration = value.toBoolean() - SHOW_MEDIA_COUNT -> config.showMediaCount = value.toBoolean() SCROLL_HORIZONTALLY -> config.scrollHorizontally = value.toBoolean() ENABLE_PULL_TO_REFRESH -> config.enablePullToRefresh = value.toBoolean() MAX_BRIGHTNESS -> config.maxBrightness = value.toBoolean() @@ -828,6 +839,9 @@ class SettingsActivity : SimpleActivity() { EDITOR_BRUSH_COLOR -> config.editorBrushColor = value.toInt() EDITOR_BRUSH_HARDNESS -> config.editorBrushHardness = value.toString().toFloat() EDITOR_BRUSH_SIZE -> config.editorBrushSize = value.toString().toFloat() + FOLDER_THUMBNAIL_STYLE -> config.folderStyle = value.toInt() + FOLDER_MEDIA_COUNT -> config.showFolderMediaCount = value.toInt() + LIMIT_FOLDER_TITLE -> config.limitFolderTitle = value.toBoolean() 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/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt index c85b0927c..f3a041c71 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 @@ -6,9 +6,11 @@ import android.content.pm.ShortcutInfo import android.content.pm.ShortcutManager import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Icon +import android.text.TextUtils import android.view.Menu import android.view.View import android.view.ViewGroup +import android.widget.RelativeLayout import com.bumptech.glide.Glide import com.google.gson.Gson import com.simplemobiletools.commons.activities.BaseSimpleActivity @@ -29,12 +31,12 @@ import com.simplemobiletools.gallery.pro.helpers.* import com.simplemobiletools.gallery.pro.interfaces.DirectoryOperationsListener import com.simplemobiletools.gallery.pro.models.AlbumCover import com.simplemobiletools.gallery.pro.models.Directory -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_check -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_location -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_lock -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_name -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_pin -import kotlinx.android.synthetic.main.directory_item_grid.view.dir_thumbnail +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_check +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_location +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_lock +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_name +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_pin +import kotlinx.android.synthetic.main.directory_item_grid_square.view.dir_thumbnail import kotlinx.android.synthetic.main.directory_item_list.view.* import java.io.File @@ -46,13 +48,16 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList() + private var showMediaCount = config.showFolderMediaCount + private var folderStyle = config.folderStyle + private var limitFolderTitle = config.limitFolderTitle + init { setupDragListener(true) fillLockedFolders() @@ -61,7 +66,12 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList R.layout.directory_item_list + folderStyle == FOLDER_STYLE_SQUARE -> R.layout.directory_item_grid_square + else -> R.layout.directory_item_grid_rounded_corners + } + return createViewHolder(layoutType, parent) } @@ -168,7 +178,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList + val paths = getSelectedPaths().filter { !activity.isAStorageRootFolder(it) && !config.isFolderProtected(it) } as ArrayList RenameItemsDialog(activity, paths) { listener?.refreshItems() } @@ -233,13 +243,13 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList if (success) { if (path.containsNoMedia()) { activity.removeNoMedia(path) { - if (activity.config.shouldShowHidden) { + if (config.shouldShowHidden) { updateFolderNames() } else { activity.runOnUiThread { @@ -298,7 +308,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList + 表示する形式 @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 2a5038e69..88407550d 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -30,6 +30,8 @@ 크기변경 버전 공유 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! Switch to file search across all visible folders + Set as default folder + Unset as default folder 필터 설정 @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5fa2e4661..d4770cad3 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -30,6 +30,8 @@ Share a resized version 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! Switch to file search across all visible folders + Set as default folder + Unset as default folder Filtruoti mediją @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 199c0f9b2..b59f659f4 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -30,6 +30,8 @@ Del versjon med endret størrelse 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! Skift til filsøk i alle synlige mapper + Set as default folder + Unset as default folder Filtrer media @@ -183,13 +185,13 @@ Unngå visning av ugyldige filer Vis bildefiltyper Tillat zooming av videoer ved å dobbelttrykke dem - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit folder title to 1 line - Square - Rounded corners + Minibildestil for mapper + Vis antall filer på en separat linje + Vis antall filer i parentes + Ikke vis antall filer + Limit long folder titles to 1 line + Firkantet + Avrundede hjørner Minibilder diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index e3ba19aab..ebd246443 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -30,6 +30,8 @@ Share a resized version 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! Switch to file search across all visible folders + Set as default folder + Unset as default folder Filter media @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 87b9638f0..fcfc8d35b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -30,6 +30,8 @@ Verkleinde versie delen Het lijkt erop dat dit een upgrade is vanaf de oude gratis versie. Deze oude versie, met de knop \"Upgraden naar Pro\" bovenaan de instellingen, kan nu gedeïnstalleerd worden.\n\nDe items in de prullenbak zullen dan wel worden verwijderd, favorieten en instellingen zullen ook opnieuw moeten worden geconfigureerd. Zoeken in alle zichtbare mappen + Set as default folder + Unset as default folder Media filteren @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7c23bb807..f446e499b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -30,6 +30,8 @@ Udostępnij zmienioną wersję Hej,\n\nwygląda na to że zaktualizowałeś ze starszej, darmowej wersji aplikacji. Możesz ją teraz odinstalować przyciskiej \'Upgrade to Pro\' w ustawieniach.\n\nZostaną jedynie usunięte elementy z Kosza, odznaczone Ulubione i konieczne będzie zresetowanie ustawień aplikacji.\n\nDziękujemy! Przełącz na przeszukiwanie plików we wszystkich widocznych folderach + Set as default folder + Unset as default folder Filtruj multimedia @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8f95f95a2..6d48286ff 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -30,6 +30,8 @@ Compartilhar uma versão redimensionada Olá,\n\nparece que você está atualizando do antigo aplicativo gratuito. Agora você já pode desinstalar a versão antiga, que tem o botão de atualizar para a versão Pro no topo da pagina de Configurações.\n\nVocê terá os itens da Lixeira excluídos, itens favoritos desmarcados e também terá que redefinir as configurações do seu aplicativo.\n\nObrigado! Alternar para a pesquisa de arquivos em todas as pastas visíveis + Set as default folder + Unset as default folder Filtrar mídia @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 58f2b8be9..342526c67 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -30,6 +30,8 @@ Partilhar foto redimensionada Olá,\n\nparece que você utilizou a opção de atualização existente na versão antiga. Agora já pode desinstalar essa versão antiga.\n\nApenas perderá os itens existentes na reciclagem e os favoritos não assinalados mas também terá que repor as predefinições da aplicação.\n\nObrigado! Trocar para pesquisa de ficheiros em todas as pastas visíveis + Set as default folder + Unset as default folder Filtrar multimédia @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f3eb854aa..ebd11fc30 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -30,6 +30,8 @@ Поделиться изменённой версией Привет,\n\nпохоже, что вы обновились со старого бесплатного приложения. Теперь вы можете удалить старую версию, которая содержит кнопку \"Обновить до Pro\" в верхней части настроек приложения.\n\nБудет очищена корзина, сняты отметки избранного, а также вам придётся сбросить настройки приложения.\n\nСпасибо! Переключиться на поиск файлов по всем видимым папкам + Set as default folder + Unset as default folder Фильтр медиа @@ -187,7 +189,7 @@ Показывать количество файлов отдельной строкой Показывать количество файлов в скобках Не показывать количество файлов - Заголовок папки одной строкой + Limit long folder titles to 1 line Квадраты Закруглённые углы diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a58487c92..6a06dae60 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -30,6 +30,8 @@ Zdieľať verziu so zmenenou veľkosťou Zdravím,\n\nvyzerá to tak, že ste zo starej bezplatnej apky prešlie na novú, platenú. Starú apku, ktorá má na vrchu nastavení tlačidlo \'Stiahnuť Pro verziu\', môžete už odinštalovať.\n\nStratíte tým iba súbory v odpadkovom koši, obľúbené položky budú odznačené a tiež si budete musieť opäť nastaviť položky v nastaveniach aplikácie.\n\nVďaka! Prepnúť na vyhľadávanie súborov vo všetkých viditeľných priečinkoch + Nastaviť ako predvolený priečinok + Odobrať predvolený priečinok Filter médií @@ -187,7 +189,7 @@ Zobraziť počet súborov na samostatnom riadku Zobraziť počet súborov v zátvorkách Nezobrazovať počet súborov - Obmedziť názov priečinka na 1 riadok + Obmedziť názvy dlhých priečinkov na 1 riadok Štvorec Zaoblené rohy diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 108b0a8a8..ea17ef500 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -30,6 +30,8 @@ Deli spremenjeno verzijo Živjo,\n\nkot kaže, ste nadgradili staro brezplačno aplikacijo. Sedaj lahko odstranite staro verzijo, ki ima gumb \'Nadgradi na Pro verzijo\' na vrhu nastavitev.\n\nIzbrisani bodo le elementi v košu, priljubljeni elementi bodo odznačeni, poleg tega pa bo potrebno še ponastaviti nastavitve aplikacije.\n\nHvala! Switch to file search across all visible folders + Set as default folder + Unset as default folder Filtriranje datotek @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 57e2c1849..2672b86ae 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -30,6 +30,8 @@ Подели верзију са промењеним димензијама 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! Switch to file search across all visible folders + Set as default folder + Unset as default folder Филтрирај медију @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ef33d76d2..0dee6fc8c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -30,6 +30,8 @@ Dela en version med ändrad storlek 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! Växla till filsökning i alla synliga mappar + Set as default folder + Unset as default folder Filtrera media @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 44d6a9c5a..174308f18 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -30,6 +30,8 @@ Yeniden boyutlandırılmış sürümü paylaş Merhaba,\n\neski ücretsiz uygulamadan yükseltmiş gibisiniz. Artık uygulama ayarlarının en üst kısmında \'Pro\'ya Yükselt\' düğmesi olan eski sürümü kaldırabilirsiniz.\n\nYalnızca Geri Dönüşüm Kutusu öğelerinin silinmesi, sık kullanılanların işaretlerinin kaldırılması ve uygulama ayarlarınızı sıfırlamanız gerekir.\n\nTeşekkürler! Tüm görünür klasörler arasında dosya aramaya geç + Varsayılan klasör olarak ayarla + Varsayılan klasör olarak ayarlama Medyayı filtrele @@ -76,7 +78,7 @@ Döndür Geçersiz resim yolu Resim düzenleme başarısız - Image editing cancelled + Resim düzenleme iptal edildi Dosya başarıyla düzenlendi Resmi şununla düzenle: Resim düzenleyici bulunamadı @@ -183,13 +185,13 @@ Geçersiz dosyaları göstermekten kaçın Resim dosyası türlerini göster Videoları iki kez dokunarak yakınlaştırmaya izin ver - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit folder title to 1 line - Square - Rounded corners + Klasör küçük resim stili + Dosya sayısını ayrı bir satırda göster + Dosya sayısını parantez içinde göster + Dosya sayısını gösterme + Uzun klasör başlıklarını 1 satırla sınırla + Kare + Yuvarlatılmış köşeler Küçük resimler diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 06a009c59..7573baf48 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -30,6 +30,8 @@ Поділитися зображенням іншого розміру Агов,\n\nздається, ви оновились зі старого безкоштовного додатка. Тепер ви можете видалити стару версію, у якій є кнопка \"Перейти на Pro\" вгорі налаштувань додатка.\n\nВи втратите лише елементи з Кошика, позначки улюблених елементів, а також потрібно буде скинути ваші налаштування додатка.\n\nДякую! Перейти до пошуку файла в усіх видимих теках + Set as default folder + Unset as default folder Фільтр мультимедійних файлів @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b4b360154..d1fe7eee1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -30,6 +30,8 @@ Chia sẻ phiên bản đã thay đổi kích thước Xin chào, có vẻ như bạn đã nâng cấp từ ứng dụng miễn phí cũ. Giờ đây, bạn có thể gỡ cài đặt phiên bản cũ có nút \'Nâng cấp lên Pro\' ở đầu Cài đặt ứng dụng. \n\nBạn sẽ chỉ xóa các mục Thùng rác, các mục yêu thích không được đánh dấu và bạn cũng sẽ phải đặt lại cài đặt ứng dụng của bạn.\n\nCảm ơn! Chuyển sang tìm kiếm tệp trên tất cả các thư mục hiển thị + Set as default folder + Unset as default folder Lọc @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 28edc12be..efe12b12b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -30,6 +30,8 @@ 调整尺寸并分享 嘿，\n\n您似乎已经从旧的免费版应用升级。您现在可以卸载旧版本，在该版本的应用设置顶部有一个“升级到专业版”按钮。\n\n此操作会删除回收站项目，取消标记收藏项目，并重置应用设置。\n\n谢谢！ 切换文件搜索范围为所有可见的文件夹 + Set as default folder + Unset as default folder 筛选媒体文件 @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1686f2a2e..20ee3edef 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -34,6 +34,8 @@ 分享調整大小的版本 嘿\n\n你似乎從舊版免費應用程式升級了。現在你能解除安裝舊版了，在應用程式設定的頂端有個\'升級至專業版\'按鈕。\n\n將只有回收桶項目會被刪除，我的最愛項目會被解除標記，以及也會重置你的應用程式設定。\n\n感謝! Switch to file search across all visible folders + Set as default folder + Unset as default folder 篩選媒體檔案 @@ -194,7 +196,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 833320b29..1d2620c34 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -30,6 +30,8 @@ 分享調整大小的版本 嘿\n\n你似乎從舊版免費應用程式升級了。現在你能解除安裝舊版了，在應用程式設定的頂端有個\'升級至專業版\'按鈕。\n\n將只有回收桶項目會被刪除，我的最愛項目會被解除標記，以及也會重置你的應用程式設定。\n\n感謝! 檔案搜尋目標切換成全部的可見資料夾 + Set as default folder + Unset as default folder 篩選媒體檔案 @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 78b30b24b..48dd76ef1 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -23,4 +23,5 @@ 110dp 40dp 30dp + 180dp diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 124e67897..a36ddae4c 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -6,6 +6,10 @@ com.simplemobiletools.gallery.pro + + Adding some folder thumbnail customization at the app settings\n + Allow setting a default folder to be opened at app launch + Allow fast forwarding videos by double clicking on screen sides 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) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c596d6f9c..333de6c76 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,6 +30,8 @@ Share a resized version 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! Switch to file search across all visible folders + Set as default folder + Unset as default folder Filter media @@ -187,7 +189,7 @@ Show file count on a separate line Show file count in brackets Do not show file count - Limit folder title to 1 line + Limit long folder titles to 1 line Square Rounded corners diff --git a/build.gradle b/build.gradle index 8791cd7a1..82b889196 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if (is_proprietary) { - classpath 'ly.img.android.pesdk:plugin:8.0.2' + classpath 'ly.img.android.pesdk:plugin:8.0.3' } // NOTE: Do not place your application dependencies here; they belong diff --git a/fastlane/metadata/android/en-US/changelogs/327.txt b/fastlane/metadata/android/en-US/changelogs/327.txt new file mode 100644 index 000000000..05a3f098d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/327.txt @@ -0,0 +1,3 @@ + * Adding some folder thumbnail customization at the app settings + * Allow setting a default folder to be opened at app launch (by roland-kister) + * Updated the photo editor to fix some glitches diff --git a/fastlane/metadata/android/en-US/changelogs/328.txt b/fastlane/metadata/android/en-US/changelogs/328.txt new file mode 100644 index 000000000..f6e221dac --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/328.txt @@ -0,0 +1 @@ + * Properly update the folder thumbnail text colors