Skip to content

Commit 9134b26

Browse files
authored
Merge pull request #1367 from vector-im/feature/bma/onboarding
Iterate on onboarding and welcome screens.
2 parents 50fbc5e + 21ecc0b commit 9134b26

File tree

29 files changed

+69
-72
lines changed

29 files changed

+69
-72
lines changed

changelog.d/1363.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
New app icon, with monochrome support.

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.compose.foundation.border
2222
import androidx.compose.foundation.isSystemInDarkTheme
2323
import androidx.compose.foundation.layout.Box
2424
import androidx.compose.foundation.layout.size
25+
import androidx.compose.foundation.shape.CircleShape
2526
import androidx.compose.foundation.shape.RoundedCornerShape
2627
import androidx.compose.runtime.Composable
2728
import androidx.compose.ui.Alignment
@@ -50,8 +51,9 @@ fun ElementLogoAtom(
5051
val blur = if (darkTheme) 160.dp else 24.dp
5152
//box-shadow: 0px 6.075949668884277px 24.30379867553711px 0px #1B1D2280;
5253
val shadowColor = if (darkTheme) size.shadowColorDark else size.shadowColorLight
54+
val logoShadowColor = if (darkTheme) size.logoShadowColorDark else size.logoShadowColorLight
5355
val backgroundColor = if (darkTheme) Color.White.copy(alpha = 0.2f) else Color.White.copy(alpha = 0.4f)
54-
val borderColor = if (darkTheme) Color.White.copy(alpha = 0.8f) else Color.White.copy(alpha = 0.4f)
56+
val borderColor = if (darkTheme) Color.White.copy(alpha = 0.89f) else Color.White
5557
Box(
5658
modifier = modifier
5759
.size(size.outerSize)
@@ -89,7 +91,21 @@ fun ElementLogoAtom(
8991
.blurCompat(blur)
9092
)
9193
Image(
92-
modifier = Modifier.size(size.logoSize),
94+
modifier = Modifier
95+
.size(size.logoSize)
96+
// Do the same double shadow than on Figma...
97+
.shadow(
98+
elevation = 25.dp,
99+
clip = false,
100+
shape = CircleShape,
101+
ambientColor = logoShadowColor,
102+
)
103+
.shadow(
104+
elevation = 25.dp,
105+
clip = false,
106+
shape = CircleShape,
107+
ambientColor = Color(0x80000000),
108+
),
93109
painter = painterResource(id = R.drawable.element_logo),
94110
contentDescription = null
95111
)
@@ -101,6 +117,8 @@ sealed class ElementLogoAtomSize(
101117
val logoSize: Dp,
102118
val cornerRadius: Dp,
103119
val borderWidth: Dp,
120+
val logoShadowColorDark: Color,
121+
val logoShadowColorLight: Color,
104122
val shadowColorDark: Color,
105123
val shadowColorLight: Color,
106124
val shadowRadius: Dp,
@@ -110,6 +128,8 @@ sealed class ElementLogoAtomSize(
110128
logoSize = 83.5.dp,
111129
cornerRadius = 33.dp,
112130
borderWidth = 0.38.dp,
131+
logoShadowColorDark = Color(0x4D000000),
132+
logoShadowColorLight = Color(0x66000000),
113133
shadowColorDark = Color.Black.copy(alpha = 0.4f),
114134
shadowColorLight = Color(0x401B1D22),
115135
shadowRadius = 32.dp,
@@ -120,6 +140,8 @@ sealed class ElementLogoAtomSize(
120140
logoSize = 110.dp,
121141
cornerRadius = 44.dp,
122142
borderWidth = 0.5.dp,
143+
logoShadowColorDark = Color(0x4D000000),
144+
logoShadowColorLight = Color(0x66000000),
123145
shadowColorDark = Color.Black,
124146
shadowColorLight = Color(0x801B1D22),
125147
shadowRadius = 60.dp,
71.2 KB
Loading
15.5 KB
Loading
71 KB
Loading

libraries/designsystem/src/main/res/drawable/element_logo.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.
5.25 KB
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)