Updated Scanner Layouts

HackIllinois · Feb 14, 2025 · d380bd1 · d380bd1
1 parent b089f98
commit d380bd1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 46 deletions.
diff --git a/app/src/main/java/org/hackillinois/android/view/scanner/AttendeeScannerFragment.kt b/app/src/main/java/org/hackillinois/android/view/scanner/AttendeeScannerFragment.kt
@@ -42,15 +42,15 @@ class AttendeeScannerFragment : Fragment() {
         }
 
         // when point shop button is clicked
-        val pointShopButton = view.findViewById<Button>(R.id.pointShopBtn)
-        pointShopButton.setOnClickListener {
-            if (appBar != null && scannerBtn != null) {
-                appBar.visibility = View.INVISIBLE
-                scannerBtn.visibility = View.INVISIBLE
-            }
-            val scannerFragment = ScannerFragment.newInstance("point-shop")
-            (context as MainActivity).switchFragment(scannerFragment, true)
-        }
+//        val pointShopButton = view.findViewById<Button>(R.id.pointShopBtn)
+//        pointShopButton.setOnClickListener {
+//            if (appBar != null && scannerBtn != null) {
+//                appBar.visibility = View.INVISIBLE
+//                scannerBtn.visibility = View.INVISIBLE
+//            }
+//            val scannerFragment = ScannerFragment.newInstance("point-shop")
+//            (context as MainActivity).switchFragment(scannerFragment, true)
+//        }
 
         return view
     }

diff --git a/app/src/main/res/drawable/burntbrown_scanner_button.xml b/app/src/main/res/drawable/burntbrown_scanner_button.xml
@@ -4,17 +4,17 @@
     <!-- Bottom Shadow -->
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="@color/burntBrownBorder" />
+            <solid android:color="@color/burntBrown" />
             <corners android:radius="20dp" />
         </shape>
     </item>
 
     <!-- Button Color -->
     <item android:bottom="8dp">
         <shape  android:shape="rectangle">
-            <stroke android:color="@color/burntBrownBorder" android:width="4dp" />
+            <stroke android:color="@color/burntBrown" android:width="4dp" />
 
-            <solid android:color="@color/burntBrown" />
+            <solid android:color="@color/burntBrownBorder" />
             <corners android:radius="15dp" />
 
 

diff --git a/app/src/main/res/drawable/burntbrown_scanner_button_pressed.xml b/app/src/main/res/drawable/burntbrown_scanner_button_pressed.xml
@@ -4,8 +4,8 @@
     <!-- Button Color -->
     <item android:top="8dp">
         <shape  android:shape="rectangle">
-            <stroke android:color="@color/burntBrownBorder" android:width="4dp" />
-            <solid android:color="@color/burntBrown" />
+            <stroke android:color="@color/burntBrown" android:width="4dp" />
+            <solid android:color="@color/burntBrownBorder" />
             <corners android:radius="15dp" />
 
 

diff --git a/app/src/main/res/layout/fragment_attendee_scanner.xml b/app/src/main/res/layout/fragment_attendee_scanner.xml
@@ -10,8 +10,9 @@
     <ImageView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:scaleType="fitXY"
         android:adjustViewBounds="true"
+        android:alpha="0.8"
+        android:scaleType="fitXY"
         android:src="@drawable/scanner_background_svg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -43,6 +44,7 @@
         android:textAllCaps="false"
         android:textColor="@color/darkBrown"
         android:textSize="22sp"
+        android:layout_marginTop="55dp"
         app:fontFamily="@font/montserrat_bold"
         app:layout_constraintBottom_toTopOf="@+id/mentorCheckInBtn"
         app:layout_constraintEnd_toEndOf="parent"
@@ -56,7 +58,8 @@
         android:id="@+id/mentorCheckInBtn"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="15dp"
+        android:layout_marginVertical="30dp"
+        android:layout_marginTop="30dp"
         android:background="@drawable/teal_scanner_button"
         android:paddingTop="20dp"
         android:paddingBottom="30dp"
@@ -65,41 +68,11 @@
         android:textColor="@color/darkBrown"
         android:textSize="22sp"
         app:fontFamily="@font/montserrat_bold"
-        app:layout_constraintBottom_toTopOf="@+id/pointShopBtn"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/eventCheckInBtn"
         app:layout_constraintWidth_percent=".8" />
 
-    <org.hackillinois.android.view.scanner.buttons.OrangeAnimatedButton
-        android:id="@+id/pointShopBtn"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:background="@drawable/orange_scanner_button"
-        android:paddingTop="20dp"
-        android:paddingBottom="30dp"
-        android:text="@string/point_shop_scan"
-        android:textAllCaps="false"
-        android:textColor="@color/darkBrown"
-        android:textSize="22sp"
-        app:fontFamily="@font/montserrat_bold"
-        app:layout_constraintBottom_toTopOf="@+id/imageView6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/mentorCheckInBtn"
-        app:layout_constraintWidth_percent=".8" />
-
-    <ImageView
-        android:id="@+id/imageView6"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:foregroundGravity="bottom"
-        android:src="@drawable/acorn_squirrel"
-        app:layout_constraintBottom_toTopOf="@id/guidelineBottom"
-        app:layout_constraintEnd_toStartOf="@+id/guideline3"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guidelineTop"
         android:layout_width="wrap_content"