Skip to content

Commit 69b57b8

Browse files
authored
Merge pull request #1363 from vector-im/feature/bma/appIcon
Update app icon
2 parents b88ce40 + b803666 commit 69b57b8

File tree

53 files changed

+89
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+89
-7
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="108"
5+
android:viewportHeight="108">
6+
<path
7+
android:fillColor="#F7F07E"
8+
android:fillType="evenOdd"
9+
android:pathData="m0,0h108v108h-108z" />
10+
</vector>
212 KB

app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@
1717
package io.element.android.x.icon
1818

1919
import androidx.compose.foundation.Image
20+
import androidx.compose.foundation.background
2021
import androidx.compose.foundation.layout.Box
22+
import androidx.compose.foundation.layout.size
2123
import androidx.compose.foundation.shape.CircleShape
24+
import androidx.compose.foundation.shape.RoundedCornerShape
2225
import androidx.compose.runtime.Composable
26+
import androidx.compose.ui.Alignment
2327
import androidx.compose.ui.Modifier
2428
import androidx.compose.ui.draw.clip
29+
import androidx.compose.ui.graphics.Color
30+
import androidx.compose.ui.graphics.ColorFilter
2531
import androidx.compose.ui.res.painterResource
2632
import androidx.compose.ui.tooling.preview.Preview
33+
import androidx.compose.ui.unit.dp
2734
import io.element.android.x.R
2835

2936
@Preview
@@ -47,3 +54,23 @@ internal fun RoundIconPreview(
4754
Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
4855
}
4956
}
57+
58+
@Preview
59+
@Composable
60+
internal fun MonochromeIconPreview(
61+
modifier: Modifier = Modifier,
62+
) {
63+
Box(
64+
modifier = modifier
65+
.size(108.dp)
66+
.background(Color(0xFF2F3133))
67+
.clip(shape = RoundedCornerShape(32.dp)),
68+
contentAlignment = Alignment.Center
69+
) {
70+
Image(
71+
painter = painterResource(id = R.mipmap.ic_launcher_monochrome),
72+
colorFilter = ColorFilter.tint(Color(0xFFC3E0F6)),
73+
contentDescription = null
74+
)
75+
}
76+
}
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (c) 2023 New Vector Ltd
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
218
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/ic_launcher_background"/>
19+
<background android:drawable="@drawable/ic_launcher_background"/>
420
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5-
<!-- Waiting for design monochrome android:drawable="@mipmap/ic_launcher_monochrome" /-->
21+
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
622
</adaptive-icon>
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (c) 2023 New Vector Ltd
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
218
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/ic_launcher_background"/>
19+
<background android:drawable="@drawable/ic_launcher_background"/>
420
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5-
<!-- Waiting for design monochrome android:drawable="@mipmap/ic_launcher_monochrome" /-->
21+
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
622
</adaptive-icon>
-4.2 KB
Binary file not shown.
3.9 KB
-11.8 KB
Binary file not shown.
10.2 KB
-3.89 KB
Binary file not shown.

0 commit comments

Comments
 (0)