diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e4a42bca..f50a9faf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,9 +12,9 @@ android:screenOrientation="portrait" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/purefin_logo" + android:icon="@mipmap/purefin_logo_2" android:label="@string/app_name" - android:roundIcon="@mipmap/purefin_logo_round" + android:roundIcon="@mipmap/purefin_logo_2_round" android:supportsRtl="true" android:theme="@style/Theme.Purefin"> Unit, onProfileClick: () -> Unit, onSettingsClick: () -> Unit, @@ -41,27 +46,37 @@ fun HomeTopBar( TopAppBar( title = { - Column { - Text( - text = title, - style = MaterialTheme.typography.headlineSmall, - maxLines = 1, - overflow = TextOverflow.Ellipsis + Row( + modifier = Modifier, + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + PurefinLogo( + contentDescription = "Purefin", + modifier = Modifier.size(48.dp), + contentScale = ContentScale.Fit, ) Text( - text = subtitle, - style = MaterialTheme.typography.bodySmall, - color = scheme.onSurfaceVariant, - maxLines = 1, - overflow = TextOverflow.Ellipsis + text = "PureFin", + fontSize = 32.sp, + fontWeight = FontWeight.Bold, + fontStyle = FontStyle.Italic, + color = scheme.onSecondary ) } }, actions = { - IconButton(onClick = onSearchClick) { + IconButton( + onClick = onSearchClick, + colors = IconButtonColors( + containerColor = scheme.secondary, + contentColor = scheme.onSecondary, + disabledContainerColor = scheme.secondary, + disabledContentColor = scheme.onSecondary) + ) { Icon( imageVector = Icons.Outlined.Search, - contentDescription = "Search" + contentDescription = "Search", ) } IconButton( diff --git a/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinLogo.kt b/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinLogo.kt new file mode 100644 index 00000000..859c7d26 --- /dev/null +++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinLogo.kt @@ -0,0 +1,32 @@ +package hu.bbara.purefin.common.ui.components + +import android.graphics.BitmapFactory +import androidx.compose.foundation.Image +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import hu.bbara.purefin.R + +@Composable +fun PurefinLogo( + modifier: Modifier = Modifier, + contentDescription: String? = null, + contentScale: ContentScale = ContentScale.Fit, +) { + val resources = LocalContext.current.resources + val logoBitmap = remember(resources) { + BitmapFactory.decodeResource(resources, R.raw.logo_raw)?.asImageBitmap() + } + + logoBitmap?.let { bitmap -> + Image( + bitmap = bitmap, + contentDescription = contentDescription, + contentScale = contentScale, + modifier = modifier, + ) + } +} diff --git a/app/src/main/purefin_logo_2-playstore.png b/app/src/main/purefin_logo_2-playstore.png new file mode 100644 index 00000000..f6e39e69 Binary files /dev/null and b/app/src/main/purefin_logo_2-playstore.png differ diff --git a/app/src/main/res/mipmap-anydpi-v26/purefin_logo_2.xml b/app/src/main/res/mipmap-anydpi-v26/purefin_logo_2.xml new file mode 100644 index 00000000..417eb8d0 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/purefin_logo_2.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/purefin_logo_2_round.xml b/app/src/main/res/mipmap-anydpi-v26/purefin_logo_2_round.xml new file mode 100644 index 00000000..417eb8d0 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/purefin_logo_2_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/purefin_logo_2.webp b/app/src/main/res/mipmap-hdpi/purefin_logo_2.webp new file mode 100644 index 00000000..3462c3bb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/purefin_logo_2.webp differ diff --git a/app/src/main/res/mipmap-hdpi/purefin_logo_2_foreground.webp b/app/src/main/res/mipmap-hdpi/purefin_logo_2_foreground.webp new file mode 100644 index 00000000..d343185c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/purefin_logo_2_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/purefin_logo_2_round.webp b/app/src/main/res/mipmap-hdpi/purefin_logo_2_round.webp new file mode 100644 index 00000000..2b93ea69 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/purefin_logo_2_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/purefin_logo_2.webp b/app/src/main/res/mipmap-mdpi/purefin_logo_2.webp new file mode 100644 index 00000000..59a80747 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/purefin_logo_2.webp differ diff --git a/app/src/main/res/mipmap-mdpi/purefin_logo_2_foreground.webp b/app/src/main/res/mipmap-mdpi/purefin_logo_2_foreground.webp new file mode 100644 index 00000000..5fbf6756 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/purefin_logo_2_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/purefin_logo_2_round.webp b/app/src/main/res/mipmap-mdpi/purefin_logo_2_round.webp new file mode 100644 index 00000000..aa201981 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/purefin_logo_2_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/purefin_logo_2.webp b/app/src/main/res/mipmap-xhdpi/purefin_logo_2.webp new file mode 100644 index 00000000..178dcd3d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/purefin_logo_2.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/purefin_logo_2_foreground.webp b/app/src/main/res/mipmap-xhdpi/purefin_logo_2_foreground.webp new file mode 100644 index 00000000..0020607c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/purefin_logo_2_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/purefin_logo_2_round.webp b/app/src/main/res/mipmap-xhdpi/purefin_logo_2_round.webp new file mode 100644 index 00000000..dbdff7e0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/purefin_logo_2_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/purefin_logo_2.webp b/app/src/main/res/mipmap-xxhdpi/purefin_logo_2.webp new file mode 100644 index 00000000..7a5f62a3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/purefin_logo_2.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/purefin_logo_2_foreground.webp b/app/src/main/res/mipmap-xxhdpi/purefin_logo_2_foreground.webp new file mode 100644 index 00000000..043d89d6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/purefin_logo_2_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/purefin_logo_2_round.webp b/app/src/main/res/mipmap-xxhdpi/purefin_logo_2_round.webp new file mode 100644 index 00000000..67de27f5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/purefin_logo_2_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2.webp b/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2.webp new file mode 100644 index 00000000..b477db17 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2_foreground.webp new file mode 100644 index 00000000..10557520 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2_round.webp b/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2_round.webp new file mode 100644 index 00000000..62c6a2da Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/purefin_logo_2_round.webp differ diff --git a/app/src/main/res/raw/logo_raw.png b/app/src/main/res/raw/logo_raw.png new file mode 100644 index 00000000..a4b9b01e Binary files /dev/null and b/app/src/main/res/raw/logo_raw.png differ diff --git a/app/src/main/res/values/purefin_logo_2_background.xml b/app/src/main/res/values/purefin_logo_2_background.xml new file mode 100644 index 00000000..2f259af3 --- /dev/null +++ b/app/src/main/res/values/purefin_logo_2_background.xml @@ -0,0 +1,4 @@ + + + #201337 + \ No newline at end of file