Drop onboarding pages 1-4, swap art for AutoAwesome icon

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/OnboardingView.kt

@@ -2,24 +2,16 @@ package com.nativeapptemplate.nativeapptemplatefree.ui.app_root
 
 import android.content.Intent
 import android.net.Uri
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AutoAwesome
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -28,11 +20,8 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -46,127 +35,49 @@ import com.nativeapptemplate.nativeapptemplatefree.ui.common.NonScaledSp.nonScal
 internal fun OnboardingView(
   onStartClick: () -> Unit,
 ) {
-  val fontSizeLarge = 24
-  val lineHeightLarge = 26
-  val onboardings = OnboardingViewModel.onboardings
-  val pagerState = rememberPagerState(pageCount = {
-    onboardings.size + 1
-  })
-
   Scaffold(
     topBar = { TopAppBar(onStartClick) },
     modifier = Modifier.fillMaxSize(),
   ) { padding ->
     Box(
       modifier = Modifier
         .fillMaxSize()
-        .padding(padding),
+        .padding(padding)
+        .padding(12.dp)
+        .padding(top = 12.dp),
     ) {
-      HorizontalPager(
-        state = pagerState,
+      Icon(
+        imageVector = Icons.Filled.AutoAwesome,
+        contentDescription = null,
+        tint = Color.White,
+        modifier = Modifier
+          .align(Alignment.TopCenter)
+          .fillMaxSize()
+          .padding(bottom = 192.dp),
+      )
+      Box(
         modifier = Modifier
-          .fillMaxSize(),
-      ) { page ->
-        if (page == 0) {
-          WelcomePage()
-          return@HorizontalPager
-        }
-        val onboarding = onboardings[page - 1]
-        val imageBottomPadding = if (onboarding.imageOrientation == ImageOrientation.LANDSCAPE) 192.dp else 0.dp
-        Box(
-          modifier = Modifier
-            .fillMaxSize()
-            .padding(12.dp)
-            .padding(top = 12.dp),
-        ) {
-          Image(
-            painter = painterResource(OnboardingViewModel.onboardingImageId(onboarding.id)),
-            contentDescription = null,
-            contentScale = ContentScale.Fit,
-            modifier = Modifier
-              .align(Alignment.TopCenter)
-              .padding(bottom = imageBottomPadding),
-          )
-          Card(
-            shape = RoundedCornerShape(16.dp),
-            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
-
-            modifier = Modifier
-              .align(Alignment.BottomCenter),
-          ) {
-            Text(
-              stringResource(OnboardingViewModel.onboardingDescription(onboarding.id)),
-              color = MaterialTheme.colorScheme.onSurfaceVariant,
-              fontSize = fontSizeLarge.sp.nonScaledSp,
-              lineHeight = lineHeightLarge.sp.nonScaledSp,
-              modifier = Modifier
-                .padding(24.dp)
-                .padding(bottom = 16.dp),
-            )
-          }
-        }
-      }
-      Row(
-        Modifier
-          .wrapContentHeight()
-          .fillMaxWidth()
           .align(Alignment.BottomCenter)
-          .padding(bottom = 8.dp),
-        horizontalArrangement = Arrangement.Center,
+          .fillMaxWidth()
+          .background(MaterialTheme.colorScheme.background),
       ) {
-        repeat(pagerState.pageCount) { iteration ->
-          val color = if (pagerState.currentPage == iteration) Color.DarkGray else Color.LightGray
-          Box(
-            modifier = Modifier
-              .padding(2.dp)
-              .clip(CircleShape)
-              .background(color)
-              .size(16.dp),
-          )
-        }
+        Text(
+          text = stringResource(R.string.welcome_to_app, stringResource(R.string.app_name)),
+          color = MaterialTheme.colorScheme.onBackground,
+          fontSize = 34.sp.nonScaledSp,
+          lineHeight = 41.sp.nonScaledSp,
+          fontWeight = FontWeight.Bold,
+          textAlign = TextAlign.Center,
+          modifier = Modifier
+            .align(Alignment.TopCenter)
+            .fillMaxWidth()
+            .padding(16.dp),
+        )
       }
     }
   }
 }
 
-@Composable
-private fun WelcomePage() {
-  Box(
-    modifier = Modifier
-      .fillMaxSize()
-      .padding(12.dp)
-      .padding(top = 12.dp),
-  ) {
-    Image(
-      painter = painterResource(R.drawable.ic_hero),
-      contentDescription = null,
-      contentScale = ContentScale.Fit,
-      modifier = Modifier
-        .align(Alignment.TopCenter)
-        .padding(bottom = 192.dp),
-    )
-    Box(
-      modifier = Modifier
-        .align(Alignment.BottomCenter)
-        .fillMaxWidth()
-        .background(MaterialTheme.colorScheme.background),
-    ) {
-      Text(
-        text = stringResource(R.string.welcome_to_app, stringResource(R.string.app_name)),
-        color = MaterialTheme.colorScheme.onBackground,
-        fontSize = 34.sp.nonScaledSp,
-        lineHeight = 41.sp.nonScaledSp,
-        fontWeight = FontWeight.Bold,
-        textAlign = TextAlign.Center,
-        modifier = Modifier
-          .align(Alignment.TopCenter)
-          .fillMaxWidth()
-          .padding(16.dp),
-      )
-    }
-  }
-}
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun TopAppBar(

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignUpOrSignInView.kt

@@ -2,16 +2,17 @@ package com.nativeapptemplate.nativeapptemplatefree.ui.app_root
 
 import android.content.Intent
 import android.net.Uri
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.AutoAwesome
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -24,14 +25,15 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLinkStyles
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withLink
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
@@ -63,18 +65,21 @@ internal fun SignUpOrSignInView(
     ) {
       Text(
         stringResource(R.string.app_name),
-        style = MaterialTheme.typography.displaySmall,
+        style = MaterialTheme.typography.headlineMedium,
+        fontWeight = FontWeight.Bold,
+        textAlign = TextAlign.Center,
         modifier = Modifier
           .fillMaxWidth()
           .padding(horizontal = 24.dp),
       )
 
-      Image(
-        painter = painterResource(R.drawable.ic_hero),
+      Icon(
+        imageVector = Icons.Filled.AutoAwesome,
         contentDescription = null,
-        contentScale = ContentScale.FillWidth,
+        tint = Color.White,
         modifier = Modifier
           .fillMaxWidth()
+          .height(256.dp)
           .padding(vertical = 24.dp),
       )
 

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

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <group android:scaleX="0.6111111"
+      android:scaleY="0.6111111"
+      android:translateX="199.11111"
+      android:translateY="199.11111">
+    <path
+        android:pathData="M0,0h1024v1024h-1024z"
+        android:fillColor="#1A2332"/>
+    <path
+        android:pathData="M512,92C512,372 552,472 932,512C552,552 512,652 512,932C512,652 472,552 92,512C472,472 512,372 512,92Z"
+        android:fillColor="#FFFFFF"/>
+  </group>
+</vector>

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

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <group android:scaleX="0.6111111"
+      android:scaleY="0.6111111"
+      android:translateX="199.11111"
+      android:translateY="199.11111">
+    <path
+        android:pathData="M0,0h1024v1024h-1024z"
+        android:fillColor="#1A2332"/>
+    <path
+        android:pathData="M512,92C512,372 552,472 932,512C552,552 512,652 512,932C512,652 472,552 92,512C472,472 512,372 512,92Z"
+        android:fillColor="#FFFFFF"/>
+  </group>
+</vector>

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

@@ -4,10 +4,7 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path
-      android:pathData="M0,-0l1024,0l0,1024l-1024,0z"
-      android:fillColor="#1F2933"/>
-  <path
-      android:pathData="M703.1,291.1L703.1,732.9L603,732.9L443.4,500.8L440.8,500.8L440.8,732.9L320.9,732.9L320.9,291.1L422.7,291.1L579.7,522.4L583.2,522.4L583.2,291.1L703.1,291.1Z"
-      android:fillColor="#5ED0FA"
+      android:pathData="M512,232 C512,419 539,485 792,512 C539,539 512,605 512,792 C512,605 485,539 232,512 C485,485 512,419 512,232 Z"
+      android:fillColor="#FFFFFF"
       android:fillType="nonZero"/>
 </vector>

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

@@ -1,5 +1,6 @@
 <?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"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -1,5 +1,6 @@
 <?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"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#1F2933</color>
+    <color name="ic_launcher_background">#1A2332</color>
 </resources>

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

@@ -1,5 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="app_name">NativeAppTemplate Free</string>
+  <string name="app_name">Native App Template</string>
   <string name="title_shops">Shops</string>
   <string name="title_settings">Settings</string>
 
@@ -67,10 +67,6 @@
 
   <!-- On-boarding -->
   <string name="welcome_to_app">Welcome to %1$s</string>
-  <string name="onboarding_description1">Onboarding description 1.</string>
-  <string name="onboarding_description2">Onboarding description 2.</string>
-  <string name="onboarding_description3">Onboarding description 3.</string>
-  <string name="onboarding_description4">Onboarding description 4.</string>
 
   <!-- Shops Screen -->
   <string name="add_shop">Add Shop</string>