Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/HackIllinois/android
Browse files Browse the repository at this point in the history
…into development
  • Loading branch information
leahlud committed Feb 28, 2024
2 parents c291357 + d205b8c commit 702cf9d
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# The Official HackIllinois Android App
[![Build Status](https://github.com/hackillinois/android/workflows/CI/badge.svg)](https://github.com/HackIllinois/android/actions)

<img src="screenshots/welcome_screen_2023.png" height="360"/> <img src="screenshots/loading_screen_2023.png" height="360"/> <img src="screenshots/home_screen_2023.png" height="360"/> <img src="screenshots/card_screen_2023.png" height="360"/>
<img src="screenshots/welcome_screen_2024.jpg" height="360"/> <img src="screenshots/loading_screen_2024.jpg" height="360"/> <img src="screenshots/home_screen_2024.jpg" height="360"/> <img src="screenshots/schedule_screen_2024.jpg" height="360"/>

<img src="screenshots/schedule_screen_2023.png" height="360"/> <img src="screenshots/profile_screen_2023.png" height="360"/> <img src="screenshots/leaderboard_screen_2023.png" height="360"/> <img src="screenshots/scanner_screen_2023.png" height="360"/>
<img src="screenshots/card_screen_2024.jpg" height="360"/> <img src="screenshots/scanner_screen_2024.jpg" height="360"/> <img src="screenshots/point_shop_screen_2024.jpg" height="360"/> <img src="screenshots/profile_screen_2024.jpg" height="360"/>

[<img src="https://freelogopng.com/images/all_img/1664287128google-play-store-logo-png.png" height="45">](https://play.google.com/store/apps/details?id=org.hackillinois.android.release)

## Development Setup
* Download and install [Android Studio](https://developer.android.com/studio)
* Download and install [Git](https://git-scm.com/downloads) and [GitHub Desktop](https://desktop.github.com/)
* Download and install [Git](https://git-scm.com/downloads) and [GitHub Desktop](https://desktop.github.com/) (optional)

## Installation
1. Clone the repository.
Expand All @@ -32,3 +32,5 @@

5. Back in the cloned project in Android Studio, create an `app/google-services.json` file.
- You can get a copy of this file from one of the developers

**Note: steps 3 & 4 are only necessary if the app uses the Google Maps API (current 2024 version doesn't)**
Binary file added screenshots/card_screen_2024.jpg
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 screenshots/home_screen_2024.jpg
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 screenshots/loading_screen_2024.jpg
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 screenshots/point_shop_screen_2024.jpg
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 screenshots/profile_screen_2024.jpg
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 screenshots/scanner_screen_2024.jpg
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 screenshots/schedule_screen_2024.jpg
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 screenshots/welcome_screen_2024.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 702cf9d

Please sign in to comment.