Skip to content

Commit

Permalink
modified icons, text, and colors in the bottom app bar
Browse files Browse the repository at this point in the history
  • Loading branch information
@sneh-saraff
sneh-saraff committed Dec 12, 2024
1 parent 0b71fd3 commit 0905eee
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 17 deletions.
Binary file added app/src/main/res/drawable/calendar_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/camera_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/home_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/prizes_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/profile_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 79 additions & 17 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">

Expand All @@ -15,39 +16,70 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:backgroundTint="@color/darkForest">
app:backgroundTint="@color/cream">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">


<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/homeButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/darkForest"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:background="@color/cream"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/scheduleButton"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_home" />
app:layout_constraintVertical_bias="0.0"
app:layout_constraintHorizontal_chainStyle="spread"
app:tint="@color/black"
app:srcCompat="@drawable/home_icon" />

<TextView
android:id="@+id/homeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="44dp"
android:gravity="center"
android:text="@string/home_icon"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@id/homeButton"
app:layout_constraintTop_toTopOf="@id/homeButton" />

<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/scheduleButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/darkForest"
android:background="@color/cream"
app:layout_constraintBottom_toBottomOf="@id/homeButton"
app:layout_constraintEnd_toStartOf="@+id/placeholder"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/homeButton"
app:srcCompat="@drawable/ic_today" />
app:srcCompat="@drawable/calendar_icon" />

<TextView
android:id="@+id/calendarText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="44dp"
android:gravity="center"
android:text="@string/schedule_icon"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@id/scheduleButton"
app:layout_constraintTop_toTopOf="@id/scheduleButton" />

<View
android:id="@+id/placeholder"
android:layout_width="70dp"
android:layout_width="72dp"
android:layout_height="0dp"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/homeButton"
Expand All @@ -61,39 +93,69 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="16dp"
android:background="@color/darkForest"
android:background="@color/cream"
app:layout_constraintBottom_toBottomOf="@id/homeButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/shopButton"
app:srcCompat="@drawable/ic_profile" />
app:srcCompat="@drawable/profile_icon" />

<TextView
android:id="@+id/profileText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="44dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:text="@string/profile_icon"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@id/profileButton"
app:layout_constraintTop_toTopOf="@id/profileButton" />

<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/shopButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginBottom="2dp"
android:background="@color/darkForest"
android:background="@color/cream"
app:layout_constraintBottom_toBottomOf="@id/homeButton"
app:layout_constraintEnd_toStartOf="@+id/profileButton"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/placeholder"
app:layout_constraintTop_toTopOf="@+id/homeButton"
app:srcCompat="@drawable/ic_point_shop" />
app:srcCompat="@drawable/prizes_icon" />

<TextView
android:id="@+id/prizesText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="44dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:text="@string/prizes_icon"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@id/shopButton"
app:layout_constraintTop_toTopOf="@id/shopButton" />
</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.bottomappbar.BottomAppBar>

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/code_entry_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:backgroundTint="@color/white"
app:layout_anchor="@id/bottomAppBar"
app:srcCompat="@drawable/qr_icon"
app:tint="@color/selectedAppBarIcon"/>
android:layout_width="72dp"
android:layout_height="72dp"
app:backgroundTint="@color/cream"
android:layout_gravity="bottom|center"
android:layout_marginBottom="30dp"
app:fabCustomSize="72dp"
app:maxImageSize="50dp"
app:srcCompat="@drawable/camera_icon" />



<!-- <FrameLayout-->
<!-- <FrameLayout-->
<!-- android:id="@+id/codeEntrySheet"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,10 @@
<color name="coinTotalColor">#2A2A2A</color>
<color name="tabSelectedColor">#D84177</color>

<!-- 2025 color palette -->
<color name="cream">#F5F0DD</color>
<color name="black">#000000</color>



</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
<string name="need_internet_title">Internet Required</string>
<string name="need_internet_message">You must be connected to the internet in order to use the HackIllinois app. Please retry once you have verified your connection.</string>

<!-- Appbar -->
<string name="home_icon">Home</string>
<string name="schedule_icon">Schedule</string>
<string name="prizes_icon">Prizes</string>
<string name="profile_icon">Profile</string>

<!-- Onboarding Fragment -->
<string name="onboarding_get_started">Get Started</string>
<string name="onboarding_welcome_title">Welcome!</string>
Expand Down

0 comments on commit 0905eee

Please sign in to comment.