Merge pull request #197 from Tiqr/feature/TIQR-507

TIQR-507: Fix UI issues with fallback method, update app icon

app/src/main/kotlin/nl/eduid/screens/verifywithid/code/VerifyWithIdCodeViewModel.kt

@@ -67,6 +67,7 @@ class VerifyWithIdCodeViewModel @Inject constructor(
         viewModelScope.launch {
             val newUserDetails = repository.deleteControlCode()
             if (newUserDetails.isSuccess) {
+                assistant.refreshDetails()
                 uiState = uiState.copy(codeDeleted = true)
                 return@launch
             }

app/src/main/kotlin/nl/eduid/screens/verifywithid/input/VerifyWithIdInputScreen.kt

@@ -7,6 +7,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.rememberScrollState
@@ -93,10 +95,11 @@ fun VerifyWithIdInputScreenContent(
     Column(
         modifier = Modifier
             .fillMaxSize()
+            .imePadding()
+            .verticalScroll(rememberScrollState())
             .padding(padding)
-            .systemBarsPadding()
             .padding(start = 24.dp, end = 24.dp, bottom = 24.dp)
-            .verticalScroll(rememberScrollState()),
+            .navigationBarsPadding(),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,47 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="105"
+    android:viewportHeight="105">
+  <group android:scaleX="0.58"
+      android:scaleY="0.58"
+      android:translateX="22.05"
+      android:translateY="22.05">
+    <path
+        android:pathData="M0,0h105v105h-105z"
+        android:strokeWidth="1.69131"
+        android:fillColor="#002568"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m17.78,49.99c-2.82,0 -4.13,2.24 -4.29,4.1h8.57c-0.06,-1.79 -1.28,-4.1 -4.29,-4.1m5.92,6.46h-10.18c0.22,2.3 1.98,4.26 4.86,4.26 1.12,0 2.4,-0.35 3.46,-1.02 0.22,-0.13 0.48,-0.19 0.7,-0.19 0.7,0 1.44,0.58 1.44,1.41 0,1.76 -3.97,2.56 -5.95,2.56 -4.64,0 -8.1,-3.23 -8.1,-8.13 0,-4.48 3.26,-8.1 7.84,-8.1 3.62,0 6.24,2.18 7.2,5.5 0.19,0.64 0.38,1.38 0.38,2.05 0,0.89 -0.74,1.66 -1.66,1.66"
+        android:strokeWidth="1"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m39.57,52.32c-0.77,-1.15 -2.37,-2.05 -3.97,-2.05 -2.62,0 -4.32,2.11 -4.32,5.09 0,2.94 1.7,5.06 4.32,5.06 1.6,0 3.2,-0.9 3.97,-2.02zM41.27,63.27c-0.96,0 -1.7,-0.77 -1.7,-1.7v-0.61c-1.22,1.57 -2.98,2.5 -4.96,2.5 -3.94,0 -6.85,-3.01 -6.85,-8.1 0,-4.99 2.88,-8.13 6.85,-8.13 1.92,0 3.71,0.9 4.96,2.5v-6.5c0,-0.93 0.74,-1.7 1.76,-1.7 0.89,0 1.66,0.77 1.66,1.7v18.33c0,0.93 -0.77,1.7 -1.73,1.7z"
+        android:strokeWidth="1"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m58.84,63.27c-0.96,0 -1.7,-0.77 -1.7,-1.7v-0.54c-1.12,1.25 -3.04,2.43 -5.47,2.43 -3.33,0 -4.96,-1.76 -4.96,-4.89v-9.47c0,-0.89 0.74,-1.66 1.76,-1.66 0.9,0 1.66,0.77 1.66,1.66v8.22c0,2.37 1.22,3.1 3.07,3.1 1.7,0 3.14,-0.96 3.94,-1.98v-9.34c0,-0.89 0.74,-1.66 1.76,-1.66 0.9,0 1.66,0.77 1.66,1.66v12.48c0,0.93 -0.77,1.7 -1.73,1.7"
+        android:strokeWidth="1"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m68.76,63.27c-1.02,0 -1.86,-0.86 -1.86,-1.89v-17.98c0,-0.99 0.83,-1.86 1.92,-1.86 1.02,0 1.89,0.86 1.89,1.86v17.98c0,1.02 -0.86,1.89 -1.95,1.89"
+        android:strokeWidth="1"
+        android:fillColor="#53a6f0"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m83.86,45.09h-4.16v14.62h4.16c4.61,0 7.26,-3.3 7.26,-7.3 0,-4.1 -2.53,-7.33 -7.26,-7.33m0,17.98h-5.66c-1.28,0 -2.3,-1.05 -2.3,-2.3v-16.74c0,-1.25 1.02,-2.3 2.3,-2.3h5.66c6.66,0 11.2,4.42 11.2,10.69 0,6.3 -4.54,10.65 -11.2,10.65"
+        android:strokeWidth="1"
+        android:fillColor="#53a6f0"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+  </group>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/themes.xml

@@ -5,6 +5,7 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+        <item name="android:windowSplashScreenBackground" tools:ignore="NewApi">@color/ic_launcher_background</item>
     </style>
 
     <style name="ComposeAppTheme" parent="AppTheme" />