diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 293adc9cb8..54024cc86b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -213,9 +213,6 @@ dependencies { // HTML parser implementation(libs.jsoup) - // Job scheduling - implementation(libs.guava) - implementation(libs.play.services.gcm) // Database diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index d0c11fb9f3..ee8a558cd1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -65,13 +65,8 @@ import com.getkeepsafe.taptargetview.TapTargetView import com.google.android.material.navigation.NavigationBarView import com.google.android.material.snackbar.Snackbar import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback -import com.google.common.primitives.Floats.max -import com.google.common.primitives.Ints.max import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R -import yokai.i18n.MR -import yokai.util.lang.getString -import dev.icerock.moko.resources.compose.stringResource import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.download.DownloadJob import eu.kanade.tachiyomi.data.download.DownloadManager @@ -147,9 +142,11 @@ import kotlinx.coroutines.withContext import uy.kohesive.injekt.injectLazy import yokai.core.migration.Migrator import yokai.domain.base.BasePreferences +import yokai.i18n.MR import yokai.presentation.core.Constants import yokai.presentation.extension.repo.ExtensionRepoController import yokai.presentation.onboarding.OnboardingController +import yokai.util.lang.getString import kotlin.collections.set import kotlin.math.abs import kotlin.math.min @@ -242,7 +239,7 @@ open class MainActivity : BaseActivity() { } val toolbarHeight: Int - get() = max(binding.toolbar.height, binding.cardFrame.height, binding.appBar.attrToolbarHeight) + get() = maxOf(binding.toolbar.height, binding.cardFrame.height, binding.appBar.attrToolbarHeight) private var actionMode: ActionMode? = null private var backPressedCallback: OnBackPressedCallback? = null @@ -310,7 +307,7 @@ open class MainActivity : BaseActivity() { motionEvent.recycle() velocityTracker.computeCurrentVelocity(1, 5f) backVelocity = - max(0.5f, abs(velocityTracker.getAxisVelocity(MotionEvent.AXIS_X)) * 0.5f) + maxOf(0.5f, abs(velocityTracker.getAxisVelocity(MotionEvent.AXIS_X)) * 0.5f) } lastX = 0f lastY = 0f diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb31e9da42..62b9b45fb5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,6 @@ firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" flexbox = { module = "com.google.android.flexbox:flexbox", version = "3.0.0" } flexible-adapter-ui = { module = "com.github.arkon.FlexibleAdapter:flexible-adapter-ui", version.ref = "flexible-adapter" } flexible-adapter = { module = "com.github.arkon.FlexibleAdapter:flexible-adapter", version.ref = "flexible-adapter" } -guava = { module = "com.google.guava:guava", version = "31.1-android" } image-decoder = { module = "com.github.tachiyomiorg:image-decoder", version = "41c059e540" } injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" }