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

Sruthi/schedule/page #559

Open
wants to merge 9 commits into
base: development
Choose a base branch
from
+382 −111
Open

Sruthi/schedule/page #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1620289
schedule changes on 1/26
sruthisun1 Jan 26, 2025
a7a05c8
update 2/5
sruthisun1 Feb 6, 2025
baa5be1
second update 2/5
sruthisun1 Feb 6, 2025
ab12de7
code style changes
sruthisun1 Feb 6, 2025
45aac19
code style changes again
sruthisun1 Feb 6, 2025
047aca8
removed comments for style issues
sruthisun1 Feb 6, 2025
195062d
Fixed KtLint issues and formatting hopefully
sruthisun1 Feb 6, 2025
09c7c3f
changed bookmark button to saved header
sruthisun1 Feb 16, 2025
40a13ac
changed bookmark button to saved header + klint issues
sruthisun1 Feb 16, 2025
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
172 changes: 113 additions & 59 deletions app/src/main/java/org/hackillinois/android/view/schedule/ScheduleFragment.kt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions app/src/main/java/org/hackillinois/android/viewmodel/ScheduleViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ class ScheduleViewModel : ViewModel() {
private val eventRepository = EventRepository.instance
private val shiftRepository = ShiftRepository.instance

// 2/23/24 00:00:00
// 2/28/25 00:00:00
val fridayStart = Calendar.getInstance().apply {
timeZone = TimeZone.getTimeZone("America/Chicago")
timeInMillis = 1708668000000
timeInMillis = 1740722400000
}.timeInMillis

// 2/23/24 23:59:59
// 2/28/25 23:59:59
val fridayEnd = Calendar.getInstance().apply {
timeZone = TimeZone.getTimeZone("America/Chicago")
timeInMillis = 1708754399000
timeInMillis = 1740808799000
}.timeInMillis

// 2/24/24 23:59:59
// 2/29/25 23:59:59
val saturdayEnd = Calendar.getInstance().apply {
timeZone = TimeZone.getTimeZone("America/Chicago")
timeInMillis = 1708840799000
timeInMillis = 1740895199000
}.timeInMillis

// 2/25/24 23:59:59
// 2/30/25 23:59:59
val sundayEnd = Calendar.getInstance().apply {
timeZone = TimeZone.getTimeZone("America/Chicago")
timeInMillis = 1708927199000
timeInMillis = 1740895199000
}.timeInMillis

var fridayEventsLiveData = eventRepository.fetchEventsHappeningBetweenTimes(fridayStart, fridayEnd)
Expand Down
22 changes: 22 additions & 0 deletions app/src/main/res/drawable/architecture_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="23dp"
android:height="22dp"
android:viewportWidth="23"
android:viewportHeight="22">
<group>
<clip-path
android:pathData="M0,0h23v22h-23z"/>
<path
android:pathData="M21.628,19.225H20.975V18.27C20.975,18.094 20.828,17.951 20.648,17.951H19.994V16.997C19.994,16.821 19.848,16.678 19.668,16.678H19.653L19.356,10.313H20.321C20.502,10.313 20.648,10.17 20.648,9.994V9.039H20.975C21.155,9.039 21.301,8.897 21.301,8.721V7.448C21.301,7.305 21.203,7.179 21.061,7.141L11.587,4.594C11.53,4.579 11.47,4.579 11.413,4.594L1.939,7.141C1.797,7.179 1.699,7.305 1.699,7.448V8.721C1.699,8.897 1.845,9.039 2.026,9.039H2.352V9.994C2.352,10.17 2.499,10.313 2.679,10.313H3.645L3.347,16.678H3.333C3.152,16.678 3.006,16.821 3.006,16.997V17.951H2.352C2.172,17.951 2.026,18.094 2.026,18.27V19.225H1.372C1.192,19.225 1.046,19.367 1.046,19.543C1.046,19.719 1.192,19.861 1.372,19.861H21.628C21.809,19.861 21.955,19.719 21.955,19.543C21.955,19.367 21.809,19.225 21.628,19.225ZM17.381,17.951V17.315H19.341V17.951H17.381ZM15.421,17.951V16.997C15.421,16.821 15.274,16.678 15.094,16.678H15.079L14.782,10.313H17.365L17.068,16.678H17.053C16.873,16.678 16.727,16.821 16.727,16.997V17.951H15.42H15.421ZM12.807,17.951V17.315H14.767V17.951H12.807ZM10.847,17.951V16.997C10.847,16.821 10.701,16.678 10.52,16.678H10.505L10.208,10.313H12.792L12.494,16.678H12.479C12.299,16.678 12.153,16.821 12.153,16.997V17.951H10.846H10.847ZM8.233,17.951V17.315H10.193V17.951H8.233ZM6.273,17.951V16.997C6.273,16.821 6.127,16.678 5.946,16.678H5.932L5.634,10.313H8.218L7.92,16.678H7.906C7.725,16.678 7.579,16.821 7.579,16.997V17.951H6.272H6.273ZM9.555,10.313L9.852,16.678H8.575L8.873,10.313H9.556H9.555ZM14.128,10.313L14.426,16.678H13.149L13.447,10.313H14.129H14.128ZM19,16.678H17.723L18.02,10.313H18.703L19.001,16.678H19ZM2.353,7.69L11.5,5.231L20.648,7.69V8.403H2.353V7.69ZM3.006,9.039H19.995V9.676H3.006V9.039ZM4.299,10.313H4.982L5.279,16.678H4.002L4.3,10.313H4.299ZM3.659,17.315H5.62V17.951H3.659V17.315ZM2.679,18.588H20.321V19.225H2.679V18.588Z"
android:fillColor="#000000"/>
<path
android:pathData="M11.5,7.766C12.041,7.766 12.48,7.338 12.48,6.811C12.48,6.285 12.041,5.856 11.5,5.856C10.959,5.856 10.52,6.285 10.52,6.811C10.52,7.338 10.959,7.766 11.5,7.766ZM11.5,6.493C11.68,6.493 11.827,6.636 11.827,6.811C11.827,6.986 11.68,7.13 11.5,7.13C11.319,7.13 11.173,6.986 11.173,6.811C11.173,6.636 11.32,6.493 11.5,6.493Z"
android:fillColor="#000000"/>
<path
android:pathData="M13.46,7.448C13.641,7.448 13.787,7.305 13.787,7.129V6.811C13.787,6.635 13.641,6.493 13.46,6.493C13.28,6.493 13.134,6.635 13.134,6.811V7.129C13.134,7.305 13.28,7.448 13.46,7.448Z"
android:fillColor="#000000"/>
<path
android:pathData="M9.54,7.448C9.72,7.448 9.866,7.305 9.866,7.129V6.811C9.866,6.635 9.72,6.493 9.54,6.493C9.359,6.493 9.213,6.635 9.213,6.811V7.129C9.213,7.305 9.359,7.448 9.54,7.448Z"
android:fillColor="#000000"/>
</group>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/brown_tab.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="81dp"
android:height="19dp"
android:viewportWidth="81"
android:viewportHeight="19">
<path
android:pathData="M9.5,0L71.5,0A9.5,9.5 0,0 1,81 9.5L81,9.5A9.5,9.5 0,0 1,71.5 19L9.5,19A9.5,9.5 0,0 1,0 9.5L0,9.5A9.5,9.5 0,0 1,9.5 0z"
android:fillColor="#C5673F"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/filled_bookmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="23dp"
android:viewportWidth="18"
android:viewportHeight="23">
<path
android:pathData="M0,23V2.556C0,1.853 0.252,1.251 0.755,0.751C1.259,0.25 1.864,0 2.571,0H15.429C16.136,0 16.741,0.25 17.245,0.751C17.748,1.251 18,1.853 18,2.556V23L9,19.167L0,23Z"
android:fillColor="#893F2F"/>
</vector>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/flag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<group>
<clip-path
android:pathData="M0,0h18v18h-18z"/>
<path
android:pathData="M16.488,3.264C16.601,3.072 16.58,2.833 16.436,2.662C16.293,2.492 16.055,2.427 15.843,2.5C11.043,4.129 8.552,-1.202 2.879,3.177L2.501,1.804C2.424,1.521 2.126,1.353 1.84,1.43C1.552,1.506 1.381,1.796 1.458,2.079L5.238,15.843C5.317,16.129 5.616,16.292 5.9,16.217C6.188,16.141 6.359,15.851 6.281,15.568L5.041,11.05C8.462,5.067 13.673,8.058 16.488,3.264ZM4.656,9.648L3.187,4.3C8.107,0.211 10.149,4.358 14.707,3.84C12.186,6.346 7.922,4.92 4.656,9.648Z"
android:fillColor="#000000"/>
</group>
</vector>
Binary file added app/src/main/res/drawable/new_underline.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/orange_tab_new.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="81dp"
android:height="19dp"
android:viewportWidth="81"
android:viewportHeight="19">
<path
android:pathData="M9.5,0L71.5,0A9.5,9.5 0,0 1,81 9.5L81,9.5A9.5,9.5 0,0 1,71.5 19L9.5,19A9.5,9.5 0,0 1,0 9.5L0,9.5A9.5,9.5 0,0 1,9.5 0z"
android:fillColor="#DE8E45"/>
</vector>
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/rounded_brown.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/rustWood" />
<corners android:radius="30dp"/>
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_pro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/proTagColor" />
<solid android:color="@color/mutedTeal" />
<corners android:radius="30dp"/>
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_wand_wood.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/wandWood" />
<solid android:color="@color/autumnSpice" />
<corners android:radius="30dp"/>
</shape>
Binary file added app/src/main/res/drawable/saved_events_background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/src/main/res/drawable/schedule_underline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<shape android:shape="rectangle" >
<stroke
android:width="3dp"
android:color="@android:color/white" />
android:color="@color/ivoryBlush" />

</shape>
</item>

Expand Down
Binary file added app/src/main/res/drawable/schedule_with_line.png
View file
Open in desktop
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/shift_background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/unfilled_bookmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="23dp"
android:viewportWidth="18"
android:viewportHeight="23">
<path
android:pathData="M0,0h18v23h-18z"
android:fillColor="#ffffff"/>
<path
android:pathData="M1.5,20.731V2.556C1.5,2.257 1.589,2.037 1.813,1.815C2.037,1.592 2.262,1.5 2.571,1.5H15.429C15.738,1.5 15.964,1.592 16.187,1.815C16.411,2.037 16.5,2.257 16.5,2.556V20.731L9.588,17.787L9,17.536L8.412,17.787L1.5,20.731Z"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#893F2F"/>
</vector>
Binary file added app/src/main/res/drawable/vase_selected.png
View file
Open in desktop
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/vase_unselected.png
View file
Open in desktop
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/font/montserrat_extra_bold.ttf
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions app/src/main/res/layout/custom_tab.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/tab_unselected"> <!-- Replace with your actual background drawable -->
android:background="@drawable/vase_unselected"> <!-- Replace with your actual background drawable -->

<TextView
android:id="@+id/tab_day_of_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:layout_marginHorizontal="27dp"
android:fontFamily="@font/montserrat_semi_bold"
android:textColor="#072C2E"
android:fontFamily="@font/montserrat_extra_bold"
android:textColor="#FFF4E9"
android:textSize="32sp"
android:text="23"
android:includeFontPadding="false"
Expand All @@ -25,8 +25,8 @@
android:id="@+id/tab_day_of_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_bold"
android:textColor="#072C2E"
android:fontFamily="@font/montserrat_extra_bold"
android:textColor="#FFF4E9"
android:textSize="14sp"
android:text="FRI"
android:includeFontPadding="false"
Expand Down
32 changes: 16 additions & 16 deletions app/src/main/res/layout/event_tile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/montserrat_bold"
android:textColor="@color/midnight"
android:textColor="@color/deepMahogany"
android:textSize="18sp"
app:layout_constraintEnd_toStartOf="@id/bookmarkButton"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -109,13 +109,13 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="7dp"
android:background="@drawable/rounded_witchy_purple"
android:fontFamily="@font/montserrat_bold"
android:background="@drawable/orange_tab_new"
android:fontFamily="@font/montserrat_semi_bold"
android:gravity="center_vertical|center_horizontal"
android:paddingHorizontal="10dp"
android:paddingTop="2dp"
android:paddingBottom="3dp"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titleTextView"
Expand All @@ -127,13 +127,13 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="7dp"
android:background="@drawable/rounded_wand_wood"
android:fontFamily="@font/montserrat_bold"
android:background="@drawable/brown_tab"
android:fontFamily="@font/montserrat_semi_bold"
android:gravity="center_vertical|center_horizontal"
android:paddingHorizontal="10dp"
android:paddingTop="2dp"
android:paddingBottom="3dp"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/eventType"
app:layout_constraintTop_toBottomOf="@+id/titleTextView"
Expand All @@ -158,9 +158,9 @@
android:layout_marginStart="6dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="72dp"
android:fontFamily="@font/montserrat_semi_bold"
android:fontFamily="@font/montserrat_medium"
android:lineSpacingExtra="3sp"
android:textColor="@color/midnight"
android:textColor="@color/darkForest"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
Expand All @@ -176,7 +176,7 @@
app:layout_constraintBottom_toBottomOf="@+id/sponsoredTextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/sponsoredTextView"
app:srcCompat="@drawable/ic_building_marker_outline" />
app:srcCompat="@drawable/architecture_icon" />

<TextView
android:id="@+id/sponsoredTextView"
Expand All @@ -185,8 +185,8 @@
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="50dp"
android:fontFamily="@font/montserrat_semi_bold"
android:textColor="@color/midnight"
android:fontFamily="@font/montserrat_medium"
android:textColor="@color/darkForest"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/sponsored_marker"
Expand All @@ -201,16 +201,16 @@
app:layout_constraintBottom_toBottomOf="@+id/locationTextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/locationTextView"
app:srcCompat="@drawable/ic_map_marker_outline" />
app:srcCompat="@drawable/flag" />

<TextView
android:id="@+id/locationTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:fontFamily="@font/montserrat_semi_bold"
android:textColor="@color/midnight"
android:fontFamily="@font/montserrat_medium"
android:textColor="@color/darkForest"
android:textSize="13sp"
app:layout_constraintStart_toEndOf="@+id/map_marker"
app:layout_constraintTop_toBottomOf="@id/sponsoredTextView"
Expand All @@ -227,7 +227,7 @@
android:fontFamily="@font/montserrat_regular"
android:maxEms="100"
android:maxLines="2"
android:textColor="@color/midnight"
android:textColor="@color/darkForest"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Loading