mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-15 13:37:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework build variants and add FOSS variant (#1775)

Browse Source
This commit is contained in:
AntsyLich
2025-02-26 00:17:36 +06:00
committed by GitHub
parent 1dd81ef1e1
commit fe22f5aa37
17 changed files with 125 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/di/PreferenceModule.kt
View File

@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.core.security.PrivacyPreferences
import eu.kanade.tachiyomi.core.security.SecurityPreferences
import eu.kanade.tachiyomi.network.NetworkPreferences
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
import eu.kanade.tachiyomi.util.system.isDevFlavor
import eu.kanade.tachiyomi.util.system.isDebugBuildType
import tachiyomi.core.common.preference.AndroidPreferenceStore
import tachiyomi.core.common.preference.PreferenceStore
import tachiyomi.core.common.storage.AndroidStorageFolderProvider
@@ -31,7 +31,7 @@ class PreferenceModule(val app: Application) : InjektModule {
addSingletonFactory {
NetworkPreferences(
preferenceStore = get(),
verboseLogging = isDevFlavor,
verboseLogging = isDebugBuildType,
)
}
addSingletonFactory {

2
app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt
View File

@@ -40,7 +40,7 @@ class CrashLogUtil(
fun getDebugInfo(): String {
return """
App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE}, ${BuildConfig.BUILD_TIME})
App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE}, ${BuildConfig.BUILD_TIME})
Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}; build ${Build.DISPLAY})
Device brand: ${Build.BRAND}
Device manufacturer: ${Build.MANUFACTURER}

13
app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt
View File

@@ -1,12 +1,17 @@
@file:Suppress("UNUSED", "KotlinConstantConditions")
package eu.kanade.tachiyomi.util.system
import eu.kanade.tachiyomi.BuildConfig
val isDevFlavor: Boolean
get() = BuildConfig.FLAVOR == "dev"
val analyticsIncluded: Boolean
inline get() = BuildConfig.INCLUDE_ANALYTICS
val isDebugBuildType: Boolean
inline get() = BuildConfig.BUILD_TYPE == "debug"
val isPreviewBuildType: Boolean
get() = BuildConfig.BUILD_TYPE == "preview"
inline get() = BuildConfig.BUILD_TYPE == "preview"
val isReleaseBuildType: Boolean
get() = BuildConfig.BUILD_TYPE == "release"
inline get() = BuildConfig.BUILD_TYPE == "release"

2
app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
View File

@@ -171,7 +171,7 @@ fun Context.isInstalledFromFDroid(): Boolean {
return installerPackageName == "org.fdroid.fdroid" ||
// F-Droid builds typically disable the updater
(!BuildConfig.INCLUDE_UPDATER && !isDevFlavor)
(!BuildConfig.INCLUDE_UPDATER && !isDebugBuildType)
}
fun Context.launchRequestPackageInstallsPermission() {