use animateItem() instead of deprecated animateItemPlacement()

frett · frett · commit 6bd39cf517db · 2024-11-14T11:47:47.000-07:00
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesLayout.kt
@@ -64,7 +64,7 @@ internal fun AllFavoritesList(
                 style = MaterialTheme.typography.titleLarge,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .animateItemPlacement()
+                    .animateItem()
             )
         }
 
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayout.kt
@@ -81,15 +81,15 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV
             Banners(
                 { banner },
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .fillMaxWidth()
             )
         }
 
         item("welcome") {
             WelcomeMessage(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = PADDING_HORIZONTAL)
                     .padding(top = 16.dp)
             )
@@ -100,7 +100,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV
             item("lesson-header", "lesson-header") {
                 FeaturedLessonsHeader(
                     modifier = Modifier
-                        .animateItemPlacement()
+                        .animateItem()
                         .padding(horizontal = PADDING_HORIZONTAL)
                         .padding(top = 32.dp, bottom = 16.dp)
                 )
@@ -121,7 +121,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV
                         }
                     },
                     modifier = Modifier
-                        .animateItemPlacement()
+                        .animateItem()
                         .padding(horizontal = PADDING_HORIZONTAL)
                         .padding(bottom = 16.dp)
                 )
@@ -135,7 +135,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV
                     showViewAll = { hasFavoriteTools },
                     onEvent = onEvent,
                     modifier = Modifier
-                        .animateItemPlacement()
+                        .animateItem()
                         .padding(horizontal = PADDING_HORIZONTAL)
                         .padding(top = 32.dp, bottom = 16.dp),
                 )
@@ -161,7 +161,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV
                             onEvent(it)
                         },
                         modifier = Modifier
-                            .animateItemPlacement()
+                            .animateItem()
                             .fillMaxWidth()
                     )
                 }
@@ -170,7 +170,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV
                     NoFavoriteTools(
                         onEvent = onEvent,
                         modifier = Modifier
-                            .animateItemPlacement()
+                            .animateItem()
                             .padding(horizontal = PADDING_HORIZONTAL)
                     )
                 }
@@ -245,7 +245,7 @@ private fun HorizontalFavoriteTools(
                     is ToolCardEvent.OpenToolDetails -> onEvent(DashboardHomeEvent.OpenToolDetails(it))
                 }
             },
-            modifier = Modifier.animateItemPlacement()
+            modifier = Modifier.animateItem()
         )
     }
 }
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/lessons/LessonsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/lessons/LessonsLayout.kt
@@ -57,7 +57,7 @@ internal fun LessonsLayout(viewModel: LessonsViewModel = viewModel(), onEvent: (
                     }
                 },
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(top = 16.dp)
             )
         }
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolFilters.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolFilters.kt
@@ -204,7 +204,7 @@ internal fun LanguageFilter(filters: ToolsScreen.Filters, modifier: Modifier = M
                         count,
                     ),
                     onClick = { eventSink(ToolsScreen.FiltersEvent.SelectLanguage(it.code)) },
-                    modifier = Modifier.animateItemPlacement()
+                    modifier = Modifier.animateItem()
                 )
             }
         }
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt
@@ -54,7 +54,7 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier
             Banners(
                 { banner },
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .fillMaxWidth()
             )
         }
@@ -64,13 +64,13 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier
                 ToolSpotlight(
                     spotlightTools,
                     modifier = Modifier
-                        .animateItemPlacement()
+                        .animateItem()
                         .padding(top = 16.dp)
                 )
 
                 HorizontalDivider(
                     modifier = Modifier
-                        .animateItemPlacement()
+                        .animateItem()
                         .padding(horizontal = MARGIN_TOOLS_LAYOUT_HORIZONTAL, top = 16.dp)
                 )
             }
@@ -80,7 +80,7 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier
             ToolFilters(
                 filters = filters,
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(vertical = 16.dp)
             )
         }
@@ -100,7 +100,7 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier
                 state = toolState,
                 showActions = false,
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(bottom = 16.dp, horizontal = 16.dp)
             )
         }
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/languages/LanguageSettingsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/languages/LanguageSettingsLayout.kt
@@ -154,22 +154,22 @@ internal fun LanguageSettingsLayout(state: State, modifier: Modifier = Modifier)
                 }
 
                 itemsIndexed(pinnedLanguages, key = { _, it -> it.code }) { i, it ->
-                    if (i == 0) HorizontalDivider(modifier = Modifier.animateItemPlacement())
+                    if (i == 0) HorizontalDivider(modifier = Modifier.animateItem())
                     LanguageName(
                         it,
                         modifier = Modifier
-                            .animateItemPlacement()
+                            .animateItem()
                             .heightIn(min = 56.dp)
                             .padding(vertical = 4.dp)
                             .wrapContentHeight(Alignment.CenterVertically)
                     )
-                    HorizontalDivider(modifier = Modifier.animateItemPlacement())
+                    HorizontalDivider(modifier = Modifier.animateItem())
                 }
                 item(SECTION_OFFLINE_LANGUAGES_BOTTOM) {
                     Button(
                         onClick = { eventSink(Event.DownloadableLanguages) },
                         modifier = Modifier
-                            .animateItemPlacement()
+                            .animateItem()
                             .padding(top = 24.dp)
                             .fillMaxWidth()
                     ) {
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/languages/downloadable/DownloadableLanguagesLayout.kt
@@ -116,7 +116,7 @@ fun DownloadableLanguagesLayout(
             modifier = Modifier.padding(contentPadding)
         ) {
             itemsIndexed(languages, key = { _, it -> it.code }) { i, it ->
-                LanguageListItem(languageViewModels.get(it), Modifier.animateItemPlacement())
+                LanguageListItem(languageViewModels.get(it), Modifier.animateItem())
                 if (i + 1 < languages.size) HorizontalDivider()
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ internal fun AllFavoritesList(`
`64`	`64`	`style = MaterialTheme.typography.titleLarge,`
`65`	`65`	`modifier = Modifier`
`66`	`66`	`.fillMaxWidth()`
`67`		`- .animateItemPlacement()`
	`67`	`+ .animateItem()`
`68`	`68`	`)`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,15 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV`
`81`	`81`	`Banners(`
`82`	`82`	`{ banner },`
`83`	`83`	`modifier = Modifier`
`84`		`- .animateItemPlacement()`
	`84`	`+ .animateItem()`
`85`	`85`	`.fillMaxWidth()`
`86`	`86`	`)`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`item("welcome") {`
`90`	`90`	`WelcomeMessage(`
`91`	`91`	`modifier = Modifier`
`92`		`- .animateItemPlacement()`
	`92`	`+ .animateItem()`
`93`	`93`	`.padding(horizontal = PADDING_HORIZONTAL)`
`94`	`94`	`.padding(top = 16.dp)`
`95`	`95`	`)`
`@@ -100,7 +100,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV`
`100`	`100`	`item("lesson-header", "lesson-header") {`
`101`	`101`	`FeaturedLessonsHeader(`
`102`	`102`	`modifier = Modifier`
`103`		`- .animateItemPlacement()`
	`103`	`+ .animateItem()`
`104`	`104`	`.padding(horizontal = PADDING_HORIZONTAL)`
`105`	`105`	`.padding(top = 32.dp, bottom = 16.dp)`
`106`	`106`	`)`
`@@ -121,7 +121,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV`
`121`	`121`	`}`
`122`	`122`	`},`
`123`	`123`	`modifier = Modifier`
`124`		`- .animateItemPlacement()`
	`124`	`+ .animateItem()`
`125`	`125`	`.padding(horizontal = PADDING_HORIZONTAL)`
`126`	`126`	`.padding(bottom = 16.dp)`
`127`	`127`	`)`
`@@ -135,7 +135,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV`
`135`	`135`	`showViewAll = { hasFavoriteTools },`
`136`	`136`	`onEvent = onEvent,`
`137`	`137`	`modifier = Modifier`
`138`		`- .animateItemPlacement()`
	`138`	`+ .animateItem()`
`139`	`139`	`.padding(horizontal = PADDING_HORIZONTAL)`
`140`	`140`	`.padding(top = 32.dp, bottom = 16.dp),`
`141`	`141`	`)`
`@@ -161,7 +161,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV`
`161`	`161`	`onEvent(it)`
`162`	`162`	`},`
`163`	`163`	`modifier = Modifier`
`164`		`- .animateItemPlacement()`
	`164`	`+ .animateItem()`
`165`	`165`	`.fillMaxWidth()`
`166`	`166`	`)`
`167`	`167`	`}`
`@@ -170,7 +170,7 @@ internal fun HomeContent(onEvent: (DashboardHomeEvent) -> Unit, viewModel: HomeV`
`170`	`170`	`NoFavoriteTools(`
`171`	`171`	`onEvent = onEvent,`
`172`	`172`	`modifier = Modifier`
`173`		`- .animateItemPlacement()`
	`173`	`+ .animateItem()`
`174`	`174`	`.padding(horizontal = PADDING_HORIZONTAL)`
`175`	`175`	`)`
`176`	`176`	`}`
`@@ -245,7 +245,7 @@ private fun HorizontalFavoriteTools(`
`245`	`245`	`is ToolCardEvent.OpenToolDetails -> onEvent(DashboardHomeEvent.OpenToolDetails(it))`
`246`	`246`	`}`
`247`	`247`	`},`
`248`		`- modifier = Modifier.animateItemPlacement()`
	`248`	`+ modifier = Modifier.animateItem()`
`249`	`249`	`)`
`250`	`250`	`}`
`251`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ internal fun LessonsLayout(viewModel: LessonsViewModel = viewModel(), onEvent: (`
`57`	`57`	`}`
`58`	`58`	`},`
`59`	`59`	`modifier = Modifier`
`60`		`- .animateItemPlacement()`
	`60`	`+ .animateItem()`
`61`	`61`	`.padding(top = 16.dp)`
`62`	`62`	`)`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ internal fun LanguageFilter(filters: ToolsScreen.Filters, modifier: Modifier = M`
`204`	`204`	`count,`
`205`	`205`	`),`
`206`	`206`	`onClick = { eventSink(ToolsScreen.FiltersEvent.SelectLanguage(it.code)) },`
`207`		`- modifier = Modifier.animateItemPlacement()`
	`207`	`+ modifier = Modifier.animateItem()`
`208`	`208`	`)`
`209`	`209`	`}`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier`
`54`	`54`	`Banners(`
`55`	`55`	`{ banner },`
`56`	`56`	`modifier = Modifier`
`57`		`- .animateItemPlacement()`
	`57`	`+ .animateItem()`
`58`	`58`	`.fillMaxWidth()`
`59`	`59`	`)`
`60`	`60`	`}`
`@@ -64,13 +64,13 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier`
`64`	`64`	`ToolSpotlight(`
`65`	`65`	`spotlightTools,`
`66`	`66`	`modifier = Modifier`
`67`		`- .animateItemPlacement()`
	`67`	`+ .animateItem()`
`68`	`68`	`.padding(top = 16.dp)`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`HorizontalDivider(`
`72`	`72`	`modifier = Modifier`
`73`		`- .animateItemPlacement()`
	`73`	`+ .animateItem()`
`74`	`74`	`.padding(horizontal = MARGIN_TOOLS_LAYOUT_HORIZONTAL, top = 16.dp)`
`75`	`75`	`)`
`76`	`76`	`}`
`@@ -80,7 +80,7 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier`
`80`	`80`	`ToolFilters(`
`81`	`81`	`filters = filters,`
`82`	`82`	`modifier = Modifier`
`83`		`- .animateItemPlacement()`
	`83`	`+ .animateItem()`
`84`	`84`	`.padding(vertical = 16.dp)`
`85`	`85`	`)`
`86`	`86`	`}`
`@@ -100,7 +100,7 @@ internal fun ToolsLayout(state: ToolsScreen.State, modifier: Modifier = Modifier`
`100`	`100`	`state = toolState,`
`101`	`101`	`showActions = false,`
`102`	`102`	`modifier = Modifier`
`103`		`- .animateItemPlacement()`
	`103`	`+ .animateItem()`
`104`	`104`	`.padding(bottom = 16.dp, horizontal = 16.dp)`
`105`	`105`	`)`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ fun DownloadableLanguagesLayout(`
`116`	`116`	`modifier = Modifier.padding(contentPadding)`
`117`	`117`	`) {`
`118`	`118`	`itemsIndexed(languages, key = { _, it -> it.code }) { i, it ->`
`119`		`- LanguageListItem(languageViewModels.get(it), Modifier.animateItemPlacement())`
	`119`	`+ LanguageListItem(languageViewModels.get(it), Modifier.animateItem())`
`120`	`120`	`if (i + 1 < languages.size) HorizontalDivider()`
`121`	`121`	`}`
`122`	`122`	`}`