diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt b/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt index 5c95b8a727..72da39b334 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight @@ -44,9 +45,9 @@ fun SimpleXInfoLayout( Text(stringResource(R.string.next_generation_of_private_messaging), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = 16.dp)) - InfoRow("🎭", R.string.privacy_redefined, R.string.first_platform_without_user_ids) - InfoRow("📭", R.string.immune_to_spam_and_abuse, R.string.people_can_connect_only_via_links_you_share) - InfoRow("🤝", R.string.decentralized, R.string.opensource_protocol_and_code_anybody_can_run_servers) + InfoRow(painterResource(R.drawable.privacy), R.string.privacy_redefined, R.string.first_platform_without_user_ids) + InfoRow(painterResource(R.drawable.shield), R.string.immune_to_spam_and_abuse, R.string.people_can_connect_only_via_links_you_share) + InfoRow(painterResource(R.drawable.decentralized), R.string.decentralized, R.string.opensource_protocol_and_code_anybody_can_run_servers) Spacer( Modifier @@ -85,11 +86,11 @@ fun SimpleXLogo() { } @Composable -private fun InfoRow(emoji: String, @StringRes titleId: Int, @StringRes textId: Int) { +private fun InfoRow(icon: Painter, @StringRes titleId: Int, @StringRes textId: Int) { Row(Modifier.padding(bottom = 20.dp), verticalAlignment = Alignment.Top) { - Text(emoji, fontSize = 36.sp, modifier = Modifier + Image(icon, contentDescription = null, modifier = Modifier .width(60.dp) - .padding(end = 16.dp)) + .padding(top = 8.dp, end = 16.dp)) Column(horizontalAlignment = Alignment.Start) { Text(stringResource(titleId), fontWeight = FontWeight.Bold, style = MaterialTheme.typography.h3, lineHeight = 24.sp) Text(stringResource(textId), lineHeight = 24.sp, style = MaterialTheme.typography.caption) diff --git a/apps/android/app/src/main/res/drawable-hdpi/decentralized.png b/apps/android/app/src/main/res/drawable-hdpi/decentralized.png new file mode 100644 index 0000000000..d59a91102b Binary files /dev/null and b/apps/android/app/src/main/res/drawable-hdpi/decentralized.png differ diff --git a/apps/android/app/src/main/res/drawable-hdpi/privacy.png b/apps/android/app/src/main/res/drawable-hdpi/privacy.png new file mode 100644 index 0000000000..8b8d644b4c Binary files /dev/null and b/apps/android/app/src/main/res/drawable-hdpi/privacy.png differ diff --git a/apps/android/app/src/main/res/drawable-hdpi/shield.png b/apps/android/app/src/main/res/drawable-hdpi/shield.png new file mode 100644 index 0000000000..8ea34bf6db Binary files /dev/null and b/apps/android/app/src/main/res/drawable-hdpi/shield.png differ diff --git a/apps/android/app/src/main/res/drawable-mdpi/decentralized.png b/apps/android/app/src/main/res/drawable-mdpi/decentralized.png new file mode 100644 index 0000000000..bb5dc8332c Binary files /dev/null and b/apps/android/app/src/main/res/drawable-mdpi/decentralized.png differ diff --git a/apps/android/app/src/main/res/drawable-mdpi/privacy.png b/apps/android/app/src/main/res/drawable-mdpi/privacy.png new file mode 100644 index 0000000000..ce3cf902b4 Binary files /dev/null and b/apps/android/app/src/main/res/drawable-mdpi/privacy.png differ diff --git a/apps/android/app/src/main/res/drawable-mdpi/shield.png b/apps/android/app/src/main/res/drawable-mdpi/shield.png new file mode 100644 index 0000000000..91eeaf6348 Binary files /dev/null and b/apps/android/app/src/main/res/drawable-mdpi/shield.png differ diff --git a/apps/android/app/src/main/res/drawable-xhdpi/decentralized.png b/apps/android/app/src/main/res/drawable-xhdpi/decentralized.png new file mode 100644 index 0000000000..535abf07fd Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xhdpi/decentralized.png differ diff --git a/apps/android/app/src/main/res/drawable-xhdpi/privacy.png b/apps/android/app/src/main/res/drawable-xhdpi/privacy.png new file mode 100644 index 0000000000..6ed47dbba5 Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xhdpi/privacy.png differ diff --git a/apps/android/app/src/main/res/drawable-xhdpi/shield.png b/apps/android/app/src/main/res/drawable-xhdpi/shield.png new file mode 100644 index 0000000000..d278b95a36 Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xhdpi/shield.png differ diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/decentralized.png b/apps/android/app/src/main/res/drawable-xxhdpi/decentralized.png new file mode 100644 index 0000000000..bf7f16bc73 Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xxhdpi/decentralized.png differ diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/privacy.png b/apps/android/app/src/main/res/drawable-xxhdpi/privacy.png new file mode 100644 index 0000000000..64bcc12a9f Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xxhdpi/privacy.png differ diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/shield.png b/apps/android/app/src/main/res/drawable-xxhdpi/shield.png new file mode 100644 index 0000000000..fae46e104b Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xxhdpi/shield.png differ diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/decentralized.png b/apps/android/app/src/main/res/drawable-xxxhdpi/decentralized.png new file mode 100644 index 0000000000..f6e4c474cf Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xxxhdpi/decentralized.png differ diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/privacy.png b/apps/android/app/src/main/res/drawable-xxxhdpi/privacy.png new file mode 100644 index 0000000000..bfc2c63dff Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xxxhdpi/privacy.png differ diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/shield.png b/apps/android/app/src/main/res/drawable-xxxhdpi/shield.png new file mode 100644 index 0000000000..52d98993c9 Binary files /dev/null and b/apps/android/app/src/main/res/drawable-xxxhdpi/shield.png differ diff --git a/apps/android/app/src/main/res/drawable/logo.png b/apps/android/app/src/main/res/drawable/logo.png index 45ab085f57..6edecb0dd9 100644 Binary files a/apps/android/app/src/main/res/drawable/logo.png and b/apps/android/app/src/main/res/drawable/logo.png differ diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon.png b/apps/android/app/src/main/res/mipmap-hdpi/icon.png index e1509a984c..6b5ead5649 100644 Binary files a/apps/android/app/src/main/res/mipmap-hdpi/icon.png and b/apps/android/app/src/main/res/mipmap-hdpi/icon.png differ diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_foreground.png b/apps/android/app/src/main/res/mipmap-hdpi/icon_foreground.png index 9cafc49acb..efe2369233 100644 Binary files a/apps/android/app/src/main/res/mipmap-hdpi/icon_foreground.png and b/apps/android/app/src/main/res/mipmap-hdpi/icon_foreground.png differ diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_round.png b/apps/android/app/src/main/res/mipmap-hdpi/icon_round.png index 21a57852ed..53afb32e97 100644 Binary files a/apps/android/app/src/main/res/mipmap-hdpi/icon_round.png and b/apps/android/app/src/main/res/mipmap-hdpi/icon_round.png differ diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon.png b/apps/android/app/src/main/res/mipmap-mdpi/icon.png index 892e2b2620..625183cf08 100644 Binary files a/apps/android/app/src/main/res/mipmap-mdpi/icon.png and b/apps/android/app/src/main/res/mipmap-mdpi/icon.png differ diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_foreground.png b/apps/android/app/src/main/res/mipmap-mdpi/icon_foreground.png index 0c542b1972..10339c009c 100644 Binary files a/apps/android/app/src/main/res/mipmap-mdpi/icon_foreground.png and b/apps/android/app/src/main/res/mipmap-mdpi/icon_foreground.png differ diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_round.png b/apps/android/app/src/main/res/mipmap-mdpi/icon_round.png index 0f893fd398..2ed7bde939 100644 Binary files a/apps/android/app/src/main/res/mipmap-mdpi/icon_round.png and b/apps/android/app/src/main/res/mipmap-mdpi/icon_round.png differ diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon.png b/apps/android/app/src/main/res/mipmap-xhdpi/icon.png index 33f0abedf8..973530a259 100644 Binary files a/apps/android/app/src/main/res/mipmap-xhdpi/icon.png and b/apps/android/app/src/main/res/mipmap-xhdpi/icon.png differ diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_foreground.png b/apps/android/app/src/main/res/mipmap-xhdpi/icon_foreground.png index 0752dc4077..6aead7d66b 100644 Binary files a/apps/android/app/src/main/res/mipmap-xhdpi/icon_foreground.png and b/apps/android/app/src/main/res/mipmap-xhdpi/icon_foreground.png differ diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_round.png b/apps/android/app/src/main/res/mipmap-xhdpi/icon_round.png index 1f38c43f5a..f5f137d468 100644 Binary files a/apps/android/app/src/main/res/mipmap-xhdpi/icon_round.png and b/apps/android/app/src/main/res/mipmap-xhdpi/icon_round.png differ diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon.png b/apps/android/app/src/main/res/mipmap-xxhdpi/icon.png index 14c1b42343..6e51bf7af3 100644 Binary files a/apps/android/app/src/main/res/mipmap-xxhdpi/icon.png and b/apps/android/app/src/main/res/mipmap-xxhdpi/icon.png differ diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_foreground.png b/apps/android/app/src/main/res/mipmap-xxhdpi/icon_foreground.png index 4359c4224f..08693da933 100644 Binary files a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_foreground.png and b/apps/android/app/src/main/res/mipmap-xxhdpi/icon_foreground.png differ diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_round.png b/apps/android/app/src/main/res/mipmap-xxhdpi/icon_round.png index adc3333d4b..755904ee8e 100644 Binary files a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_round.png and b/apps/android/app/src/main/res/mipmap-xxhdpi/icon_round.png differ diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon.png b/apps/android/app/src/main/res/mipmap-xxxhdpi/icon.png index cfcb4031e7..0a36686e7d 100644 Binary files a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon.png and b/apps/android/app/src/main/res/mipmap-xxxhdpi/icon.png differ diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png b/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png index e9117819ee..6ab60a3293 100644 Binary files a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png and b/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png differ diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_round.png b/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_round.png index c47b7d47dc..2d5095c832 100644 Binary files a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_round.png and b/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_round.png differ