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

Make icons squircle. Fixes #301 #307

Merged
merged 2 commits into from
Feb 4, 2023
Merged

Make icons squircle. Fixes #301 #307

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4da716
Make icons squircle. Fixes #301
dessalines Feb 4, 2023
901a956
Merge branch 'main' into icons_squircle
dessalines Feb 4, 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 app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
Expand Down Expand Up @@ -62,7 +61,7 @@ fun CircularIcon(
contentScale = ContentScale.Crop,
modifier = modifier
.size(size)
.clip(CircleShape)
.clip(RoundedCornerShape(12f))
)
}

Expand Down