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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Desktop
Commits
d92a01eb
Verified
Commit
d92a01eb
authored
2 years ago
by
Sebastian
Browse files
Options
Downloads
Patches
Plain Diff
Define minimum height of expiration banner via subcomponent paddings
parent
a5c0652d
No related branches found
No related tags found
No related merge requests found
Pipeline
#10762
passed
2 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/kotlin/org/briarproject/briar/desktop/expiration/ExpirationBanner.kt
+4
-5
4 additions, 5 deletions
...briarproject/briar/desktop/expiration/ExpirationBanner.kt
with
4 additions
and
5 deletions
src/main/kotlin/org/briarproject/briar/desktop/expiration/ExpirationBanner.kt
+
4
−
5
View file @
d92a01eb
...
...
@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Row
import
androidx.compose.foundation.layout.fillMaxWidth
import
androidx.compose.foundation.layout.padding
import
androidx.compose.foundation.layout.size
import
androidx.compose.foundation.layout.sizeIn
import
androidx.compose.material.Icon
import
androidx.compose.material.IconButton
import
androidx.compose.material.MaterialTheme
...
...
@@ -92,14 +91,14 @@ fun ExpirationBanner(
)
=
Surface
(
color
=
MaterialTheme
.
colors
.
warningBackground
,
contentColor
=
MaterialTheme
.
colors
.
warningForeground
,
modifier
=
Modifier
.
fillMaxWidth
()
.
sizeIn
(
minHeight
=
56
.
dp
)
modifier
=
Modifier
.
fillMaxWidth
()
)
{
Row
(
horizontalArrangement
=
Arrangement
.
spacedBy
(
24
.
dp
),
verticalAlignment
=
Alignment
.
CenterVertically
,
modifier
=
Modifier
.
padding
(
horizontal
=
16
.
dp
)
)
{
Icon
(
Icons
.
Filled
.
Warning
,
i18n
(
"warning"
),
Modifier
.
size
(
40
.
dp
))
Icon
(
Icons
.
Filled
.
Warning
,
i18n
(
"warning"
),
Modifier
.
size
(
40
.
dp
)
.
padding
(
vertical
=
4
.
dp
)
)
val
text
=
if
(
daysLeft
==
0
)
"${i18n("
expiration
.
banner
.
part1
.
zero
")} ${i18n("
expiration
.
banner
.
part2
")}"
else
...
...
@@ -107,9 +106,9 @@ fun ExpirationBanner(
Text
(
text
=
text
,
style
=
MaterialTheme
.
typography
.
body2
,
modifier
=
Modifier
.
weight
(
1f
,
true
)
modifier
=
Modifier
.
weight
(
1f
,
true
)
.
padding
(
vertical
=
12
.
dp
)
)
IconButton
(
hide
)
{
IconButton
(
hide
,
modifier
=
Modifier
.
padding
(
vertical
=
4
.
dp
)
)
{
Icon
(
Icons
.
Filled
.
Close
,
i18n
(
"hide"
),
Modifier
.
size
(
24
.
dp
))
}
}
...
...
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