Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Desktop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Desktop
Commits
39d94310
Commit
39d94310
authored
Sep 22, 2021
by
Sebastian
Committed by
Sebastian
Sep 22, 2021
Browse files
Options
Downloads
Patches
Plain Diff
Add import for androidx.compose.foundation.Canvas
parent
844d70a3
No related branches found
No related tags found
1 merge request
!7
Import upstream updates to UI
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
+4
-3
4 additions, 3 deletions
...iarproject/briar/desktop/paul/views/PrivateMessageView.kt
with
4 additions
and
3 deletions
src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
+
4
−
3
View file @
39d94310
package
org.briarproject.briar.desktop.paul.views
package
org.briarproject.briar.desktop.paul.views
import
androidx.compose.animation.core.animateDpAsState
import
androidx.compose.animation.core.animateDpAsState
import
androidx.compose.foundation.Canvas
import
androidx.compose.foundation.Image
import
androidx.compose.foundation.Image
import
androidx.compose.foundation.background
import
androidx.compose.foundation.background
import
androidx.compose.foundation.border
import
androidx.compose.foundation.border
...
@@ -256,7 +257,7 @@ fun ContactCard(
...
@@ -256,7 +257,7 @@ fun ContactCard(
ProfileCircle
(
imageFromResource
(
"images/profile_images/p0.png"
),
36
.
dp
)
ProfileCircle
(
imageFromResource
(
"images/profile_images/p0.png"
),
36
.
dp
)
// Draw notification badges
// Draw notification badges
if
(
drawNotifications
)
{
if
(
drawNotifications
)
{
androidx
.
compose
.
foundation
.
Canvas
(
Canvas
(
modifier
=
Modifier
.
align
(
Alignment
.
CenterVertically
),
modifier
=
Modifier
.
align
(
Alignment
.
CenterVertically
),
onDraw
=
{
onDraw
=
{
val
size
=
10
.
dp
.
toPx
()
val
size
=
10
.
dp
.
toPx
()
...
@@ -283,7 +284,7 @@ fun ContactCard(
...
@@ -283,7 +284,7 @@ fun ContactCard(
)
)
}
}
}
}
androidx
.
compose
.
foundation
.
Canvas
(
Canvas
(
modifier
=
Modifier
.
padding
(
start
=
32
.
dp
,
end
=
18
.
dp
).
size
(
22
.
dp
).
align
(
Alignment
.
CenterVertically
),
modifier
=
Modifier
.
padding
(
start
=
32
.
dp
,
end
=
18
.
dp
).
size
(
22
.
dp
).
align
(
Alignment
.
CenterVertically
),
onDraw
=
{
onDraw
=
{
val
size
=
16
.
dp
.
toPx
()
val
size
=
16
.
dp
.
toPx
()
...
@@ -484,7 +485,7 @@ fun MsgColumnHeader(
...
@@ -484,7 +485,7 @@ fun MsgColumnHeader(
Box
(
modifier
=
Modifier
.
fillMaxWidth
().
height
(
HEADER_SIZE
+
1
.
dp
))
{
Box
(
modifier
=
Modifier
.
fillMaxWidth
().
height
(
HEADER_SIZE
+
1
.
dp
))
{
Row
(
modifier
=
Modifier
.
align
(
Alignment
.
Center
))
{
Row
(
modifier
=
Modifier
.
align
(
Alignment
.
Center
))
{
ProfileCircle
(
imageFromResource
(
"images/profile_images/p0.png"
),
36
.
dp
)
ProfileCircle
(
imageFromResource
(
"images/profile_images/p0.png"
),
36
.
dp
)
androidx
.
compose
.
foundation
.
Canvas
(
Canvas
(
modifier
=
Modifier
.
align
(
Alignment
.
CenterVertically
),
modifier
=
Modifier
.
align
(
Alignment
.
CenterVertically
),
onDraw
=
{
onDraw
=
{
val
size
=
10
.
dp
.
toPx
()
val
size
=
10
.
dp
.
toPx
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment