Merge pull request #96 from Tiqr/bugfix/edured-95_change_app_icon

Edured-95: use figma eduid icon logo
Tiqr · May 26, 2023 · 061501c · 061501c
2 parents 1dbcdac + 8704556
commit 061501c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,10 @@
+<vector android:autoMirrored="true" android:height="36dp"
+    android:viewportHeight="36" android:viewportWidth="92"
+    android:width="92dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h92v36h-92z"/>
+        <path android:fillColor="#173552" android:pathData="M4,0L87.636,0A4,4 0,0 1,91.636 4L91.636,32A4,4 0,0 1,87.636 36L4,36A4,4 0,0 1,0 32L0,4A4,4 0,0 1,4 0z"/>
+        <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M31.751,26.534C30.977,26.974 30.089,27.194 29.087,27.194C28.281,27.194 27.548,27.039 26.89,26.729C26.231,26.418 25.67,25.961 25.207,25.358C24.743,24.756 24.386,24.005 24.136,23.105C23.885,22.206 23.76,21.172 23.76,20.003C23.76,18.965 23.899,17.998 24.177,17.104C24.455,16.209 24.857,15.432 25.381,14.774C25.904,14.115 26.542,13.598 27.293,13.223C28.044,12.847 28.897,12.66 29.852,12.66C30.715,12.66 31.452,12.806 32.064,13.098C32.676,13.39 33.223,13.8 33.705,14.329V6.512H36.181V27H34.707C34.354,27 34.132,26.828 34.039,26.485L33.816,24.774C33.214,25.507 32.525,26.093 31.751,26.534ZM15.929,27.194C16.439,27.194 16.954,27.15 17.473,27.062C17.993,26.974 18.496,26.842 18.982,26.666C19.469,26.49 19.926,26.265 20.352,25.991C20.779,25.718 21.145,25.396 21.451,25.025L20.756,24.121C20.645,23.963 20.487,23.884 20.283,23.884C20.125,23.884 19.937,23.956 19.719,24.1C19.502,24.243 19.23,24.399 18.906,24.566C18.581,24.733 18.194,24.888 17.744,25.032C17.295,25.175 16.759,25.247 16.138,25.247C15.47,25.247 14.868,25.138 14.33,24.92C13.792,24.702 13.328,24.373 12.939,23.933C12.549,23.492 12.243,22.943 12.021,22.285C11.798,21.626 11.678,20.852 11.659,19.962H21.034C21.266,19.962 21.423,19.897 21.507,19.767C21.59,19.637 21.632,19.378 21.632,18.988C21.632,17.987 21.486,17.094 21.194,16.311C20.902,15.527 20.496,14.869 19.977,14.336C19.458,13.802 18.841,13.394 18.127,13.112C17.413,12.829 16.634,12.687 15.79,12.687C14.77,12.687 13.852,12.866 13.036,13.223C12.22,13.58 11.529,14.071 10.964,14.697C10.398,15.323 9.965,16.063 9.663,16.916C9.362,17.769 9.211,18.687 9.211,19.67C9.211,20.884 9.378,21.96 9.712,22.897C10.046,23.833 10.512,24.619 11.11,25.254C11.708,25.889 12.417,26.372 13.238,26.701C14.059,27.03 14.956,27.194 15.929,27.194ZM19.406,18.418H11.743C11.91,17.194 12.336,16.236 13.022,15.546C13.708,14.855 14.65,14.509 15.846,14.509C16.412,14.509 16.914,14.604 17.355,14.795C17.795,14.985 18.169,15.254 18.475,15.601C18.781,15.949 19.013,16.362 19.17,16.839C19.328,17.317 19.406,17.843 19.406,18.418ZM29.908,25.192C29.333,25.192 28.823,25.094 28.378,24.899C27.933,24.705 27.557,24.396 27.251,23.975C26.945,23.553 26.713,23.015 26.556,22.361C26.398,21.707 26.319,20.921 26.319,20.003C26.319,18.27 26.672,16.934 27.376,15.998C28.081,15.061 29.092,14.593 30.409,14.593C31.067,14.593 31.667,14.716 32.21,14.962C32.752,15.207 33.251,15.636 33.705,16.248V23.063C33.195,23.74 32.636,24.264 32.029,24.635C31.422,25.006 30.715,25.192 29.908,25.192ZM47.336,26.603C46.576,27.016 45.704,27.222 44.721,27.222C43.951,27.222 43.272,27.095 42.683,26.84C42.095,26.585 41.601,26.226 41.202,25.762C40.803,25.298 40.504,24.737 40.305,24.079C40.106,23.42 40.006,22.693 40.006,21.895V12.91H42.482V21.895C42.482,22.962 42.728,23.787 43.219,24.371C43.71,24.955 44.452,25.247 45.444,25.247C46.168,25.247 46.849,25.076 47.489,24.733C48.129,24.389 48.718,23.912 49.256,23.3V12.91H51.731V27H50.257C49.904,27 49.682,26.828 49.589,26.485L49.395,24.969C48.783,25.646 48.096,26.191 47.336,26.603Z"/>
+        <path android:fillColor="#5BA5FB" android:fillType="evenOdd" android:pathData="M59.395,27V7.068H56.697V27H59.395ZM72.191,27C73.657,27 74.992,26.761 76.197,26.283C77.403,25.806 78.437,25.131 79.299,24.26C80.161,23.388 80.829,22.34 81.302,21.116C81.775,19.892 82.011,18.534 82.011,17.041C82.011,15.548 81.775,14.189 81.302,12.965C80.829,11.741 80.161,10.691 79.299,9.815C78.437,8.939 77.403,8.262 76.197,7.784C74.992,7.307 73.657,7.068 72.191,7.068H64.736V27H72.191ZM67.449,24.816H72.191C73.258,24.816 74.227,24.64 75.099,24.287C75.97,23.935 76.712,23.427 77.324,22.764C77.936,22.101 78.409,21.288 78.743,20.323C79.076,19.359 79.243,18.265 79.243,17.041C79.243,15.817 79.076,14.722 78.743,13.758C78.409,12.794 77.936,11.978 77.324,11.31C76.712,10.642 75.97,10.132 75.099,9.78C74.227,9.428 73.258,9.252 72.191,9.252H67.449V24.816Z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/logo_eduid_big.webp b/app/src/main/res/drawable/logo_eduid_big.webp
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -104,17 +104,8 @@
         <item name="android:src">@drawable/logo_power_by_surf</item>
     </style>
 
-    <style name="TopBarIconSmall">
-        <item name="android:src">@drawable/logo_eduid_big</item>
-    </style>
-
     <style name="AboutSurfIcon">
         <item name="android:src">@drawable/logo_surf_big</item>
     </style>
 
-    <style name="AboutAppIcon">
-        <item name="android:src">@drawable/logo_eduid_big</item>
-    </style>
-
-
 </resources>