-
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #445 from qdsfdhvh/version_1.7.4
Version 1.7.4
- Loading branch information
Showing
20 changed files
with
212 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
app/common/src/androidMain/kotlin/com/seiko/imageloader/demo/util/HttpEngine.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| package com.seiko.imageloader.demo.util | ||
|
|
||
| import io.ktor.client.engine.HttpClientEngine | ||
| import io.ktor.client.engine.cio.CIO | ||
| import io.ktor.client.engine.okhttp.OkHttp | ||
|
|
||
| actual val httpEngine: HttpClientEngine | ||
| get() = CIO.create() | ||
| get() = OkHttp.create() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 156 additions & 0 deletions
156
app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/WanAndroidScene.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| package com.seiko.imageloader.demo.scene | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.widthIn | ||
| import androidx.compose.foundation.lazy.grid.GridCells | ||
| import androidx.compose.foundation.lazy.grid.LazyVerticalGrid | ||
| import androidx.compose.material.ScrollableTabRow | ||
| import androidx.compose.material.Tab | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableIntStateOf | ||
| import androidx.compose.runtime.produceState | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import com.seiko.imageloader.demo.MR | ||
| import com.seiko.imageloader.demo.util.JSON | ||
| import com.seiko.imageloader.demo.util.httpEngine | ||
| import com.seiko.imageloader.ui.AutoSizeImage | ||
| import io.ktor.client.HttpClient | ||
| import io.ktor.client.call.body | ||
| import io.ktor.client.plugins.contentnegotiation.ContentNegotiation | ||
| import io.ktor.client.plugins.defaultRequest | ||
| import io.ktor.client.request.get | ||
| import io.ktor.client.statement.HttpResponse | ||
| import io.ktor.serialization.kotlinx.json.json | ||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
| import org.jetbrains.compose.resources.ExperimentalResourceApi | ||
| import org.jetbrains.compose.resources.painterResource | ||
|
|
||
| @OptIn(ExperimentalResourceApi::class) | ||
| @Composable | ||
| fun WanAndroidScene( | ||
| onBack: () -> Unit, | ||
| ) { | ||
| BackScene( | ||
| onBack = onBack, | ||
| title = { Text("WanAndroid") }, | ||
| ) { innerPadding -> | ||
| val client by remember { | ||
| lazy { | ||
| HttpClient(httpEngine) { | ||
| install(ContentNegotiation) { | ||
| json(JSON) | ||
| } | ||
| defaultRequest { | ||
| url("https://www.wanandroid.com/") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Column(Modifier.padding(innerPadding).fillMaxSize()) { | ||
| val tabs by produceState(emptyList()) { | ||
| value = runCatching { | ||
| client.get("project/tree/json") | ||
| .wanBody<List<WanProjectTabs>>() | ||
| .take(5) | ||
| }.getOrElse { | ||
| it.printStackTrace() | ||
| emptyList() | ||
| } | ||
| } | ||
| if (tabs.isEmpty()) return@Column | ||
|
|
||
| var selectedTabIndex by remember { mutableIntStateOf(0) } | ||
| ScrollableTabRow( | ||
| selectedTabIndex = selectedTabIndex, | ||
| modifier = Modifier.fillMaxWidth(), | ||
| tabs = { | ||
| tabs.forEachIndexed { index, tag -> | ||
| Tab( | ||
| selected = index == selectedTabIndex, | ||
| onClick = { selectedTabIndex = index }, | ||
| modifier = Modifier.widthIn(min = 100.dp), | ||
| ) { | ||
| Text(tag.name) | ||
| } | ||
| } | ||
| }, | ||
| ) | ||
|
|
||
| val projects by produceState(emptyList(), key1 = tabs, key2 = selectedTabIndex) { | ||
| value = runCatching { | ||
| client.get("project/list/1/json?cid=${tabs[selectedTabIndex].id}") | ||
| .wanBody<WanProjectPage>().projects | ||
| }.getOrElse { | ||
| it.printStackTrace() | ||
| emptyList() | ||
| } | ||
| } | ||
|
|
||
| LazyVerticalGrid( | ||
| GridCells.Fixed(3), | ||
| Modifier.weight(1f).fillMaxWidth(), | ||
| ) { | ||
| items( | ||
| projects.size, | ||
| key = { projects[it].id }, | ||
| ) { | ||
| Column { | ||
| AutoSizeImage( | ||
| projects[it].envelopePic, | ||
| contentDescription = projects[it].title, | ||
| modifier = Modifier.size(200.dp), | ||
| placeholderPainter = { painterResource(MR.images.cat) }, | ||
| errorPainter = { painterResource(MR.images.cat) }, | ||
| ) | ||
| Text(projects[it].title) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private suspend inline fun <reified T> HttpResponse.wanBody(): T { | ||
| val response = body<WanResponse<T>>() | ||
| if (response.errorCode == 0) { | ||
| return response.data | ||
| } else { | ||
| error(response.errorMsg) | ||
| } | ||
| } | ||
|
|
||
| @Serializable | ||
| private data class WanResponse<T>( | ||
| val data: T, | ||
| val errorCode: Int, | ||
| val errorMsg: String, | ||
| ) | ||
|
|
||
| @Serializable | ||
| private data class WanProjectTabs( | ||
| val id: Int, | ||
| val name: String, | ||
| ) | ||
|
|
||
| @Serializable | ||
| private data class WanProjectPage( | ||
| val curPage: Int, | ||
| @SerialName("datas") val projects: List<WanProject>, | ||
| ) | ||
|
|
||
| @Serializable | ||
| private data class WanProject( | ||
| val id: Int, | ||
| val title: String, | ||
| val envelopePic: String, | ||
| ) |
4 changes: 2 additions & 2 deletions
4
app/common/src/desktopMain/kotlin/com/seiko/imageloader/demo/util/HttpEngine.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| package com.seiko.imageloader.demo.util | ||
|
|
||
| import io.ktor.client.engine.HttpClientEngine | ||
| import io.ktor.client.engine.cio.CIO | ||
| import io.ktor.client.engine.okhttp.OkHttp | ||
|
|
||
| actual val httpEngine: HttpClientEngine | ||
| get() = CIO.create() | ||
| get() = OkHttp.create() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.