Run ktfmt 0.54 on poxdex compose
Change-Id: Id8aba5aff0def33e1f8891c42c3eb798b50443f2
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/details/DetailsRepositoryImpl.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/details/DetailsRepositoryImpl.kt
index 8604b1f..2612f66 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/details/DetailsRepositoryImpl.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/details/DetailsRepositoryImpl.kt
@@ -38,7 +38,7 @@
override fun fetchPokemonInfo(
name: String,
onComplete: () -> Unit,
- onError: (String?) -> Unit
+ onError: (String?) -> Unit,
) =
flow {
val pokemonInfo = pokemonInfoDao.getPokemonInfo(name)
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/home/HomeRepositoryImpl.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/home/HomeRepositoryImpl.kt
index b347870..05471a5 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/home/HomeRepositoryImpl.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/data/repository/home/HomeRepositoryImpl.kt
@@ -34,7 +34,7 @@
private val pokedexClient: PokedexClient,
private val pokemonDao: PokemonDao,
@Dispatcher(PokedexAppDispatchers.IO) private val ioDispatcher: CoroutineDispatcher,
- private val apiUrl: HttpUrl
+ private val apiUrl: HttpUrl,
) : HomeRepository {
@WorkerThread
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/PokedexDatabase.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/PokedexDatabase.kt
index bef6a0b..2cb1821 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/PokedexDatabase.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/PokedexDatabase.kt
@@ -25,7 +25,7 @@
@Database(
entities = [PokemonEntity::class, PokemonInfoEntity::class],
version = 1,
- exportSchema = false /* We don't require schema versioning in Hero Benchmarks */
+ exportSchema = false, /* We don't require schema versioning in Hero Benchmarks */
)
@TypeConverters(value = [TypeResponseConverter::class, StatsResponseConverter::class])
abstract class PokedexDatabase : RoomDatabase() {
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/entitiy/mapper/PokemonEntityMapper.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/entitiy/mapper/PokemonEntityMapper.kt
index c61d20e..a1118f4 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/entitiy/mapper/PokemonEntityMapper.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/database/entitiy/mapper/PokemonEntityMapper.kt
@@ -37,6 +37,6 @@
.addPathSegment("image")
.build()
.toString(),
- page = page
+ page = page,
)
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexAppBar.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexAppBar.kt
index 524c450..ede81e3 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexAppBar.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexAppBar.kt
@@ -57,10 +57,7 @@
)
},
colors =
- TopAppBarDefaults.topAppBarColors()
- .copy(
- containerColor = PokedexTheme.colors.primary,
- ),
+ TopAppBarDefaults.topAppBarColors().copy(containerColor = PokedexTheme.colors.primary),
)
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexProgressBar.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexProgressBar.kt
index 5286a25..17f5f56 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexProgressBar.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexProgressBar.kt
@@ -65,7 +65,7 @@
screenWidth
} else {
0f
- },
+ }
)
}
@@ -79,15 +79,12 @@
color = PokedexTheme.colors.absoluteWhite,
shape = RoundedCornerShape(64.dp),
)
- .clip(RoundedCornerShape(64.dp)),
+ .clip(RoundedCornerShape(64.dp))
) {
var textWidth by remember { mutableIntStateOf(0) }
val threshold = 16
val isInner by
- remember(
- progressWidth,
- textWidth,
- ) {
+ remember(progressWidth, textWidth) {
mutableStateOf(progressWidth > (textWidth + threshold * 2))
}
@@ -102,14 +99,9 @@
Box(
modifier =
Modifier.align(Alignment.CenterStart)
- .width(
- progressWidth.toInt().pxToDp() * animation,
- )
+ .width(progressWidth.toInt().pxToDp() * animation)
.height(18.dp)
- .background(
- color = color,
- shape = RoundedCornerShape(64.dp),
- ),
+ .background(color = color, shape = RoundedCornerShape(64.dp))
) {
if (isInner) {
Text(
@@ -129,9 +121,7 @@
modifier =
Modifier.onSizeChanged { textWidth = it.width }
.align(Alignment.CenterStart)
- .padding(
- start = progressWidth.toInt().pxToDp() + threshold.pxToDp(),
- ),
+ .padding(start = progressWidth.toInt().pxToDp() + threshold.pxToDp()),
text = label,
fontSize = 12.sp,
color = PokedexTheme.colors.absoluteBlack,
@@ -147,7 +137,7 @@
PokedexTheme {
Box(
modifier =
- Modifier.fillMaxWidth().height(120.dp).background(PokedexTheme.colors.background),
+ Modifier.fillMaxWidth().height(120.dp).background(PokedexTheme.colors.background)
) {
PokedexProgressBar(
modifier = Modifier.align(Alignment.Center),
@@ -166,7 +156,7 @@
PokedexTheme {
Box(
modifier =
- Modifier.fillMaxWidth().height(120.dp).background(PokedexTheme.colors.background),
+ Modifier.fillMaxWidth().height(120.dp).background(PokedexTheme.colors.background)
) {
PokedexProgressBar(
modifier = Modifier.fillMaxWidth().align(Alignment.Center),
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexSharedElement.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexSharedElement.kt
index e160416..82c1aba 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexSharedElement.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexSharedElement.kt
@@ -89,10 +89,7 @@
}
private val DefaultSpring =
- spring(
- stiffness = Spring.StiffnessMediumLow,
- visibilityThreshold = Rect.VisibilityThreshold,
- )
+ spring(stiffness = Spring.StiffnessMediumLow, visibilityThreshold = Rect.VisibilityThreshold)
@OptIn(ExperimentalSharedTransitionApi::class)
private val DefaultBoundsTransform = BoundsTransform { _, _ -> DefaultSpring }
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexTheme.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexTheme.kt
index 7d9a743..d3d50ec 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexTheme.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexTheme.kt
@@ -56,7 +56,7 @@
) {
Box(
modifier =
- Modifier.background(background.color).semantics { testTagsAsResourceId = true },
+ Modifier.background(background.color).semantics { testTagsAsResourceId = true }
) {
content()
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/di/RepositoryModule.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/di/RepositoryModule.kt
index b8790af..b0f7164 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/di/RepositoryModule.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/di/RepositoryModule.kt
@@ -31,7 +31,7 @@
private val pokemonDao: PokemonDao,
private val pokemonInfoDao: PokemonInfoDao,
private val ioDispatcher: CoroutineDispatcher,
- private val apiUrl: HttpUrl
+ private val apiUrl: HttpUrl,
) {
val detailsRepository: DetailsRepository by lazy {
DetailsRepositoryImpl(pokedexClient, pokemonInfoDao, ioDispatcher)
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonInfo.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonInfo.kt
index 8909227..5c2f9c9 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonInfo.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonInfo.kt
@@ -75,15 +75,9 @@
@SerialName(value = "stat") val stat: Stat,
)
- @Serializable
- data class Stat(
- @SerialName(value = "name") val name: String,
- )
+ @Serializable data class Stat(@SerialName(value = "name") val name: String)
- @Serializable
- data class Type(
- @SerialName(value = "name") val name: String,
- )
+ @Serializable data class Type(@SerialName(value = "name") val name: String)
companion object {
const val MAX_HP = 300
@@ -103,7 +97,7 @@
weight = random.nextInt(80, 300),
experience = random.nextInt(0, 100),
types = listOf(FakePokemonTypeResponse(random)),
- stats = listOf(fakePokemonStats(random))
+ stats = listOf(fakePokemonStats(random)),
)
}
@@ -122,7 +116,7 @@
return PokemonInfo.StatsResponse(
baseStat = random.nextInt(until = statMax),
effort = random.nextInt(),
- stat = stat
+ stat = stat,
)
}
@@ -133,7 +127,7 @@
"A big one",
"An adorable one",
"A tiny one",
- "A software-developing one"
+ "A software-developing one",
)
fun FakePokemonTypeResponse(random: Random = Random) =
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonNetworkModel.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonNetworkModel.kt
index 5abce09..a568c58 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonNetworkModel.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/model/PokemonNetworkModel.kt
@@ -339,6 +339,6 @@
"Xenonix",
"Zephyron",
"Ziggurat",
- "Zincite"
+ "Zincite",
)
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/LocalComposeNavigator.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/LocalComposeNavigator.kt
index f77ab07..fad499e 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/LocalComposeNavigator.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/LocalComposeNavigator.kt
@@ -25,7 +25,7 @@
compositionLocalOf {
error(
"No AppComposeNavigator provided! " +
- "Make sure to wrap all usages of Pokedex components in PokedexTheme.",
+ "Make sure to wrap all usages of Pokedex components in PokedexTheme."
)
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/Navigator.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/Navigator.kt
index 1d54821..67ff4b9 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/Navigator.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/Navigator.kt
@@ -60,10 +60,7 @@
}
NavigationCommand.NavigateUp -> navigateUp()
is ComposeNavigationCommand.PopUpToRoute<*> ->
- popBackStack(
- navigationCommand.route,
- navigationCommand.inclusive,
- )
+ popBackStack(navigationCommand.route, navigationCommand.inclusive)
is ComposeNavigationCommand.NavigateUpWithResult<*, *> -> {
navUpWithResult(navigationCommand)
}
@@ -71,16 +68,11 @@
}
private fun NavController.navUpWithResult(
- navigationCommand: ComposeNavigationCommand.NavigateUpWithResult<*, *>,
+ navigationCommand: ComposeNavigationCommand.NavigateUpWithResult<*, *>
) {
val backStackEntry =
navigationCommand.route?.let { getBackStackEntry(it) } ?: previousBackStackEntry
- backStackEntry
- ?.savedStateHandle
- ?.set(
- navigationCommand.key,
- navigationCommand.result,
- )
+ backStackEntry?.savedStateHandle?.set(navigationCommand.key, navigationCommand.result)
navigationCommand.route?.let { popBackStack(it, false) } ?: navigateUp()
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/PokedexComposeNavigator.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/PokedexComposeNavigator.kt
index 2bd72c8..03dc29c 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/PokedexComposeNavigator.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/navigation/PokedexComposeNavigator.kt
@@ -28,10 +28,7 @@
override fun navigateAndClearBackStack(route: PokedexScreen) {
navigationCommands.tryEmit(
- ComposeNavigationCommand.NavigateToRoute(
- route,
- navOptions { popUpTo(0) },
- ),
+ ComposeNavigationCommand.NavigateToRoute(route, navOptions { popUpTo(0) })
)
}
@@ -41,11 +38,7 @@
override fun <R> navigateBackWithResult(key: String, result: R, route: PokedexScreen?) {
navigationCommands.tryEmit(
- ComposeNavigationCommand.NavigateUpWithResult(
- key = key,
- result = result,
- route = route,
- ),
+ ComposeNavigationCommand.NavigateUpWithResult(key = key, result = result, route = route)
)
}
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/PokedexAppDispatchers.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/PokedexAppDispatchers.kt
index 52021b9..e272254 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/PokedexAppDispatchers.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/PokedexAppDispatchers.kt
@@ -22,5 +22,5 @@
annotation class Dispatcher(@Suppress("Unused") val pokedexAppDispatchers: PokedexAppDispatchers)
enum class PokedexAppDispatchers {
- IO,
+ IO
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/ModuleLocator.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/ModuleLocator.kt
index bdd7e89..3aab54e 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/ModuleLocator.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/ModuleLocator.kt
@@ -37,13 +37,13 @@
val networkModule by lazy {
NetworkModule(
json = serializationModule.json,
- networkCoroutineContext = dispatchersModule.io
+ networkCoroutineContext = dispatchersModule.io,
)
}
val databaseModule by lazy {
DatabaseModule(
context = requireNotNull(context) { "Please attach the context using attach" },
- json = serializationModule.json
+ json = serializationModule.json,
)
}
val repositoryModule by lazy {
@@ -52,7 +52,7 @@
databaseModule.pokemonDao,
databaseModule.pokemonInfoDao,
dispatchersModule.io,
- networkModule.baseUrl
+ networkModule.baseUrl,
)
}
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/NetworkModule.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/NetworkModule.kt
index 58a5598..51250b6 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/NetworkModule.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/di/NetworkModule.kt
@@ -87,7 +87,7 @@
)
.sslSocketFactory(
sslSocketFactory = localhostCertificates.sslSocketFactory(),
- trustManager = localhostCertificates.trustManager
+ trustManager = localhostCertificates.trustManager,
)
.build()
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/service/PokedexClient.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/service/PokedexClient.kt
index 51c24a3..dbac51e 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/service/PokedexClient.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/network/service/PokedexClient.kt
@@ -23,10 +23,7 @@
suspend fun fetchPokemonList(page: Int): Result<PokemonResponse> =
kotlin.runCatching {
- pokedexService.fetchPokemonList(
- limit = PAGING_SIZE,
- offset = page * PAGING_SIZE,
- )
+ pokedexService.fetchPokemonList(limit = PAGING_SIZE, offset = page * PAGING_SIZE)
}
suspend fun fetchPokemonInfo(name: String): Result<PokemonInfo> =
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PokedexPreviewTheme.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PokedexPreviewTheme.kt
index 01c84aa..2a00e29 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PokedexPreviewTheme.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PokedexPreviewTheme.kt
@@ -29,11 +29,9 @@
@OptIn(ExperimentalSharedTransitionApi::class)
@Composable
fun PokedexPreviewTheme(
- content: @Composable SharedTransitionScope.(AnimatedVisibilityScope) -> Unit,
+ content: @Composable SharedTransitionScope.(AnimatedVisibilityScope) -> Unit
) {
- CompositionLocalProvider(
- LocalComposeNavigator provides PokedexComposeNavigator(),
- ) {
+ CompositionLocalProvider(LocalComposeNavigator provides PokedexComposeNavigator()) {
PokedexTheme {
SharedTransitionScope { modifier ->
AnimatedVisibility(modifier = modifier, visible = true, label = "") {
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PreviewUtils.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PreviewUtils.kt
index 058a1e4..8da64cc 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PreviewUtils.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/preview/PreviewUtils.kt
@@ -23,18 +23,14 @@
@Suppress("Unused")
fun mockPokemon() =
- Pokemon(
- page = 0,
- name = "bulbasaur",
- imageUrl = "https://pokeapi.co/api/v2/pokemon/1/",
- )
+ Pokemon(page = 0, name = "bulbasaur", imageUrl = "https://pokeapi.co/api/v2/pokemon/1/")
fun mockPokemonList() =
List(10) {
Pokemon(
page = 0,
name = "bulbasaur$it",
- imageUrl = "https://pokeapi.co/api/v2/pokemon/1/"
+ imageUrl = "https://pokeapi.co/api/v2/pokemon/1/",
)
}
@@ -55,22 +51,22 @@
PokemonInfo.StatsResponse(
baseStat = 20,
effort = 0,
- stat = PokemonInfo.Stat("hp")
+ stat = PokemonInfo.Stat("hp"),
),
PokemonInfo.StatsResponse(
baseStat = 40,
effort = 0,
- stat = PokemonInfo.Stat("attack")
+ stat = PokemonInfo.Stat("attack"),
),
PokemonInfo.StatsResponse(
baseStat = 60,
effort = 0,
- stat = PokemonInfo.Stat("defense")
+ stat = PokemonInfo.Stat("defense"),
),
PokemonInfo.StatsResponse(
baseStat = 80,
effort = 0,
- stat = PokemonInfo.Stat("attack")
+ stat = PokemonInfo.Stat("attack"),
),
),
)
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/viewmodel/ViewModelStateFlow.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/viewmodel/ViewModelStateFlow.kt
index de57265..f547b97 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/core/viewmodel/ViewModelStateFlow.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/core/viewmodel/ViewModelStateFlow.kt
@@ -35,9 +35,7 @@
class ViewModelStateFlow<T>(private val key: ViewModelKey, value: T) : MutableStateFlow<T> {
private val mutableStateFlow: MutableStateFlow<Map<ViewModelKey, T>> =
- MutableStateFlow(
- mapOf(key to value),
- )
+ MutableStateFlow(mapOf(key to value))
override val subscriptionCount: StateFlow<Int>
get() = mutableStateFlow.subscriptionCount
@@ -47,7 +45,7 @@
if (key != this.key) {
throw IllegalArgumentException(
"Used different key to emit new value: $value!" +
- "Don't manipulate key value or try to emit out of ViewModels",
+ "Don't manipulate key value or try to emit out of ViewModels"
)
}
@@ -62,7 +60,7 @@
if (key != this.key) {
throw IllegalArgumentException(
"Used different key to emit new value: $value!" +
- "Don't manipulate key value or try to emit out of ViewModels",
+ "Don't manipulate key value or try to emit out of ViewModels"
)
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsBackground.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsBackground.kt
index e5142eb..b7758ff 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsBackground.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsBackground.kt
@@ -36,11 +36,7 @@
val domainColor = Color(domain)
if (light != null) {
val lightColor = Color(light)
- val gradient =
- arrayOf(
- 0.0f to domainColor,
- 1f to lightColor,
- )
+ val gradient = arrayOf(0.0f to domainColor, 1f to lightColor)
Brush.verticalGradient(colorStops = gradient)
} else {
Brush.linearGradient(colors = listOf(domainColor, domainColor))
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsViewModel.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsViewModel.kt
index 2b0fd6b..55d2e73 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsViewModel.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/DetailsViewModel.kt
@@ -31,10 +31,8 @@
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.stateIn
-class DetailsViewModel(
- detailsRepository: DetailsRepository,
- savedStateHandle: SavedStateHandle,
-) : BaseViewModel() {
+class DetailsViewModel(detailsRepository: DetailsRepository, savedStateHandle: SavedStateHandle) :
+ BaseViewModel() {
internal val uiState: ViewModelStateFlow<DetailsUiState> =
viewModelStateFlow(DetailsUiState.Loading)
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokedexDetails.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokedexDetails.kt
index 784070e..c5fdd3e 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokedexDetails.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokedexDetails.kt
@@ -97,7 +97,7 @@
Column(
modifier =
- Modifier.fillMaxSize().verticalScroll(rememberScrollState()).testTag("PokedexDetails"),
+ Modifier.fillMaxSize().verticalScroll(rememberScrollState()).testTag("PokedexDetails")
) {
DetailsHeader(
sharedTransitionScope = sharedTransitionScope,
@@ -126,12 +126,7 @@
val composeNavigator = currentComposeNavigator
val palette by remember { mutableStateOf<Palette?>(null) }
val shape =
- RoundedCornerShape(
- topStart = 0.dp,
- topEnd = 0.dp,
- bottomStart = 64.dp,
- bottomEnd = 64.dp,
- )
+ RoundedCornerShape(topStart = 0.dp, topEnd = 0.dp, bottomStart = 64.dp, bottomEnd = 64.dp)
val backgroundBrush by palette.paletteBackgroundBrush()
@@ -140,7 +135,7 @@
Modifier.fillMaxWidth()
.height(290.dp)
.shadow(elevation = 9.dp, shape = shape)
- .background(brush = backgroundBrush, shape = shape),
+ .background(brush = backgroundBrush, shape = shape)
) {
Row(
modifier = Modifier.padding(12.dp).statusBarsPadding(),
@@ -186,7 +181,7 @@
),
animatedVisibilityScope = animatedVisibilityScope,
boundsTransform = boundsTransform,
- )
+ ),
)
}
@@ -281,9 +276,7 @@
}
@Composable
-private fun DetailsStatus(
- pokemonInfo: PokemonInfo,
-) {
+private fun DetailsStatus(pokemonInfo: PokemonInfo) {
Text(
modifier = Modifier.fillMaxWidth().padding(top = 22.dp, bottom = 16.dp),
text = stringResource(id = R.string.base_stats),
@@ -333,11 +326,7 @@
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
private fun PokedexDetailsStatusPreview() {
- PokedexPreviewTheme {
- DetailsStatus(
- pokemonInfo = PreviewUtils.mockPokemonInfo(),
- )
- }
+ PokedexPreviewTheme { DetailsStatus(pokemonInfo = PreviewUtils.mockPokemonInfo()) }
}
private const val PokemonHeaderImageCrossfadeDurationMillis = 250
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonInfoItem.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonInfoItem.kt
index c2fd3b9..bff4445 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonInfoItem.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonInfoItem.kt
@@ -28,10 +28,7 @@
import com.skydoves.pokedex.compose.core.designsystem.theme.PokedexTheme
@Composable
-internal fun PokemonInfoItem(
- title: String?,
- content: String?,
-) {
+internal fun PokemonInfoItem(title: String?, content: String?) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
PokedexText(
modifier = Modifier.padding(10.dp),
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonStatusItem.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonStatusItem.kt
index 8b6f05e..653179b 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonStatusItem.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/details/PokemonStatusItem.kt
@@ -31,14 +31,8 @@
import com.skydoves.pokedex.compose.core.designsystem.theme.PokedexTheme
@Composable
-internal fun PokemonStatusItem(
- modifier: Modifier = Modifier,
- pokedexStatus: PokedexStatus,
-) {
- Row(
- modifier = modifier,
- horizontalArrangement = Arrangement.SpaceEvenly,
- ) {
+internal fun PokemonStatusItem(modifier: Modifier = Modifier, pokedexStatus: PokedexStatus) {
+ Row(modifier = modifier, horizontalArrangement = Arrangement.SpaceEvenly) {
Text(
modifier = Modifier.padding(start = 32.dp).widthIn(min = 20.dp),
text = pokedexStatus.type,
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/home/PokedexHome.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/home/PokedexHome.kt
index 4575b00..3029e36 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/home/PokedexHome.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/feature/home/PokedexHome.kt
@@ -189,7 +189,7 @@
animatedVisibilityScope = animatedVisibilityScope,
boundsTransform = boundsTransform,
),
- pokemon = pokemon
+ pokemon = pokemon,
)
Text(
@@ -254,7 +254,7 @@
animatedVisibilityScope = this,
sharedTransitionScope = this@SharedTransitionScope,
homeViewModel =
- viewModel { HomeViewModel(homeRepository = FakeHomeRepository()) }
+ viewModel { HomeViewModel(homeRepository = FakeHomeRepository()) },
)
}
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavHost.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavHost.kt
index ea11813..f06f40e 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavHost.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavHost.kt
@@ -27,10 +27,7 @@
@Composable
fun PokedexNavHost(navHostController: NavHostController) {
SharedTransitionLayout {
- NavHost(
- navController = navHostController,
- startDestination = PokedexScreen.Home,
- ) {
+ NavHost(navController = navHostController, startDestination = PokedexScreen.Home) {
pokedexNavigation(this@SharedTransitionLayout)
}
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavigation.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavigation.kt
index e31a779..1b72be7 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavigation.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/navigation/PokedexNavigation.kt
@@ -30,12 +30,10 @@
PokedexHome(sharedTransitionScope = sharedTransitionScope, animatedVisibilityScope = this)
}
- composable<PokedexScreen.Details>(
- typeMap = PokedexScreen.Details.typeMap,
- ) {
+ composable<PokedexScreen.Details>(typeMap = PokedexScreen.Details.typeMap) {
PokedexDetails(
sharedTransitionScope = sharedTransitionScope,
- animatedVisibilityScope = this
+ animatedVisibilityScope = this,
)
}
}
diff --git a/app/src/main/kotlin/com/skydoves/pokedex/compose/ui/PokedexComposeGlideAppModule.kt b/app/src/main/kotlin/com/skydoves/pokedex/compose/ui/PokedexComposeGlideAppModule.kt
index b89d22d..5c4b35d 100644
--- a/app/src/main/kotlin/com/skydoves/pokedex/compose/ui/PokedexComposeGlideAppModule.kt
+++ b/app/src/main/kotlin/com/skydoves/pokedex/compose/ui/PokedexComposeGlideAppModule.kt
@@ -34,7 +34,7 @@
registry.replace<GlideUrl, InputStream>(
/* modelClass = */ GlideUrl::class.java,
/* dataClass = */ InputStream::class.java,
- /* factory = */ loaderFactory
+ /* factory = */ loaderFactory,
)
}
}
