Skip to content

Commit ce00a1a

Browse files
feat: adopt uDroid logo across app
1 parent 84723dc commit ce00a1a

20 files changed

Lines changed: 53 additions & 42 deletions

File tree

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<application
1212
android:name=".UdroidApplication"
1313
android:allowBackup="false"
14-
android:icon="@drawable/ic_launcher"
14+
android:icon="@mipmap/ic_launcher"
1515
android:label="@string/app_name"
16-
android:roundIcon="@drawable/ic_launcher"
16+
android:roundIcon="@mipmap/ic_launcher_round"
1717
android:supportsRtl="true"
1818
android:theme="@style/Theme.Udroid"
1919
tools:replace="android:icon,android:roundIcon,android:theme">

app/src/main/java/org/randomcoder/udroid/linuxapps/LinuxApplicationShortcutPublisher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class LinuxApplicationShortcutPublisher(
6464
return if (bitmap != null) {
6565
IconCompat.createWithBitmap(bitmap)
6666
} else {
67-
IconCompat.createWithResource(context, R.drawable.ic_launcher)
67+
IconCompat.createWithResource(context, R.drawable.udroid_logo)
6868
}
6969
}
7070
}

app/src/main/java/org/randomcoder/udroid/ui/UiComponents.kt

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.randomcoder.udroid.ui
22

33
import androidx.compose.foundation.BorderStroke
4+
import androidx.compose.foundation.Image
45
import androidx.compose.foundation.clickable
56
import androidx.compose.foundation.layout.Arrangement
67
import androidx.compose.foundation.layout.Box
@@ -23,15 +24,18 @@ import androidx.compose.material3.Text
2324
import androidx.compose.runtime.Composable
2425
import androidx.compose.ui.Alignment
2526
import androidx.compose.ui.Modifier
27+
import androidx.compose.ui.draw.clip
2628
import androidx.compose.ui.graphics.Color
2729
import androidx.compose.ui.graphics.vector.ImageVector
30+
import androidx.compose.ui.res.painterResource
2831
import androidx.compose.ui.semantics.Role
2932
import androidx.compose.ui.semantics.role
3033
import androidx.compose.ui.semantics.semantics
3134
import androidx.compose.ui.text.font.FontFamily
3235
import androidx.compose.ui.text.font.FontWeight
3336
import androidx.compose.ui.text.style.TextOverflow
3437
import androidx.compose.ui.unit.dp
38+
import org.randomcoder.udroid.R
3539

3640
@Composable
3741
fun UdroidBrand(
@@ -42,25 +46,14 @@ fun UdroidBrand(
4246
modifier = modifier,
4347
verticalAlignment = Alignment.CenterVertically,
4448
) {
45-
Surface(
46-
modifier = Modifier.size(if (compact) 30.dp else 34.dp),
47-
color = UdroidForest,
48-
shape = RoundedCornerShape(if (compact) 8.dp else 9.dp),
49-
) {
50-
Box(contentAlignment = Alignment.Center) {
51-
Text(
52-
"u",
53-
color = Color.White,
54-
fontWeight = FontWeight.Bold,
55-
style =
56-
if (compact) {
57-
MaterialTheme.typography.titleMedium
58-
} else {
59-
MaterialTheme.typography.titleLarge
60-
},
61-
)
62-
}
63-
}
49+
Image(
50+
painter = painterResource(R.drawable.udroid_logo),
51+
contentDescription = null,
52+
modifier =
53+
Modifier
54+
.size(if (compact) 30.dp else 34.dp)
55+
.clip(CircleShape),
56+
)
6457
Spacer(Modifier.width(10.dp))
6558
Text(
6659
"uDroid",
99.6 KB
Loading

app/src/main/res/drawable/ic_launcher.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/udroid_logo" />
5+
</adaptive-icon>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/udroid_logo" />
5+
</adaptive-icon>
5.38 KB
Loading
5.38 KB
Loading
3.14 KB
Loading

0 commit comments

Comments
 (0)