Adjust expandable fab animation

Co-authored-by: p

.github/workflows/build_pull_request.yml

@@ -1,10 +1,12 @@
 name: PR build check
 on:
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'i18n/src/commonMain/moko-resources/**/strings.xml'
-      - 'i18n/src/commonMain/moko-resources/**/plurals.xml'
+    paths:
+      - '!**.md'
+      - '!i18n/src/commonMain/moko-resources/**/strings.xml'
+      - '!i18n/src/commonMain/moko-resources/**/plurals.xml'
+      - 'i18n/src/commonMain/moko-resources/base/strings.xml'
+      - 'i18n/src/commonMain/moko-resources/base/plurals.xml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}

app/src/main/java/eu/kanade/domain/track/interactor/AddTracks.kt

@@ -5,6 +5,7 @@ import eu.kanade.domain.track.model.toDomainTrack
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.EnhancedTracker
 import eu.kanade.tachiyomi.data.track.Tracker
+import eu.kanade.tachiyomi.data.track.TrackerManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.lang.convertEpochMillisZone
 import logcat.LogPriority
@@ -14,17 +15,16 @@ import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
 import tachiyomi.domain.history.interactor.GetHistory
 import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.track.interactor.GetTracks
 import tachiyomi.domain.track.interactor.InsertTrack
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.time.ZoneOffset
 
 class AddTracks(
-    private val getTracks: GetTracks,
     private val insertTrack: InsertTrack,
     private val syncChapterProgressWithTrack: SyncChapterProgressWithTrack,
     private val getChaptersByMangaId: GetChaptersByMangaId,
+    private val trackerManager: TrackerManager,
 ) {
 
     // TODO: update all trackers based on common data
@@ -79,7 +79,7 @@ class AddTracks(
 
     suspend fun bindEnhancedTrackers(manga: Manga, source: Source) = withNonCancellableContext {
         withIOContext {
-            getTracks.await(manga.id)
+            trackerManager.loggedInTrackers()
                 .filterIsInstance<EnhancedTracker>()
                 .filter { it.accept(source) }
                 .forEach { service ->
@@ -87,11 +87,11 @@ class AddTracks(
                         service.match(manga)?.let { track ->
                             track.manga_id = manga.id
                             (service as Tracker).bind(track)
-                            insertTrack.await(track.toDomainTrack()!!)
+                            insertTrack.await(track.toDomainTrack(idRequired = false)!!)
 
                             syncChapterProgressWithTrack.await(
                                 manga.id,
-                                track.toDomainTrack()!!,
+                                track.toDomainTrack(idRequired = false)!!,
                                 service,
                             )
                         }

buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts

@@ -6,6 +6,18 @@ plugins {
 
 val libs = the<LibrariesForLibs>()
 
+val xmlFormatExclude = buildList(2) {
+    add("**/build/**/*.xml")
+
+    projectDir
+        .resolve("src/commonMain/moko-resources")
+        .takeIf { it.isDirectory }
+        ?.let(::fileTree)
+        ?.matching { exclude("/base/**") }
+        ?.let(::add)
+}
+    .toTypedArray()
+
 spotless {
     kotlin {
         target("**/*.kt", "**/*.kts")
@@ -23,7 +35,7 @@ spotless {
     }
     format("xml") {
         target("**/*.xml")
-        targetExclude("**/build/**/*.xml")
+        targetExclude(*xmlFormatExclude)
         trimTrailingWhitespace()
         endWithNewline()
     }

presentation-core/src/main/java/tachiyomi/presentation/core/components/material/FloatingActionButton.kt

@@ -9,11 +9,11 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkHorizontally
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.layout.width
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.FloatingActionButtonElevation
@@ -46,12 +46,8 @@ fun ExtendedFloatingActionButton(
     contentColor: Color = contentColorFor(containerColor),
     elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
 ) {
-    val minWidth by animateDpAsState(
-        targetValue = if (expanded) ExtendedFabMinimumWidth else FabContainerWidth,
-        label = "minWidth",
-    )
     FloatingActionButton(
-        modifier = modifier.sizeIn(minWidth = minWidth),
+        modifier = modifier,
         onClick = onClick,
         interactionSource = interactionSource,
         shape = shape,
@@ -59,18 +55,29 @@ fun ExtendedFloatingActionButton(
         contentColor = contentColor,
         elevation = elevation,
     ) {
+        val minWidth by animateDpAsState(
+            targetValue = if (expanded) ExtendedFabMinimumWidth else FabContainerWidth,
+            animationSpec = tween(
+                durationMillis = 500,
+                easing = EasingEmphasizedCubicBezier,
+            ),
+            label = "minWidth",
+        )
         val startPadding by animateDpAsState(
             targetValue = if (expanded) ExtendedFabIconSize / 2 else 0.dp,
+            animationSpec = tween(
+                durationMillis = if (expanded) 300 else 900,
+                easing = EasingEmphasizedCubicBezier,
+            ),
             label = "startPadding",
         )
-        val endPadding by animateDpAsState(
-            targetValue = if (expanded) ExtendedFabTextPadding else 0.dp,
-            label = "endPadding",
-        )
 
         Row(
-            modifier = Modifier.padding(start = startPadding, end = endPadding),
+            modifier = Modifier
+                .sizeIn(minWidth = minWidth)
+                .padding(start = startPadding),
             verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center,
         ) {
             icon()
             AnimatedVisibility(
@@ -78,8 +85,7 @@ fun ExtendedFloatingActionButton(
                 enter = ExtendedFabExpandAnimation,
                 exit = ExtendedFabCollapseAnimation,
             ) {
-                Row {
-                    Spacer(Modifier.width(ExtendedFabIconPadding))
+                Box(modifier = Modifier.padding(start = ExtendedFabIconPadding, end = ExtendedFabTextPadding)) {
                     text()
                 }
             }