Merge branch 'develop' of https://github.com/Nexters/Funch-AOS into f…

…eature/create-profile-create-ui

# Conflicts:
#	app/src/main/AndroidManifest.xml

app/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     implementation(projects.feature.profile)
     implementation(projects.feature.home)
     implementation(projects.feature.match)
-
+    implementation(projects.feature.onboarding)
 //    implementation(libs.coil.core)
     implementation(libs.startup)
 //    implementation(libs.security)

app/src/main/AndroidManifest.xml

@@ -10,17 +10,16 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_funch_logo"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_funch_logo_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.PunchAOS"
         android:usesCleartextTraffic="true"
         tools:targetApi="34">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/title_activity_sample"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.FunchAOS">
             <intent-filter>

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

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="182dp"
+    android:height="164dp"
+    android:viewportWidth="182"
+    android:viewportHeight="164">
+  <path
+      android:pathData="M170.81,119C154.52,98.61 160.1,64.49 182,50.36C173.03,54.73 157.37,58.28 138.05,58.91C126.98,59.27 116.78,54.49 116.96,42.62C117.14,30.75 123.08,19.88 128.84,9.55C118.67,21.38 103.07,38.88 79.26,38.97C61.29,38.07 36.51,0 36.51,0C36.51,0 42.54,29.04 39.33,59.24C36.87,82.26 11.04,97.62 0,99.91C10.32,98.22 17.76,97.23 27.42,98.61C37.95,100.15 52.71,109.36 56.85,119.6C63.45,135.93 59.76,164 59.76,164C59.76,164 64.41,134.84 85.35,121.86C102.53,111.2 116.99,109.03 137.12,110.9C151.73,112.25 170.81,119.03 170.81,119.03V119Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="80.5"
+          android:startY="71"
+          android:endX="135.5"
+          android:endY="117"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFE83B"/>
+        <item android:offset="1" android:color="#FFFFD440"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

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

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="182"
+    android:viewportHeight="164">
+  <group android:scaleX="0.47"
+      android:scaleY="0.42351648"
+      android:translateX="48.23"
+      android:translateY="47.27165">
+    <path
+        android:pathData="M170.81,119C154.52,98.61 160.1,64.49 182,50.36C173.03,54.73 157.37,58.28 138.05,58.91C126.98,59.27 116.78,54.49 116.96,42.62C117.14,30.75 123.08,19.88 128.84,9.55C118.67,21.38 103.07,38.88 79.26,38.97C61.29,38.07 36.51,0 36.51,0C36.51,0 42.54,29.04 39.33,59.24C36.87,82.26 11.04,97.62 0,99.91C10.32,98.22 17.76,97.23 27.42,98.61C37.95,100.15 52.71,109.36 56.85,119.6C63.45,135.93 59.76,164 59.76,164C59.76,164 64.41,134.84 85.35,121.86C102.53,111.2 116.99,109.03 137.12,110.9C151.73,112.25 170.81,119.03 170.81,119.03V119Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="80.5"
+            android:startY="71"
+            android:endX="135.5"
+            android:endY="117"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFE83B"/>
+          <item android:offset="1" android:color="#FFFFD440"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

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

@@ -0,0 +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_funch_logo_background"/>
+    <foreground android:drawable="@drawable/ic_funch_logo_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +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_funch_logo_background"/>
+    <foreground android:drawable="@drawable/ic_funch_logo_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_funch_logo_background">#070707</color>
+</resources>

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

@@ -1,4 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Punch-AOS</string>
-    <string name="title_activity_sample">SampleActivity</string>
+    <string name="app_name">Funch</string>
 </resources>

feature/onboarding/.gitignore

@@ -0,0 +1 @@
+/build

feature/onboarding/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    alias(libs.plugins.funch.feature)
+    alias(libs.plugins.funch.compose)
+}
+
+android {
+    namespace = "com.moya.funch.onboarding"
+}
+
+dependencies {
+    implementation(projects.core.designsystem)
+    implementation(projects.core.domain)
+
+    implementation(libs.compose.lottie)
+}

feature/onboarding/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

feature/onboarding/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+</manifest>