From 02d11dff68392ec156af041a0da3613a977b9575 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 6 Sep 2023 12:55:34 +0530 Subject: [PATCH 1/7] Upgrade AGP to 8.1.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28ba853f3..51047fb55 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ room = "2.6.0-beta01" #Simple tools simple-commons = "7c1e5b5777" #Gradle -gradlePlugins-agp = "8.1.0" +gradlePlugins-agp = "8.1.1" #Other androidGifDrawable = "1.2.25" androidImageCropper = "4.5.0" From 802b05d3fe37a02022b603b5ea19c6d6f6991c1e Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 6 Sep 2023 18:10:18 +0530 Subject: [PATCH 2/7] Bump jvm heap size to 8192m --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9a656f4f3..23bdc1ab5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ android.enableJetifier=true android.nonTransitiveRClass=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx8192m From fd043a780512788b7828db107903464123aeeb4d Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 6 Sep 2023 18:10:26 +0530 Subject: [PATCH 3/7] Update commons --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51047fb55..2504a57e8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ exif = "1.0.1" #Room room = "2.6.0-beta01" #Simple tools -simple-commons = "7c1e5b5777" +simple-commons = "73d78e5cd3" #Gradle gradlePlugins-agp = "8.1.1" #Other From 4cb053847cd76ec2c8260f604c3441aa210c0670 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 6 Sep 2023 18:10:39 +0530 Subject: [PATCH 4/7] Use in-app dividers --- .../gallery/pro/dialogs/ChangeSortingDialog.kt | 8 ++++---- .../main/res/layout/dialog_change_sorting.xml | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt index df07cc913..6770b8e22 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt @@ -22,7 +22,7 @@ class ChangeSortingDialog( init { currSorting = if (isDirectorySorting) config.directorySorting else config.getFolderSorting(pathToUse) binding = DialogChangeSortingBinding.inflate(activity.layoutInflater).apply { - useForThisFolderDivider.beVisibleIf(showFolderCheckbox || (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0)) + sortingDialogOrderDivider.beVisibleIf(showFolderCheckbox || (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0)) sortingDialogNumericSorting.beVisibleIf(showFolderCheckbox && (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0)) sortingDialogNumericSorting.isChecked = currSorting and SORT_USE_NUMERIC_VALUE != 0 @@ -46,14 +46,14 @@ class ChangeSortingDialog( private fun setupSortRadio() { val sortingRadio = binding.sortingDialogRadioSorting - sortingRadio.setOnCheckedChangeListener { group, checkedId -> + sortingRadio.setOnCheckedChangeListener { _, checkedId -> val isSortingByNameOrPath = checkedId == binding.sortingDialogRadioName.id || checkedId == binding.sortingDialogRadioPath.id binding.sortingDialogNumericSorting.beVisibleIf(isSortingByNameOrPath) - binding.useForThisFolderDivider.beVisibleIf(binding.sortingDialogNumericSorting.isVisible() || binding.sortingDialogUseForThisFolder.isVisible()) + binding.sortingDialogOrderDivider.beVisibleIf(binding.sortingDialogNumericSorting.isVisible() || binding.sortingDialogUseForThisFolder.isVisible()) val hideSortOrder = checkedId == binding.sortingDialogRadioCustom.id || checkedId == binding.sortingDialogRadioRandom.id binding.sortingDialogRadioOrder.beGoneIf(hideSortOrder) - binding.sortingDialogOrderDivider.beGoneIf(hideSortOrder) + binding.sortingDialogSortingDivider.beGoneIf(hideSortOrder) } val sortBtn = when { diff --git a/app/src/main/res/layout/dialog_change_sorting.xml b/app/src/main/res/layout/dialog_change_sorting.xml index a64047385..246be097a 100644 --- a/app/src/main/res/layout/dialog_change_sorting.xml +++ b/app/src/main/res/layout/dialog_change_sorting.xml @@ -63,9 +63,12 @@ - + - + Date: Wed, 6 Sep 2023 18:15:48 +0530 Subject: [PATCH 5/7] Include simple-commons locally --- settings.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index a1c8e5667..e58479029 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,4 +17,12 @@ dependencyResolutionManagement { maven(url = "https://artifactory.img.ly/artifactory/imgly") } } +// TODO: This will be deprecated in future. Migrate to the newer `pluginManagement { includeBuild() }` mechanism instead of explicitly substituting dependency. +includeBuild("../Simple-Commons") { + dependencySubstitution { + substitute(module("com.github.SimpleMobileTools:Simple-Commons")).using(project(":commons")) + } +} +rootProject.name = "Simple-Gallery" +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") include(":app") From c2d864fda079defa94f79eaf6b3e7ecf44e78e87 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 6 Sep 2023 18:18:24 +0530 Subject: [PATCH 6/7] Comment out locally included simple-commons --- settings.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index e58479029..98e6af87b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,11 +18,11 @@ dependencyResolutionManagement { } } // TODO: This will be deprecated in future. Migrate to the newer `pluginManagement { includeBuild() }` mechanism instead of explicitly substituting dependency. -includeBuild("../Simple-Commons") { - dependencySubstitution { - substitute(module("com.github.SimpleMobileTools:Simple-Commons")).using(project(":commons")) - } -} +//includeBuild("../Simple-Commons") { +// dependencySubstitution { +// substitute(module("com.github.SimpleMobileTools:Simple-Commons")).using(project(":commons")) +// } +//} rootProject.name = "Simple-Gallery" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") include(":app") From 13faec0af1f3fcb1848ea9eeb3a94d465b1bee2d Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Thu, 7 Sep 2023 09:37:18 +0200 Subject: [PATCH 7/7] Update settings.gradle.kts --- settings.gradle.kts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 98e6af87b..431103c4c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,12 +17,14 @@ dependencyResolutionManagement { maven(url = "https://artifactory.img.ly/artifactory/imgly") } } -// TODO: This will be deprecated in future. Migrate to the newer `pluginManagement { includeBuild() }` mechanism instead of explicitly substituting dependency. -//includeBuild("../Simple-Commons") { -// dependencySubstitution { -// substitute(module("com.github.SimpleMobileTools:Simple-Commons")).using(project(":commons")) -// } -//} + rootProject.name = "Simple-Gallery" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") include(":app") + +// TODO: This will be deprecated in future. Migrate to the newer `pluginManagement { includeBuild() }` mechanism instead of explicitly substituting dependency. +/*includeBuild("../Simple-Commons") { + dependencySubstitution { + substitute(module("com.github.SimpleMobileTools:Simple-Commons")).using(project(":commons")) + } +}*/