Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update google.accompanist to v0.32.0 #135

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Update google.accompanist to v0.32.0 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd8b88
Update google.accompanist to v0.32.0
renovate[bot] Nov 7, 2023
cd64002
Remove accompanist placeholder
julioromano Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ androidx-test = "1.5.0"
androidx-testEspresso = "3.5.1"
androidx-workManager = "2.8.1"
coil = "2.5.0"
google-accompanist = "0.30.1"
google-accompanist = "0.32.0"
google-glance-tooling = "0.2.2"
kotlin = "1.9.20"
kotlin-inject = "0.6.3"
Expand Down Expand Up @@ -113,7 +113,6 @@ google-accompanistNavigationMaterial = { module = "com.google.accompanist:accomp
google-accompanistPager = { module = "com.google.accompanist:accompanist-pager", version.ref = "google-accompanist" }
google-accompanistPagerInd = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "google-accompanist" }
google-accompanistPermissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "google-accompanist" }
google-accompanistPlaceholderMaterial = { module = "com.google.accompanist:accompanist-placeholder-material", version.ref = "google-accompanist" }
google-accompanistSystemUi = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "google-accompanist" }
google-firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
google-firebase-bom = "com.google.firebase:firebase-bom:32.5.0"
Expand Down
1 change: 0 additions & 1 deletion trending/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ dependencies {
implementation(libs.coilCompose)
implementation(libs.androidx.pagingRuntime)
implementation(libs.androidx.pagingCompose)
implementation(libs.google.accompanistPlaceholderMaterial)
implementation(libs.square.sqlDelightAndroidPaging3)
implementation(libs.square.sqlDelightCoroutines)
testImplementation(libs.square.turbine)
Expand Down
17 changes: 12 additions & 5 deletions ...ing/src/main/kotlin/net/marcoromano/mooviez/trending/widgets/trending/MoviePlaceHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.marcoromano.mooviez.trending.widgets.trending

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -8,6 +9,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
Expand All @@ -16,7 +18,6 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.google.accompanist.placeholder.material.placeholder
import net.marcoromano.mooviez.widgets.UserScore

@Composable
Expand All @@ -30,9 +31,9 @@ internal fun MoviePlaceHolder() {
Column {
Box(
modifier = Modifier
.placeholder(true)
.aspectRatio(500f / 750f)
.clip(RoundedCornerShape(32f)),
.clip(RoundedCornerShape(8f))
.background(MaterialTheme.colorScheme.surface),
)
Spacer(modifier = Modifier.height(32.dp))
}
Expand All @@ -48,15 +49,21 @@ internal fun MoviePlaceHolder() {
) {
Text(
text = "Lorem ipsum lorem ipsum",
modifier = Modifier
.clip(RoundedCornerShape(8f))
.background(MaterialTheme.colorScheme.surface),
color = MaterialTheme.colorScheme.surface,
fontWeight = FontWeight.Bold,
modifier = Modifier.placeholder(true),
)
Spacer(
modifier = Modifier.height(4.dp),
)
Text(
modifier = Modifier.placeholder(true),
text = "1999-01-01",
modifier = Modifier
.clip(RoundedCornerShape(8f))
.background(MaterialTheme.colorScheme.surface),
color = MaterialTheme.colorScheme.surface,
)
}
}
Expand Down