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

color changes for bookmark + time icon #562

Merged
merged 3 commits into from
Feb 25, 2025
Merged

color changes for bookmark + time icon #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d2d78b
color changes for bookmark + time icon
sruthisun1 Feb 20, 2025
9d472d2
date change
sruthisun1 Feb 23, 2025
c912738
Merge branch 'development' into sruthi/schedule/page
AdityaK2905 Feb 25, 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
2 changes: 1 addition & 1 deletion app/src/main/java/org/hackillinois/android/view/schedule/ScheduleFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class ScheduleFragment : Fragment() {
}

private fun setupCustomTabs(tabLayout: TabLayout) {
val tabDayOfMonth = arrayOf("28", "29", "30")
val tabDayOfMonth = arrayOf("28", "1", "2")
val tabDayOfWeek = arrayOf("FRI", "SAT", "SUN")
for (i in tabDayOfMonth.indices) {
val tab = tabLayout.newTab()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/dark_bookmark_filled.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
android:viewportHeight="20">

<path
android:fillColor="#662B13"
android:fillColor="#893F2F"
android:pathData="M0 19.043V2.11589C0 1.53402 0.205301 1.0359 0.615902 0.621541C1.0265 0.20718 1.5201 0 2.09669 0H12.5801C13.1567 0 13.6503 0.20718 14.0609 0.621541C14.4715 1.0359 14.6768 1.53402 14.6768 2.11589V19.043L7.33841 15.8691L0 19.043Z" />
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/dark_bookmark_hollow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
android:viewportHeight="20">

<path
android:fillColor="#662B13"
android:fillColor="#893F2F"
android:pathData="M0 19.043V2.11589C0 1.53402 0.205301 1.0359 0.615902 0.621541C1.0265 0.20718 1.5201 0 2.09669 0H12.5801C13.1567 0 13.6503 0.20718 14.0609 0.621541C14.4715 1.0359 14.6768 1.53402 14.6768 2.11589V19.043L7.3384 15.8691L0 19.043ZM2.09669 15.8162L7.3384 13.5417L12.5801 15.8162V2.11589H2.09669V15.8162Z" />
</vector>
Binary file added app/src/main/res/drawable/roundedtangerine.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.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/time_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
android:paddingTop="2dp"
android:paddingBottom="3dp"
android:paddingHorizontal="10dp"
android:background="@drawable/rounded_dark_forest"
android:textColor="@color/cinnamonMilk"
android:background="@drawable/roundedtangerine"
android:textColor="@color/burntSienna"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<color name="starColor">#ED9B21</color>
<color name="primaryTextColor">#08151B</color>
<color name="proTagColor">#6D9CA0</color>

<color name="burntSienna">#7D3525</color>
<!-- <color name="selectedAppBarIcon">#000000</color> &lt;!&ndash; For bottom tab icons &ndash;&gt;-->
<!-- <color name="unselectedAppBarIcon">#000000F</color> &lt;!&ndash; For bottom tab icons &ndash;&gt;-->

Expand Down