diff --git a/app/build.gradle b/app/build.gradle index 0479c28..7f58cf2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/app/src/main/res/color/list_nav_bar_icon.xml b/app/src/main/res/color/list_nav_bar_icon.xml new file mode 100644 index 0000000..201d836 --- /dev/null +++ b/app/src/main/res/color/list_nav_bar_icon.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/switch_thumb.xml b/app/src/main/res/color/list_nav_bar_text.xml similarity index 100% rename from app/src/main/res/color/switch_thumb.xml rename to app/src/main/res/color/list_nav_bar_text.xml diff --git a/app/src/main/res/color/list_switch_decoration.xml b/app/src/main/res/color/list_switch_decoration.xml new file mode 100644 index 0000000..a157963 --- /dev/null +++ b/app/src/main/res/color/list_switch_decoration.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_switch_thumb.xml b/app/src/main/res/color/list_switch_thumb.xml new file mode 100644 index 0000000..c82831e --- /dev/null +++ b/app/src/main/res/color/list_switch_thumb.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_switch_track.xml b/app/src/main/res/color/list_switch_track.xml new file mode 100644 index 0000000..8c46431 --- /dev/null +++ b/app/src/main/res/color/list_switch_track.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 50c2a7c..2ceecf4 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -40,6 +40,15 @@ app:layout_constraintTop_toBottomOf="@+id/toolbar" app:navGraph="@navigation/nav_graph"/> + + + app:layout_constraintEnd_toEndOf="parent" + android:background="?attr/colorBackground"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_food.xml b/app/src/main/res/layout/fragment_food.xml index 8307d90..6fa493a 100644 --- a/app/src/main/res/layout/fragment_food.xml +++ b/app/src/main/res/layout/fragment_food.xml @@ -1,7 +1,21 @@ - + android:background="?attr/colorBackground" + android:orientation="vertical"> - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 4f60458..5daf0aa 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -17,7 +17,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="8dp" android:layout_marginVertical="4dp" - style="@style/Widget.Material3.CardView.Outlined"> + style="@style/Widget.Material3.CardView.Outlined" + android:backgroundTint="?attr/colorCardBackground"> + + + + + + + + + + app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml index a251fe4..451f9dc 100644 --- a/app/src/main/res/layout/item_event.xml +++ b/app/src/main/res/layout/item_event.xml @@ -11,7 +11,8 @@ android:id="@+id/card_background" android:layout_width="match_parent" android:layout_height="wrap_content" - style="@style/Widget.Material3.CardView.Outlined"> + style="@style/Widget.Material3.CardView.Outlined" + android:backgroundTint="?attr/colorCardBackground"> \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 0763bd9..11b6fd0 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -2,7 +2,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2abdf11..ef77769 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,21 +6,27 @@ - #B82729 - #B2665A + #B2665A + #995348 #871D1E #CB9890 - #CB9890 // TODO + #141414 // TODO #CDCBCB - #CB9890 // TODO + #2A2828 // TODO #B9B6B6 - #151414 // TODO + #EBEBEB // TODO #151414 + #E0E0E0 // TODO + #1F1E1E + + #D6D6D6 + #2A2828 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2873f12..08f6c54 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,46 +26,13 @@ General Miscellaneous + Refresh your Stud.IP schedule + This will clear any customisations! Show academic quarter Where applicable App Version with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__* - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris - volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus - dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad - litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse blandit eleifend - diam, vel rutrum tellus vulputate quis. Aliquam eget libero aliquet, imperdiet nisl a, - ornare ex. Sed rhoncus est ut libero porta lobortis. Fusce in dictum tellus.\n\n - Suspendisse interdum ornare ante. Aliquam nec cursus lorem. Morbi id magna felis. Vivamus - egestas, est a condimentum egestas, turpis nisl iaculis ipsum, in dictum tellus dolor sed - neque. Morbi tellus erat, dapibus ut sem a, iaculis tincidunt dui. Interdum et malesuada - fames ac ante ipsum primis in faucibus. Curabitur et eros porttitor, ultricies urna vitae, - molestie nibh. Phasellus at commodo eros, non aliquet metus. Sed maximus nisl nec dolor - bibendum, vel congue leo egestas.\n\n - Sed interdum tortor nibh, in sagittis risus mollis quis. Curabitur mi odio, condimentum sit - amet auctor at, mollis non turpis. Nullam pretium libero vestibulum, finibus orci vel, - molestie quam. Fusce blandit tincidunt nulla, quis sollicitudin libero facilisis et. Integer - interdum nunc ligula, et fermentum metus hendrerit id. Vestibulum lectus felis, dictum at - lacinia sit amet, tristique id quam. Cras eu consequat dui. Suspendisse sodales nunc ligula, - in lobortis sem porta sed. Integer id ultrices magna, in luctus elit. Sed a pellentesque - est.\n\n - Aenean nunc velit, lacinia sed dolor sed, ultrices viverra nulla. Etiam a venenatis nibh. - Morbi laoreet, tortor sed facilisis varius, nibh orci rhoncus nulla, id elementum leo dui - non lorem. Nam mollis ipsum quis auctor varius. Quisque elementum eu libero sed commodo. In - eros nisl, imperdiet vel imperdiet et, scelerisque a mauris. Pellentesque varius ex nunc, - quis imperdiet eros placerat ac. Duis finibus orci et est auctor tincidunt. Sed non viverra - ipsum. Nunc quis augue egestas, cursus lorem at, molestie sem. Morbi a consectetur ipsum, a - placerat diam. Etiam vulputate dignissim convallis. Integer faucibus mauris sit amet finibus - convallis.\n\n - Phasellus in aliquet mi. Pellentesque habitant morbi tristique senectus et netus et - malesuada fames ac turpis egestas. In volutpat arcu ut felis sagittis, in finibus massa - gravida. Pellentesque id tellus orci. Integer dictum, lorem sed efficitur ullamcorper, - libero justo consectetur ipsum, in mollis nisl ex sed nisl. Donec maximus ullamcorper - sodales. Praesent bibendum rhoncus tellus nec feugiat. In a ornare nulla. Donec rhoncus - libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus - vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim. - + In our hearts, she lives forevermore \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ed16973..d77cafd 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,29 +1,39 @@ + \ No newline at end of file