Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-10-18 12:54:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compose->build152

Browse Source
This commit is contained in:
shabinder 2021-02-12 02:51:39 +05:30
parent b5de14ae75
commit a186a1a1e7
6 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle.kts
View File

@ -13,13 +13,4 @@ allprojects {
maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers/") maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers/")
maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev") maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev")
} }
} }
/*
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check",
"-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
"-Xuse-experimental=kotlinx.coroutines.TheAnnotationYouWantToDisable"
)
}
}*/

2
buildSrc/buildSrc/src/main/kotlin/Versions.kt
View File

@ -67,7 +67,7 @@ object JetBrains {
object Compose { object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
const val VERSION = "0.3.0-build150" const val VERSION = "0.3.0-build152"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
} }
} }

10
common/compose-ui/src/commonMain/kotlin/com/shabinder/common/list/SpotiFlyerListUi.kt
View File

@ -76,11 +76,11 @@ fun TrackCard(
pic = pic, pic = pic,
"Album Art", "Album Art",
modifier = Modifier modifier = Modifier
.preferredWidth(75.dp) .width(75.dp)
.preferredHeight(90.dp) .height(90.dp)
.clip(MaterialTheme.shapes.medium) .clip(MaterialTheme.shapes.medium)
) )
Column(modifier = Modifier.padding(horizontal = 8.dp).preferredHeight(60.dp).weight(1f),verticalArrangement = Arrangement.SpaceEvenly) { Column(modifier = Modifier.padding(horizontal = 8.dp).height(60.dp).weight(1f),verticalArrangement = Arrangement.SpaceEvenly) {
Text(track.title,maxLines = 1,overflow = TextOverflow.Ellipsis,style = SpotiFlyerTypography.h6,color = colorAccent) Text(track.title,maxLines = 1,overflow = TextOverflow.Ellipsis,style = SpotiFlyerTypography.h6,color = colorAccent)
Row( Row(
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween,
@ -138,8 +138,8 @@ fun CoverImage(
pic, pic,
"Cover Image", "Cover Image",
modifier = Modifier modifier = Modifier
.preferredWidth(210.dp) .width(210.dp)
.preferredHeight(230.dp) .height(230.dp)
.clip(MaterialTheme.shapes.medium) .clip(MaterialTheme.shapes.medium)
) )
Text( Text(

8
common/compose-ui/src/commonMain/kotlin/com/shabinder/common/main/SpotiFlyerMainUi.kt
View File

@ -235,7 +235,7 @@ fun AboutColumn(modifier: Modifier = Modifier) {
.clickable(onClick = { openPlatform("","http://github.com/Shabinder/SpotiFlyer") }), .clickable(onClick = { openPlatform("","http://github.com/Shabinder/SpotiFlyer") }),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Icon(Icons.Rounded.Flag,"Help Translate",Modifier.preferredSize(32.dp)) Icon(Icons.Rounded.Flag,"Help Translate",Modifier.size(32.dp))
Spacer(modifier = Modifier.padding(start = 16.dp)) Spacer(modifier = Modifier.padding(start = 16.dp))
Column { Column {
Text( Text(
@ -334,9 +334,9 @@ fun DownloadRecordItem(
ImageLoad( ImageLoad(
pic, pic,
"Album Art", "Album Art",
modifier = Modifier.preferredHeight(75.dp).preferredWidth(90.dp) modifier = Modifier.height(75.dp).width(90.dp)
) )
Column(modifier = Modifier.padding(horizontal = 8.dp).preferredHeight(60.dp).weight(1f),verticalArrangement = Arrangement.SpaceEvenly) { Column(modifier = Modifier.padding(horizontal = 8.dp).height(60.dp).weight(1f),verticalArrangement = Arrangement.SpaceEvenly) {
Text(item.name,maxLines = 1,overflow = TextOverflow.Ellipsis,style = SpotiFlyerTypography.h6,color = colorAccent) Text(item.name,maxLines = 1,overflow = TextOverflow.Ellipsis,style = SpotiFlyerTypography.h6,color = colorAccent)
Row( Row(
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween,
@ -366,7 +366,7 @@ fun HomeCategoryTabIndicator(
) { ) {
Spacer( Spacer(
modifier.padding(horizontal = 24.dp) modifier.padding(horizontal = 24.dp)
.preferredHeight(4.dp) .height(4.dp)
.background(color, RoundedCornerShape(topStartPercent = 100, topEndPercent = 100)) .background(color, RoundedCornerShape(topStartPercent = 100, topEndPercent = 100))
) )
} }

2
common/compose-ui/src/commonMain/kotlin/com/shabinder/common/root/SpotiFlyerRootUi.kt
View File

@ -59,7 +59,7 @@ fun AppBar(
Image( Image(
imageVector = SpotiFlyerLogo(), imageVector = SpotiFlyerLogo(),
"SpotiFlyer Logo", "SpotiFlyer Logo",
Modifier.preferredSize(32.dp), Modifier.size(32.dp),
) )
Spacer(Modifier.padding(horizontal = 4.dp)) Spacer(Modifier.padding(horizontal = 4.dp))
Text( Text(

7
common/compose-ui/src/desktopMain/kotlin/com/shabinder/common/ui/DesktopToast.kt
View File

@ -1,9 +1,6 @@
package com.shabinder.common.ui package com.shabinder.common.ui
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Surface import androidx.compose.material.Surface
import androidx.compose.material.Text import androidx.compose.material.Text
@ -49,7 +46,7 @@ actual fun Toast(
contentAlignment = Alignment.BottomCenter contentAlignment = Alignment.BottomCenter
) { ) {
Surface( Surface(
modifier = Modifier.preferredSize(300.dp, 70.dp), modifier = Modifier.size(300.dp, 70.dp),
color = Color(23, 23, 23), color = Color(23, 23, 23),
shape = RoundedCornerShape(4.dp) shape = RoundedCornerShape(4.dp)
) { ) {