kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduced the disable external links option for custom apps.

Browse Source 
* We have introduced the option to disable external links for custom apps. If a custom app is configured not to display the external links popup, it will both hide the external links preference from settings and refrain from showing the external link popup when opening external links. Additionally, we have included relevant comments within the methods and code to provide developers with a clear understanding of the reasons behind these changes.
This commit is contained in:
MohitMaliFtechiz 2023-12-13 15:43:37 +05:30 committed by Kelson
parent d65265b807
commit caf776a60d
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/kotlin/custom/CustomApp.kt
View File

@ -35,7 +35,8 @@ data class CustomApp(
val disableSideBar: Boolean = false,
val disableTabs: Boolean = false,
val disableReadAloud: Boolean = false,
val disableTitle: Boolean = false
val disableTitle: Boolean = false,
val disableExternalLinks: Boolean = false
) {
constructor(name: String, parsedJson: JSONObject) : this(
name,
@ -46,7 +47,8 @@ data class CustomApp(
parsedJson.getAndCast("disable_sidebar") ?: false,
parsedJson.getAndCast("disable_tabs") ?: false,
parsedJson.getAndCast("disable_read_aloud") ?: false,
parsedJson.getAndCast("disable_title") ?: false
parsedJson.getAndCast("disable_title") ?: false,
parsedJson.getAndCast("disable_external_links") ?: false
)
val versionCode: Int = formatCurrentDate("YYDDD0").toInt()

1
buildSrc/src/main/kotlin/custom/CustomApps.kt
View File

@ -52,6 +52,7 @@ fun ProductFlavors.create(customApps: List<CustomApp>) {
buildConfigField("Boolean", "DISABLE_TABS", "${customApp.disableTabs}")
buildConfigField("Boolean", "DISABLE_READ_ALOUD", "${customApp.disableReadAloud}")
buildConfigField("Boolean", "DISABLE_TITLE", "${customApp.disableTitle}")
buildConfigField("Boolean", "DISABLE_EXTERNAL_LINK", "${customApp.disableExternalLinks}")
configureStrings(customApp.displayName)
}
}

6
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
View File

@ -80,6 +80,12 @@ class CustomReaderFragment : CoreReaderFragment() {
toolbar?.let(::setUpDrawerToggle)
}
loadPageFromNavigationArguments()
if (BuildConfig.DISABLE_EXTERNAL_LINK) {
// If "external links" are disabled in a custom app,
// this sets the shared preference to not show the external link popup
// when opening external links.
sharedPreferenceUtil?.putPrefExternalLinkPopup(false)
}
}
}

14
custom/src/main/java/org/kiwix/kiwixmobile/custom/settings/CustomPrefsFragment.kt
View File

@ -27,6 +27,9 @@ import org.kiwix.kiwixmobile.custom.BuildConfig
class CustomPrefsFragment : CorePrefsFragment() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
super.onCreatePreferences(savedInstanceState, rootKey)
if (BuildConfig.DISABLE_EXTERNAL_LINK) {
hideExternalLinksPreference()
}
if (BuildConfig.ENFORCED_LANG.isEmpty()) {
setUpLanguageChooser(PREF_LANG)
} else {
@ -35,6 +38,17 @@ class CustomPrefsFragment : CorePrefsFragment() {
preferenceScreen.removePreferenceRecursively(PREF_WIFI_ONLY)
}
/**
* If "external links" are disabled in a custom app,
* this function hides the external links preference from settings
* and sets the shared preference to not show the external link popup
* when opening external links.
*/
private fun hideExternalLinksPreference() {
preferenceScreen.removePreferenceRecursively("pref_external_link_popup")
sharedPreferenceUtil?.putPrefExternalLinkPopup(false)
}
override fun setStorage() {
preferenceScreen.removePreference(findPreference("pref_storage"))
}