Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Home Page 2024 #524

Merged
merged 20 commits into from
Jan 7, 2024
+289 −155
Merged

Home Page 2024 #524

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
98db048
Removed unused API call to upload/blobstore/times
leahlud Dec 2, 2023
b326337
Add new countdown layout
leahlud Dec 3, 2023
494b3ac
Changed time of when hackathon starts
leahlud Dec 3, 2023
8198124
Removed unused import
leahlud Dec 3, 2023
1da88c0
Added documentation to CountdownManager.kt
leahlud Dec 5, 2023
33a6f3b
Added EventProgressManager to update background on home page
leahlud Dec 10, 2023
626b1f2
Merge branch 'development' into leah/home-2024
leahlud Dec 17, 2023
f5fc730
Added countdown backgrounds and fragment_home.xml layout
leahlud Dec 17, 2023
8bfa52d
Removed backgrounds and added final checkpoint time
leahlud Dec 17, 2023
3852326
Added functionality to toggle info tags for home page
leahlud Dec 19, 2023
02ba666
Made status bar invisible
leahlud Dec 19, 2023
02c3c87
Fixed navbar colors and event progress manager
leahlud Dec 19, 2023
5708f47
Removed log statements and added comments
leahlud Dec 19, 2023
b5c8eef
Made home page background constraints more dynamic
leahlud Dec 20, 2023
9e9e1af
Changed android navigation bar color
leahlud Dec 20, 2023
3006922
Added tentative dates and times for countdowns
leahlud Dec 26, 2023
d84cf67
changed margins of countdown
leahlud Dec 28, 2023
3b8d0e5
removed navbar color change
leahlud Jan 2, 2024
e33c8b9
Merge branch 'development' into leah/home-2024
leahlud Jan 2, 2024
fe5b114
small adjustments to countdown paddings
leahlud Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
small adjustments to countdown paddings
@leahlud
leahlud committed Jan 6, 2024
commit fe5b11405913a2ffef25579679c64421a3872efe
16 changes: 8 additions & 8 deletions app/src/main/res/layout/fragment_home.xml
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="10dp"
android:layout_marginTop="8dp"
android:adjustViewBounds="false"
android:scaleType="centerInside"
android:src="@drawable/home_bg_start"
@@ -37,7 +37,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="10dp"
android:layout_marginTop="8dp"
android:adjustViewBounds="false"
android:scaleType="centerInside"
android:src="@drawable/home_bg_tags"
@@ -110,7 +110,7 @@
android:layout_gravity="center_horizontal"
android:fontFamily="@font/montserrat_bold"
android:includeFontPadding="false"
android:paddingVertical="0dp"
android:paddingTop="4dp"
android:textColor="@color/burntBark"
android:textSize="36sp"
tools:text="12" />
@@ -121,7 +121,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@font/montserrat_bold"
android:includeFontPadding="false"
android:paddingBottom="3dp"
android:text="@string/days_label"
android:textColor="@color/burntBark"
android:textSize="12sp" />
@@ -144,7 +144,7 @@
android:layout_gravity="center_horizontal"
android:fontFamily="@font/montserrat_bold"
android:includeFontPadding="false"
android:paddingVertical="0dp"
android:paddingTop="4dp"
android:textColor="@color/burntBark"
android:textSize="36sp"
tools:text="23" />
@@ -155,7 +155,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@font/montserrat_bold"
android:includeFontPadding="false"
android:paddingBottom="3dp"
android:text="@string/hours_label"
android:textColor="@color/burntBark"
android:textSize="12sp" />
@@ -177,7 +177,7 @@
android:layout_gravity="center_horizontal"
android:fontFamily="@font/montserrat_bold"
android:includeFontPadding="false"
android:paddingVertical="0dp"
android:paddingTop="4dp"
android:textColor="@color/burntBark"
android:textSize="36sp"
tools:text="43" />
@@ -188,7 +188,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@font/montserrat_bold"
android:includeFontPadding="false"
android:paddingBottom="3dp"
android:text="@string/minutes_label"
android:textColor="@color/burntBark"
android:textSize="12sp" />