diff --git a/app/src/debug/res/drawable/app_logo.xml b/app/src/debug/res/drawable/app_logo.xml new file mode 100644 index 0000000000..f6c30ad19f --- /dev/null +++ b/app/src/debug/res/drawable/app_logo.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/org/jellyfin/mobile/ui/screens/connect/ConnectScreen.kt b/app/src/main/java/org/jellyfin/mobile/ui/screens/connect/ConnectScreen.kt index 8544c8c40d..8c02bfde9c 100644 --- a/app/src/main/java/org/jellyfin/mobile/ui/screens/connect/ConnectScreen.kt +++ b/app/src/main/java/org/jellyfin/mobile/ui/screens/connect/ConnectScreen.kt @@ -5,18 +5,12 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface -import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.ui.Modifier -import androidx.compose.ui.layout.FixedScale import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import org.jellyfin.mobile.MainViewModel import org.jellyfin.mobile.R @@ -47,24 +41,14 @@ fun ConnectScreen( @Stable @Composable fun LogoHeader() { - CenterRow { + CenterRow( + modifier = Modifier.padding(vertical = 25.dp), + ) { Image( - painter = painterResource(R.drawable.ic_launcher_foreground), + painter = painterResource(R.drawable.app_logo), modifier = Modifier - .width(72.dp) - .height(72.dp) - .padding(top = 8.dp), - contentScale = @Suppress("MagicNumber") FixedScale(1.2f), + .height(72.dp), contentDescription = null, ) - Text( - text = stringResource(R.string.app_name_short), - modifier = Modifier - .padding(vertical = 56.dp) - .padding(start = 12.dp, end = 24.dp), - fontFamily = FontFamily(Font(R.font.quicksand)), - maxLines = 1, - style = MaterialTheme.typography.h3, - ) } } diff --git a/app/src/main/java/org/jellyfin/mobile/ui/utils/CenterRow.kt b/app/src/main/java/org/jellyfin/mobile/ui/utils/CenterRow.kt index 13d871e4a0..db12665670 100644 --- a/app/src/main/java/org/jellyfin/mobile/ui/utils/CenterRow.kt +++ b/app/src/main/java/org/jellyfin/mobile/ui/utils/CenterRow.kt @@ -10,9 +10,12 @@ import androidx.compose.ui.Modifier @Composable inline fun CenterRow( + modifier: Modifier = Modifier, content: @Composable RowScope.() -> Unit, ) = Row( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .then(modifier), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, content = content, diff --git a/app/src/main/res/drawable/app_logo.xml b/app/src/main/res/drawable/app_logo.xml new file mode 100644 index 0000000000..3aeaa90340 --- /dev/null +++ b/app/src/main/res/drawable/app_logo.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/font/quicksand.ttf b/app/src/main/res/font/quicksand.ttf deleted file mode 100644 index cb1596d5bc..0000000000 Binary files a/app/src/main/res/font/quicksand.ttf and /dev/null differ