Merge pull request #537 from HackIllinois/leah/splash-screen-2024

Splash Screen Page 2024
HackIllinois · Jan 25, 2024 · a9e6aad · a9e6aad
2 parents ce32f14 + 9708b83
commit a9e6aad
Show file tree

Hide file tree

Showing 51 changed files with 291 additions and 37 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,8 +19,8 @@
         android:name="org.hackillinois.android.App"
         android:allowBackup="false"
         android:label="@string/app_name"
-        android:icon="@mipmap/ic_launcher_23"
-        android:roundIcon="@mipmap/ic_launcher_23_round"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme">
 
 

diff --git a/app/src/main/assets/swirling_cauldron.json b/app/src/main/assets/swirling_cauldron.json
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/org/hackillinois/android/view/MainActivity.kt b/app/src/main/java/org/hackillinois/android/view/MainActivity.kt
@@ -66,7 +66,7 @@ class MainActivity : AppCompatActivity() {
         val bottomBarButtons = listOf(
             bottomAppBar.homeButton,
             bottomAppBar.scheduleButton,
-            bottomAppBar.leaderboard,
+            bottomAppBar.shop,
             bottomAppBar.profile,
         )
 
@@ -87,7 +87,7 @@ class MainActivity : AppCompatActivity() {
                     when (view) {
                         bottomAppBar.homeButton -> switchFragment(HomeFragment(), false)
                         bottomAppBar.scheduleButton -> switchFragment(ScheduleFragment(), false)
-                        bottomAppBar.leaderboard -> switchFragment(LeaderboardFragment(), false)
+                        bottomAppBar.shop -> switchFragment(LeaderboardFragment(), false)
                         bottomAppBar.profile -> switchFragment(ProfileFragment(), false)
                         else -> return@setOnClickListener
                     }
@@ -110,7 +110,7 @@ class MainActivity : AppCompatActivity() {
                 val bottomBarButtons = listOf(
                     bottomAppBar.homeButton,
                     bottomAppBar.scheduleButton,
-                    bottomAppBar.leaderboard,
+                    bottomAppBar.shop,
                     bottomAppBar.profile,
                 )
                 val unselectedIconColor = ContextCompat.getColor(this, R.color.unselectedAppBarIcon)

diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1022">
+  <group android:scaleY="0.9980469"
+      android:translateY="0.9980469">
+    <group>
+      <clip-path
+          android:pathData="M0,0h1024v1024h-1024z"/>
+      <path
+          android:pathData="M1024,0H0V1024H1024V0Z"
+          android:fillColor="#5B619B"/>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,149 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1022">
+  <group android:scaleX="0.67"
+      android:scaleY="0.6686914"
+      android:translateX="168.96"
+      android:translateY="169.29869">
+    <group>
+      <clip-path
+          android:pathData="M0,0h1024v1024h-1024z"/>
+      <path
+          android:pathData="M1024,0H0V1024H1024V0Z"
+          android:fillColor="#5B619B"/>
+      <path
+          android:pathData="M286.1,736.1C279.2,736.1 272.3,736.8 266,737.4C247.1,679.6 196.2,638.1 135.9,638.1C66.7,638.1 9.5,692.2 -0.5,762.5C-23.2,745.6 -50.2,735.5 -80.4,735.5C-135.7,735.5 -182.8,770.1 -204.8,819.7C-207.3,819.7 -209.9,819.1 -212.4,819.1C-255.7,819.1 -291.6,856.8 -291.6,903.3V915.9C-291.6,924.7 -285.3,931 -277.1,931H398.6C412.4,931 423.8,919 423.8,903.9V881.3C423.8,802.1 362.1,736.1 286.1,736.1Z"
+          android:strokeAlpha="0.1"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.1"/>
+      <path
+          android:pathData="M556.7,379.6V402.2C556.7,417.3 568.1,429.2 581.9,429.2H707.6H807.5H948.3H982.9H1128.8H1173.4H1257.6C1265.8,429.2 1272.1,422.9 1272.1,414.1V401.6C1272.1,355.1 1236.2,317.4 1192.9,317.4C1190.3,317.4 1187.8,318 1185.3,318C1163.3,268.3 1116.2,233.8 1060.9,233.8C1030.7,233.8 1003.7,243.8 981,260.8C971,190.4 913.8,136.4 844.6,136.4C784.3,136.4 733.4,177.8 714.5,235.7C708.2,235 701.3,234.4 694.4,234.4C618.3,234.4 556.7,300.4 556.7,379.6Z"
+          android:fillColor="#666B9E"/>
+      <path
+          android:pathData="M726.7,688.4V718.3H685.5L726.7,688.4Z"
+          android:fillColor="#DE8E45"/>
+      <path
+          android:pathData="M287.4,307.8V337.8L323.6,301.5L287.4,307.8Z"
+          android:fillColor="#DE8E45"/>
+      <path
+          android:pathData="M726.7,193.7V337.8H602.2V457.1H413.6V337.8H287.4L370.9,193.7H726.7Z"
+          android:fillColor="#DE8E45"/>
+      <path
+          android:pathData="M726.7,718.3L646.3,862.3H287.4V718.3H413.6V599H602.2V718.3H726.7Z"
+          android:fillColor="#DE8E45"/>
+      <path
+          android:pathData="M726.7,193.7V337.8H602.2V457.1H413.6V337.8H287.4L370.9,193.7H726.7Z"
+          android:strokeAlpha="0.94"
+          android:fillColor="#DE8E45"
+          android:fillAlpha="0.94"/>
+      <path
+          android:pathData="M726.7,193.7V337.8H602.2V457.1H413.6V337.8H287.4L370.9,193.7H726.7Z"
+          android:fillColor="#DE8E45"/>
+      <path
+          android:pathData="M726.7,718.3L646.3,862.3H304.9L287.4,718.3H413.6V599H602.2V718.3H726.7Z"
+          android:fillColor="#DE8E45"/>
+      <path
+          android:pathData="M726.7,163.8V307.8H602.2V427.1H413.6V307.8H287.4L370.9,163.8H726.7Z"
+          android:fillColor="#FFB23E"/>
+      <path
+          android:pathData="M726.7,163.8V307.8H602.2V427.1H413.6V307.8H287.4L370.9,163.8H726.7Z"
+          android:fillColor="#FFB23E"/>
+      <path
+          android:pathData="M726.7,688.3L646.3,832.4H287.4V688.3H413.6V569H602.2V688.3H726.7Z"
+          android:fillColor="#FFB23E"/>
+      <path
+          android:pathData="M599.8,163.8L450.7,427.1H413.6V352.5L520.4,163.8H599.8Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M549.4,569L400.3,832.4H358L507.1,569H549.4Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M578.2,427.1L602.2,384.8V427.1H578.2Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M726.7,165V239.7L688.1,307.8H645.8L726.7,165Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M726.7,688.4L646.3,832.4H578.7L661.9,688.4H726.7Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M370.9,163.8L716.1,173.3L727,250.9V165L370.9,163.8Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M413.6,569L594.7,577.4L602.2,688.3V569H413.6Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M370.9,307.8L416.8,305.5L413.6,337.8L413.6,307.8H370.9Z"
+          android:fillColor="#F5EA83"/>
+      <path
+          android:pathData="M876.1,609m-9.9,0a9.9,9.9 0,1 1,19.8 0a9.9,9.9 0,1 1,-19.8 0"
+          android:fillColor="#B7D6D6"
+          android:fillAlpha="0.8"/>
+      <path
+          android:pathData="M685.7,915.2m-9.9,0a9.9,9.9 0,1 1,19.8 0a9.9,9.9 0,1 1,-19.8 0"
+          android:fillColor="#B7D6D6"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M202.4,251m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:fillColor="#FFFACC"/>
+      <path
+          android:pathData="M208.1,936.9m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:strokeAlpha="0.7"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.7"/>
+      <path
+          android:pathData="M826.1,273.6m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M281.6,529.9m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M909,924.7m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M571.7,90.9m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M93.1,112.5m-6.1,0a6.1,6.1 0,1 1,12.2 0a6.1,6.1 0,1 1,-12.2 0"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M142.8,464.6L160.3,473.2L179.3,468.8L176.6,488.1L186.7,504.8L167.4,508.2L154.6,523L145.5,505.7L127.5,498.1L141.1,484.1L142.8,464.6Z"
+          android:strokeAlpha="0.5"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M861.2,793.2L860.2,812.4L871.4,827.9L852.9,832.8L841.6,848.3L831.2,832.2L812.9,826.2L825,811.4L825.1,792.2L843,799.1L861.2,793.2Z"
+          android:strokeAlpha="0.5"
+          android:fillColor="#B7D6D6"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M330.1,106.9L329.8,112.1L332.9,116.4L327.8,117.7L324.7,122L321.9,117.6L316.9,115.9L320.2,111.8L320.2,106.6L325.1,108.5L330.1,106.9Z"
+          android:fillColor="#B7D6D6"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M935.3,88.3L931.6,92.1L931.2,97.3L926.5,95L921.3,96.2L922,91L919.3,86.5L924.5,85.6L927.9,81.6L930.4,86.2L935.3,88.3Z"
+          android:fillColor="#B7D6D6"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M789.7,427.1L794.5,437.5L804.8,442.6L796.3,450.3L794.7,461.6L784.7,456L773.4,457.9L775.7,446.7L770.4,436.6L781.7,435.3L789.7,427.1Z"
+          android:fillColor="#EAD1D0"
+          android:fillAlpha="0.3"/>
+      <path
+          android:pathData="M133.6,789.9L140.4,790L145.8,785.7L147.9,792.3L153.6,796.1L148,800.1L146.2,806.7L140.6,802.6L133.8,802.9L136,796.3L133.6,789.9Z"
+          android:fillColor="#FFFACC"
+          android:fillAlpha="0.5"/>
+      <path
+          android:pathData="M885.2,149.6L886.6,164L896.8,174.2L883.6,180L877,192.9L867.4,182.1L853.1,179.7L860.4,167.3L858.2,153L872.3,156.1L885.2,149.6Z"
+          android:strokeAlpha="0.5"
+          android:fillColor="#EAD1D0"
+          android:fillAlpha="0.5"/>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_point_shop.xml b/app/src/main/res/drawable/ic_point_shop.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="20dp"
+    android:viewportWidth="19"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M3.001,7L2.003,20H17.003L16.001,7H3.001ZM2.003,5C1.522,5 1.031,5.52 1.001,6L0.001,21C-0.031,21.524 0.479,22 1.003,22H18.003C18.528,22 19.034,21.524 19.001,21L18.001,6C17.972,5.52 17.482,5 17.001,5L2.003,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9.501,2C7.742,2 6.501,3.247 6.501,5.006V8C6.501,8.503 6.004,9 5.501,9C4.999,9 4.501,8.503 4.501,8L4.495,5.006C4.495,2.241 6.737,0 9.501,0C12.266,0 14.508,2.241 14.508,5.006L14.501,8C14.501,8.503 14.004,9 13.501,9C12.998,9 12.501,8.503 12.501,8V5C12.501,3.24 11.261,2 9.501,2Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/login_bg.png b/app/src/main/res/drawable/login_bg.png
diff --git a/app/src/main/res/drawable/moon.xml b/app/src/main/res/drawable/moon.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="69dp"
+    android:height="69dp"
+    android:viewportWidth="69"
+    android:viewportHeight="69">
+  <path
+      android:pathData="M34.5,34.5m-34.5,0a34.5,34.5 0,1 1,69 0a34.5,34.5 0,1 1,-69 0"
+      android:fillColor="#FFFACC"/>
+  <path
+      android:pathData="M41,17m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
+      android:strokeAlpha="0.7"
+      android:fillColor="#EDE9BE"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M15.5,33.5m-5.5,0a5.5,5.5 0,1 1,11 0a5.5,5.5 0,1 1,-11 0"
+      android:strokeAlpha="0.7"
+      android:fillColor="#EDE9BE"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M47,48m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeAlpha="0.7"
+      android:fillColor="#EDE9BE"
+      android:fillAlpha="0.7"/>
+</vector>
diff --git a/app/src/main/res/drawable/profile_2024.png b/app/src/main/res/drawable/profile_2024.png
diff --git a/app/src/main/res/drawable/scanner_2024.png b/app/src/main/res/drawable/scanner_2024.png
diff --git a/app/src/main/res/drawable/schedule_2024.png b/app/src/main/res/drawable/schedule_2024.png
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -9,14 +9,25 @@
     <ImageView
         android:id="@+id/imageView3"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:scaleType="centerCrop"
+        android:layout_height="0dp"
+        android:scaleType="fitXY"
         android:src="@drawable/login_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/moon"
+        app:layout_constraintHorizontal_bias="0.125"
+        app:layout_constraintVertical_bias="0.95"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineTop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
@@ -125,7 +136,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.14" />
+        app:layout_constraintGuide_percent="0.15" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guidelineBottom"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/contentFrame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottomAppBar"
@@ -49,7 +49,7 @@
                 android:layout_height="0dp"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="@id/homeButton"
-                app:layout_constraintEnd_toStartOf="@id/leaderboard"
+                app:layout_constraintEnd_toStartOf="@id/shop"
                 app:layout_constraintStart_toEndOf="@id/scheduleButton"
                 app:layout_constraintTop_toTopOf="@id/homeButton" />
 
@@ -60,19 +60,20 @@
                 android:background="@color/darkForest"
                 app:layout_constraintBottom_toBottomOf="@id/homeButton"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/leaderboard"
+                app:layout_constraintStart_toEndOf="@+id/shop"
                 app:srcCompat="@drawable/ic_profile" />
 
             <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/leaderboard"
+                android:id="@+id/shop"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
+                android:layout_marginBottom="2dp"
                 android:background="@color/darkForest"
                 app:layout_constraintBottom_toBottomOf="@id/homeButton"
                 app:layout_constraintEnd_toStartOf="@id/profile"
                 app:layout_constraintStart_toEndOf="@id/placeholder"
                 app:layout_constraintTop_toTopOf="@+id/homeButton"
-                app:srcCompat="@drawable/ic_leaderboard" />
+                app:srcCompat="@drawable/ic_point_shop" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.bottomappbar.BottomAppBar>

diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
@@ -7,13 +7,24 @@
 
     <ImageView
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:scaleType="centerCrop"
+        android:layout_height="0dp"
+        android:scaleType="fitXY"
         android:src="@drawable/login_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/moon"
+        app:layout_constraintHorizontal_bias="0.125"
+        app:layout_constraintVertical_bias="0.95"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineTop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager"