diff --git a/app/src/main/kotlin/nl/eduid/screens/homepage/HomePageNoAccount.kt b/app/src/main/kotlin/nl/eduid/screens/homepage/HomePageNoAccount.kt index 9d27ba6e..2556ed44 100644 --- a/app/src/main/kotlin/nl/eduid/screens/homepage/HomePageNoAccount.kt +++ b/app/src/main/kotlin/nl/eduid/screens/homepage/HomePageNoAccount.kt @@ -17,6 +17,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -156,10 +157,11 @@ fun HomePageNoAccountContent( ) Image( - painter = painterResource(id = R.drawable.logo_eduid_big), + painter = painterResource(id = R.drawable.ic_correct_logo), contentDescription = "", + contentScale = ContentScale.Fit, modifier = Modifier - .size(width = 150.dp, height = 59.dp) + .height(64.dp) .constrainAs(eduIdLogo) { top.linkTo(parent.top) start.linkTo(parent.start) diff --git a/app/src/main/kotlin/nl/eduid/screens/splash/SplashScreen.kt b/app/src/main/kotlin/nl/eduid/screens/splash/SplashScreen.kt index 889519ef..a157e0a2 100644 --- a/app/src/main/kotlin/nl/eduid/screens/splash/SplashScreen.kt +++ b/app/src/main/kotlin/nl/eduid/screens/splash/SplashScreen.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -46,11 +47,12 @@ private fun SplashContent( .weight(1f) ) { Image( - painter = painterResource(id = R.drawable.logo_eduid_big), + painter = painterResource(id = R.drawable.ic_correct_logo), contentDescription = "", + contentScale = ContentScale.Fit, modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 32.dp), + .height(88.dp) + .fillMaxWidth(), ) Spacer(Modifier.height(36.dp)) diff --git a/app/src/main/kotlin/nl/eduid/ui/EduIdTopAppBar.kt b/app/src/main/kotlin/nl/eduid/ui/EduIdTopAppBar.kt index 7036a160..9a003bc9 100644 --- a/app/src/main/kotlin/nl/eduid/ui/EduIdTopAppBar.kt +++ b/app/src/main/kotlin/nl/eduid/ui/EduIdTopAppBar.kt @@ -10,6 +10,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -52,10 +53,11 @@ fun EduIdTopAppBar( }, title = { Image( - painter = painterResource(R.drawable.logo_eduid_big), + painter = painterResource(R.drawable.ic_correct_logo), contentDescription = "", + contentScale = ContentScale.Fit, modifier = Modifier - .size(width = 122.dp, height = 48.dp), + .height(36.dp), alignment = Alignment.Center ) }, diff --git a/app/src/main/res/drawable/ic_correct_logo.xml b/app/src/main/res/drawable/ic_correct_logo.xml new file mode 100644 index 00000000..cce895a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_correct_logo.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/logo_eduid_big.webp b/app/src/main/res/drawable/logo_eduid_big.webp deleted file mode 100644 index 8cef0ddf..00000000 Binary files a/app/src/main/res/drawable/logo_eduid_big.webp and /dev/null differ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1f24fb25..2a517feb 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -104,17 +104,8 @@ @drawable/logo_power_by_surf - - - - -