Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ android {

flavorDimensions.add("variants")
productFlavors {
register("core")
register("foss")
register("gplay")
}
Expand Down
3 changes: 1 addition & 2 deletions app/src/foss/res/values/bools.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="show_donate_in_about">true</bool>
<bool name="hide_google_relations">true</bool>
<bool name="pretend_thank_you_installed">true</bool>
<bool name="is_google_play_build">false</bool>
</resources>
3 changes: 1 addition & 2 deletions app/src/gplay/res/values/bools.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="show_donate_in_about">false</bool>
<bool name="hide_google_relations">false</bool>
<bool name="pretend_thank_you_installed">true</bool>
<bool name="is_google_play_build">true</bool>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class SettingsActivity : SimpleActivity() {
private fun refreshMenuItems() {
binding.settingsToolbar.menu.apply {
findItem(R.id.more_apps_from_us).isVisible =
!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)
resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build)
}
}

Expand Down Expand Up @@ -116,7 +116,7 @@ class SettingsActivity : SimpleActivity() {
FAQItem(R.string.faq_1_title, R.string.faq_1_text)
)

if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) {
if (resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build)) {
faqItems.add(
FAQItem(
org.fossify.commons.R.string.faq_2_title_commons,
Expand Down Expand Up @@ -217,26 +217,22 @@ class SettingsActivity : SimpleActivity() {
}

private fun setupSavePhotosFolder() = binding.apply {
settingsSavePhotosLabel.text = addLockedLabelIfNeeded(R.string.save_photos)
settingsSavePhotosLabel.text = getString(R.string.save_photos)
settingsSavePhotos.text = getLastPart(config.savePhotosFolder)
settingsSavePhotosHolder.setOnClickListener {
if (isOrWasThankYouInstalled()) {
FilePickerDialog(
this@SettingsActivity,
config.savePhotosFolder,
false,
showFAB = true
) {
val path = it
handleSAFDialog(it) { success ->
if (success) {
config.savePhotosFolder = path
settingsSavePhotos.text = getLastPart(config.savePhotosFolder)
}
FilePickerDialog(
this@SettingsActivity,
config.savePhotosFolder,
false,
showFAB = true
) {
val path = it
handleSAFDialog(it) { success ->
if (success) {
config.savePhotosFolder = path
settingsSavePhotos.text = getLastPart(config.savePhotosFolder)
}
}
} else {
FeatureLockedDialog(this@SettingsActivity) { }
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ androidx-window = "1.5.1"
androidx-camera = "1.6.1"
androidx-ktx = "2.10.0"
#Fossify
commons = "6.1.6"
commons = "7.1.0"
#Gradle
gradlePlugins-agp = "9.4.1"
#build
Expand Down
Loading