fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2967 from naveensingh/setup_composite_build 

Include simple-commons locally using composite build
This commit is contained in:
Tibor Kaputa 2023-09-07 10:10:58 +02:00 committed by GitHub
parent 87adbfcd4b 13faec0af1
commit 7d8de9e96f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt
View File

@ -22,7 +22,7 @@ class ChangeSortingDialog(
init { init {
currSorting = if (isDirectorySorting) config.directorySorting else config.getFolderSorting(pathToUse) currSorting = if (isDirectorySorting) config.directorySorting else config.getFolderSorting(pathToUse)
binding = DialogChangeSortingBinding.inflate(activity.layoutInflater).apply { 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.beVisibleIf(showFolderCheckbox && (currSorting and SORT_BY_NAME != 0 || currSorting and SORT_BY_PATH != 0))
sortingDialogNumericSorting.isChecked = currSorting and SORT_USE_NUMERIC_VALUE != 0 sortingDialogNumericSorting.isChecked = currSorting and SORT_USE_NUMERIC_VALUE != 0
@ -46,14 +46,14 @@ class ChangeSortingDialog(
private fun setupSortRadio() { private fun setupSortRadio() {
val sortingRadio = binding.sortingDialogRadioSorting val sortingRadio = binding.sortingDialogRadioSorting
sortingRadio.setOnCheckedChangeListener { group, checkedId -> sortingRadio.setOnCheckedChangeListener { _, checkedId ->
val isSortingByNameOrPath = checkedId == binding.sortingDialogRadioName.id || checkedId == binding.sortingDialogRadioPath.id val isSortingByNameOrPath = checkedId == binding.sortingDialogRadioName.id || checkedId == binding.sortingDialogRadioPath.id
binding.sortingDialogNumericSorting.beVisibleIf(isSortingByNameOrPath) 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 val hideSortOrder = checkedId == binding.sortingDialogRadioCustom.id || checkedId == binding.sortingDialogRadioRandom.id
binding.sortingDialogRadioOrder.beGoneIf(hideSortOrder) binding.sortingDialogRadioOrder.beGoneIf(hideSortOrder)
binding.sortingDialogOrderDivider.beGoneIf(hideSortOrder) binding.sortingDialogSortingDivider.beGoneIf(hideSortOrder)
} }
val sortBtn = when { val sortBtn = when {

18
app/src/main/res/layout/dialog_change_sorting.xml
View File

@ -63,9 +63,12 @@
</RadioGroup> </RadioGroup>
<include <ImageView
android:id="@+id/sorting_dialog_order_divider" android:id="@+id/sorting_dialog_sorting_divider"
layout="@layout/divider" /> android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"
android:background="@color/divider_grey"
android:importantForAccessibility="no" />
<RadioGroup <RadioGroup
android:id="@+id/sorting_dialog_radio_order" android:id="@+id/sorting_dialog_radio_order"
@ -87,9 +90,12 @@
android:text="@string/descending" /> android:text="@string/descending" />
</RadioGroup> </RadioGroup>
<include <ImageView
android:id="@+id/use_for_this_folder_divider" android:id="@+id/sorting_dialog_order_divider"
layout="@layout/divider" /> android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"
android:background="@color/divider_grey"
android:importantForAccessibility="no" />
<com.simplemobiletools.commons.views.MyAppCompatCheckbox <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/sorting_dialog_numeric_sorting" android:id="@+id/sorting_dialog_numeric_sorting"

2
gradle.properties
View File

@ -1,4 +1,4 @@
android.enableJetifier=true android.enableJetifier=true
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx8192m

4
gradle/libs.versions.toml
View File

@ -13,9 +13,9 @@ exif = "1.0.1"
#Room #Room
room = "2.6.0-beta01" room = "2.6.0-beta01"
#Simple tools #Simple tools
simple-commons = "7c1e5b5777" simple-commons = "73d78e5cd3"
#Gradle #Gradle
gradlePlugins-agp = "8.1.0" gradlePlugins-agp = "8.1.1"
#Other #Other
androidGifDrawable = "1.2.25" androidGifDrawable = "1.2.25"
androidImageCropper = "4.5.0" androidImageCropper = "4.5.0"

10
settings.gradle.kts
View File

@ -17,4 +17,14 @@ dependencyResolutionManagement {
maven(url = "https://artifactory.img.ly/artifactory/imgly") maven(url = "https://artifactory.img.ly/artifactory/imgly")
} }
} }
rootProject.name = "Simple-Gallery"
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
include(":app") 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"))
}
}*/