Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Directly use shortcuts and update google services and firebase

Browse Source 
(cherry picked from commit b5fb64b70e7c24951e53d516c7910690ced244e6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
This commit is contained in:
Jobobby04 2023-04-16 17:13:00 -04:00
parent eb52af9cd8
commit e6bb7ffa3d
8 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
kotlin("android")
kotlin("plugin.parcelize")
kotlin("plugin.serialization")
id("com.github.zellius.shortcut-helper")
//id("com.github.zellius.shortcut-helper")
id("com.github.ben-manes.versions")
}
@ -17,7 +17,7 @@ if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
apply(plugin = "com.google.firebase.crashlytics")
}
shortcutHelper.setFilePath("./shortcuts.xml")
//shortcutHelper.setFilePath("./shortcuts.xml")
val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")

10
app/src/main/java/eu/kanade/tachiyomi/App.kt
View File

@ -32,8 +32,6 @@ import com.elvishew.xlog.printer.Printer
import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy
import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
import com.google.firebase.analytics.ktx.analytics
import com.google.firebase.ktx.Firebase
import eu.kanade.domain.DomainModule
import eu.kanade.domain.SYDomainModule
import eu.kanade.domain.base.BasePreferences
@ -54,7 +52,6 @@ import eu.kanade.tachiyomi.network.NetworkPreferences
import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
import eu.kanade.tachiyomi.util.system.WebViewUtil
import eu.kanade.tachiyomi.util.system.animatorDurationScale
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
import eu.kanade.tachiyomi.util.system.notification
import exh.log.CrashlyticsPrinter
import exh.log.EHLogLevel
@ -92,7 +89,6 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
// if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
setupExhLogging() // EXH logging
LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
if (!BuildConfig.DEBUG) addAnalytics()
GlobalExceptionHandler.initialize(applicationContext, CrashActivity::class.java)
@ -198,12 +194,6 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
SecureActivityDelegate.onApplicationStart()
}
private fun addAnalytics() {
if (isPreviewBuildType) {
Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
}
}
override fun onStop(owner: LifecycleOwner) {
SecureActivityDelegate.onApplicationStopped()
}

13
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -50,6 +50,8 @@ import cafe.adriel.voyager.navigator.Navigator
import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
import cafe.adriel.voyager.navigator.currentOrThrow
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.google.firebase.analytics.ktx.analytics
import com.google.firebase.ktx.Firebase
import eu.kanade.domain.UnsortedPreferences
import eu.kanade.domain.base.BasePreferences
import eu.kanade.domain.library.service.LibraryPreferences
@ -82,6 +84,7 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen
import eu.kanade.tachiyomi.ui.more.NewUpdateScreen
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.isNavigationBarNeedsScrim
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.setComposeContent
import exh.EXHMigrations
@ -91,6 +94,7 @@ import exh.log.DebugModeOverlay
import exh.source.BlacklistedSources
import exh.source.EH_SOURCE_ID
import exh.source.EXH_SOURCE_ID
import exh.syDebugVersion
import kotlinx.coroutines.cancel
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.delay
@ -164,6 +168,7 @@ class MainActivity : BaseActivity() {
super.onCreate(savedInstanceState)
val didMigration = if (savedInstanceState == null) {
addAnalytics()
EXHMigrations.upgrade(
context = applicationContext,
basePreferences = preferences,
@ -539,6 +544,14 @@ class MainActivity : BaseActivity() {
registerSecureActivity(this)
}
// SY -->
private fun addAnalytics() {
if (!BuildConfig.DEBUG && isPreviewBuildType) {
Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
}
}
// SY <--
companion object {
// Splash screen
private const val SPLASH_MIN_DURATION = 500 // ms

5
app/src/main/java/exh/log/CrashlyticsPrinter.kt
View File

@ -1,7 +1,8 @@
package exh.log
import com.elvishew.xlog.printer.Printer
import com.google.firebase.crashlytics.FirebaseCrashlytics
import com.google.firebase.crashlytics.ktx.crashlytics
import com.google.firebase.ktx.Firebase
import eu.kanade.tachiyomi.BuildConfig
class CrashlyticsPrinter(private val logLevel: Int) : Printer {
@ -15,7 +16,7 @@ class CrashlyticsPrinter(private val logLevel: Int) : Printer {
override fun println(logLevel: Int, tag: String?, msg: String?) {
if (logLevel >= this.logLevel) {
try {
FirebaseCrashlytics.getInstance().log("$logLevel/$tag: $msg")
Firebase.crashlytics.log("$logLevel/$tag: $msg")
} catch (t: Throwable) {
// Crash in debug if shit like this happens
if (BuildConfig.DEBUG) throw t

4
app/shortcuts.xml → app/src/main/res/xml/shortcuts.xml
View File

@ -9,6 +9,7 @@
android:shortcutShortLabel="@string/label_library">
<intent
android:action="eu.kanade.tachiyomi.SHOW_LIBRARY"
android:targetPackage="eu.kanade.tachiyomi.sy"
android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
</shortcut>
<shortcut
@ -20,6 +21,7 @@
android:shortcutShortLabel="@string/label_recent_updates">
<intent
android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
android:targetPackage="eu.kanade.tachiyomi.sy"
android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
</shortcut>
<shortcut
@ -31,6 +33,7 @@
android:shortcutShortLabel="@string/label_recent_manga">
<intent
android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
android:targetPackage="eu.kanade.tachiyomi.sy"
android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
</shortcut>
<shortcut
@ -42,6 +45,7 @@
android:shortcutShortLabel="@string/browse">
<intent
android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
android:targetPackage="eu.kanade.tachiyomi.sy"
android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
</shortcut>
</shortcuts>

2
build.gradle.kts
View File

@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
buildscript {
dependencies {
classpath(libs.android.shortcut.gradle)
// classpath(libs.android.shortcut.gradle)
classpath(libs.google.services.gradle)
classpath(libs.aboutLibraries.gradle)
classpath(libs.sqldelight.gradle)

2
gradle/libs.versions.toml
View File

@ -12,7 +12,7 @@ richtext = "0.16.0"
[libraries]
desugar = "com.android.tools:desugar_jdk_libs:2.0.2"
android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2"
google-services-gradle = "com.google.gms:google-services:4.3.10"
google-services-gradle = "com.google.gms:google-services:4.3.15"
rxandroid = "io.reactivex:rxandroid:1.2.1"
rxjava = "io.reactivex:rxjava:1.3.8"

6
gradle/sy.versions.toml
View File

@ -1,9 +1,9 @@
[versions]
[libraries]
firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.0.0"
firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics-ktx:18.2.11"
firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.8.0"
firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.2.2"
firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics-ktx:18.3.6"
firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.9.5"
simularity = "info.debatty:java-string-similarity:2.0.0"
xlog = "com.elvishew:xlog:1.11.0"