From eeee1bc8a6a5b86ea7277e32ed8fcc205a8831b4 Mon Sep 17 00:00:00 2001
From: Dev Keshwani <dev.keshwani2022@vitstudent.ac.in>
Date: Fri, 8 Aug 2025 15:45:01 +0530
Subject: [PATCH] Revert "feat: v3 to v3-master"

This reverts commit ee8032ed16755e72f0e66ebcac65678f6eb5f758.
---
 .gitignore                                    |    2 -
 .idea/.name                                   |    1 -
 .idea/AndroidProjectSystem.xml                |    6 -
 .idea/compiler.xml                            |    2 +-
 .idea/deploymentTargetSelector.xml            |   10 -
 .idea/detekt.xml                              |    7 -
 .idea/deviceManager.xml                       |   13 -
 .idea/gradle.xml                              |    6 +-
 .idea/inspectionProfiles/Project_Default.xml  |   61 -
 .idea/kotlinc.xml                             |    6 -
 .idea/ktlint-plugin.xml                       |    7 -
 .idea/material_theme_project_new.xml          |   12 -
 .idea/migrations.xml                          |   10 -
 .idea/misc.xml                                |    4 +-
 .idea/runConfigurations.xml                   |   17 -
 .idea/vcs.xml                                 |    2 +-
 README.md                                     |   67 +-
 app/build.gradle                              |  133 +-
 app/src/main/AndroidManifest.xml              |   24 +-
 app/src/main/java/com/dscvit/vitty/App.kt     |    2 +-
 .../dscvit/vitty/activity/AddInfoActivity.kt  |  343 ----
 .../com/dscvit/vitty/activity/AuthActivity.kt |  253 +--
 .../com/dscvit/vitty/activity/HomeActivity.kt |  476 +-----
 .../vitty/activity/HomeComposeActivity.kt     |  247 ---
 .../vitty/activity/InstructionsActivity.kt    |  117 +-
 .../vitty/activity/MaintenanceActivity.kt     |   52 -
 .../dscvit/vitty/activity/SettingsActivity.kt |    1 -
 .../vitty/activity/VITEventsActivity.kt       |    1 -
 .../com/dscvit/vitty/adapter/DayAdapter.kt    |    4 +-
 .../com/dscvit/vitty/adapter/EventAdapter.kt  |    8 +-
 .../com/dscvit/vitty/adapter/FriendAdapter.kt |  171 --
 .../com/dscvit/vitty/adapter/PeriodAdapter.kt |   81 +-
 .../com/dscvit/vitty/adapter/SearchAdapter.kt |  191 ---
 .../{network/api/events => api}/APIEvents.kt  |    6 +-
 .../api/events => api}/ApiEventRestClient.kt  |    3 +-
 .../api/events => api}/NetworkClient.kt       |   10 +-
 .../events => api}/RetrofitEventListener.kt   |    3 +-
 .../dscvit/vitty/data/converter/Converters.kt |   12 -
 .../java/com/dscvit/vitty/data/dao/NoteDao.kt |   47 -
 .../com/dscvit/vitty/data/dao/ReminderDao.kt  |   47 -
 .../vitty/data/database/VittyDatabase.kt      |   43 -
 .../dscvit/vitty/data/entity/NoteEntity.kt    |   19 -
 .../vitty/data/entity/ReminderEntity.kt       |   25 -
 .../vitty/data/repository/NoteRepository.kt   |   79 -
 .../data/repository/ReminderRepository.kt     |  108 --
 .../network/api/community/APICommunity.kt     |  227 ---
 .../api/community/APICommunityRestClient.kt   | 1079 ------------
 .../api/community/CommunityNetworkClient.kt   |   41 -
 .../community/RetrofitCommunityListener.kt    |  183 ---
 .../api/community/requests/AuthRequestBody.kt |   14 -
 .../requests/CampusUpdateRequestBody.kt       |    5 -
 .../requests/CircleBatchRequestBody.kt        |    5 -
 .../community/requests/UsernameRequestBody.kt |    5 -
 .../circle/CircleBatchRequestResponse.kt      |   15 -
 .../responses/circle/CircleRequestItem.kt     |    8 -
 .../circle/CircleRequestsResponse.kt          |    5 -
 .../responses/circle/CreateCircleResponse.kt  |    7 -
 .../responses/circle/JoinCircleResponse.kt    |   10 -
 .../responses/requests/RequestsResponse.kt    |    3 -
 .../requests/RequestsResponseItem.kt          |    7 -
 .../community/responses/timetable/Course.kt   |   11 -
 .../responses/timetable/CurrentStatus.kt      |    9 -
 .../api/community/responses/timetable/Data.kt |   11 -
 .../responses/timetable/TimetableResponse.kt  |    5 -
 .../responses/user/ActiveFriendResponse.kt    |    5 -
 .../responses/user/CircleResponse.kt          |   12 -
 .../responses/user/FriendResponse.kt          |    6 -
 .../responses/user/GhostPostResponse.kt       |    5 -
 .../community/responses/user/PostResponse.kt  |    5 -
 .../responses/user/SignInResponse.kt          |   10 -
 .../community/responses/user/UserResponse.kt  |   16 -
 .../vitty/receiver/DeviceBootReceiver.kt      |    4 +-
 .../receiver/ReminderBroadcastReceiver.kt     |   45 -
 .../receiver/ReminderNotificationManager.kt   |  132 --
 .../com/dscvit/vitty/service/TileService.kt   |    6 +-
 .../vitty/service/TodayWidgetService.kt       |   42 +-
 .../main/java/com/dscvit/vitty/theme/Color.kt |   12 -
 .../main/java/com/dscvit/vitty/theme/Theme.kt |   26 -
 .../java/com/dscvit/vitty/theme/Typography.kt |   89 -
 .../vitty/ui/academics/AcademicsFragment.kt   |  174 --
 .../ui/academics/AcademicsScreenContent.kt    |  201 ---
 .../vitty/ui/academics/AcademicsViewModel.kt  |   54 -
 .../components/AcademicsScreenComponents.kt   |  883 ----------
 .../vitty/ui/academics/models/Course.kt       |   11 -
 .../com/dscvit/vitty/ui/auth/AuthViewModel.kt |  119 --
 .../com/dscvit/vitty/ui/auth/IntroFragment.kt |    2 -
 .../vitty/ui/community/AllRequestFragment.kt  |   98 --
 .../vitty/ui/community/CommunityFragment.kt   |  245 +--
 .../vitty/ui/community/CommunityViewModel.kt  |  277 +---
 .../vitty/ui/community/FriendFragment.kt      |  288 ----
 .../vitty/ui/community/RequestsFragment.kt    |  165 +-
 .../vitty/ui/community/SearchFragment.kt      |  143 --
 .../vitty/ui/components/CampusUpdateDialog.kt |  227 ---
 .../ui/connect/AddFriendScreenContent.kt      |  534 ------
 .../connect/AddParticipantsScreenContent.kt   |  612 -------
 .../ui/connect/CircleDetailScreenContent.kt   |  888 ----------
 .../CircleMemberDetailScreenContent.kt        |  604 -------
 .../ui/connect/CircleRequestsScreenContent.kt |  433 -----
 .../vitty/ui/connect/ConnectFragment.kt       |   47 -
 .../vitty/ui/connect/ConnectScreenContent.kt  |  352 ----
 .../vitty/ui/connect/ConnectViewModel.kt      |  784 ---------
 .../ui/connect/FriendDetailScreenContent.kt   |  972 -----------
 .../ui/connect/FriendRequestsScreenContent.kt |  298 ----
 .../components/CircleActionBottomSheet.kt     |  213 ---
 .../components/ConnectScreenComponents.kt     |  939 -----------
 .../components/CreateCircleBottomSheet.kt     |  347 ----
 .../components/JoinCircleBottomSheet.kt       |  224 ---
 .../ui/connect/components/QRCodeScanner.kt    |  118 --
 .../vitty/ui/coursepage/CoursePageContent.kt  |  195 ---
 .../vitty/ui/coursepage/CoursePageFragment.kt |   52 -
 .../ui/coursepage/CoursePageViewModel.kt      |  318 ----
 .../coursepage/ReminderBroadcastReceiver.kt   |    0
 .../coursepage/ReminderNotificationManager.kt |    0
 .../components/CoursePageComponents.kt        |  718 --------
 .../components/ReminderComponents.kt          |  892 ----------
 .../ui/coursepage/models/CoursePageModels.kt  |   50 -
 .../emptyclassrooms/EmptyClassroomsContent.kt |  379 -----
 .../vitty/ui/events/VITEventsViewModel.kt     |    5 +-
 .../dscvit/vitty/ui/main/MainComposeApp.kt    | 1445 -----------------
 .../vitty/ui/maintenance/MaintenanceBanner.kt |  270 ---
 .../vitty/ui/maintenance/MaintenanceScreen.kt |  115 --
 .../com/dscvit/vitty/ui/notes/NoteFragment.kt |   69 -
 .../vitty/ui/notes/NoteScreenContent.kt       |  311 ----
 .../notes/components/NoteScreenComponents.kt  |  263 ---
 .../dscvit/vitty/ui/schedule/DayFragment.kt   |  198 +--
 .../vitty/ui/schedule/ScheduleFragment.kt     |  137 +-
 .../ui/schedule/ScheduleScreenContent.kt      |  628 -------
 .../vitty/ui/schedule/ScheduleViewModel.kt    |  100 +-
 .../vitty/ui/settings/SettingsFragment.kt     |  100 +-
 .../com/dscvit/vitty/util/APIConstants.kt     |    6 +
 .../java/com/dscvit/vitty/util/Analytics.kt   |    9 -
 .../java/com/dscvit/vitty/util/Constants.kt   |   41 +-
 .../com/dscvit/vitty/util/LogoutHelper.kt     |   45 +-
 .../dscvit/vitty/util/MaintenanceChecker.kt   |   57 -
 .../util/NotificationPermissionHelper.kt      |   44 -
 .../com/dscvit/vitty/util/QRCodeGenerator.kt  |   33 -
 .../com/dscvit/vitty/util/SemesterUtils.kt    |   33 -
 .../com/dscvit/vitty/util/UtilFunctions.kt    |  114 +-
 .../main/java/com/dscvit/vitty/util/VITMap.kt |    4 +-
 .../com/dscvit/vitty/util/WebConstants.kt     |    6 -
 .../dscvit/vitty/widget/NextClassWidget.kt    |  266 +--
 .../com/dscvit/vitty/widget/TodayWidget.kt    |  324 +---
 app/src/main/res/anim/bounce_in.xml           |   16 -
 app/src/main/res/anim/crossfade_in.xml        |    6 -
 app/src/main/res/anim/crossfade_out.xml       |    6 -
 app/src/main/res/anim/nav_slide_down.xml      |   12 -
 app/src/main/res/anim/nav_slide_up.xml        |   12 -
 app/src/main/res/anim/slide_in_left.xml       |   13 -
 app/src/main/res/anim/slide_in_right.xml      |   13 -
 app/src/main/res/anim/slide_out_left.xml      |   12 -
 app/src/main/res/anim/slide_out_right.xml     |   15 -
 app/src/main/res/drawable/bg_nav_bar.xml      |    7 -
 .../res/drawable/bg_nav_item_selected.xml     |    6 -
 app/src/main/res/drawable/bubble_bg.xml       |    9 -
 .../main/res/drawable/circular_background.xml |    5 -
 app/src/main/res/drawable/cursor_white.xml    |    6 -
 app/src/main/res/drawable/et_style.xml        |    9 -
 app/src/main/res/drawable/ic_about.xml        |   15 -
 .../res/drawable/ic_academics_outline.xml     |   13 -
 .../res/drawable/ic_academics_selector.xml    |    5 -
 app/src/main/res/drawable/ic_add_a_photo.xml  |   13 -
 app/src/main/res/drawable/ic_add_friend.xml   |   29 -
 app/src/main/res/drawable/ic_back.xml         |   11 -
 app/src/main/res/drawable/ic_busy.png         |  Bin 1080 -> 0 bytes
 app/src/main/res/drawable/ic_circle_join.xml  |   13 -
 app/src/main/res/drawable/ic_clock.xml        |   13 -
 .../res/drawable/ic_community_selector.xml    |    2 +-
 app/src/main/res/drawable/ic_compass.png      |  Bin 41146 -> 0 bytes
 .../main/res/drawable/ic_edit_document.xml    |    9 -
 .../main/res/drawable/ic_empty_classroom.xml  |   13 -
 app/src/main/res/drawable/ic_format_bold.xml  |   13 -
 .../main/res/drawable/ic_format_italic.xml    |   13 -
 .../res/drawable/ic_format_list_bulleted.xml  |   13 -
 .../res/drawable/ic_format_underlined.xml     |   13 -
 app/src/main/res/drawable/ic_free.png         |  Bin 1018 -> 0 bytes
 app/src/main/res/drawable/ic_group_add.xml    |   13 -
 .../res/drawable/ic_library_add_check.xml     |   13 -
 app/src/main/res/drawable/ic_logout_2.xml     |   13 -
 app/src/main/res/drawable/ic_maintenance.xml  |   10 -
 app/src/main/res/drawable/ic_pin.xml          |   11 -
 app/src/main/res/drawable/ic_qr.xml           |    5 -
 app/src/main/res/drawable/ic_redo.xml         |   13 -
 .../main/res/drawable/ic_request_pending.xml  |    9 -
 app/src/main/res/drawable/ic_requests.xml     |   13 +-
 .../res/drawable/ic_round_chevron_left.xml    |    9 -
 app/src/main/res/drawable/ic_screwdriver.xml  |   10 -
 app/src/main/res/drawable/ic_search.xml       |   10 -
 app/src/main/res/drawable/ic_settings.xml     |   16 -
 app/src/main/res/drawable/ic_share.xml        |   17 +-
 app/src/main/res/drawable/ic_star.xml         |    9 -
 app/src/main/res/drawable/ic_support.xml      |   11 -
 .../res/drawable/ic_timetable_selector.xml    |    2 +-
 app/src/main/res/drawable/ic_undo.xml         |   13 -
 app/src/main/res/drawable/ic_upload.xml       |   13 -
 .../res/drawable/ic_visibility_outlined.xml   |   12 -
 app/src/main/res/drawable/ic_vitevents.xml    |   34 +-
 app/src/main/res/drawable/nav_color.xml       |    4 +-
 .../main/res/drawable/nav_item_background.xml |   14 -
 app/src/main/res/drawable/nav_item_color.xml  |    5 -
 .../res/drawable/slot_chip_background.xml     |   14 -
 .../res/drawable/tab_selected_background.xml  |   10 +-
 app/src/main/res/layout/activity_add_info.xml |  159 --
 app/src/main/res/layout/activity_home.xml     |  165 +-
 .../main/res/layout/activity_home_compose.xml |    9 -
 .../main/res/layout/activity_maintenance.xml  |   22 -
 app/src/main/res/layout/card_friend.xml       |  114 --
 app/src/main/res/layout/card_period.xml       |  163 +-
 app/src/main/res/layout/card_request.xml      |  170 --
 .../main/res/layout/fragment_academics.xml    |   10 -
 .../main/res/layout/fragment_all_request.xml  |   98 --
 .../main/res/layout/fragment_community.xml    |  315 ++--
 app/src/main/res/layout/fragment_connect.xml  |   12 -
 .../main/res/layout/fragment_course_page.xml  |    9 -
 app/src/main/res/layout/fragment_day.xml      |   29 +-
 app/src/main/res/layout/fragment_friend.xml   |  252 ---
 app/src/main/res/layout/fragment_note.xml     |    5 -
 app/src/main/res/layout/fragment_requests.xml |  180 +-
 app/src/main/res/layout/fragment_schedule.xml |   80 +-
 app/src/main/res/layout/fragment_search.xml   |  135 --
 app/src/main/res/layout/item_period.xml       |    2 +-
 app/src/main/res/layout/next_class_widget.xml |    1 -
 app/src/main/res/layout/today_widget.xml      |    1 -
 app/src/main/res/menu/bottom_nav_menu.xml     |    6 +-
 .../main/res/navigation/mobile_navigation.xml |  116 +-
 app/src/main/res/values/colors.xml            |    8 +-
 app/src/main/res/values/strings.xml           |   36 +-
 app/src/main/res/values/themes.xml            |    2 +-
 app/src/main/res/xml/root_preferences.xml     |   18 -
 build.gradle                                  |   23 +-
 gradle.properties                             |    2 +-
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 markdowntext/.gitignore                       |    1 -
 markdowntext/build.gradle                     |   80 -
 markdowntext/consumer-rules.pro               |    0
 markdowntext/proguard-rules.pro               |   21 -
 markdowntext/src/main/AndroidManifest.xml     |    2 -
 .../compose/markdowntext/AutoSizeConfig.kt    |   13 -
 .../markdowntext/CustomTaskListPlugin.kt      |   19 -
 .../compose/markdowntext/CustomTextView.kt    |   58 -
 .../compose/markdowntext/MarkdownRender.kt    |  110 --
 .../compose/markdowntext/MarkdownText.kt      |  149 --
 .../compose/markdowntext/TextAppearanceExt.kt |  118 --
 .../plugins/core/MardownCorePlugin.kt         |  396 -----
 .../plugins/image/ImagesPlugin.kt             |  134 --
 .../StrikethroughNodeRenderer.kt              |   33 -
 .../syntaxhighlight/SyntaxHighlight.kt        |   18 -
 .../SyntaxHighlightDelimiterProcessor.kt      |   42 -
 .../SyntaxHighlightExtension.kt               |   34 -
 .../syntaxhighlight/SyntaxHighlightPlugin.kt  |   33 -
 .../plugins/tasklist/CustomTaskListPlugin.kt  |  143 --
 settings.gradle                               |    1 -
 251 files changed, 996 insertions(+), 25474 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/AndroidProjectSystem.xml
 delete mode 100644 .idea/deploymentTargetSelector.xml
 delete mode 100644 .idea/detekt.xml
 delete mode 100644 .idea/deviceManager.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/kotlinc.xml
 delete mode 100644 .idea/ktlint-plugin.xml
 delete mode 100644 .idea/material_theme_project_new.xml
 delete mode 100644 .idea/migrations.xml
 delete mode 100644 .idea/runConfigurations.xml
 delete mode 100644 app/src/main/java/com/dscvit/vitty/activity/AddInfoActivity.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/activity/HomeComposeActivity.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/activity/MaintenanceActivity.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/adapter/FriendAdapter.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/adapter/SearchAdapter.kt
 rename app/src/main/java/com/dscvit/vitty/{network/api/events => api}/APIEvents.kt (88%)
 rename app/src/main/java/com/dscvit/vitty/{network/api/events => api}/ApiEventRestClient.kt (96%)
 rename app/src/main/java/com/dscvit/vitty/{network/api/events => api}/NetworkClient.kt (73%)
 rename app/src/main/java/com/dscvit/vitty/{network/api/events => api}/RetrofitEventListener.kt (83%)
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/converter/Converters.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/dao/NoteDao.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/dao/ReminderDao.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/database/VittyDatabase.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/entity/NoteEntity.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/entity/ReminderEntity.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/repository/NoteRepository.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/data/repository/ReminderRepository.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/APICommunity.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/APICommunityRestClient.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/CommunityNetworkClient.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/RetrofitCommunityListener.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/requests/AuthRequestBody.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/requests/CampusUpdateRequestBody.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/requests/CircleBatchRequestBody.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/requests/UsernameRequestBody.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleBatchRequestResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestItem.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestsResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CreateCircleResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/JoinCircleResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponseItem.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Course.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/CurrentStatus.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Data.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/TimetableResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/ActiveFriendResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/CircleResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/FriendResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/GhostPostResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/PostResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/SignInResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/UserResponse.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/receiver/ReminderBroadcastReceiver.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/receiver/ReminderNotificationManager.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/theme/Color.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/theme/Theme.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/theme/Typography.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsViewModel.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/academics/models/Course.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/auth/AuthViewModel.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/community/AllRequestFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/community/FriendFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/community/SearchFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/components/CampusUpdateDialog.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/AddFriendScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/AddParticipantsScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/CircleDetailScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/CircleRequestsScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/ConnectFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/ConnectScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/ConnectViewModel.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/FriendRequestsScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/components/CircleActionBottomSheet.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/components/ConnectScreenComponents.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/components/CreateCircleBottomSheet.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/components/JoinCircleBottomSheet.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/connect/components/QRCodeScanner.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageViewModel.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/ReminderBroadcastReceiver.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/ReminderNotificationManager.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/components/CoursePageComponents.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/components/ReminderComponents.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/coursepage/models/CoursePageModels.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/emptyclassrooms/EmptyClassroomsContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/main/MainComposeApp.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceBanner.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceScreen.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/notes/NoteFragment.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/notes/NoteScreenContent.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/notes/components/NoteScreenComponents.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt
 create mode 100644 app/src/main/java/com/dscvit/vitty/util/APIConstants.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/util/MaintenanceChecker.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/util/NotificationPermissionHelper.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/util/QRCodeGenerator.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/util/SemesterUtils.kt
 delete mode 100644 app/src/main/java/com/dscvit/vitty/util/WebConstants.kt
 delete mode 100644 app/src/main/res/anim/bounce_in.xml
 delete mode 100644 app/src/main/res/anim/crossfade_in.xml
 delete mode 100644 app/src/main/res/anim/crossfade_out.xml
 delete mode 100644 app/src/main/res/anim/nav_slide_down.xml
 delete mode 100644 app/src/main/res/anim/nav_slide_up.xml
 delete mode 100644 app/src/main/res/anim/slide_in_left.xml
 delete mode 100644 app/src/main/res/anim/slide_in_right.xml
 delete mode 100644 app/src/main/res/anim/slide_out_left.xml
 delete mode 100644 app/src/main/res/anim/slide_out_right.xml
 delete mode 100644 app/src/main/res/drawable/bg_nav_bar.xml
 delete mode 100644 app/src/main/res/drawable/bg_nav_item_selected.xml
 delete mode 100644 app/src/main/res/drawable/bubble_bg.xml
 delete mode 100644 app/src/main/res/drawable/circular_background.xml
 delete mode 100644 app/src/main/res/drawable/cursor_white.xml
 delete mode 100644 app/src/main/res/drawable/et_style.xml
 delete mode 100644 app/src/main/res/drawable/ic_about.xml
 delete mode 100644 app/src/main/res/drawable/ic_academics_outline.xml
 delete mode 100644 app/src/main/res/drawable/ic_academics_selector.xml
 delete mode 100644 app/src/main/res/drawable/ic_add_a_photo.xml
 delete mode 100644 app/src/main/res/drawable/ic_add_friend.xml
 delete mode 100644 app/src/main/res/drawable/ic_back.xml
 delete mode 100644 app/src/main/res/drawable/ic_busy.png
 delete mode 100644 app/src/main/res/drawable/ic_circle_join.xml
 delete mode 100644 app/src/main/res/drawable/ic_clock.xml
 delete mode 100644 app/src/main/res/drawable/ic_compass.png
 delete mode 100644 app/src/main/res/drawable/ic_edit_document.xml
 delete mode 100644 app/src/main/res/drawable/ic_empty_classroom.xml
 delete mode 100644 app/src/main/res/drawable/ic_format_bold.xml
 delete mode 100644 app/src/main/res/drawable/ic_format_italic.xml
 delete mode 100644 app/src/main/res/drawable/ic_format_list_bulleted.xml
 delete mode 100644 app/src/main/res/drawable/ic_format_underlined.xml
 delete mode 100644 app/src/main/res/drawable/ic_free.png
 delete mode 100644 app/src/main/res/drawable/ic_group_add.xml
 delete mode 100644 app/src/main/res/drawable/ic_library_add_check.xml
 delete mode 100644 app/src/main/res/drawable/ic_logout_2.xml
 delete mode 100644 app/src/main/res/drawable/ic_maintenance.xml
 delete mode 100644 app/src/main/res/drawable/ic_pin.xml
 delete mode 100644 app/src/main/res/drawable/ic_qr.xml
 delete mode 100644 app/src/main/res/drawable/ic_redo.xml
 delete mode 100644 app/src/main/res/drawable/ic_request_pending.xml
 delete mode 100644 app/src/main/res/drawable/ic_round_chevron_left.xml
 delete mode 100644 app/src/main/res/drawable/ic_screwdriver.xml
 delete mode 100644 app/src/main/res/drawable/ic_search.xml
 delete mode 100644 app/src/main/res/drawable/ic_settings.xml
 delete mode 100644 app/src/main/res/drawable/ic_star.xml
 delete mode 100644 app/src/main/res/drawable/ic_support.xml
 delete mode 100644 app/src/main/res/drawable/ic_undo.xml
 delete mode 100644 app/src/main/res/drawable/ic_upload.xml
 delete mode 100644 app/src/main/res/drawable/ic_visibility_outlined.xml
 delete mode 100644 app/src/main/res/drawable/nav_item_background.xml
 delete mode 100644 app/src/main/res/drawable/nav_item_color.xml
 delete mode 100644 app/src/main/res/drawable/slot_chip_background.xml
 delete mode 100644 app/src/main/res/layout/activity_add_info.xml
 delete mode 100644 app/src/main/res/layout/activity_home_compose.xml
 delete mode 100644 app/src/main/res/layout/activity_maintenance.xml
 delete mode 100644 app/src/main/res/layout/card_friend.xml
 delete mode 100644 app/src/main/res/layout/card_request.xml
 delete mode 100644 app/src/main/res/layout/fragment_academics.xml
 delete mode 100644 app/src/main/res/layout/fragment_all_request.xml
 delete mode 100644 app/src/main/res/layout/fragment_connect.xml
 delete mode 100644 app/src/main/res/layout/fragment_course_page.xml
 delete mode 100644 app/src/main/res/layout/fragment_friend.xml
 delete mode 100644 app/src/main/res/layout/fragment_note.xml
 delete mode 100644 app/src/main/res/layout/fragment_search.xml
 delete mode 100644 markdowntext/.gitignore
 delete mode 100644 markdowntext/build.gradle
 delete mode 100644 markdowntext/consumer-rules.pro
 delete mode 100644 markdowntext/proguard-rules.pro
 delete mode 100644 markdowntext/src/main/AndroidManifest.xml
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/AutoSizeConfig.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTaskListPlugin.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTextView.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownRender.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownText.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/TextAppearanceExt.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/core/MardownCorePlugin.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/image/ImagesPlugin.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/StrikethroughNodeRenderer.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlight.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightDelimiterProcessor.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightExtension.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightPlugin.kt
 delete mode 100644 markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/tasklist/CustomTaskListPlugin.kt

diff --git a/.gitignore b/.gitignore
index 8715c49..7e5b563 100755
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,4 @@
 .externalNativeBuild
 .cxx
 /app/google-services.json
-/app/google-services.prod.json
-/app/google-services.dev.json
 /keystore.properties
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 0325727..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-VITTY
\ No newline at end of file
diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
deleted file mode 100644
index 4a53bee..0000000
--- a/.idea/AndroidProjectSystem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b86273d..fb7f4a8 100755
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index b268ef3..0000000
--- a/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/detekt.xml b/.idea/detekt.xml
deleted file mode 100644
index ee7289c..0000000
--- a/.idea/detekt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DetektPluginSettings">
-    <option name="enableDetekt" value="true" />
-    <option name="enableForProjectResult" value="Accepted" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
deleted file mode 100644
index 91f9558..0000000
--- a/.idea/deviceManager.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DeviceTable">
-    <option name="columnSorters">
-      <list>
-        <ColumnSorterState>
-          <option name="column" value="Name" />
-          <option name="order" value="ASCENDING" />
-        </ColumnSorterState>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 804c374..7b46144 100755
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,14 +4,14 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-21" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/markdowntext" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 7061a0d..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewParameterProviderOnFirstParameter" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index fe63bb6..0000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.23" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/ktlint-plugin.xml b/.idea/ktlint-plugin.xml
deleted file mode 100644
index e8bd90c..0000000
--- a/.idea/ktlint-plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.nbadal.ktlint.KtlintProjectSettings">
-    <ktlintMode>DISTRACT_FREE</ktlintMode>
-    <ktlintRulesetVersion>DEFAULT</ktlintRulesetVersion>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
deleted file mode 100644
index f286756..0000000
--- a/.idea/material_theme_project_new.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MaterialThemeProjectNewConfig">
-    <option name="metadata">
-      <MTProjectMetadataState>
-        <option name="migrated" value="true" />
-        <option name="pristineConfig" value="false" />
-        <option name="userId" value="71e92a15:18ddf599d59:-8000" />
-      </MTProjectMetadataState>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
deleted file mode 100644
index f8051a6..0000000
--- a/.idea/migrations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 07a0a33..6d6971a 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -66,8 +67,7 @@
       </map>
     </option>
   </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 16660f1..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..94a25f7 100755
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index c4186b6..4f77557 100755
--- a/README.md
+++ b/README.md
@@ -3,46 +3,35 @@
 	<img width="400" src="https://user-images.githubusercontent.com/56252312/159312411-58410727-3933-4224-b43e-4e9b627838a3.png#gh-light-mode-only" alt="GDSC VIT"/>
 </a>
 	<h2 align="center">VITTY - VIT Timetable App</h2>
-	<h4 align="center">An Android app for your VIT timetable with homescreen widgets, caching, friend & circle features, ghost mode, reminders, and in-app notifications for your classes</h4>
+	<h4 align="center">An Android app for your VIT timetable with homescreen widgets and in-app notifications for your classes</h4>
 </p>
 
 ---
-
 [![Join Us](https://img.shields.io/badge/Join%20Us-Google%20Developer%20Student%20Clubs-red)](https://dsc.community.dev/vellore-institute-of-technology/)
 [![Discord Chat](https://img.shields.io/discord/760928671698649098.svg)](https://discord.gg/498KVdSKWR)
 
-[![DOCS](https://img.shields.io/badge/Documentation-see%20docs-green?style=flat-square&logo=appveyor)](https://github.com/GDGVIT/vitty-app/blob/master/README.md)
-[![UI ](https://img.shields.io/badge/User%20Interface-Link%20to%20UI-orange?style=flat-square&logo=appveyor)](https://www.figma.com/file/3ILW1qy1qIjiJ5S78zyIqh/VITTY?node-id=1%3A4)
+[![DOCS](https://img.shields.io/badge/Documentation-see%20docs-green?style=flat-square&logo=appveyor)](https://github.com/GDGVIT/vitty-app/blob/master/README.md) 
+  [![UI ](https://img.shields.io/badge/User%20Interface-Link%20to%20UI-orange?style=flat-square&logo=appveyor)](https://www.figma.com/file/3ILW1qy1qIjiJ5S78zyIqh/VITTY?node-id=1%3A4)
 
-## Features
 
-- [x] Easy access to your VIT timetable (cached & offline-ready)
-- [x] Home screen widgets (Today, Next Class)
-- [x] Notifications before classes with Exam/Holiday mode to disable them
-- [x] Navigation directions to class venues
-- [x] Friend system (send requests, view schedules)
-- [x] Ghost Mode – hide your timetable from friends 
-- [x] Circles – group participants, view shared schedules
-- [x] Reminders – attach, edit, or delete course reminders
-- [x] Notes – markdown editor with undo/redo and local Room database
-- [x] QR code scan & generate for joining circles
-- [x] Community integration with rich friend profiles and actions
-- [x] Support & Feedback section in Settings
+## Features
+- [x]  Easy access to timetable
+- [x]  Home screen widgets
+- [x]  Notifications for classes
+- [x]  Exam/Holiday mode to turn off your class notifications
+- [x]  Navigation directions to your classes
 
 <br>
 
 ## Dependencies
+ - Android SDK
+ - Android Studio
 
-- Android SDK
-- Android Studio (latest stable)
-- Kotlin, Jetpack Compose
-- Room, LiveData, ViewModel
 
 ## Running
 
-- Clone the repository
-- Open it in Android Studio
-- Sync Gradle and run the app using the default `APP` configuration
+- Import the project in Android Studio
+- Run the project using the automatically added APP configuration
 
 ## Contributors
 
@@ -62,37 +51,9 @@
 				</a>
 			</p>
 		</td>
-		<td>
-		Rudrank Basant
-		<p align="center">
-			<img src = "https://avatars.githubusercontent.com/u/85751479?v=4" width="150" height="150" alt="Rudrank Basant">
-		</p>
-			<p align="center">
-				<a href = "https://github.com/rudrankbasant">
-					<img src = "http://www.iconninja.com/files/241/825/211/round-collaboration-social-github-code-circle-network-icon.svg" width="36" height = "36" alt="GitHub"/>
-				</a>
-				<a href = "https://www.linkedin.com/in/rudrankbasant">
-					<img src = "http://www.iconninja.com/files/863/607/751/network-linkedin-social-connection-circular-circle-media-icon.svg" width="36" height="36" alt="LinkedIn"/>
-				</a>
-			</p>
-		</td>
-		<td>
-		Jothish Kamal
-		<p align="center">
-			<img src = "https://avatars.githubusercontent.com/u/74227363?v=4" width="150" height="150" alt="Jothish Kamal">
-		</p>
-			<p align="center">
-				<a href = "https://github.com/JothishKamal">
-					<img src = "http://www.iconninja.com/files/241/825/211/round-collaboration-social-github-code-circle-network-icon.svg" width="36" height = "36" alt="GitHub"/>
-				</a>
-				<a href = "https://www.linkedin.com/in/jothishkamal">
-					<img src = "http://www.iconninja.com/files/863/607/751/network-linkedin-social-connection-circular-circle-media-icon.svg" width="36" height="36" alt="LinkedIn"/>
-				</a>
-			</p>
-		</td>
 	</tr>
 </table>
 
 <p align="center">
-	Made with ❤️ by <a href="https://dscvit.com">GDSC VIT</a>
+	Made with :heart: by <a href="https://dscvit.com">GDSC VIT</a>
 </p>
diff --git a/app/build.gradle b/app/build.gradle
index 20d3f6d..7a5acc9 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,41 +2,33 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'androidx.navigation.safeargs.kotlin'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
-    id 'org.jlleitschuh.gradle.ktlint' version '13.0.0'
-    id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0'
+    id 'org.jlleitschuh.gradle.ktlint' version '10.0.0'
 }
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
-
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-} else {
-    throw new GradleException("Missing keystore.properties file!")
-}
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdk 36
-
     signingConfigs {
         release {
-            keyAlias keystoreProperties["keyAlias"]
-            keyPassword keystoreProperties["keyPassword"]
-            storeFile file(keystoreProperties["storeFile"])
-            storePassword keystoreProperties["storePassword"]
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
         }
     }
-    //    buildToolsVersion "30.0.3"
+    compileSdkVersion 33
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        namespace "com.dscvit.vitty"
-        minSdkVersion 26
-        targetSdkVersion 36
-        versionCode 44
-        versionName "3.0.1"
+        applicationId "com.dscvit.vitty"
+        minSdkVersion 24
+        targetSdkVersion 33
+        versionCode 34
+        versionName "2.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
     }
@@ -47,110 +39,67 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    kotlin{
-        jvmToolchain(21)
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 
     buildFeatures {
-        viewBinding true
         dataBinding true
-        buildConfig true
-        compose true
     }
 }
 
 dependencies {
-    // Compose BOM (Bill of Materials)
-    implementation platform("androidx.compose:compose-bom:2025.07.00")
-
-    // Core Compose dependencies
-    implementation "androidx.compose.ui:ui"
-    implementation "androidx.compose.material:material"
-    implementation "androidx.compose.ui:ui-tooling-preview"
-    implementation "androidx.activity:activity-compose"
-
-    // For interoperability
-    implementation "androidx.compose.ui:ui-viewbinding"
 
     // Android Stuff
-    implementation 'androidx.core:core-ktx:1.16.0'
-    implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2'
-    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.2'
-    implementation 'androidx.navigation:navigation-compose:2.9.2'
-    implementation 'androidx.compose.material3:material3-android:1.3.2'
-
-    implementation 'androidx.compose.runtime:runtime-livedata:1.8.3'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Firebase
-    implementation platform('com.google.firebase:firebase-bom:33.16.0')
+    implementation platform('com.google.firebase:firebase-bom:27.1.0')
     implementation 'com.google.firebase:firebase-analytics-ktx'
 
     // Firebase Auth
     implementation 'com.google.firebase:firebase-auth-ktx'
-    implementation 'com.google.android.gms:play-services-auth:21.3.0'
+    implementation 'com.google.android.gms:play-services-auth:19.2.0'
 
-    // FireStore
-    implementation 'com.google.firebase:firebase-firestore:25.1.4'
+    // Firestore
+    implementation 'com.google.firebase:firebase-firestore:24.2.0'
 
     // FCM
-    implementation 'com.google.firebase:firebase-messaging:24.1.2'
+    implementation 'com.google.firebase:firebase-messaging:23.0.6'
 
     // Remote Config
     implementation 'com.google.firebase:firebase-config-ktx'
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.8.3'
 
     // Crashlytics
     releaseImplementation 'com.google.firebase:firebase-crashlytics-ktx'
 
     // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:3.0.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:5.1.0'
-    implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
 
     // Loading Animations
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
 
     // Coil
-    implementation "io.coil-kt:coil:2.7.0"
-    implementation("io.coil-kt:coil-compose:2.7.0")
-    // Timber for logs
-    implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation "io.coil-kt:coil:1.4.0"
 
-    // Room Database
-    implementation "androidx.room:room-runtime:2.7.2"
-    implementation "androidx.room:room-ktx:2.7.2"
-    kapt "androidx.room:room-compiler:2.7.2"
-
-    // ViewModel and LiveData
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2"
-    implementation "androidx.lifecycle:lifecycle-runtime-compose:2.9.2"
-
-    implementation 'androidx.dynamicanimation:dynamicanimation-ktx:1.1.0'
-    
-    implementation project(':markdowntext')
-
-    // QR Code generation
-    implementation 'com.google.zxing:core:3.5.3'
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
-
-    // Camera permissions for QR scanning
-    implementation 'com.google.accompanist:accompanist-permissions:0.37.3'
-
-    // Google Play In-App Updates
-    implementation 'com.google.android.play:app-update:2.1.0'
-    implementation 'com.google.android.play:app-update-ktx:2.1.0'
-
-    // Google Play In-App Review
-    implementation "com.google.android.play:review:2.0.2"
-    implementation "com.google.android.play:review-ktx:2.0.2"
+    // Timber for logs
+    implementation 'com.jakewharton.timber:timber:4.7.1'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f8938b..a01a9fc 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.dscvit.vitty">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <queries>
         <intent>
@@ -30,17 +23,10 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.VITTY"
-        android:usesCleartextTraffic="true">
-        <activity
-            android:name=".activity.AddInfoActivity"
-            android:exported="false" />
+        android:theme="@style/Theme.VITTY">
         <activity
             android:name=".activity.VITEventsActivity"
             android:exported="false" />
-        <activity
-            android:name=".activity.MaintenanceActivity"
-            android:exported="false" />
         <activity
             android:name=".activity.NavigationActivity"
             android:exported="false" />
@@ -105,7 +91,6 @@
             </intent-filter>
         </activity>
         <activity android:name=".activity.HomeActivity" />
-        <activity android:name=".activity.HomeComposeActivity" />
 
         <receiver
             android:name=".receiver.DeviceBootReceiver"
@@ -117,9 +102,6 @@
         </receiver>
         <receiver android:name=".receiver.AlarmReceiver" />
         <receiver android:name=".receiver.ShareReceiver" />
-        <receiver
-            android:name=".receiver.ReminderBroadcastReceiver"
-            android:exported="false" />
 
         <service
             android:name=".service.TodayWidgetService"
diff --git a/app/src/main/java/com/dscvit/vitty/App.kt b/app/src/main/java/com/dscvit/vitty/App.kt
index a468e1e..a5c58e2 100755
--- a/app/src/main/java/com/dscvit/vitty/App.kt
+++ b/app/src/main/java/com/dscvit/vitty/App.kt
@@ -16,7 +16,7 @@ class App : Application() {
 
     private val defaultConfig: HashMap<String, Any> =
         hashMapOf(
-            LATEST_VERSION to BuildConfig.VERSION_NAME,
+            LATEST_VERSION to BuildConfig.VERSION_CODE,
             ONLINE_MODE to false
         )
 
diff --git a/app/src/main/java/com/dscvit/vitty/activity/AddInfoActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/AddInfoActivity.kt
deleted file mode 100644
index 2cffe56..0000000
--- a/app/src/main/java/com/dscvit/vitty/activity/AddInfoActivity.kt
+++ /dev/null
@@ -1,343 +0,0 @@
-package com.dscvit.vitty.activity
-
-import android.app.Activity
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.Build
-import android.os.Bundle
-import android.os.PowerManager
-import android.provider.Settings
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.View
-import android.widget.ArrayAdapter
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.edit
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import com.dscvit.vitty.BuildConfig
-import com.dscvit.vitty.R
-import com.dscvit.vitty.databinding.ActivityAddInfoBinding
-import com.dscvit.vitty.receiver.AlarmReceiver
-import com.dscvit.vitty.ui.auth.AuthViewModel
-import com.dscvit.vitty.util.ArraySaverLoader
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.LogoutHelper
-import com.dscvit.vitty.util.NotificationHelper
-import com.dscvit.vitty.util.UtilFunctions
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.Source
-import timber.log.Timber
-import java.util.Date
-
-class AddInfoActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityAddInfoBinding
-    private lateinit var authViewModel: AuthViewModel
-    private lateinit var prefs: SharedPreferences
-    private val db = FirebaseFirestore.getInstance()
-    private val days =
-        listOf("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday")
-    private var uid = ""
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_add_info)
-        authViewModel = ViewModelProvider(this)[AuthViewModel::class.java]
-        prefs = getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        uid = prefs.getString(Constants.UID, "").toString()
-        setupToolbar()
-        setGDSCVITChannel()
-        setupCampusSpinner()
-
-        binding.continueButton.setOnClickListener {
-            setupContinueButton()
-        }
-
-        authViewModel.signInResponse.observe(this) {
-            if (it != null) {
-                prefs.edit().putString(Constants.COMMUNITY_TOKEN, it.token).apply()
-                prefs.edit().putString(Constants.COMMUNITY_NAME, it.name).apply()
-                prefs.edit().putString(Constants.COMMUNITY_PICTURE, it.picture).apply()
-            } else {
-                Toast.makeText(this, R.string.something_went_wrong, Toast.LENGTH_LONG).show()
-                binding.loadingView.visibility = View.GONE
-            }
-        }
-
-        authViewModel.user.observe(this) {
-            Timber.d("User: $it")
-            if (it != null) {
-                val timetableDays = it.timetable?.data
-                if (!timetableDays?.Monday.isNullOrEmpty() ||
-                    !timetableDays?.Tuesday.isNullOrEmpty() ||
-                    !timetableDays?.Wednesday.isNullOrEmpty() ||
-                    !timetableDays?.Thursday.isNullOrEmpty() ||
-                    !timetableDays?.Friday.isNullOrEmpty() ||
-                    !timetableDays?.Saturday.isNullOrEmpty() ||
-                    !timetableDays?.Sunday.isNullOrEmpty()
-                ) {
-                    binding.loadingView.visibility = View.GONE
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        createNotificationChannels()
-                    } else {
-                        tellUpdated()
-                    }
-                    prefs.edit().putBoolean(Constants.COMMUNITY_TIMETABLE_AVAILABLE, true).apply()
-                } else {
-                    val intent = Intent(this, InstructionsActivity::class.java)
-                    binding.loadingView.visibility = View.GONE
-                    startActivity(intent)
-                    finish()
-                }
-            } else {
-                Toast.makeText(this, R.string.something_went_wrong, Toast.LENGTH_LONG).show()
-                binding.loadingView.visibility = View.GONE
-            }
-        }
-
-        binding.etUsername.addTextChangedListener(
-            object : TextWatcher {
-                override fun beforeTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    count: Int,
-                    after: Int,
-                ) {}
-
-                override fun onTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    before: Int,
-                    count: Int,
-                ) {
-                    val username = s.toString().trim()
-                    authViewModel.checkUsername(username)
-                }
-
-                override fun afterTextChanged(s: Editable?) {
-                }
-            },
-        )
-
-        authViewModel.usernameValidity.observe(this) {
-            Timber.d("Validity: $it")
-            if (it != null) {
-                binding.usernameValidity.visibility = View.VISIBLE
-                binding.usernameValidity.text = it.detail
-                if (it.detail == "Username is valid") {
-                    binding.usernameValidity.setTextColor(getColor(R.color.white))
-                } else {
-                    binding.usernameValidity.setTextColor(getColor(R.color.red))
-                }
-            }
-        }
-    }
-
-    private fun setupCampusSpinner() {
-        val campusOptions = arrayOf("Select Campus", "Vellore", "Chennai", "Bhopal")
-        val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, campusOptions)
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        binding.spinnerCampus.adapter = adapter
-    }
-
-    private fun setupContinueButton() {
-        binding.loadingView.visibility = View.VISIBLE
-        val uuid = prefs.getString(Constants.UID, null)
-        val username =
-            binding.etUsername.text
-                .toString()
-                .trim()
-        val regno =
-            binding.etRegno.text
-                .toString()
-                .uppercase()
-                .trim()
-        val selectedCampus = binding.spinnerCampus.selectedItem.toString()
-        val regexPattern = Regex("^[0-9]{2}[a-zA-Z]{3}[0-9]{4}$")
-
-        if (username.isEmpty() || regno.isEmpty() || selectedCampus == "Select Campus") {
-            Toast.makeText(this, getString(R.string.fill_all_fields), Toast.LENGTH_LONG).show()
-            binding.loadingView.visibility = View.GONE
-        } else if (!regexPattern.matches(regno)) {
-            Toast.makeText(this, getString(R.string.invalid_regno), Toast.LENGTH_LONG).show()
-            binding.loadingView.visibility = View.GONE
-        } else {
-            if (uuid != null) {
-                prefs.edit().putString(Constants.COMMUNITY_USERNAME, username).apply()
-                prefs.edit { putString(Constants.COMMUNITY_REGNO, regno) }
-                prefs.edit { putString(Constants.COMMUNITY_CAMPUS, selectedCampus) }
-                authViewModel.signInAndGetTimeTable(username, regno, uuid, selectedCampus.lowercase())
-            } else {
-                Toast
-                    .makeText(this, getString(R.string.something_went_wrong), Toast.LENGTH_LONG)
-                    .show()
-                binding.loadingView.visibility = View.GONE
-            }
-        }
-    }
-
-    private fun setupToolbar() {
-        binding.addInfoToolbar.setOnMenuItemClickListener { menuItem ->
-            when (menuItem.itemId) {
-                R.id.close -> {
-                    LogoutHelper.logout(this, this as Activity, prefs)
-                    true
-                }
-
-                else -> false
-            }
-        }
-    }
-
-    private fun createNotificationChannels() {
-        binding.loadingView.visibility = View.VISIBLE
-        setNotificationGroup()
-        val notifChannels = ArraySaverLoader.loadArray(Constants.NOTIFICATION_CHANNELS, this)
-        for (notifChannel in notifChannels) {
-            if (notifChannel != null) {
-                NotificationHelper.deleteNotificationChannel(this, notifChannel.toString())
-            }
-        }
-        val newNotifChannels: ArrayList<String> = ArrayList()
-        for (day in days) {
-            db
-                .collection("users")
-                .document(uid)
-                .collection("timetable")
-                .document(day)
-                .collection("periods")
-                .get(Source.SERVER)
-                .addOnSuccessListener { result ->
-                    for (document in result) {
-                        var cn = document.getString("courseName")
-                        cn = if (cn.isNullOrEmpty()) "Default" else cn
-                        val cc = document.getString("courseCode")
-                        NotificationHelper.createNotificationChannel(
-                            this,
-                            cn,
-                            "Course Code: $cc",
-                            Constants.GROUP_ID,
-                        )
-                        newNotifChannels.add(cn)
-                        Timber.d(cn)
-                    }
-                    ArraySaverLoader.saveArray(
-                        newNotifChannels,
-                        Constants.NOTIFICATION_CHANNELS,
-                        this,
-                    )
-
-                    if (day == "sunday") {
-                        tellUpdated()
-                    }
-                }.addOnFailureListener { e ->
-                    Timber.d("Error: $e")
-                }
-        }
-    }
-
-    private fun tellUpdated() {
-        prefs.edit().putInt(Constants.TIMETABLE_AVAILABLE, 1).apply()
-        prefs.edit().putInt(Constants.UPDATE, 0).apply()
-        val updated =
-            hashMapOf(
-                "isTimetableAvailable" to true,
-                "isUpdated" to false,
-            )
-        db
-            .collection("users")
-            .document(uid)
-            .set(updated)
-            .addOnSuccessListener {
-                setAlarm()
-                UtilFunctions.reloadWidgets(this)
-                val pm: PowerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
-                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                    Toast
-                        .makeText(
-                            this,
-                            "Please turn off the Battery Optimization Settings for VITTY to receive notifications on time.",
-                            Toast.LENGTH_LONG,
-                        ).show()
-                    val pmIntent = Intent()
-                    pmIntent.action = Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS
-                    startActivity(pmIntent)
-                } else {
-                    val intent = Intent(this, HomeComposeActivity::class.java)
-                    startActivity(intent)
-                    finish()
-                }
-            }.addOnFailureListener { e ->
-                Timber.d("Error: $e")
-            }
-    }
-
-    private fun setGDSCVITChannel() {
-        if (!prefs.getBoolean("gdscvitChannelCreated", false)) {
-            NotificationHelper.createNotificationGroup(
-                this,
-                getString(R.string.gdscvit),
-                Constants.GROUP_ID_2,
-            )
-            NotificationHelper.createNotificationChannel(
-                this,
-                getString(R.string.default_notification_channel_name),
-                "Notifications from GDSC VIT",
-                Constants.GROUP_ID_2,
-            )
-            prefs.edit {
-                putBoolean("gdscvitChannelCreated", true)
-                apply()
-            }
-        }
-    }
-
-    private fun setNotificationGroup() {
-        if (!prefs.getBoolean("groupCreated", false)) {
-            NotificationHelper.createNotificationGroup(
-                this,
-                getString(R.string.notif_group),
-                Constants.GROUP_ID,
-            )
-            prefs.edit {
-                putBoolean("groupCreated", true)
-                apply()
-            }
-        }
-    }
-
-    private fun setAlarm() {
-        if (!prefs.getBoolean(Constants.EXAM_MODE, false)) {
-            if (prefs.getInt(Constants.VERSION_CODE, 0) != BuildConfig.VERSION_CODE) {
-                val intent = Intent(this, AlarmReceiver::class.java)
-
-                val pendingIntent =
-                    PendingIntent.getBroadcast(
-                        this,
-                        Constants.ALARM_INTENT,
-                        intent,
-                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
-                    )
-                val alarmManager = getSystemService(ALARM_SERVICE) as AlarmManager
-
-                val date = Date().time
-
-                alarmManager.setRepeating(
-                    AlarmManager.RTC_WAKEUP,
-                    date,
-                    (1000 * 60 * Constants.NOTIF_DELAY).toLong(),
-                    pendingIntent,
-                )
-
-                prefs.edit {
-                    putInt(Constants.VERSION_CODE, BuildConfig.VERSION_CODE)
-                    apply()
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/activity/AuthActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/AuthActivity.kt
index a58db1c..c984561 100755
--- a/app/src/main/java/com/dscvit/vitty/activity/AuthActivity.kt
+++ b/app/src/main/java/com/dscvit/vitty/activity/AuthActivity.kt
@@ -1,31 +1,20 @@
 package com.dscvit.vitty.activity
 
-import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.edit
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager2.widget.ViewPager2
 import com.dscvit.vitty.R
 import com.dscvit.vitty.adapter.IntroAdapter
 import com.dscvit.vitty.databinding.ActivityAuthBinding
-import com.dscvit.vitty.ui.auth.AuthViewModel
-import com.dscvit.vitty.util.Constants
 import com.dscvit.vitty.util.Constants.TOKEN
 import com.dscvit.vitty.util.Constants.UID
 import com.dscvit.vitty.util.Constants.USER_INFO
-import com.dscvit.vitty.util.NotificationPermissionHelper
-import com.dscvit.vitty.util.MaintenanceChecker
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
@@ -35,9 +24,9 @@ import com.google.android.gms.tasks.Task
 import com.google.android.material.tabs.TabLayoutMediator
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
-import timber.log.Timber
 
 class AuthActivity : AppCompatActivity() {
+
     private lateinit var binding: ActivityAuthBinding
 
     private val SIGNIN: Int = 1
@@ -45,130 +34,34 @@ class AuthActivity : AppCompatActivity() {
     private lateinit var mGoogleSignInOptions: GoogleSignInOptions
     private lateinit var firebaseAuth: FirebaseAuth
     private lateinit var sharedPref: SharedPreferences
-    private lateinit var authViewModel: AuthViewModel
 
     private val pages = listOf("○", "○", "○")
     private var loginClick = false
 
-    private lateinit var notificationPermissionLauncher: ActivityResultLauncher<String>
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_auth)
         firebaseAuth = FirebaseAuth.getInstance()
         sharedPref = getSharedPreferences(USER_INFO, Context.MODE_PRIVATE)
-        authViewModel = ViewModelProvider(this)[AuthViewModel::class.java]
-
-        setupNotificationPermissionLauncher()
-        requestNotificationPermissionIfNeeded()
-
         configureGoogleSignIn()
         setupUI()
-        setupBackPressedHandler()
-    }
-
-    private fun setupBackPressedHandler() {
-        val callback = object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                binding.apply {
-                    if (introPager.currentItem == 0 || loginClick) {
-                        finish()
-                    } else {
-                        introPager.currentItem--
-                    }
-                }
-            }
-        }
-        onBackPressedDispatcher.addCallback(this, callback)
-    }
-
-    private fun setupNotificationPermissionLauncher() {
-        notificationPermissionLauncher =
-            registerForActivityResult(
-                ActivityResultContracts.RequestPermission(),
-            ) { isGranted ->
-                if (isGranted) {
-                    Timber.d("Notification permission granted")
-                    // Check and request exact alarm permission if needed
-                    if (!NotificationPermissionHelper.canScheduleExactAlarms(this)) {
-                        NotificationPermissionHelper.requestExactAlarmPermission(this)
-                    }
-                } else {
-                    Timber.d("Notification permission denied")
-                    Toast
-                        .makeText(
-                            this,
-                            "Notification permission is required for reminders to work properly",
-                            Toast.LENGTH_LONG,
-                        ).show()
-                }
-            }
-    }
-
-    private fun requestNotificationPermissionIfNeeded() {
-        // For Android 13+ (API 33+), request POST_NOTIFICATIONS permission
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (!NotificationPermissionHelper.hasNotificationPermission(this)) {
-                Timber.d("Requesting POST_NOTIFICATIONS permission for Android 13+")
-                notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-            } else {
-                Timber.d("POST_NOTIFICATIONS permission already granted")
-                checkAdditionalPermissions()
-            }
-        } else {
-            // For Android 12 and below, notifications are enabled by default
-            // but we still need to check other permissions
-            Timber.d("Android version < 13, notifications enabled by default")
-            checkAdditionalPermissions()
-        }
-    }
-
-    private fun checkAdditionalPermissions() {
-        // Check and request exact alarm permission if needed (Android 12+)
-        if (!NotificationPermissionHelper.canScheduleExactAlarms(this)) {
-            Timber.d("Requesting exact alarm permission")
-            NotificationPermissionHelper.requestExactAlarmPermission(this)
-        }
-
-        // Note: Battery optimization can be checked later in the app flow
-        // as it's more intrusive and not immediately necessary
     }
 
     override fun onStart() {
         super.onStart()
-        sharedPref = getSharedPreferences(USER_INFO, Context.MODE_PRIVATE)
-        val isTimeTableAvailable =
-            sharedPref.getBoolean(Constants.COMMUNITY_TIMETABLE_AVAILABLE, false)
-        val token = sharedPref.getString(Constants.COMMUNITY_TOKEN, null)
-        val username = sharedPref.getString(Constants.COMMUNITY_USERNAME, null)
-        val regno = sharedPref.getString(Constants.COMMUNITY_REGNO, null)
         val user = FirebaseAuth.getInstance().currentUser
-        Timber.d("isTimeTableAvailable: $isTimeTableAvailable token: $token username: $username regno: $regno")
-        if (isTimeTableAvailable) {
-            val intent = Intent(this, HomeComposeActivity::class.java)
-            startActivity(intent)
-            finish()
-        } else if (token != null && username != null) {
+        if (user != null) {
             val intent = Intent(this, InstructionsActivity::class.java)
             startActivity(intent)
             finish()
-        } else {
-            Timber.d("here going to add info")
-            if (user != null) {
-                val intent = Intent(this, AddInfoActivity::class.java)
-                startActivity(intent)
-                finish()
-            }
         }
     }
 
     private fun configureGoogleSignIn() {
-        mGoogleSignInOptions =
-            GoogleSignInOptions
-                .Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .requestIdToken(getString(R.string.default_web_client_id))
-                .requestEmail()
-                .build()
+        mGoogleSignInOptions = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestIdToken(getString(R.string.default_web_client_id))
+            .requestEmail()
+            .build()
         mGoogleSignInClient = GoogleSignIn.getClient(this, mGoogleSignInOptions)
         mGoogleSignInClient.signOut()
     }
@@ -177,33 +70,30 @@ class AuthActivity : AppCompatActivity() {
         val pagerAdapter = IntroAdapter(this)
         binding.introPager.adapter = pagerAdapter
 
-        val pageChangeCallback =
-            object : ViewPager2.OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-                    binding.apply {
-                        if (position == 0 || position == 1) {
-                            loginButton.visibility = View.INVISIBLE
-                            nextButton.visibility = View.VISIBLE
-                        } else {
-                            nextButton.visibility = View.INVISIBLE
-                            loginButton.visibility = View.VISIBLE
-                        }
+        val pageChangeCallback = object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                binding.apply {
+                    if (position == 0 || position == 1) {
+                        loginButton.visibility = View.INVISIBLE
+                        nextButton.visibility = View.VISIBLE
+                    } else {
+                        nextButton.visibility = View.INVISIBLE
+                        loginButton.visibility = View.VISIBLE
                     }
                 }
             }
+        }
 
         binding.introPager.registerOnPageChangeCallback(pageChangeCallback)
 
         TabLayoutMediator(
-            binding.introTabs,
-            binding.introPager,
+            binding.introTabs, binding.introPager
         ) { tab, position -> tab.text = pages[position] }.attach()
 
         binding.nextButton.setOnClickListener {
             binding.apply {
-                if (introPager.currentItem != pages.size - 1) {
+                if (introPager.currentItem != pages.size - 1)
                     introPager.currentItem++
-                }
             }
         }
 
@@ -223,136 +113,59 @@ class AuthActivity : AppCompatActivity() {
     }
 
     private fun logoutFailed() {
-        Timber.e("Google sign-in failed - showing error message to user")
         Toast.makeText(this, getString(R.string.sign_in_fail), Toast.LENGTH_LONG).show()
         binding.loadingView.visibility = View.GONE
         binding.introPager.currentItem = 0
         loginClick = false
     }
 
-    private fun saveInfo(
-        token: String?,
-        uid: String?,
-    ) {
+    private fun saveInfo(token: String?, uid: String?) {
         with(sharedPref.edit()) {
-            putString("simethod", "Google")
+            putString("sign_in_method", "Google")
             putString(TOKEN, token)
             putString(UID, uid)
             apply()
         }
     }
 
-    override fun onActivityResult(
-        requestCode: Int,
-        resultCode: Int,
-        data: Intent?,
-    ) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        Timber.d("Activity Result - requestCode: $requestCode, resultCode: $resultCode")
         if (requestCode == SIGNIN) {
             val task: Task<GoogleSignInAccount> = GoogleSignIn.getSignedInAccountFromIntent(data)
             try {
                 val account = task.getResult(ApiException::class.java)
-                Timber.d("Google sign-in account: $account")
                 if (account != null) {
-                    Timber.d("Google sign-in successful, proceeding with Firebase auth")
                     firebaseAuthWithGoogle(account)
-                } else {
-                    Timber.e("Google sign-in account is null")
-                    logoutFailed()
                 }
             } catch (e: ApiException) {
-                Timber.e("Google sign-in failed with ApiException: ${e.message}, statusCode: ${e.statusCode}")
-                logoutFailed()
-            } catch (e: Exception) {
-                Timber.e("Google sign-in failed with Exception: ${e.message}")
                 logoutFailed()
             }
         }
     }
 
     private fun firebaseAuthWithGoogle(acct: GoogleSignInAccount) {
-        Timber.d("Starting Firebase authentication with Google account: ${acct.email}")
         val credential = GoogleAuthProvider.getCredential(acct.idToken, null)
-
-        firebaseAuth
-            .signInWithCredential(credential)
-            .addOnCompleteListener { authResult ->
-                if (authResult.isSuccessful) {
-                    loginClick = true
-                    val uid = firebaseAuth.currentUser?.uid
-                    val email = firebaseAuth.currentUser?.email
-                    Timber.d("Firebase authentication successful - uid: $uid, email: $email")
-                    saveInfo(acct.idToken, uid)
-                    
-                    // Quick maintenance check for new login
-                    checkMaintenanceBeforeProceed()
-                } else {
-                    Timber.e("Firebase authentication failed: ${authResult.exception?.message}")
-                    logoutFailed()
-                }
-            }.addOnFailureListener { exception ->
-                Timber.e("Firebase authentication failed with exception: ${exception.message}")
-                logoutFailed()
-            }
-    }
-
-    private fun checkMaintenanceBeforeProceed() {
-        MaintenanceChecker.checkMaintenanceStatusAsync(this) { isUnderMaintenance ->
-            if (isUnderMaintenance) {
+        firebaseAuth.signInWithCredential(credential).addOnCompleteListener {
+            if (it.isSuccessful) {
+                loginClick = true
+                val uid = firebaseAuth.currentUser?.uid
+                saveInfo(acct.idToken, uid)
+                val intent = Intent(this, InstructionsActivity::class.java)
                 binding.loadingView.visibility = View.GONE
-                val intent = Intent(this, MaintenanceActivity::class.java)
                 startActivity(intent)
                 finish()
             } else {
-                authViewModel.signInAndGetTimeTable("", "", firebaseAuth.currentUser?.uid ?: "", "")
-                leadToNextPage()
+                logoutFailed()
             }
         }
     }
 
-    private fun leadToNextPage() {
-        authViewModel.signInResponse.observe(this) {
-            if (it != null) {
-                Timber.d("here--$it")
-                sharedPref.edit { putString(Constants.COMMUNITY_USERNAME, it.username) }
-                sharedPref.edit { putString(Constants.COMMUNITY_TOKEN, it.token) }
-                sharedPref.edit { putString(Constants.COMMUNITY_NAME, it.name) }
-                sharedPref.edit { putString(Constants.COMMUNITY_PICTURE, it.picture) }
-                sharedPref.edit { putString(Constants.COMMUNITY_CAMPUS, it.campus) }
+    override fun onBackPressed() {
+        binding.apply {
+            if (introPager.currentItem == 0 || loginClick) {
+                super.onBackPressed()
             } else {
-                val intent = Intent(this, AddInfoActivity::class.java)
-                binding.loadingView.visibility = View.GONE
-                startActivity(intent)
-                finish()
-            }
-        }
-
-        authViewModel.user.observe(this) {
-            if (it != null) {
-                val timetableDays = it.timetable?.data
-                if (!timetableDays?.Monday.isNullOrEmpty() ||
-                    !timetableDays?.Tuesday.isNullOrEmpty() ||
-                    !timetableDays?.Wednesday.isNullOrEmpty() ||
-                    !timetableDays?.Thursday.isNullOrEmpty() ||
-                    !timetableDays?.Friday.isNullOrEmpty() ||
-                    !timetableDays?.Saturday.isNullOrEmpty() ||
-                    !timetableDays?.Sunday.isNullOrEmpty()
-                ) {
-                    sharedPref
-                        .edit {
-                            putBoolean(Constants.COMMUNITY_TIMETABLE_AVAILABLE, true)
-                        }
-                    val intent = Intent(this, HomeComposeActivity::class.java)
-                    startActivity(intent)
-                    finish()
-                    binding.loadingView.visibility = View.GONE
-                } else {
-                    val intent = Intent(this, InstructionsActivity::class.java)
-                    startActivity(intent)
-                    finish()
-                    binding.loadingView.visibility = View.GONE
-                }
+                introPager.currentItem--
             }
         }
     }
diff --git a/app/src/main/java/com/dscvit/vitty/activity/HomeActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/HomeActivity.kt
index c8ba281..f529585 100644
--- a/app/src/main/java/com/dscvit/vitty/activity/HomeActivity.kt
+++ b/app/src/main/java/com/dscvit/vitty/activity/HomeActivity.kt
@@ -1,492 +1,28 @@
 package com.dscvit.vitty.activity
 
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
 import android.os.Bundle
-import android.view.View
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.DecelerateInterpolator
-import android.view.animation.OvershootInterpolator
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.FragmentActivity
-import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
+import androidx.navigation.ui.setupWithNavController
 import com.dscvit.vitty.R
 import com.dscvit.vitty.databinding.ActivityHomeBinding
+import com.google.android.material.bottomnavigation.BottomNavigationView
 
 class HomeActivity : FragmentActivity() {
+
     private lateinit var binding: ActivityHomeBinding
-    private var selectedBackground: View? = null
-    private var currentSelectedId = -1
-    private var isAnimating = false
-    private var isNavigating = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_home)
 
-        val navController = findNavController(R.id.nav_host_fragment_activity_main)
-
-        fun createNavOptions(): NavOptions =
-            NavOptions
-                .Builder()
-                .setEnterAnim(R.anim.crossfade_in)
-                .setExitAnim(R.anim.crossfade_out)
-                .setPopEnterAnim(R.anim.crossfade_in)
-                .setPopExitAnim(R.anim.crossfade_out)
-                .build()
-
-        fun navigateIfNeeded(destinationId: Int) {
-            if (navController.currentDestination?.id != destinationId && !isNavigating) {
-                isNavigating = true
-
-                android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                    navController.navigate(destinationId, null, createNavOptions())
-
-                    android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                        isNavigating = false
-                    }, 250)
-                }, 50)
-            }
-        }
-
-        fun findImageViewInLayout(layout: LinearLayout): ImageView? {
-            for (i in 0 until layout.childCount) {
-                val child = layout.getChildAt(i)
-                if (child is ImageView) {
-                    return child
-                }
-            }
-            return null
-        }
-
-        fun animateIconBounce(layout: LinearLayout) {
-            val imageView = findImageViewInLayout(layout) ?: return
-
-            val scaleX =
-                ObjectAnimator.ofFloat(imageView, "scaleX", 1f, 1.15f, 1f).apply {
-                    duration = 250
-                    interpolator = OvershootInterpolator(1.0f)
-                }
-            val scaleY =
-                ObjectAnimator.ofFloat(imageView, "scaleY", 1f, 1.15f, 1f).apply {
-                    duration = 250
-                    interpolator = OvershootInterpolator(1.0f)
-                }
-
-            AnimatorSet().apply {
-                playTogether(scaleX, scaleY)
-                start()
-            }
-        }
-
-        fun animateTextSlideIn(
-            textView: TextView,
-            delay: Long = 0,
-        ) {
-            textView.alpha = 0f
-            textView.translationX = 10f
-            textView.scaleX = 0.95f
-            textView.visibility = View.VISIBLE
-
-            val slideAnimator =
-                ObjectAnimator.ofFloat(textView, "translationX", 10f, 0f).apply {
-                    duration = 200
-                    startDelay = delay
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val fadeAnimator =
-                ObjectAnimator.ofFloat(textView, "alpha", 0f, 1f).apply {
-                    duration = 150
-                    startDelay = delay
-                }
-            val scaleAnimator =
-                ObjectAnimator.ofFloat(textView, "scaleX", 0.95f, 1f).apply {
-                    duration = 200
-                    startDelay = delay
-                    interpolator = OvershootInterpolator(0.6f)
-                }
-
-            AnimatorSet().apply {
-                playTogether(slideAnimator, fadeAnimator, scaleAnimator)
-                start()
-            }
-        }
-
-        fun animateTextSlideOut(
-            textView: TextView,
-            onComplete: () -> Unit = {},
-        ) {
-            if (textView.visibility != View.VISIBLE) {
-                onComplete()
-                return
-            }
-
-            val slideAnimator =
-                ObjectAnimator.ofFloat(textView, "translationX", 0f, -10f).apply {
-                    duration = 100
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val fadeAnimator =
-                ObjectAnimator.ofFloat(textView, "alpha", 1f, 0f).apply {
-                    duration = 100
-                }
-
-            AnimatorSet().apply {
-                playTogether(slideAnimator, fadeAnimator)
-                addListener(
-                    object : android.animation.AnimatorListenerAdapter() {
-                        override fun onAnimationEnd(animation: android.animation.Animator) {
-                            textView.visibility = View.GONE
-                            textView.translationX = 0f
-                            textView.alpha = 1f
-                            textView.scaleX = 1f
-                            onComplete()
-                        }
-
-                        override fun onAnimationCancel(animation: android.animation.Animator) {
-                            textView.visibility = View.GONE
-                            textView.translationX = 0f
-                            textView.alpha = 1f
-                            textView.scaleX = 1f
-                            onComplete()
-                        }
-                    },
-                )
-                start()
-            }
-        }
-
-        fun animatePillMovement(
-            fromView: View?,
-            toView: View,
-            onComplete: () -> Unit = {},
-        ) {
-            binding.navAcademics.setBackgroundResource(0)
-            binding.navTimetable.setBackgroundResource(0)
-            binding.navCommunity.setBackgroundResource(0)
-
-            binding.navAcademics.elevation = 0f
-            binding.navTimetable.elevation = 0f
-            binding.navCommunity.elevation = 0f
-
-            if (fromView == null) {
-                toView.setBackgroundResource(R.drawable.bg_nav_item_selected)
-                toView.alpha = 0f
-                toView.scaleX = 0.95f
-                toView.scaleY = 0.95f
-
-                val fadeAnim =
-                    ObjectAnimator.ofFloat(toView, "alpha", 0f, 1f).apply {
-                        duration = 150
-                    }
-                val scaleXAnim =
-                    ObjectAnimator.ofFloat(toView, "scaleX", 0.95f, 1f).apply {
-                        duration = 180
-                        interpolator = OvershootInterpolator(0.8f)
-                    }
-                val scaleYAnim =
-                    ObjectAnimator.ofFloat(toView, "scaleY", 0.95f, 1f).apply {
-                        duration = 180
-                        interpolator = OvershootInterpolator(0.8f)
-                    }
-                val elevationAnim =
-                    ObjectAnimator.ofFloat(toView, "elevation", 0f, 8f).apply {
-                        duration = 180
-                        interpolator = DecelerateInterpolator()
-                    }
-
-                AnimatorSet().apply {
-                    playTogether(fadeAnim, scaleXAnim, scaleYAnim, elevationAnim)
-                    addListener(
-                        object : android.animation.AnimatorListenerAdapter() {
-                            override fun onAnimationEnd(animation: android.animation.Animator) {
-                                onComplete()
-                            }
-
-                            override fun onAnimationCancel(animation: android.animation.Animator) {
-                                onComplete()
-                            }
-                        },
-                    )
-                    start()
-                }
-                return
-            }
-
-            toView.setBackgroundResource(R.drawable.bg_nav_item_selected)
-
-            val scaleX =
-                ObjectAnimator.ofFloat(toView, "scaleX", 1f, 1.03f, 1f).apply {
-                    duration = 150
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val scaleY =
-                ObjectAnimator.ofFloat(toView, "scaleY", 1f, 1.03f, 1f).apply {
-                    duration = 150
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val elevationAnim =
-                ObjectAnimator.ofFloat(toView, "elevation", 0f, 8f).apply {
-                    duration = 150
-                    interpolator = DecelerateInterpolator()
-                }
-
-            AnimatorSet().apply {
-                playTogether(scaleX, scaleY, elevationAnim)
-                addListener(
-                    object : android.animation.AnimatorListenerAdapter() {
-                        override fun onAnimationEnd(animation: android.animation.Animator) {
-                            onComplete()
-                        }
-
-                        override fun onAnimationCancel(animation: android.animation.Animator) {
-                            onComplete()
-                        }
-                    },
-                )
-                start()
-            }
-        }
+        val navView: BottomNavigationView = binding.navView
 
-        fun highlightSelectedTab(selectedId: Int) {
-            if (currentSelectedId == selectedId) return
-
-            if (isAnimating) {
-                binding.textAcademics.clearAnimation()
-                binding.textTimetable.clearAnimation()
-                binding.textCommunity.clearAnimation()
-                binding.navAcademics.clearAnimation()
-                binding.navTimetable.clearAnimation()
-                binding.navCommunity.clearAnimation()
-            }
-
-            isAnimating = true
-
-            val (newSelectedView, newTextView) =
-                when (selectedId) {
-                    R.id.navigation_academics -> Pair(binding.navAcademics, binding.textAcademics)
-                    R.id.navigation_schedule -> Pair(binding.navTimetable, binding.textTimetable)
-                    R.id.navigation_connect -> Pair(binding.navCommunity, binding.textCommunity)
-                    else -> {
-                        isAnimating = false
-                        return
-                    }
-                }
-
-            val allTextViews = listOf(binding.textAcademics, binding.textTimetable, binding.textCommunity)
-            val visibleTextViews = allTextViews.filter { it.isVisible && it != newTextView }
-
-            var completedOperations = 0
-            val totalOperations = 1 + visibleTextViews.size
-
-            fun onOperationComplete() {
-                completedOperations++
-                if (completedOperations >= totalOperations) {
-                    isAnimating = false
-                }
-            }
-
-            animatePillMovement(selectedBackground, newSelectedView) {
-                onOperationComplete()
-            }
-
-            animateTextSlideIn(newTextView, delay = 25)
-
-            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                animateIconBounce(newSelectedView)
-            }, 50)
-
-            if (visibleTextViews.isEmpty()) {
-                onOperationComplete()
-            } else {
-                visibleTextViews.forEach { textView ->
-                    animateTextSlideOut(textView) {
-                        onOperationComplete()
-                    }
-                }
-            }
-
-            selectedBackground = newSelectedView
-            currentSelectedId = selectedId
-        }
-
-        fun animateButtonPress(view: View) {
-            val scaleDown =
-                ObjectAnimator.ofFloat(view, "scaleX", 1f, 0.95f).apply {
-                    duration = 60
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val scaleDownY =
-                ObjectAnimator.ofFloat(view, "scaleY", 1f, 0.95f).apply {
-                    duration = 60
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val elevationDown =
-                ObjectAnimator.ofFloat(view, "elevation", view.elevation, view.elevation * 0.5f).apply {
-                    duration = 60
-                }
-            val scaleUp =
-                ObjectAnimator.ofFloat(view, "scaleX", 0.95f, 1f).apply {
-                    duration = 100
-                    interpolator = OvershootInterpolator(1.2f)
-                }
-            val scaleUpY =
-                ObjectAnimator.ofFloat(view, "scaleY", 0.95f, 1f).apply {
-                    duration = 100
-                    interpolator = OvershootInterpolator(1.2f)
-                }
-            val elevationUp =
-                ObjectAnimator.ofFloat(view, "elevation", view.elevation * 0.5f, view.elevation).apply {
-                    duration = 100
-                    interpolator = OvershootInterpolator(0.6f)
-                }
-
-            AnimatorSet().apply {
-                play(scaleDown).with(scaleDownY).with(elevationDown)
-                play(scaleUp).after(scaleDown).with(scaleUpY).with(elevationUp)
-                start()
-            }
-        }
-
-        binding.navAcademics.setOnClickListener {
-            if (isAnimating || isNavigating) return@setOnClickListener
-            try {
-                it.performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY)
-            } catch (e: Exception) {
-            }
-            animateButtonPress(it)
-            navigateIfNeeded(R.id.navigation_academics)
-        }
-
-        binding.navTimetable.setOnClickListener {
-            if (isAnimating || isNavigating) return@setOnClickListener
-            try {
-                it.performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY)
-            } catch (e: Exception) {
-            }
-            animateButtonPress(it)
-            navigateIfNeeded(R.id.navigation_schedule)
-        }
-
-        binding.navCommunity.setOnClickListener {
-            if (isAnimating || isNavigating) return@setOnClickListener
-            try {
-                it.performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY)
-            } catch (e: Exception) {
-            }
-            animateButtonPress(it)
-            navigateIfNeeded(R.id.navigation_connect)
-        }
-
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-
-            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                when (destination.id) {
-                    R.id.allRequestFragment,
-                    R.id.friendFragment,
-                    R.id.searchFragment,
-                    R.id.navigation_requests,
-                    R.id.coursePageFragment,
-                    R.id.noteFragment,
-                    -> {
-                        hideBottomNavSafely()
-                    }
-
-                    R.id.navigation_academics -> {
-                        showBottomNavSafely()
-                        android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                            highlightSelectedTab(R.id.navigation_academics)
-                        }, 25)
-                    }
-
-                    R.id.navigation_schedule -> {
-                        showBottomNavSafely()
-                        android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                            highlightSelectedTab(R.id.navigation_schedule)
-                        }, 25)
-                    }
-
-                    R.id.navigation_connect -> {
-                        showBottomNavSafely()
-                        android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                            highlightSelectedTab(R.id.navigation_connect)
-                        }, 25)
-                    }
-
-                    else -> {
-                        hideBottomNavSafely()
-                    }
-                }
-            }, 50)
-        }
-    }
-
-    private fun showBottomNavSafely() {
-        if (binding.customBottomNav.visibility != View.VISIBLE) {
-            binding.customBottomNav.visibility = View.VISIBLE
-            binding.customBottomNav.translationY = 200f
-            binding.customBottomNav.alpha = 0f
-            binding.customBottomNav.scaleY = 0.9f
-
-            val slideUp =
-                ObjectAnimator.ofFloat(binding.customBottomNav, "translationY", 200f, 0f).apply {
-                    duration = 300
-                    interpolator = DecelerateInterpolator(1.0f)
-                }
-            val fadeIn =
-                ObjectAnimator.ofFloat(binding.customBottomNav, "alpha", 0f, 1f).apply {
-                    duration = 250
-                    startDelay = 25
-                }
-            val scaleUp =
-                ObjectAnimator.ofFloat(binding.customBottomNav, "scaleY", 0.9f, 1f).apply {
-                    duration = 280
-                    interpolator = OvershootInterpolator(0.4f)
-                    startDelay = 50
-                }
+        val navController = findNavController(R.id.nav_host_fragment_activity_main)
 
-            AnimatorSet().apply {
-                playTogether(slideUp, fadeIn, scaleUp)
-                start()
-            }
-        }
+        navView.setupWithNavController(navController)
     }
 
-    private fun hideBottomNavSafely() {
-        if (binding.customBottomNav.visibility == View.VISIBLE) {
-            val slideDown =
-                ObjectAnimator.ofFloat(binding.customBottomNav, "translationY", 0f, 200f).apply {
-                    duration = 250
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
-            val fadeOut =
-                ObjectAnimator.ofFloat(binding.customBottomNav, "alpha", 1f, 0f).apply {
-                    duration = 200
-                }
-            val scaleDown =
-                ObjectAnimator.ofFloat(binding.customBottomNav, "scaleY", 1f, 0.9f).apply {
-                    duration = 220
-                    interpolator = AccelerateDecelerateInterpolator()
-                }
 
-            AnimatorSet().apply {
-                playTogether(slideDown, fadeOut, scaleDown)
-                addListener(
-                    object : android.animation.AnimatorListenerAdapter() {
-                        override fun onAnimationEnd(animation: android.animation.Animator) {
-                            binding.customBottomNav.visibility = View.GONE
-                            binding.customBottomNav.translationY = 0f
-                            binding.customBottomNav.scaleY = 1f
-                        }
-                    },
-                )
-                start()
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/com/dscvit/vitty/activity/HomeComposeActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/HomeComposeActivity.kt
deleted file mode 100644
index d891ee7..0000000
--- a/app/src/main/java/com/dscvit/vitty/activity/HomeComposeActivity.kt
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.dscvit.vitty.activity
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.core.content.edit
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.FragmentActivity
-import com.dscvit.vitty.R
-import com.dscvit.vitty.databinding.ActivityHomeComposeBinding
-import com.dscvit.vitty.ui.main.MainComposeApp
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.Constants.PREF_LAST_REVIEW_REQUEST
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.play.core.appupdate.AppUpdateInfo
-import com.google.android.play.core.appupdate.AppUpdateManager
-import com.google.android.play.core.appupdate.AppUpdateManagerFactory
-import com.google.android.play.core.appupdate.AppUpdateOptions
-import com.google.android.play.core.install.InstallStateUpdatedListener
-import com.google.android.play.core.install.model.AppUpdateType
-import com.google.android.play.core.install.model.InstallStatus
-import com.google.android.play.core.install.model.UpdateAvailability
-import com.google.android.play.core.review.ReviewInfo
-import com.google.android.play.core.review.ReviewManager
-import com.google.android.play.core.review.ReviewManagerFactory
-import timber.log.Timber
-import java.util.concurrent.TimeUnit
-
-class HomeComposeActivity : FragmentActivity() {
-    private lateinit var binding: ActivityHomeComposeBinding
-    private lateinit var prefs: SharedPreferences
-    private lateinit var appUpdateManager: AppUpdateManager
-    private lateinit var reviewManager: ReviewManager
-
-    private var reviewInfo: ReviewInfo? = null
-
-    companion object {
-        private val REVIEW_INTERVAL_MILLIS = TimeUnit.DAYS.toMillis(30)
-        private const val TAG = "HomeComposeActivity"
-    }
-
-    private val updateResultLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.StartIntentSenderForResult(),
-        ) { result: ActivityResult ->
-            when (result.resultCode) {
-                RESULT_OK -> {
-                    Timber.d("$TAG:Update flow completed successfully")
-                }
-                RESULT_CANCELED -> {
-                    Timber.d("$TAG:Update flow was cancelled by user")
-                }
-                else -> {
-                    Timber.d("$TAG:Update flow failed with result code: ${result.resultCode}")
-                }
-            }
-        }
-
-    private val installStateUpdatedListener: InstallStateUpdatedListener =
-        InstallStateUpdatedListener { state ->
-            when (state.installStatus()) {
-                InstallStatus.DOWNLOADED -> {
-                    showUpdateDownloadedSnackbar()
-                }
-                InstallStatus.INSTALLED -> {
-                    appUpdateManager.unregisterListener(installStateUpdatedListener)
-                }
-                else -> {
-                    Timber.d("$TAG:Install status: ${state.installStatus()}")
-                }
-            }
-        }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_home_compose)
-        prefs = getSharedPreferences(Constants.USER_INFO, 0)
-        appUpdateManager = AppUpdateManagerFactory.create(this)
-        reviewManager = ReviewManagerFactory.create(this)
-
-        binding.composeView.apply {
-            setViewCompositionStrategy(
-                ViewCompositionStrategy.DisposeOnLifecycleDestroyed(this@HomeComposeActivity),
-            )
-            setContent { MainComposeApp() }
-        }
-
-        appUpdateManager.registerListener(installStateUpdatedListener)
-
-        checkForAppUpdate()
-        checkForReviewRequest()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        appUpdateManager.appUpdateInfo
-            .addOnSuccessListener { appUpdateInfo ->
-                Timber.d(
-                    "$TAG:onResume - Update availability: ${appUpdateInfo.updateAvailability()}",
-                )
-                Timber.d("$TAG:onResume - Install status: ${appUpdateInfo.installStatus()}")
-
-                if (appUpdateInfo.updateAvailability() ==
-                    UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS
-                ) {
-                    Timber.d("$TAG:Resuming in-progress update")
-                    appUpdateManager.startUpdateFlowForResult(
-                        appUpdateInfo,
-                        updateResultLauncher,
-                        AppUpdateOptions.newBuilder(AppUpdateType.IMMEDIATE).build(),
-                    )
-                }
-
-                if (appUpdateInfo.installStatus() == InstallStatus.DOWNLOADED) {
-                    showUpdateDownloadedSnackbar()
-                }
-            }.addOnFailureListener { exception ->
-                Timber.e("$TAG:Failed to get app update info in onResume$exception")
-            }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        appUpdateManager.unregisterListener(installStateUpdatedListener)
-    }
-
-    private fun checkForAppUpdate() {
-        Timber.d("$TAG:Checking for app updates...")
-
-        appUpdateManager.appUpdateInfo
-            .addOnSuccessListener { appUpdateInfo ->
-                Timber.d("$TAG:Update availability: ${appUpdateInfo.updateAvailability()}")
-                Timber.d("$TAG:Update priority: ${appUpdateInfo.updatePriority()}")
-                Timber.d(
-                    "$TAG:Client version staleness days: ${appUpdateInfo.clientVersionStalenessDays()}",
-                )
-                Timber.d("$TAG:Available version code: ${appUpdateInfo.availableVersionCode()}")
-                Timber.d("$TAG:Install status: ${appUpdateInfo.installStatus()}")
-
-                when {
-                    appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
-                        appUpdateInfo.updatePriority() >= 4 &&
-                        appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE) -> {
-                        Timber.d("$TAG:Starting immediate update (high priority)")
-                        startImmediateUpdate(appUpdateInfo)
-                    }
-                    appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
-                        appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE) -> {
-                        val stalenessDays = appUpdateInfo.clientVersionStalenessDays() ?: 0
-                        Timber.d("$TAG:Update staleness: $stalenessDays days")
-
-                        if (stalenessDays >= 1) {
-                            Timber.d("$TAG:Starting flexible update (staleness criteria met)")
-                            startFlexibleUpdate(appUpdateInfo)
-                        } else {
-                            Timber.d("$TAG:Update available but staleness criteria not met")
-                        }
-                    }
-                    appUpdateInfo.updateAvailability() ==
-                        UpdateAvailability.UPDATE_AVAILABLE -> {
-                        Timber.d("$TAG:Update available but no update type allowed")
-                        Timber.d(
-                            "$TAG:Immediate allowed: ${appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)}",
-                        )
-                        Timber.d(
-                            "$TAG:Flexible allowed: ${appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)}",
-                        )
-                    }
-                    else -> {
-                        Timber.d("$TAG:No update available or update not applicable")
-                    }
-                }
-            }.addOnFailureListener { exception ->
-                Timber.e("$TAG:Failed to check for app updates:$exception")
-            }
-    }
-
-    private fun startImmediateUpdate(appUpdateInfo: AppUpdateInfo) {
-        Timber.d("Launching immediate update flow")
-        appUpdateManager.startUpdateFlowForResult(
-            appUpdateInfo,
-            updateResultLauncher,
-            AppUpdateOptions.newBuilder(AppUpdateType.IMMEDIATE).build(),
-        )
-    }
-
-    private fun startFlexibleUpdate(appUpdateInfo: AppUpdateInfo) {
-        Timber.d("Launching flexible update flow")
-        appUpdateManager.startUpdateFlowForResult(
-            appUpdateInfo,
-            updateResultLauncher,
-            AppUpdateOptions.newBuilder(AppUpdateType.FLEXIBLE).build(),
-        )
-    }
-
-    private fun showUpdateDownloadedSnackbar() {
-        Timber.d("Showing update downloaded snackbar")
-        Snackbar
-            .make(
-                binding.root,
-                "An update has been downloaded.",
-                Snackbar.LENGTH_INDEFINITE,
-            ).apply {
-                setAction("RESTART") {
-                    Timber.d("User clicked restart - completing update")
-                    appUpdateManager.completeUpdate()
-                }
-                show()
-            }
-    }
-
-    private fun checkForReviewRequest() {
-        val lastReviewRequest = prefs.getLong(PREF_LAST_REVIEW_REQUEST, 0)
-        val currentTime = System.currentTimeMillis()
-
-        if (currentTime - lastReviewRequest >= REVIEW_INTERVAL_MILLIS) {
-            requestReviewInfo()
-        }
-    }
-
-    private fun requestReviewInfo() {
-        val request = reviewManager.requestReviewFlow()
-        request.addOnCompleteListener { task ->
-            if (task.isSuccessful) {
-                reviewInfo = task.result
-                launchReviewFlow()
-            } else {
-                Timber.e("$TAG:Failed to request review info:${task.exception}")
-            }
-        }
-    }
-
-    private fun launchReviewFlow() {
-        reviewInfo?.let { info ->
-            val flow = reviewManager.launchReviewFlow(this, info)
-            flow.addOnCompleteListener {
-                prefs.edit { putLong(PREF_LAST_REVIEW_REQUEST, System.currentTimeMillis()) }
-                reviewInfo = null
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/activity/InstructionsActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/InstructionsActivity.kt
index 956b9ca..d23fc02 100755
--- a/app/src/main/java/com/dscvit/vitty/activity/InstructionsActivity.kt
+++ b/app/src/main/java/com/dscvit/vitty/activity/InstructionsActivity.kt
@@ -15,15 +15,12 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
 import com.dscvit.vitty.BuildConfig
 import com.dscvit.vitty.R
 import com.dscvit.vitty.databinding.ActivityInstructionsBinding
 import com.dscvit.vitty.receiver.AlarmReceiver
-import com.dscvit.vitty.ui.auth.AuthViewModel
 import com.dscvit.vitty.util.ArraySaverLoader.loadArray
 import com.dscvit.vitty.util.ArraySaverLoader.saveArray
-import com.dscvit.vitty.util.Constants
 import com.dscvit.vitty.util.Constants.ALARM_INTENT
 import com.dscvit.vitty.util.Constants.EXAM_MODE
 import com.dscvit.vitty.util.Constants.GROUP_ID
@@ -44,8 +41,8 @@ import timber.log.Timber
 import java.util.Date
 
 class InstructionsActivity : AppCompatActivity() {
+
     private lateinit var binding: ActivityInstructionsBinding
-    private lateinit var authViewModel: AuthViewModel
     private val days =
         listOf("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday")
     private lateinit var prefs: SharedPreferences
@@ -57,14 +54,12 @@ class InstructionsActivity : AppCompatActivity() {
         binding = DataBindingUtil.setContentView(this, R.layout.activity_instructions)
         prefs = getSharedPreferences(USER_INFO, 0)
         uid = prefs.getString(UID, "").toString()
-        authViewModel = ViewModelProvider(this)[AuthViewModel::class.java]
+
         setupToolbar()
         setGDSCVITChannel()
 
         binding.doneButton.setOnClickListener {
-            val token = prefs.getString(Constants.COMMUNITY_TOKEN, null)
-            val username = prefs.getString(Constants.COMMUNITY_USERNAME, null)
-            setupDoneButton(token, username)
+            setupDoneButton()
         }
     }
 
@@ -72,62 +67,20 @@ class InstructionsActivity : AppCompatActivity() {
         super.onStart()
         if (prefs.getInt(UPDATE, 0) == 1) {
             createNotificationChannels()
-            Toast
-                .makeText(this, getString(R.string.updated), Toast.LENGTH_SHORT)
+            Toast.makeText(this, getString(R.string.updated), Toast.LENGTH_SHORT)
                 .show()
         }
         if (prefs.getInt(TIMETABLE_AVAILABLE, 0) == 1) {
             setAlarm()
-            val intent = Intent(this, HomeComposeActivity::class.java)
+            val intent = Intent(this, HomeActivity::class.java)
             startActivity(intent)
             finish()
         }
     }
 
-    private fun setupDoneButton(
-        token: String?,
-        username: String?,
-    ) {
+    private fun setupDoneButton() {
         binding.loadingView.visibility = View.VISIBLE
-
-        Timber.d("done button clicked")
-
-        if (token != null && username != null) {
-            authViewModel.getUserWithTimeTable(token, username)
-        } else {
-            Toast
-                .makeText(this, "Please login again", Toast.LENGTH_LONG)
-                .show()
-        }
-
-        authViewModel.user.observe(this) {
-            Timber.d("user: $it")
-            if (it != null) {
-                val timetableDays = it.timetable?.data
-                if (!timetableDays?.Monday.isNullOrEmpty() ||
-                    !timetableDays?.Tuesday.isNullOrEmpty() ||
-                    !timetableDays?.Wednesday.isNullOrEmpty() ||
-                    !timetableDays?.Thursday.isNullOrEmpty() ||
-                    !timetableDays?.Friday.isNullOrEmpty() ||
-                    !timetableDays?.Saturday.isNullOrEmpty() ||
-                    !timetableDays?.Sunday.isNullOrEmpty()
-                ) {
-                    binding.loadingView.visibility = View.GONE
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        createNotificationChannels()
-                    } else {
-                        tellUpdated()
-                    }
-                } else {
-                    binding.loadingView.visibility = View.GONE
-                    Toast
-                        .makeText(this, getString(R.string.follow_instructions), Toast.LENGTH_LONG)
-                        .show()
-                }
-            }
-        }
-
-        /*db.collection("users")
+        db.collection("users")
             .document(uid)
             .get()
             .addOnSuccessListener { document ->
@@ -142,7 +95,7 @@ class InstructionsActivity : AppCompatActivity() {
                     Toast.makeText(this, getString(R.string.follow_instructions), Toast.LENGTH_LONG)
                         .show()
                 }
-            }*/
+            }
     }
 
     private fun createNotificationChannels() {
@@ -156,8 +109,7 @@ class InstructionsActivity : AppCompatActivity() {
         }
         val newNotifChannels: ArrayList<String> = ArrayList()
         for (day in days) {
-            db
-                .collection("users")
+            db.collection("users")
                 .document(uid)
                 .collection("timetable")
                 .document(day)
@@ -172,17 +124,17 @@ class InstructionsActivity : AppCompatActivity() {
                             this,
                             cn,
                             "Course Code: $cc",
-                            GROUP_ID,
+                            GROUP_ID
                         )
                         newNotifChannels.add(cn)
                         Timber.d(cn)
                     }
                     saveArray(newNotifChannels, NOTIFICATION_CHANNELS, this)
 
-                    if (day == "sunday") {
+                    if (day == "sunday")
                         tellUpdated()
-                    }
-                }.addOnFailureListener { e ->
+                }
+                .addOnFailureListener { e ->
                     Timber.d("Error: $e")
                 }
         }
@@ -191,13 +143,11 @@ class InstructionsActivity : AppCompatActivity() {
     private fun tellUpdated() {
         prefs.edit().putInt(TIMETABLE_AVAILABLE, 1).apply()
         prefs.edit().putInt(UPDATE, 0).apply()
-        val updated =
-            hashMapOf(
-                "isTimetableAvailable" to true,
-                "isUpdated" to false,
-            )
-        db
-            .collection("users")
+        val updated = hashMapOf(
+            "isTimetableAvailable" to true,
+            "isUpdated" to false
+        )
+        db.collection("users")
             .document(uid)
             .set(updated)
             .addOnSuccessListener {
@@ -205,21 +155,21 @@ class InstructionsActivity : AppCompatActivity() {
                 UtilFunctions.reloadWidgets(this)
                 val pm: PowerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
                 if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                    Toast
-                        .makeText(
-                            this,
-                            "Please turn off the Battery Optimization Settings for VITTY to receive notifications on time.",
-                            Toast.LENGTH_LONG,
-                        ).show()
+                    Toast.makeText(
+                        this,
+                        "Please turn off the Battery Optimization Settings for VITTY to receive notifications on time.",
+                        Toast.LENGTH_LONG
+                    ).show()
                     val pmIntent = Intent()
                     pmIntent.action = Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS
                     startActivity(pmIntent)
                 } else {
-                    val intent = Intent(this, HomeComposeActivity::class.java)
+                    val intent = Intent(this, HomeActivity::class.java)
                     startActivity(intent)
                     finish()
                 }
-            }.addOnFailureListener { e ->
+            }
+            .addOnFailureListener { e ->
                 Timber.d("Error: $e")
             }
     }
@@ -229,13 +179,13 @@ class InstructionsActivity : AppCompatActivity() {
             NotificationHelper.createNotificationGroup(
                 this,
                 getString(R.string.gdscvit),
-                GROUP_ID_2,
+                GROUP_ID_2
             )
             NotificationHelper.createNotificationChannel(
                 this,
                 getString(R.string.default_notification_channel_name),
                 "Notifications from GDSC VIT",
-                GROUP_ID_2,
+                GROUP_ID_2
             )
             prefs.edit {
                 putBoolean("gdscvitChannelCreated", true)
@@ -249,7 +199,7 @@ class InstructionsActivity : AppCompatActivity() {
             NotificationHelper.createNotificationGroup(
                 this,
                 getString(R.string.notif_group),
-                GROUP_ID,
+                GROUP_ID
             )
             prefs.edit {
                 putBoolean("groupCreated", true)
@@ -265,10 +215,8 @@ class InstructionsActivity : AppCompatActivity() {
 
                 val pendingIntent =
                     PendingIntent.getBroadcast(
-                        this,
-                        ALARM_INTENT,
-                        intent,
-                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+                        this, ALARM_INTENT, intent,
+                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
                     )
                 val alarmManager = getSystemService(ALARM_SERVICE) as AlarmManager
 
@@ -278,7 +226,7 @@ class InstructionsActivity : AppCompatActivity() {
                     AlarmManager.RTC_WAKEUP,
                     date,
                     (1000 * 60 * NOTIF_DELAY).toLong(),
-                    pendingIntent,
+                    pendingIntent
                 )
 
                 prefs.edit {
@@ -296,7 +244,6 @@ class InstructionsActivity : AppCompatActivity() {
                     LogoutHelper.logout(this, this as Activity, prefs)
                     true
                 }
-
                 else -> false
             }
         }
diff --git a/app/src/main/java/com/dscvit/vitty/activity/MaintenanceActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/MaintenanceActivity.kt
deleted file mode 100644
index 1b4fef1..0000000
--- a/app/src/main/java/com/dscvit/vitty/activity/MaintenanceActivity.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.dscvit.vitty.activity
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.FragmentActivity
-import com.dscvit.vitty.R
-import com.dscvit.vitty.databinding.ActivityMaintenanceBinding
-import com.dscvit.vitty.theme.VittyTheme
-import com.dscvit.vitty.ui.maintenance.MaintenanceScreen
-import com.dscvit.vitty.util.MaintenanceChecker
-
-class MaintenanceActivity : FragmentActivity() {
-
-    private lateinit var binding: ActivityMaintenanceBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_maintenance)
-        
-        binding.composeView.apply {
-            setViewCompositionStrategy(
-                ViewCompositionStrategy.DisposeOnLifecycleDestroyed(this@MaintenanceActivity)
-            )
-            setContent {
-                VittyTheme {
-                    MaintenanceScreen(
-                        onRetryClick = { retryConnection() },
-                        onExitClick = { exitApp() }
-                    )
-                }
-            }
-        }
-    }
-
-    private fun retryConnection() {
-        MaintenanceChecker.checkMaintenanceStatusAsync(this) { isUnderMaintenance ->
-            if (!isUnderMaintenance) {
-                val intent = Intent(this, InstructionsActivity::class.java)
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                startActivity(intent)
-                finish()
-            }
-        }
-    }
-
-    private fun exitApp() {
-        finishAffinity()
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/activity/SettingsActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/SettingsActivity.kt
index bcd4d4b..6292018 100755
--- a/app/src/main/java/com/dscvit/vitty/activity/SettingsActivity.kt
+++ b/app/src/main/java/com/dscvit/vitty/activity/SettingsActivity.kt
@@ -40,7 +40,6 @@ class SettingsActivity : AppCompatActivity() {
                     onBackPressed()
                     true
                 }
-
                 else -> false
             }
         }
diff --git a/app/src/main/java/com/dscvit/vitty/activity/VITEventsActivity.kt b/app/src/main/java/com/dscvit/vitty/activity/VITEventsActivity.kt
index 1cb120a..b91f085 100644
--- a/app/src/main/java/com/dscvit/vitty/activity/VITEventsActivity.kt
+++ b/app/src/main/java/com/dscvit/vitty/activity/VITEventsActivity.kt
@@ -41,7 +41,6 @@ class VITEventsActivity : AppCompatActivity() {
                     onBackPressed()
                     true
                 }
-
                 else -> false
             }
         }
diff --git a/app/src/main/java/com/dscvit/vitty/adapter/DayAdapter.kt b/app/src/main/java/com/dscvit/vitty/adapter/DayAdapter.kt
index dcc0370..bd7f139 100755
--- a/app/src/main/java/com/dscvit/vitty/adapter/DayAdapter.kt
+++ b/app/src/main/java/com/dscvit/vitty/adapter/DayAdapter.kt
@@ -5,7 +5,7 @@ import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.dscvit.vitty.ui.schedule.DayFragment
 
-class DayAdapter(fa: Fragment, private val username: String?, private val isFriendsTimetable: Boolean = false) : FragmentStateAdapter(fa) {
+class DayAdapter(fa: Fragment) : FragmentStateAdapter(fa) {
     private val numPages = 7
 
     override fun getItemCount(): Int = numPages
@@ -13,8 +13,6 @@ class DayAdapter(fa: Fragment, private val username: String?, private val isFrie
     override fun createFragment(position: Int): Fragment {
         val bundle = Bundle()
         bundle.putString("frag_id", position.toString())
-        bundle.putString("username", username)
-        bundle.putBoolean("isFriendsTimetable", isFriendsTimetable)
         val fragment = DayFragment()
         fragment.arguments = bundle
         return fragment
diff --git a/app/src/main/java/com/dscvit/vitty/adapter/EventAdapter.kt b/app/src/main/java/com/dscvit/vitty/adapter/EventAdapter.kt
index 9d49995..0ba0191 100644
--- a/app/src/main/java/com/dscvit/vitty/adapter/EventAdapter.kt
+++ b/app/src/main/java/com/dscvit/vitty/adapter/EventAdapter.kt
@@ -27,12 +27,8 @@ class EventAdapter(private val dataSet: List<Event>) :
     }
 
     override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val date: Date = SimpleDateFormat(
-            "hh:mm z",
-            Locale.getDefault()
-        ).parse("${dataSet[position].Time} IST") as Date
-        val time: String =
-            SimpleDateFormat("h:mm a", Locale.getDefault()).format(date).uppercase(Locale.ROOT)
+        val date: Date = SimpleDateFormat("hh:mm z", Locale.getDefault()).parse("${dataSet[position].Time} IST") as Date
+        val time: String = SimpleDateFormat("h:mm a", Locale.getDefault()).format(date).uppercase(Locale.ROOT)
         viewHolder.eventName.text = dataSet[position].EventName
         viewHolder.eventTime.text = time
     }
diff --git a/app/src/main/java/com/dscvit/vitty/adapter/FriendAdapter.kt b/app/src/main/java/com/dscvit/vitty/adapter/FriendAdapter.kt
deleted file mode 100644
index af8e94f..0000000
--- a/app/src/main/java/com/dscvit/vitty/adapter/FriendAdapter.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.dscvit.vitty.adapter
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import com.dscvit.vitty.R
-import com.dscvit.vitty.databinding.CardFriendBinding
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.util.Effects.vibrateOnClick
-import timber.log.Timber
-
-class FriendAdapter(
-    dataList: List<UserResponse>,
-    private val pinnedFriendAdapterListener: PinnedFriendAdapterListener
-) :
-    RecyclerView.Adapter<FriendAdapter.ViewHolder>() {
-
-
-    private val dataSet = pinFriendsOnTop(dataList).toMutableList()
-
-    class ViewHolder(private val binding: CardFriendBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        val friend_name = binding.friendName
-        val friend_class = binding.friendClass
-        val friend_status = binding.friendStatus
-        val friend_image = binding.icon
-        val pin = binding.pin
-
-        fun bind(data: UserResponse) {
-            binding.friendDetails = data
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(
-            DataBindingUtil.inflate(
-                LayoutInflater.from(parent.context),
-                R.layout.card_friend,
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = dataSet[holder.adapterPosition]
-        holder.bind(item)
-
-
-        /* val startTime: Date = item.startTime.toDate()
-         val simpleDateFormat = SimpleDateFormat("h:mm a", Locale.getDefault())
-         val sTime: String = simpleDateFormat.format(startTime).uppercase(Locale.ROOT)
-
-         val endTime: Date = item.endTime.toDate()
-         val eTime: String = simpleDateFormat.format(endTime).uppercase(Locale.ROOT)*/
-
-        /*val now = Calendar.getInstance()
-        val s = Calendar.getInstance()
-        s.time = startTime
-        val start = Calendar.getInstance()
-        start[Calendar.HOUR_OF_DAY] = s[Calendar.HOUR_OF_DAY]
-        start[Calendar.MINUTE] = s[Calendar.MINUTE]
-        val e = Calendar.getInstance()
-        e.time = endTime
-        val end = Calendar.getInstance()
-        end[Calendar.HOUR_OF_DAY] = e[Calendar.HOUR_OF_DAY]
-        end[Calendar.MINUTE] = e[Calendar.MINUTE]*/
-
-        holder.friend_status.text = item.current_status?.venue ?: "Free"
-        val status = item.current_status?.status
-        val course = item.current_status?.`class`
-
-        holder.friend_class.text =
-            if (status == null || status.lowercase() == "free" || status.lowercase() == "unknown") {
-                "Not in a class right now"
-            } else {
-                "$course"
-            }
-        val pinnedFriends = pinnedFriendAdapterListener.getPinnedFriends()
-        if (pinnedFriends.contains(item.username)) {
-            holder.pin.visibility = View.VISIBLE
-        } else {
-            holder.pin.visibility = View.GONE
-        }
-
-        holder.friend_image.load(item.picture) {
-            crossfade(true)
-            placeholder(R.drawable.ic_gdscvit)
-            error(R.drawable.ic_gdscvit)
-        }
-
-        holder.itemView.apply {
-            setOnClickListener {
-                val bundle = Bundle()
-                bundle.putString("username", item.username)
-                bundle.putString("name", item.name)
-                bundle.putString("profile_picture", item.picture)
-                bundle.putString("friend_status", item.friend_status)
-
-                findNavController().navigate(
-                    R.id.action_navigation_community_to_friendFragment,
-                    bundle
-                )
-            }
-        }
-
-        holder.itemView.apply {
-            setOnLongClickListener {
-                vibrateOnClick(context)
-                val updatedPinnedFriends = pinnedFriendAdapterListener.getPinnedFriends()
-                if (updatedPinnedFriends.contains(item.username)) {
-                    if (pinnedFriendAdapterListener.unPinFriend(item.username)) {
-                        holder.pin.visibility = View.GONE
-                        notifyItemMoved(
-                            holder.adapterPosition,
-                            pinnedFriendAdapterListener.getPinnedFriends().size
-                        )
-                        Timber.d("Pinned Friends: ${pinnedFriendAdapterListener.getPinnedFriends()}")
-                    }
-                } else {
-                    if (pinnedFriendAdapterListener.pinFriend(item.username)) {
-                        holder.pin.visibility = View.VISIBLE
-                        notifyItemMoved(holder.adapterPosition, updatedPinnedFriends.size)
-                        Timber.d("Pinned Friends: ${pinnedFriendAdapterListener.getPinnedFriends()}")
-                    }
-
-                }
-                true
-            }
-        }
-
-
-    }
-
-    override fun getItemCount() = dataSet.size
-
-    private fun pinFriendsOnTop(dataSet: List<UserResponse>): List<UserResponse> {
-        val pinnedFriends = pinnedFriendAdapterListener.getPinnedFriends()
-        val pinnedFriendsList = mutableListOf<UserResponse>()
-        val otherFriendsList = mutableListOf<UserResponse>()
-        for (i in pinnedFriends) {
-            for (j in dataSet) {
-                if (i == j.username) {
-                    pinnedFriendsList.add(j)
-                    continue
-                }
-            }
-        }
-        for (i in dataSet) {
-            if (!pinnedFriends.contains(i.username)) {
-                pinnedFriendsList.add(i)
-            }
-        }
-
-        return pinnedFriendsList + otherFriendsList
-    }
-}
-
-
-interface PinnedFriendAdapterListener {
-    fun pinFriend(username: String): Boolean
-
-    fun unPinFriend(username: String): Boolean
-
-    fun getPinnedFriends(): List<String>
-}
diff --git a/app/src/main/java/com/dscvit/vitty/adapter/PeriodAdapter.kt b/app/src/main/java/com/dscvit/vitty/adapter/PeriodAdapter.kt
index 0e54fee..761e008 100755
--- a/app/src/main/java/com/dscvit/vitty/adapter/PeriodAdapter.kt
+++ b/app/src/main/java/com/dscvit/vitty/adapter/PeriodAdapter.kt
@@ -3,7 +3,6 @@ package com.dscvit.vitty.adapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.dscvit.vitty.R
@@ -18,44 +17,42 @@ import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
-class PeriodAdapter(
-    private val dataSet: ArrayList<PeriodDetails>,
-    private val day: Int,
-) : RecyclerView.Adapter<PeriodAdapter.ViewHolder>() {
+class PeriodAdapter(private val dataSet: ArrayList<PeriodDetails>, private val day: Int) :
+    RecyclerView.Adapter<PeriodAdapter.ViewHolder>() {
+
+    private var previousExpandedPosition = -1
+    private var mExpandedPosition = -1
     private var active = -1
 
-    class ViewHolder(
-        private val binding: CardPeriodBinding,
-    ) : RecyclerView.ViewHolder(binding.root) {
+    class ViewHolder(private val binding: CardPeriodBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        val arrow = binding.arrowMoreInfo
+        val moreInfo = binding.moreInfo
+        val expandedBackground = binding.expandedBackground
         val activePeriod = binding.activePeriod
         val periodTime = binding.periodTime
         val classNav = binding.classNav
         val classIdOnline = binding.classIdOnline
-        val periodCard = binding.periodCard
 
+        //        val courseCode = binding.courseCode
         fun bind(data: PeriodDetails) {
             binding.periodDetails = data
         }
     }
 
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int,
-    ): ViewHolder =
-        ViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(
             DataBindingUtil.inflate(
                 LayoutInflater.from(parent.context),
                 R.layout.card_period,
                 parent,
-                false,
-            ),
+                false
+            )
         )
+    }
 
-    override fun onBindViewHolder(
-        holder: ViewHolder,
-        position: Int,
-    ) {
-        val item = dataSet[holder.adapterPosition]
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = dataSet[position]
         holder.bind(item)
 
         val startTime: Date = item.startTime.toDate()
@@ -88,10 +85,8 @@ class PeriodAdapter(
         }
 
         holder.apply {
-            periodTime.text = "$sTime - $eTime | ${item.slot}"
+            periodTime.text = "$sTime - $eTime"
             activePeriod.visibility = View.INVISIBLE
-            periodCard.strokeWidth = 0
-
             classNav.apply {
                 setOnClickListener {
                     VITMap.openClassMap(classNav.context, item.roomNo)
@@ -101,7 +96,7 @@ class PeriodAdapter(
                         context,
                         "Room Number",
                         "ROOM_NUMBER_ITEM",
-                        item.roomNo,
+                        item.roomNo
                     )
                     true
                 }
@@ -109,26 +104,46 @@ class PeriodAdapter(
         }
 
         if ((((day + 1) % 7) + 1) == now[Calendar.DAY_OF_WEEK]) {
-            if ((start.before(now) && end.after(now)) ||
-                start.equals(now) ||
-                (start.after(now) && active == -1) ||
-                active == holder.adapterPosition
-            ) {
+            if ((start.before(now) && end.after(now)) || start.equals(now) || (start.after(now) && active == -1) || active == position) {
                 holder.activePeriod.visibility = View.VISIBLE
-                holder.periodCard.strokeWidth = 2
-                holder.periodCard.strokeColor = ContextCompat.getColor(holder.itemView.context, R.color.translucent)
-                active = holder.adapterPosition
+                active = position
             }
         }
 
+        val isExpanded = position == mExpandedPosition
+        holder.apply {
+            if (isExpanded) {
+                expandedBackground.visibility = View.VISIBLE
+                moreInfo.visibility = View.VISIBLE
+//                courseCode.visibility = View.VISIBLE
+                arrow.rotation = 180F
+            } else {
+                moreInfo.visibility = View.GONE
+                expandedBackground.visibility = View.GONE
+//                courseCode.visibility = View.GONE
+                arrow.rotation = 0F
+            }
+            itemView.isActivated = isExpanded
+        }
+
+        if (isExpanded) previousExpandedPosition = position
+
         holder.itemView.apply {
             setOnClickListener {
                 vibrateOnClick(holder.itemView.context)
+                mExpandedPosition = if (isExpanded) -1 else position
+                notifyItemChanged(previousExpandedPosition)
+                notifyItemChanged(position)
             }
             setOnLongClickListener {
+                mExpandedPosition = position
+                notifyItemChanged(previousExpandedPosition)
+                notifyItemChanged(position)
                 true
             }
         }
+
+
     }
 
     override fun getItemCount() = dataSet.size
diff --git a/app/src/main/java/com/dscvit/vitty/adapter/SearchAdapter.kt b/app/src/main/java/com/dscvit/vitty/adapter/SearchAdapter.kt
deleted file mode 100644
index 23efe31..0000000
--- a/app/src/main/java/com/dscvit/vitty/adapter/SearchAdapter.kt
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.dscvit.vitty.adapter
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.databinding.DataBindingUtil
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import com.dscvit.vitty.R
-import com.dscvit.vitty.databinding.CardRequestBinding
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.ui.community.CommunityViewModel
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-class SearchAdapter(
-    dataSet: List<UserResponse>,
-    private val token: String,
-    private val communityViewModel: CommunityViewModel,
-    private val isSearchMode: Boolean,
-    private val isAllReqPage: Boolean
-) :
-    RecyclerView.Adapter<SearchAdapter.ViewHolder>() {
-
-    private val mutableDataSet = dataSet.toMutableList()
-
-    class ViewHolder(private val binding: CardRequestBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        val name = binding.name
-        val actionLayout = binding.actionLayout
-        val pendingRequestLayout = binding.acceptRejectLayout
-        val sendRequestLayout = binding.sendRequestLayout
-        val sentLayout = binding.sentLayout
-        val accept = binding.accept
-        val reject = binding.reject
-        val sendRequest = binding.sendRequest
-        val image = binding.icon
-        val username = binding.username
-        fun bind(data: UserResponse) {
-            binding.personDetails = data
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(
-            DataBindingUtil.inflate(
-                LayoutInflater.from(parent.context),
-                R.layout.card_request,
-                parent,
-                false
-            )
-        )
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = mutableDataSet[holder.adapterPosition]
-        holder.bind(item)
-
-        if (isSearchMode) {
-            holder.actionLayout.visibility = View.GONE
-        }
-        when (item.friend_status) {
-            "received" -> {
-                holder.pendingRequestLayout.visibility = View.VISIBLE
-                holder.sendRequestLayout.visibility = View.GONE
-                holder.sentLayout.visibility = View.GONE
-            }
-
-            "sent" -> {
-                holder.pendingRequestLayout.visibility = View.GONE
-                holder.sendRequestLayout.visibility = View.GONE
-                holder.sentLayout.visibility = View.VISIBLE
-            }
-
-            else -> {
-                holder.pendingRequestLayout.visibility = View.GONE
-                holder.sendRequestLayout.visibility = View.VISIBLE
-                holder.sentLayout.visibility = View.GONE
-            }
-        }
-
-        holder.image.load(item.picture) {
-            crossfade(true)
-            placeholder(R.drawable.ic_gdscvit)
-            error(R.drawable.ic_gdscvit)
-        }
-
-
-        holder.accept.apply {
-            setOnClickListener {
-                communityViewModel.acceptRequest(token, item.username)
-                mutableDataSet.removeAt(holder.adapterPosition)
-                notifyItemRemoved(holder.adapterPosition)
-                notifyItemRangeChanged(holder.adapterPosition, mutableDataSet.size)
-            }
-        }
-
-        holder.reject.apply {
-            setOnClickListener {
-
-                val v: View = LayoutInflater
-                    .from(context)
-                    .inflate(R.layout.dialog_setup_complete, null)
-                val dialog = MaterialAlertDialogBuilder(context)
-                    .setView(v)
-                    .setBackground(
-                        AppCompatResources.getDrawable(
-                            context,
-                            R.color.transparent
-                        )
-                    )
-                    .create()
-                dialog.setCanceledOnTouchOutside(true)
-                dialog.show()
-
-                val skip = v.findViewById<Button>(R.id.skip)
-                val next = v.findViewById<Button>(R.id.next)
-                val title = v.findViewById<TextView>(R.id.title)
-                val desc = v.findViewById<TextView>(R.id.description)
-
-                title.text = "Reject Request"
-                desc.text = "Are you sure you want to reject this request?"
-                skip.text = "Cancel"
-                next.text = "Reject"
-
-                skip.setOnClickListener {
-                    dialog.dismiss()
-                }
-
-                next.setOnClickListener {
-                    communityViewModel.rejectRequest(token, item.username)
-                    mutableDataSet.removeAt(holder.adapterPosition)
-                    notifyItemRemoved(holder.adapterPosition)
-                    notifyItemRangeChanged(holder.adapterPosition, mutableDataSet.size)
-                    dialog.dismiss()
-                }
-
-            }
-        }
-
-        holder.sendRequest.apply {
-            setOnClickListener {
-                holder.sendRequestLayout.visibility = View.GONE
-                holder.sentLayout.visibility = View.VISIBLE
-                communityViewModel.sendRequest(token, item.username)
-            }
-        }
-
-
-
-        holder.itemView.apply {
-            setOnClickListener {
-                val bundle = Bundle()
-                bundle.putString("username", item.username)
-                bundle.putString("name", item.name)
-                bundle.putString("profile_picture", item.picture)
-                bundle.putString("friend_status", item.friend_status)
-
-                if (isSearchMode) {
-                    findNavController().navigate(
-                        R.id.action_searchFragment_to_friendFragment,
-                        bundle
-                    )
-                } else if (isAllReqPage) {
-                    findNavController().navigate(
-                        R.id.action_allRequestFragment_to_friendFragment,
-                        bundle
-                    )
-                } else {
-                    findNavController().navigate(
-                        R.id.action_navigation_requests_to_friendFragment,
-                        bundle
-                    )
-                }
-            }
-
-        }
-
-
-    }
-
-    override fun getItemCount() = mutableDataSet.size
-
-}
-
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/events/APIEvents.kt b/app/src/main/java/com/dscvit/vitty/api/APIEvents.kt
similarity index 88%
rename from app/src/main/java/com/dscvit/vitty/network/api/events/APIEvents.kt
rename to app/src/main/java/com/dscvit/vitty/api/APIEvents.kt
index 68b4834..3f02fdc 100644
--- a/app/src/main/java/com/dscvit/vitty/network/api/events/APIEvents.kt
+++ b/app/src/main/java/com/dscvit/vitty/api/APIEvents.kt
@@ -1,10 +1,8 @@
-package com.dscvit.vitty.network.api.events
-
+package com.dscvit.vitty.api
 import com.dscvit.vitty.model.EventDetails
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.QueryMap
-
 /**
  * API for getting User list from https://reqres.in/api/users?&page=1
  */
@@ -12,6 +10,4 @@ interface APIEvents {
     // https://reqres.in/api/users?page=1
     @GET("event?")
     fun getEvents(@QueryMap options: Map<String, String>): Call<EventDetails>
-
-
 }
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/events/ApiEventRestClient.kt b/app/src/main/java/com/dscvit/vitty/api/ApiEventRestClient.kt
similarity index 96%
rename from app/src/main/java/com/dscvit/vitty/network/api/events/ApiEventRestClient.kt
rename to app/src/main/java/com/dscvit/vitty/api/ApiEventRestClient.kt
index efc1cde..08b7b00 100644
--- a/app/src/main/java/com/dscvit/vitty/network/api/events/ApiEventRestClient.kt
+++ b/app/src/main/java/com/dscvit/vitty/api/ApiEventRestClient.kt
@@ -1,4 +1,4 @@
-package com.dscvit.vitty.network.api.events
+package com.dscvit.vitty.api
 
 import com.dscvit.vitty.model.EventDetails
 import retrofit2.Call
@@ -33,7 +33,6 @@ class ApiEventRestClient {
                     retrofitEventListener.onSuccess(call, response.body())
                 }
             }
-
             override fun onFailure(call: Call<EventDetails>, t: Throwable) {
                 retrofitEventListener.onError(call, t)
             }
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/events/NetworkClient.kt b/app/src/main/java/com/dscvit/vitty/api/NetworkClient.kt
similarity index 73%
rename from app/src/main/java/com/dscvit/vitty/network/api/events/NetworkClient.kt
rename to app/src/main/java/com/dscvit/vitty/api/NetworkClient.kt
index d601c73..89f6a22 100644
--- a/app/src/main/java/com/dscvit/vitty/network/api/events/NetworkClient.kt
+++ b/app/src/main/java/com/dscvit/vitty/api/NetworkClient.kt
@@ -1,7 +1,7 @@
-package com.dscvit.vitty.network.api.events
+package com.dscvit.vitty.api
 
-import com.dscvit.vitty.util.WebConstants.COMMUNITY_BASE_URL
-import com.dscvit.vitty.util.WebConstants.TIMEOUT
+import com.dscvit.vitty.util.APIConstants.BASE_URL
+import com.dscvit.vitty.util.APIConstants.TIMEOUT
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit
 
 object NetworkClient {
 
-    private var retrofit: Retrofit? = null
+    var retrofit: Retrofit? = null
 
     val retrofitClient: Retrofit
         get() {
@@ -17,7 +17,7 @@ object NetworkClient {
                 val okHttpClientBuilder = OkHttpClient.Builder()
                 okHttpClientBuilder.connectTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
                 retrofit = Retrofit.Builder()
-                    .baseUrl(COMMUNITY_BASE_URL)
+                    .baseUrl(BASE_URL)
                     .addConverterFactory(GsonConverterFactory.create())
                     .client(okHttpClientBuilder.build())
                     .build()
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/events/RetrofitEventListener.kt b/app/src/main/java/com/dscvit/vitty/api/RetrofitEventListener.kt
similarity index 83%
rename from app/src/main/java/com/dscvit/vitty/network/api/events/RetrofitEventListener.kt
rename to app/src/main/java/com/dscvit/vitty/api/RetrofitEventListener.kt
index a2935a4..cb76aec 100644
--- a/app/src/main/java/com/dscvit/vitty/network/api/events/RetrofitEventListener.kt
+++ b/app/src/main/java/com/dscvit/vitty/api/RetrofitEventListener.kt
@@ -1,4 +1,4 @@
-package com.dscvit.vitty.network.api.events
+package com.dscvit.vitty.api
 
 import com.dscvit.vitty.model.EventDetails
 import retrofit2.Call
@@ -7,4 +7,3 @@ interface RetrofitEventListener {
     fun onSuccess(call: Call<EventDetails>?, response: EventDetails?)
     fun onError(call: Call<EventDetails>?, t: Throwable?)
 }
-
diff --git a/app/src/main/java/com/dscvit/vitty/data/converter/Converters.kt b/app/src/main/java/com/dscvit/vitty/data/converter/Converters.kt
deleted file mode 100644
index 715e212..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/converter/Converters.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dscvit.vitty.data.converter
-
-import androidx.room.TypeConverter
-import com.dscvit.vitty.ui.coursepage.models.NoteType
-
-class Converters {
-    @TypeConverter
-    fun fromNoteType(noteType: NoteType): String = noteType.name
-
-    @TypeConverter
-    fun toNoteType(noteType: String): NoteType = NoteType.valueOf(noteType)
-}
diff --git a/app/src/main/java/com/dscvit/vitty/data/dao/NoteDao.kt b/app/src/main/java/com/dscvit/vitty/data/dao/NoteDao.kt
deleted file mode 100644
index c224ce5..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/dao/NoteDao.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dscvit.vitty.data.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Update
-import com.dscvit.vitty.data.entity.NoteEntity
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface NoteDao {
-    @Query("SELECT * FROM notes WHERE courseId = :courseId ORDER BY createdAt DESC")
-    fun getNotesByCourse(courseId: String): Flow<List<NoteEntity>>
-
-    @Query("SELECT * FROM notes WHERE courseId = :courseId AND isStarred = 1 ORDER BY createdAt DESC")
-    fun getStarredNotesByCourse(courseId: String): Flow<List<NoteEntity>>
-
-    @Query("SELECT * FROM notes WHERE id = :noteId")
-    suspend fun getNoteById(noteId: Long): NoteEntity?
-
-    @Insert
-    suspend fun insertNote(note: NoteEntity): Long
-
-    @Update
-    suspend fun updateNote(note: NoteEntity)
-
-    @Delete
-    suspend fun deleteNote(note: NoteEntity)
-
-    @Query("DELETE FROM notes WHERE courseId = :courseId")
-    suspend fun deleteNotesByCourse(courseId: String)
-
-    @Query("UPDATE notes SET isStarred = :isStarred WHERE id = :noteId")
-    suspend fun updateStarredStatus(
-        noteId: Long,
-        isStarred: Boolean,
-    )
-
-    @Query(
-        "SELECT * FROM notes WHERE courseId = :courseId AND (title LIKE '%' || :query || '%' OR content LIKE '%' || :query || '%') ORDER BY createdAt DESC",
-    )
-    fun searchNotes(
-        courseId: String,
-        query: String,
-    ): Flow<List<NoteEntity>>
-}
diff --git a/app/src/main/java/com/dscvit/vitty/data/dao/ReminderDao.kt b/app/src/main/java/com/dscvit/vitty/data/dao/ReminderDao.kt
deleted file mode 100644
index 2a5fe0d..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/dao/ReminderDao.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dscvit.vitty.data.dao
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Update
-import com.dscvit.vitty.data.entity.ReminderEntity
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface ReminderDao {
-    @Query("SELECT * FROM reminders WHERE courseId = :courseId ORDER BY dateMillis ASC")
-    fun getRemindersByCourse(courseId: String): Flow<List<ReminderEntity>>
-
-    @Query("SELECT * FROM reminders ORDER BY dateMillis ASC")
-    fun getAllReminders(): Flow<List<ReminderEntity>>
-
-    @Query("SELECT * FROM reminders WHERE id = :id")
-    suspend fun getReminderById(id: Long): ReminderEntity?
-
-    @Query("SELECT * FROM reminders WHERE dateMillis >= :startTime AND dateMillis <= :endTime AND isCompleted = 0")
-    suspend fun getRemindersInRange(
-        startTime: Long,
-        endTime: Long,
-    ): List<ReminderEntity>
-
-    @Insert
-    suspend fun insertReminder(reminder: ReminderEntity): Long
-
-    @Update
-    suspend fun updateReminder(reminder: ReminderEntity)
-
-    @Delete
-    suspend fun deleteReminder(reminder: ReminderEntity)
-
-    @Query("DELETE FROM reminders WHERE courseId = :courseId")
-    suspend fun deleteRemindersByCourse(courseId: String)
-
-    @Query("UPDATE reminders SET isCompleted = :isCompleted WHERE id = :id")
-    suspend fun updateCompletedStatus(
-        id: Long,
-        isCompleted: Boolean,
-    )
-
-    @Query("SELECT * FROM reminders WHERE isCompleted = 0 ORDER BY dateMillis ASC")
-    suspend fun getAllPendingReminders(): List<ReminderEntity>
-}
diff --git a/app/src/main/java/com/dscvit/vitty/data/database/VittyDatabase.kt b/app/src/main/java/com/dscvit/vitty/data/database/VittyDatabase.kt
deleted file mode 100644
index 1a5f3d2..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/database/VittyDatabase.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dscvit.vitty.data.database
-
-import android.content.Context
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import com.dscvit.vitty.data.converter.Converters
-import com.dscvit.vitty.data.dao.NoteDao
-import com.dscvit.vitty.data.dao.ReminderDao
-import com.dscvit.vitty.data.entity.NoteEntity
-import com.dscvit.vitty.data.entity.ReminderEntity
-
-@Database(
-    entities = [NoteEntity::class, ReminderEntity::class],
-    version = 3,
-    exportSchema = false,
-)
-@TypeConverters(Converters::class)
-abstract class VittyDatabase : RoomDatabase() {
-    abstract fun noteDao(): NoteDao
-    abstract fun reminderDao(): ReminderDao
-
-    companion object {
-        @Volatile
-        private var _instance: VittyDatabase? = null
-
-        fun getDatabase(context: Context): VittyDatabase =
-            _instance ?: synchronized(this) {
-                val instance =
-                    Room
-                        .databaseBuilder(
-                            context.applicationContext,
-                            VittyDatabase::class.java,
-                            "vitty_database",
-                        )
-                        .fallbackToDestructiveMigration(true)
-                        .build()
-                _instance = instance
-                instance
-            }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/data/entity/NoteEntity.kt b/app/src/main/java/com/dscvit/vitty/data/entity/NoteEntity.kt
deleted file mode 100644
index aeec5f6..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/entity/NoteEntity.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dscvit.vitty.data.entity
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import com.dscvit.vitty.ui.coursepage.models.NoteType
-
-@Entity(tableName = "notes")
-data class NoteEntity(
-    @PrimaryKey(autoGenerate = true)
-    val id: Long = 0,
-    val courseId: String,
-    val title: String,
-    val content: String,
-    val type: NoteType,
-    val isStarred: Boolean = false,
-    val imagePath: String? = null,
-    val createdAt: Long = System.currentTimeMillis(),
-    val updatedAt: Long = System.currentTimeMillis(),
-)
diff --git a/app/src/main/java/com/dscvit/vitty/data/entity/ReminderEntity.kt b/app/src/main/java/com/dscvit/vitty/data/entity/ReminderEntity.kt
deleted file mode 100644
index 7bd249a..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/entity/ReminderEntity.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dscvit.vitty.data.entity
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "reminders")
-data class ReminderEntity(
-    @PrimaryKey(autoGenerate = true)
-    val id: Long = 0,
-    val courseId: String,
-    val courseTitle: String, 
-    val title: String,
-    val description: String,
-    val dateMillis: Long,
-    val fromTimeHour: Int,
-    val fromTimeMinute: Int,
-    val toTimeHour: Int,
-    val toTimeMinute: Int,
-    val isAllDay: Boolean,
-    val alertDaysBefore: Int, 
-    val attachmentUrl: String? = null,
-    val isCompleted: Boolean = false,
-    val createdAt: Long = System.currentTimeMillis(),
-    val updatedAt: Long = System.currentTimeMillis()
-)
diff --git a/app/src/main/java/com/dscvit/vitty/data/repository/NoteRepository.kt b/app/src/main/java/com/dscvit/vitty/data/repository/NoteRepository.kt
deleted file mode 100644
index 6587176..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/repository/NoteRepository.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.dscvit.vitty.data.repository
-
-import com.dscvit.vitty.data.dao.NoteDao
-import com.dscvit.vitty.data.entity.NoteEntity
-import com.dscvit.vitty.ui.coursepage.models.Note
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-class NoteRepository(
-    private val noteDao: NoteDao,
-) {
-    fun getNotesByCourse(courseId: String): Flow<List<Note>> =
-        noteDao.getNotesByCourse(courseId).map { entities ->
-            entities.map { it.toNote() }
-        }
-
-    suspend fun getNoteById(noteId: Long): Note? = noteDao.getNoteById(noteId)?.toNote()
-
-    suspend fun insertNote(
-        note: Note,
-        courseId: String,
-    ): Long = noteDao.insertNote(note.toEntity(courseId))
-
-    suspend fun updateNote(
-        note: Note,
-        courseId: String,
-        noteId: Long,
-    ) {
-        noteDao.updateNote(note.toEntity(courseId, noteId))
-    }
-
-    suspend fun deleteNote(
-        note: Note,
-        courseId: String,
-        noteId: Long,
-    ) {
-        noteDao.deleteNote(note.toEntity(courseId, noteId))
-    }
-
-    suspend fun updateStarredStatus(
-        noteId: Long,
-        isStarred: Boolean,
-    ) {
-        noteDao.updateStarredStatus(noteId, isStarred)
-    }
-
-    fun searchNotes(
-        courseId: String,
-        query: String,
-    ): Flow<List<Note>> =
-        noteDao.searchNotes(courseId, query).map { entities ->
-            entities.map { it.toNote() }
-        }
-
-    private fun NoteEntity.toNote(): Note =
-        Note(
-            id = id,
-            title = title,
-            content = content,
-            type = type,
-            isStarred = isStarred,
-            imagePath = imagePath,
-        )
-
-    private fun Note.toEntity(
-        courseId: String,
-        id: Long = 0,
-    ): NoteEntity =
-        NoteEntity(
-            id = if (id == 0L) this.id else id,
-            courseId = courseId,
-            title = title,
-            content = content,
-            type = type,
-            isStarred = isStarred,
-            imagePath = imagePath,
-            updatedAt = System.currentTimeMillis(),
-        )
-}
diff --git a/app/src/main/java/com/dscvit/vitty/data/repository/ReminderRepository.kt b/app/src/main/java/com/dscvit/vitty/data/repository/ReminderRepository.kt
deleted file mode 100644
index 2d6beec..0000000
--- a/app/src/main/java/com/dscvit/vitty/data/repository/ReminderRepository.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.dscvit.vitty.data.repository
-
-import com.dscvit.vitty.data.dao.ReminderDao
-import com.dscvit.vitty.data.entity.ReminderEntity
-import com.dscvit.vitty.ui.coursepage.models.Reminder
-import com.dscvit.vitty.ui.coursepage.models.ReminderStatus
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-
-class ReminderRepository(
-    private val reminderDao: ReminderDao,
-) {
-    fun getRemindersByCourse(courseId: String): Flow<List<Reminder>> =
-        reminderDao.getRemindersByCourse(courseId).map { entities ->
-            entities.map { it.toReminder() }
-        }
-
-    fun getAllReminders(): Flow<List<Reminder>> =
-        reminderDao.getAllReminders().map { entities ->
-            entities.map { it.toReminder() }
-        }
-
-    suspend fun insertReminder(
-        reminder: Reminder,
-        courseId: String,
-        courseTitle: String,
-    ): Long = reminderDao.insertReminder(reminder.toEntity(courseId, courseTitle))
-
-    suspend fun deleteReminder(
-        reminder: Reminder,
-        courseId: String,
-        courseTitle: String,
-        id: Long,
-    ) {
-        reminderDao.deleteReminder(reminder.toEntity(courseId, courseTitle, id))
-    }
-
-    suspend fun updateCompletedStatus(
-        id: Long,
-        isCompleted: Boolean,
-    ) {
-        reminderDao.updateCompletedStatus(id, isCompleted)
-    }
-
-    private fun ReminderEntity.toReminder(): Reminder {
-        val calendar = Calendar.getInstance()
-        calendar.timeInMillis = dateMillis
-        val currentTime = System.currentTimeMillis()
-
-        val status =
-            when {
-                isCompleted -> ReminderStatus.COMPLETED
-                dateMillis < currentTime -> ReminderStatus.UPCOMING
-                else -> ReminderStatus.CAN_WAIT
-            }
-
-        val dateFormat = SimpleDateFormat("dd MMM", Locale.getDefault())
-        val fullDateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-
-        return Reminder(
-            id = id,
-            title = title,
-            description = description,
-            dueDate = dateFormat.format(Date(dateMillis)),
-            date = fullDateFormat.format(Date(dateMillis)),
-            status = status,
-            dateMillis = dateMillis,
-            fromTime = if (isAllDay) "" else String.format(Locale.getDefault(), "%02d:%02d", fromTimeHour, fromTimeMinute),
-            toTime = if (isAllDay) "" else String.format(Locale.getDefault(), "%02d:%02d", toTimeHour, toTimeMinute),
-            isAllDay = isAllDay,
-            alertDaysBefore = alertDaysBefore,
-            attachmentUrl = attachmentUrl,
-            courseId = courseId,
-            courseTitle = courseTitle,
-        )
-    }
-
-    private fun Reminder.toEntity(
-        courseId: String,
-        courseTitle: String,
-        id: Long = 0,
-    ): ReminderEntity {
-        val fromTimeParts = fromTime.split(":")
-        val toTimeParts = toTime.split(":")
-
-        return ReminderEntity(
-            id = if (id == 0L) this.id else id,
-            courseId = courseId.ifEmpty { this.courseId },
-            courseTitle = courseTitle.ifEmpty { this.courseTitle },
-            title = title,
-            description = description,
-            dateMillis = dateMillis,
-            fromTimeHour = if (fromTimeParts.size >= 2) fromTimeParts[0].toIntOrNull() ?: 0 else 0,
-            fromTimeMinute = if (fromTimeParts.size >= 2) fromTimeParts[1].toIntOrNull() ?: 0 else 0,
-            toTimeHour = if (toTimeParts.size >= 2) toTimeParts[0].toIntOrNull() ?: 0 else 0,
-            toTimeMinute = if (toTimeParts.size >= 2) toTimeParts[1].toIntOrNull() ?: 0 else 0,
-            isAllDay = isAllDay,
-            alertDaysBefore = alertDaysBefore,
-            attachmentUrl = attachmentUrl,
-            isCompleted = status == ReminderStatus.COMPLETED,
-            updatedAt = System.currentTimeMillis(),
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/APICommunity.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/APICommunity.kt
deleted file mode 100644
index f3a0380..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/APICommunity.kt
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.dscvit.vitty.network.api.community
-
-import com.dscvit.vitty.network.api.community.requests.CampusUpdateRequestBody
-import com.dscvit.vitty.network.api.community.requests.CircleBatchRequestBody
-import com.dscvit.vitty.network.api.community.requests.UsernameRequestBody
-import com.dscvit.vitty.network.api.community.responses.circle.CircleBatchRequestResponse
-import com.dscvit.vitty.network.api.community.responses.circle.CircleRequestsResponse
-import com.dscvit.vitty.network.api.community.responses.circle.CreateCircleRequest
-import com.dscvit.vitty.network.api.community.responses.circle.CreateCircleResponse
-import com.dscvit.vitty.network.api.community.responses.circle.JoinCircleResponse
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse
-import com.dscvit.vitty.network.api.community.responses.user.ActiveFriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.CircleResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.GhostPostResponse
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.network.api.community.responses.user.SignInResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.DELETE
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.Headers
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-interface APICommunity {
-    @GET("/")
-    fun checkServerStatus(): Call<String>
-
-    @Headers("Content-Type: application/json")
-    @POST("/api/v3/auth/check-username")
-    fun checkUsername(
-        @Body body: UsernameRequestBody,
-    ): Call<PostResponse>
-
-    @Headers("Content-Type: application/json")
-    @POST("/api/v3/auth/firebase/")
-    fun signInInfo(
-        @Body body: Any,
-    ): Call<SignInResponse>
-
-    @GET("/api/v3/users/{username}")
-    fun getUser(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<UserResponse>
-
-    @GET("/api/v3/timetable/{username}/")
-    fun getTimeTable(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<TimetableResponse>
-
-    @GET("/api/v3/circles/{circleId}/{username}/")
-    fun getCircleTimeTable(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-        @Path("username") username: String,
-    ): Call<TimetableResponse>
-
-    @GET("/api/v3/friends/{username}/")
-    fun getFriendList(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<FriendResponse>
-
-    @GET("/api/v3/users/search")
-    fun searchUsers(
-        @Header("Authorization") authToken: String,
-        @Query("query") query: String,
-    ): Call<List<UserResponse>>
-
-    @GET("/api/v3/requests/")
-    fun getFriendRequests(
-        @Header("Authorization") authToken: String,
-    ): Call<RequestsResponse>
-
-    @GET("/api/v3/users/suggested/")
-    fun getSuggestedFriends(
-        @Header("Authorization") authToken: String,
-    ): Call<List<UserResponse>>
-
-    @POST("/api/v3/requests/{username}/send")
-    fun sendRequest(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @POST("/api/v3/requests/{username}/accept/")
-    fun acceptRequest(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @POST("/api/v3/requests/{username}/decline/")
-    fun declineRequest(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @DELETE("/api/v3/friends/{username}/")
-    fun deleteFriend(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @Headers("Content-Type: application/json")
-    @PATCH("/api/v3/users/campus")
-    fun updateCampus(
-        @Header("Authorization") authToken: String,
-        @Body campusRequestBody: CampusUpdateRequestBody,
-    ): Call<PostResponse>
-
-    @POST("/api/v3/friends/ghost/{username}")
-    fun enableGhostMode(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<GhostPostResponse>
-
-    @POST("/api/v3/friends/alive/{username}")
-    fun disableGhostMode(
-        @Header("Authorization") authToken: String,
-        @Path("username") username: String,
-    ): Call<GhostPostResponse>
-
-    @GET("/api/v3/circles")
-    fun getCircles(
-        @Header("Authorization") authToken: String,
-    ): Call<CircleResponse>
-
-    @POST("/api/v3/circles/create")
-    fun createCircle(
-        @Header("Authorization") authToken: String,
-        @Body requestBody: CreateCircleRequest //
-    ): Call<CreateCircleResponse>
-
-    @POST("/api/v3/circles/join")
-    fun joinCircleByCode(
-        @Header("Authorization") authToken: String,
-        @Query("code") joinCode: String,
-    ): Call<JoinCircleResponse>
-
-    @GET("/api/v3/circles/{circleId}")
-    fun getCircleDetails(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-    ): Call<FriendResponse>
-
-    @POST("/api/v3/circles/sendRequest/{circleId}/{username}")
-    fun sendCircleRequest(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @Headers("Content-Type: application/json")
-    @POST("/api/v3/circles/sendRequest/{circleId}")
-    fun sendBatchCircleRequest(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-        @Body body: CircleBatchRequestBody,
-    ): Call<CircleBatchRequestResponse>
-
-    @GET("/api/v3/circles/requests/received")
-    fun getReceivedCircleRequests(
-        @Header("Authorization") authToken: String,
-    ): Call<CircleRequestsResponse>
-
-    @GET("/api/v3/circles/requests/sent")
-    fun getSentCircleRequests(
-        @Header("Authorization") authToken: String,
-    ): Call<CircleRequestsResponse>
-
-    @DELETE("/api/v3/circles/{circleId}")
-    fun deleteCircle(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-    ): Call<PostResponse>
-
-    @DELETE("/api/v3/circles/leave/{circleId}")
-    fun leaveCircle(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-    ): Call<PostResponse>
-
-    @POST("/api/v3/circles/acceptRequest/{circleId}")
-    fun acceptCircleRequest(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-    ): Call<PostResponse>
-
-    @POST("/api/v3/circles/declineRequest/{circleId}")
-    fun declineCircleRequest(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-    ): Call<PostResponse>
-
-    @DELETE("/api/v3/circles/unsendRequest/{circleId}/{username}")
-    fun unsendCircleRequest(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @DELETE("/api/v3/circles/remove/{circleId}/{username}")
-    fun removeUserFromCircle(
-        @Header("Authorization") authToken: String,
-        @Path("circleId") circleId: String,
-        @Path("username") username: String,
-    ): Call<PostResponse>
-
-    @GET("/api/v3/timetable/emptyClassRooms")
-    fun getEmptyClassrooms(
-        @Header("Authorization") authToken: String,
-        @Query("slot") slot: String,
-    ): Call<Map<String, List<String>>>
-
-    @GET(value = "/api/v3/friends/active")
-    fun getActiveFriends(
-        @Header("Authorization") authToken: String,
-    ): Call<ActiveFriendResponse>
-}
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/APICommunityRestClient.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/APICommunityRestClient.kt
deleted file mode 100644
index 5ef302a..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/APICommunityRestClient.kt
+++ /dev/null
@@ -1,1079 +0,0 @@
-package com.dscvit.vitty.network.api.community
-
-import com.dscvit.vitty.network.api.community.requests.AuthRequestBodyWithCampus
-import com.dscvit.vitty.network.api.community.requests.AuthRequestBodyWithoutCampus
-import com.dscvit.vitty.network.api.community.requests.CampusUpdateRequestBody
-import com.dscvit.vitty.network.api.community.requests.CircleBatchRequestBody
-import com.dscvit.vitty.network.api.community.requests.UsernameRequestBody
-import com.dscvit.vitty.network.api.community.responses.circle.CircleBatchRequestResponse
-import com.dscvit.vitty.network.api.community.responses.circle.CircleRequestsResponse
-import com.dscvit.vitty.network.api.community.responses.circle.CreateCircleRequest
-import com.dscvit.vitty.network.api.community.responses.circle.CreateCircleResponse
-import com.dscvit.vitty.network.api.community.responses.circle.JoinCircleResponse
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse
-import com.dscvit.vitty.network.api.community.responses.user.ActiveFriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.CircleResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.GhostPostResponse
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.network.api.community.responses.user.SignInResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.google.gson.Gson
-import com.google.gson.JsonSyntaxException
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import timber.log.Timber
-
-class APICommunityRestClient {
-    companion object {
-        val instance = APICommunityRestClient()
-    }
-
-    private var mApiUser: APICommunity? = null
-    private val retrofit = CommunityNetworkClient.retrofitClientCommunity
-
-    fun signInWithUsernameRegNo(
-        username: String,
-        regno: String,
-        uuid: String,
-        campus: String,
-        retrofitCommunitySignInListener: RetrofitCommunitySignInListener,
-        retrofitSelfUserListener: RetrofitSelfUserListener,
-    ) {
-        mApiUser = retrofit.create(APICommunity::class.java)
-
-        val requestBody =
-            if (campus != "") {
-                AuthRequestBodyWithCampus(
-                    reg_no = regno,
-                    username = username,
-                    uuid = uuid,
-                    campus = campus,
-                )
-            } else {
-                AuthRequestBodyWithoutCampus(
-                    reg_no = regno,
-                    username = username,
-                    uuid = uuid,
-                )
-            }
-
-        val apiSignInCall = mApiUser!!.signInInfo(requestBody)
-
-        apiSignInCall.enqueue(
-            object : Callback<SignInResponse> {
-                override fun onResponse(
-                    call: Call<SignInResponse>,
-                    response: Response<SignInResponse>,
-                ) {
-                    retrofitCommunitySignInListener.onSuccess(call, response.body())
-                    val token = response.body()?.token.toString()
-                    val res_username = response.body()?.username.toString()
-
-                    getUserWithTimeTable(token, res_username, retrofitSelfUserListener)
-                }
-
-                override fun onFailure(
-                    call: Call<SignInResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitCommunitySignInListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getUserWithTimeTable(
-        token: String,
-        username: String,
-        retrofitSelfUserListener: RetrofitSelfUserListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiUserCall = mApiUser!!.getUser(bearerToken, username)
-        apiUserCall.enqueue(
-            object : Callback<UserResponse> {
-                override fun onResponse(
-                    call: Call<UserResponse>,
-                    response: Response<UserResponse>,
-                ) {
-                    Timber.d("UserResponse: $response")
-                    retrofitSelfUserListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<UserResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.e("Error fetching user with timetable: ${t.message}")
-                    retrofitSelfUserListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getTimeTable(
-        token: String,
-        username: String,
-        retrofitTimeTableListener: RetrofitTimetableListener,
-    ) {
-        val token = "Bearer $token"
-
-        mApiUser = retrofit.create(APICommunity::class.java)
-        val apiTimetableCall = mApiUser!!.getTimeTable(token, username)
-        apiTimetableCall.enqueue(
-            object : Callback<TimetableResponse> {
-                override fun onResponse(
-                    call: Call<TimetableResponse>,
-                    response: Response<TimetableResponse>,
-                ) {
-                    retrofitTimeTableListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<TimetableResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitTimeTableListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getCircleTimeTable(
-        token: String,
-        circleId: String,
-        username: String,
-        retrofitTimeTableListener: RetrofitTimetableListener,
-    ) {
-        val token = "Bearer $token"
-
-        mApiUser = retrofit.create(APICommunity::class.java)
-        val apiCircleTimetableCall = mApiUser!!.getCircleTimeTable(token, circleId, username)
-        apiCircleTimetableCall.enqueue(
-            object : Callback<TimetableResponse> {
-                override fun onResponse(
-                    call: Call<TimetableResponse>,
-                    response: Response<TimetableResponse>,
-                ) {
-                    retrofitTimeTableListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<TimetableResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitTimeTableListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getFriendList(
-        token: String,
-        username: String,
-        retrofitFriendListListener: RetrofitFriendListListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiFriendListCall = mApiUser!!.getFriendList(bearerToken, username)
-        apiFriendListCall.enqueue(
-            object : Callback<FriendResponse> {
-                override fun onResponse(
-                    call: Call<FriendResponse>,
-                    response: Response<FriendResponse>,
-                ) {
-                    Timber.d("FriendListResponse: ${response.body()}")
-                    retrofitFriendListListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<FriendResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitFriendListListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getCircles(
-        token: String,
-        retrofitCircleListener: RetrofitCircleListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiCirclesCall = mApiUser!!.getCircles(bearerToken)
-        apiCirclesCall.enqueue(
-            object : Callback<CircleResponse> {
-                override fun onResponse(
-                    call: Call<CircleResponse>,
-                    response: Response<CircleResponse>,
-                ) {
-                    retrofitCircleListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<CircleResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitCircleListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun createCircle(
-        token: String,
-        circleName: String,
-        retrofitCreateCircleListener: RetrofitCreateCircleListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        Timber.d("APICommunityRestClient.createCircle called with circleName: $circleName")
-        val requestBody = CreateCircleRequest(circleName = circleName)
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiCreateCircleCall = mApiUser!!.createCircle(bearerToken, requestBody)
-        Timber.d("API call created with request body, enqueueing request...")
-
-
-        apiCreateCircleCall.enqueue(
-            object : Callback<CreateCircleResponse> {
-                override fun onResponse(
-                    call: Call<CreateCircleResponse>,
-                    response: Response<CreateCircleResponse>,
-                ) {
-                    Timber.d("API Response received: ${response.code()}, body: ${response.body()}")
-                    if (response.isSuccessful) {
-                        retrofitCreateCircleListener.onSuccess(call, response.body())
-                    } else {
-                        val errorBody = response.errorBody()?.string()
-                        Timber.e("API Error: ${response.code()} - $errorBody")
-                        retrofitCreateCircleListener.onError(call, Throwable("API Error: ${response.code()} - ${errorBody ?: "Unknown error"}"))
-                    }
-                }
-
-                override fun onFailure(
-                    call: Call<CreateCircleResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.e("API Call failed: ${t.message}")
-                    retrofitCreateCircleListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun joinCircleByCode(
-        token: String,
-        joinCode: String,
-        retrofitJoinCircleListener: RetrofitJoinCircleListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        Timber.d("APICommunityRestClient.joinCircleByCode called with joinCode: $joinCode")
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiJoinCircleCall = mApiUser!!.joinCircleByCode(bearerToken, joinCode)
-
-        Timber.d("Join circle API call created, enqueueing request...")
-
-        apiJoinCircleCall.enqueue(
-            object : Callback<JoinCircleResponse> {
-                override fun onResponse(
-                    call: Call<JoinCircleResponse>,
-                    response: Response<JoinCircleResponse>,
-                ) {
-                    Timber.d("Join Circle API Response received: ${response.code()}, body: ${response.body()}")
-                    if (response.isSuccessful) {
-                        retrofitJoinCircleListener.onSuccess(call, response.body())
-                    } else {
-                        // Handle error responses (400, 409, 500)
-                        val errorMessage =
-                            when (response.code()) {
-                                400 -> "Invalid join code"
-                                409 -> "You are already part of the circle"
-                                500 -> "Failed to join circle"
-                                else -> "Unknown error occurred"
-                            }
-                        Timber.e("Join Circle API Error: ${response.code()} - $errorMessage")
-                        retrofitJoinCircleListener.onError(call, Throwable(errorMessage))
-                    }
-                }
-
-                override fun onFailure(
-                    call: Call<JoinCircleResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.e("Join Circle API Call failed: ${t.message}")
-                    retrofitJoinCircleListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getCircleDetails(
-        token: String,
-        circleId: String,
-        retrofitFriendListListener: RetrofitFriendListListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiCircleDetailsCall = mApiUser!!.getCircleDetails(bearerToken, circleId)
-        apiCircleDetailsCall.enqueue(
-            object : Callback<FriendResponse> {
-                override fun onResponse(
-                    call: Call<FriendResponse>,
-                    response: Response<FriendResponse>,
-                ) {
-                    retrofitFriendListListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<FriendResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitFriendListListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getSearchResult(
-        token: String,
-        query: String,
-        retrofitSearchResultListener: RetrofitSearchResultListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiSearchResultCall = mApiUser!!.searchUsers(bearerToken, query)
-        apiSearchResultCall.enqueue(
-            object : Callback<List<UserResponse>> {
-                override fun onResponse(
-                    call: Call<List<UserResponse>>,
-                    response: Response<List<UserResponse>>,
-                ) {
-                    Timber.d("SearchResult4: $response")
-                    retrofitSearchResultListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<List<UserResponse>>,
-                    t: Throwable,
-                ) {
-                    retrofitSearchResultListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getSuggestedFriends(
-        token: String,
-        retrofitSearchResultListener: RetrofitSearchResultListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiSuggestedResultCall = mApiUser!!.getSuggestedFriends(bearerToken)
-        apiSuggestedResultCall.enqueue(
-            object : Callback<List<UserResponse>> {
-                override fun onResponse(
-                    call: Call<List<UserResponse>>,
-                    response: Response<List<UserResponse>>,
-                ) {
-                    Timber.d("SearchResult4: $response")
-                    Timber.d("Response Code: ${response.code()}")
-                    Timber.d("Response Headers: ${response.headers()}")
-                    Timber.d("Response Body: ${response.body()}")
-                    Timber.d("Response Raw: ${response.raw()}")
-                    Timber.d("Response isSuccessful: ${response.isSuccessful}")
-
-                    if (response.isSuccessful) {
-                        val body = response.body()
-                        if (body != null) {
-                            Timber.d("Suggested Friends Count: ${body.size}")
-                            retrofitSearchResultListener.onSuccess(call, body)
-                        } else {
-                            Timber.d("Response body is null, treating as empty list")
-                            retrofitSearchResultListener.onSuccess(call, emptyList())
-                        }
-                    } else {
-                        Timber.d("Response not successful: ${response.code()}")
-                        retrofitSearchResultListener.onError(call, Exception("HTTP ${response.code()}"))
-                    }
-                }
-
-                override fun onFailure(
-                    call: Call<List<UserResponse>>,
-                    t: Throwable,
-                ) {
-                    Timber.d("API Call Failed: ${t.message}")
-                    retrofitSearchResultListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getFriendRequest(
-        token: String,
-        retrofitFriendRequestListener: RetrofitFriendRequestListener,
-    ) {
-        val bearerToken = "Bearer $token"
-        Timber.d("FriendReqToken--: $bearerToken")
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiFriendRequestCall = mApiUser!!.getFriendRequests(bearerToken)
-        apiFriendRequestCall.enqueue(
-            object : Callback<RequestsResponse> {
-                override fun onResponse(
-                    call: Call<RequestsResponse>,
-                    response: Response<RequestsResponse>,
-                ) {
-                    Timber.d("FriendRequest--: $response")
-                    retrofitFriendRequestListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<RequestsResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("FriendRequestError--: ${t.message}")
-                    retrofitFriendRequestListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun acceptRequest(
-        token: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiAcceptRequestCall = mApiUser!!.acceptRequest(bearerToken, username)
-        apiAcceptRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun rejectRequest(
-        token: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiRejectRequestCall = mApiUser!!.declineRequest(bearerToken, username)
-        apiRejectRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun sendRequest(
-        token: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiSendRequestCall = mApiUser!!.sendRequest(bearerToken, username)
-        apiSendRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun unfriend(
-        token: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiUnfriendCall = mApiUser!!.deleteFriend(bearerToken, username)
-        apiUnfriendCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun sendCircleRequest(
-        token: String,
-        circleId: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create(APICommunity::class.java)
-        val apiSendCircleRequestCall = mApiUser!!.sendCircleRequest(bearerToken, circleId, username)
-        apiSendCircleRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("SendCircleResponse: $response")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun sendBatchCircleRequest(
-        token: String,
-        circleId: String,
-        usernames: List<String>,
-        callback: (CircleBatchRequestResponse?) -> Unit,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create(APICommunity::class.java)
-        val requestBody = CircleBatchRequestBody(usernames)
-        val apiSendBatchCircleRequestCall = mApiUser!!.sendBatchCircleRequest(bearerToken, circleId, requestBody)
-        apiSendBatchCircleRequestCall.enqueue(
-            object : Callback<CircleBatchRequestResponse> {
-                override fun onResponse(
-                    call: Call<CircleBatchRequestResponse>,
-                    response: Response<CircleBatchRequestResponse>,
-                ) {
-                    Timber.d("SendBatchCircleResponse: $response")
-                    callback(response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<CircleBatchRequestResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("SendBatchCircleRequestError: ${t.message}")
-                    callback(null)
-                }
-            },
-        )
-    }
-
-    fun checkUsername(
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val usernameRequestBody = UsernameRequestBody(username)
-        val apiCheckUsernameCall = mApiUser!!.checkUsername(usernameRequestBody)
-        apiCheckUsernameCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    if (response.isSuccessful) {
-                        retrofitUserActionListener.onSuccess(call, response.body())
-                    } else {
-                        val gson = Gson()
-                        val errorString = response.errorBody()?.string()
-                        Timber.d("ResponseV: $errorString")
-                        try {
-                            val errorResponse = gson.fromJson(errorString, PostResponse::class.java)
-                            retrofitUserActionListener.onSuccess(call, errorResponse)
-                        } catch (e: JsonSyntaxException) {
-                            // Handle any JSON parsing errors.
-                            val errorMessage = "Username is not valid/available."
-                            retrofitUserActionListener.onSuccess(call, PostResponse(errorMessage))
-                        }
-                    }
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("ErrorV: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun enableGhostMode(
-        token: String,
-        username: String,
-        retrofitUserActionListener: RetrofitGhostActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiGhostModeCall = mApiUser!!.enableGhostMode(bearerToken, username)
-        apiGhostModeCall.enqueue(
-            object : Callback<GhostPostResponse> {
-                override fun onResponse(
-                    call: Call<GhostPostResponse>,
-                    response: Response<GhostPostResponse>,
-                ) {
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<GhostPostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun disableGhostMode(
-        token: String,
-        username: String,
-        retrofitUserActionListener: RetrofitGhostActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiGhostModeCall = mApiUser!!.disableGhostMode(bearerToken, username)
-        apiGhostModeCall.enqueue(
-            object : Callback<GhostPostResponse> {
-                override fun onResponse(
-                    call: Call<GhostPostResponse>,
-                    response: Response<GhostPostResponse>,
-                ) {
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<GhostPostResponse>,
-                    t: Throwable,
-                ) {
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getReceivedCircleRequests(
-        token: String,
-        retrofitCircleRequestListener: RetrofitCircleRequestListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiReceivedCircleRequestsCall = mApiUser!!.getReceivedCircleRequests(bearerToken)
-        apiReceivedCircleRequestsCall.enqueue(
-            object : Callback<CircleRequestsResponse> {
-                override fun onResponse(
-                    call: Call<CircleRequestsResponse>,
-                    response: Response<CircleRequestsResponse>,
-                ) {
-                    Timber.d("ReceivedCircleRequests: ${response.body()}")
-                    retrofitCircleRequestListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<CircleRequestsResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("ReceivedCircleRequestsError: ${t.message}")
-                    retrofitCircleRequestListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getSentCircleRequests(
-        token: String,
-        retrofitCircleRequestListener: RetrofitCircleRequestListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiSentCircleRequestsCall = mApiUser!!.getSentCircleRequests(bearerToken)
-        apiSentCircleRequestsCall.enqueue(
-            object : Callback<CircleRequestsResponse> {
-                override fun onResponse(
-                    call: Call<CircleRequestsResponse>,
-                    response: Response<CircleRequestsResponse>,
-                ) {
-                    Timber.d("SentCircleRequests: ${response.body()}")
-                    retrofitCircleRequestListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<CircleRequestsResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("SentCircleRequestsError: ${t.message}")
-                    retrofitCircleRequestListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun deleteCircle(
-        token: String,
-        circleId: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiDeleteCircleCall = mApiUser!!.deleteCircle(bearerToken, circleId)
-        apiDeleteCircleCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("DeleteCircle: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("DeleteCircleError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun leaveCircle(
-        token: String,
-        circleId: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiLeaveCircleCall = mApiUser!!.leaveCircle(bearerToken, circleId)
-        apiLeaveCircleCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("LeaveCircle: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("LeaveCircleError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun acceptCircleRequest(
-        token: String,
-        circleId: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiAcceptCircleRequestCall = mApiUser!!.acceptCircleRequest(bearerToken, circleId)
-        apiAcceptCircleRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("AcceptCircleRequest: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("AcceptCircleRequestError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun declineCircleRequest(
-        token: String,
-        circleId: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiDeclineCircleRequestCall = mApiUser!!.declineCircleRequest(bearerToken, circleId)
-        apiDeclineCircleRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("DeclineCircleRequest: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("DeclineCircleRequestError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun unsendCircleRequest(
-        token: String,
-        circleId: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiUnsendCircleRequestCall = mApiUser!!.unsendCircleRequest(bearerToken, circleId, username)
-        apiUnsendCircleRequestCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("UnsendCircleRequest: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("UnsendCircleRequestError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getEmptyClassrooms(
-        token: String,
-        slot: String,
-        callback: (Map<String, List<String>>?) -> Unit,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiEmptyClassroomsCall = mApiUser!!.getEmptyClassrooms(bearerToken, slot)
-        apiEmptyClassroomsCall.enqueue(
-            object : Callback<Map<String, List<String>>> {
-                override fun onResponse(
-                    call: Call<Map<String, List<String>>>,
-                    response: Response<Map<String, List<String>>>,
-                ) {
-                    Timber.d("EmptyClassrooms: ${response.body()}")
-                    callback(response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<Map<String, List<String>>>,
-                    t: Throwable,
-                ) {
-                    Timber.d("EmptyClassroomsError: ${t.message}")
-                    callback(null)
-                }
-            },
-        )
-    }
-
-    fun removeUserFromCircle(
-        token: String,
-        circleId: String,
-        username: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiRemoveUserCall = mApiUser!!.removeUserFromCircle(bearerToken, circleId, username)
-        apiRemoveUserCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("RemoveUserFromCircle: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("RemoveUserFromCircleError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun updateCampus(
-        token: String,
-        campus: String,
-        retrofitUserActionListener: RetrofitUserActionListener,
-    ) {
-        val bearerToken = "Bearer $token"
-
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val requestBody = CampusUpdateRequestBody(campus)
-        val apiUpdateCampusCall = mApiUser!!.updateCampus(bearerToken, requestBody)
-        apiUpdateCampusCall.enqueue(
-            object : Callback<PostResponse> {
-                override fun onResponse(
-                    call: Call<PostResponse>,
-                    response: Response<PostResponse>,
-                ) {
-                    Timber.d("UpdateCampus: ${response.body()}")
-                    retrofitUserActionListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<PostResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("UpdateCampusError: ${t.message}")
-                    retrofitUserActionListener.onError(call, t)
-                }
-            },
-        )
-    }
-
-    fun getActiveFriends(
-        token: String,
-        retrofitActiveFriendsListener: RetrofitActiveFriendsListener,
-    ) {
-        val bearerToken = "Bearer $token"
-        mApiUser = retrofit.create(APICommunity::class.java)
-        val apiActiveFriendsCall = mApiUser!!.getActiveFriends(bearerToken)
-        apiActiveFriendsCall.enqueue(
-            object : Callback<ActiveFriendResponse> {
-                override fun onResponse(
-                    call: Call<ActiveFriendResponse>,
-                    response: Response<ActiveFriendResponse>,
-                ) {
-                    Timber.d("ActiveFriends: ${response.body()}")
-                    retrofitActiveFriendsListener.onSuccess(call, response.body())
-                }
-
-                override fun onFailure(
-                    call: Call<ActiveFriendResponse>,
-                    t: Throwable,
-                ) {
-                    Timber.d("ActiveFriendsError: ${t.message}")
-                    retrofitActiveFriendsListener.onError(call, t)
-                }
-            },
-        )
-    }
-    
-    fun checkServerStatus(
-        retrofitServerStatusListener: RetrofitServerStatusListener,
-    ) {
-        mApiUser = retrofit.create<APICommunity>(APICommunity::class.java)
-        val apiServerStatusCall = mApiUser!!.checkServerStatus()
-        apiServerStatusCall.enqueue(
-            object : Callback<String> {
-                override fun onResponse(
-                    call: Call<String>,
-                    response: Response<String>,
-                ) {
-                    Timber.d("ServerStatus: ${response.body()}")
-                    retrofitServerStatusListener.onSuccess(call, response.body(), response.isSuccessful)
-                }
-
-                override fun onFailure(
-                    call: Call<String>,
-                    t: Throwable,
-                ) {
-                    Timber.d("ServerStatusError: ${t.message}")
-                    retrofitServerStatusListener.onError(call, t)
-                }
-            },
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/CommunityNetworkClient.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/CommunityNetworkClient.kt
deleted file mode 100644
index c9b4f93..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/CommunityNetworkClient.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.dscvit.vitty.network.api.community
-
-import com.dscvit.vitty.util.WebConstants.COMMUNITY_BASE_URL
-import com.dscvit.vitty.util.WebConstants.TIMEOUT
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.util.concurrent.TimeUnit
-
-object CommunityNetworkClient {
-    private var retrofit: Retrofit? = null
-
-    val retrofitClientCommunity: Retrofit
-        get() {
-            if (retrofit == null) {
-                val loggingInterceptor =
-                    HttpLoggingInterceptor().apply {
-                        level = HttpLoggingInterceptor.Level.BODY
-                    }
-
-                val okHttpClient =
-                    OkHttpClient
-                        .Builder()
-                        .addInterceptor(loggingInterceptor)
-                        .connectTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-                        .readTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-                        .writeTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-                        .build()
-
-                retrofit =
-                    Retrofit
-                        .Builder()
-                        .baseUrl(COMMUNITY_BASE_URL)
-                        .addConverterFactory(GsonConverterFactory.create())
-                        .client(okHttpClient)
-                        .build()
-            }
-            return retrofit!!
-        }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/RetrofitCommunityListener.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/RetrofitCommunityListener.kt
deleted file mode 100644
index f178876..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/RetrofitCommunityListener.kt
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.dscvit.vitty.network.api.community
-
-import com.dscvit.vitty.network.api.community.responses.circle.CircleRequestsResponse
-import com.dscvit.vitty.network.api.community.responses.circle.CreateCircleResponse
-import com.dscvit.vitty.network.api.community.responses.circle.JoinCircleResponse
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse
-import com.dscvit.vitty.network.api.community.responses.user.ActiveFriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.CircleResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.GhostPostResponse
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.network.api.community.responses.user.SignInResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import retrofit2.Call
-
-interface RetrofitCommunitySignInListener {
-    fun onSuccess(
-        call: Call<SignInResponse>?,
-        response: SignInResponse?,
-    )
-
-    fun onError(
-        call: Call<SignInResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitSelfUserListener {
-    fun onSuccess(
-        call: Call<UserResponse>?,
-        response: UserResponse?,
-    )
-
-    fun onError(
-        call: Call<UserResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitTimetableListener {
-    fun onSuccess(
-        call: Call<TimetableResponse>?,
-        response: TimetableResponse?,
-    )
-
-    fun onError(
-        call: Call<TimetableResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitFriendListListener {
-    fun onSuccess(
-        call: Call<FriendResponse>?,
-        response: FriendResponse?,
-    )
-
-    fun onError(
-        call: Call<FriendResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitSearchResultListener {
-    fun onSuccess(
-        call: Call<List<UserResponse>>?,
-        response: List<UserResponse>?,
-    )
-
-    fun onError(
-        call: Call<List<UserResponse>>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitFriendRequestListener {
-    fun onSuccess(
-        call: Call<RequestsResponse>?,
-        response: RequestsResponse?,
-    )
-
-    fun onError(
-        call: Call<RequestsResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitCircleRequestListener {
-    fun onSuccess(
-        call: Call<CircleRequestsResponse>?,
-        response: CircleRequestsResponse?,
-    )
-
-    fun onError(
-        call: Call<CircleRequestsResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitUserActionListener {
-    fun onSuccess(
-        call: Call<PostResponse>?,
-        response: PostResponse?,
-    )
-
-    fun onError(
-        call: Call<PostResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitGhostActionListener {
-    fun onSuccess(
-        call: Call<GhostPostResponse>?,
-        response: GhostPostResponse?,
-    )
-
-    fun onError(
-        call: Call<GhostPostResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitCircleListener {
-    fun onSuccess(
-        call: Call<CircleResponse>?,
-        response: CircleResponse?,
-    )
-
-    fun onError(
-        call: Call<CircleResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitCreateCircleListener {
-    fun onSuccess(
-        call: Call<CreateCircleResponse>?,
-        response: CreateCircleResponse?,
-    )
-
-    fun onError(
-        call: Call<CreateCircleResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitJoinCircleListener {
-    fun onSuccess(
-        call: Call<JoinCircleResponse>?,
-        response: JoinCircleResponse?,
-    )
-
-    fun onError(
-        call: Call<JoinCircleResponse>?,
-        t: Throwable?,
-    )
-}
-
-interface RetrofitActiveFriendsListener {
-    fun onSuccess(
-        call: Call<ActiveFriendResponse>,
-        response: ActiveFriendResponse?,
-    )
-
-    fun onError(
-        call: Call<ActiveFriendResponse>,
-        t: Throwable,
-    )
-}
-
-interface RetrofitServerStatusListener {
-    fun onSuccess(
-        call: Call<String>,
-        response: String?,
-        isSuccessful: Boolean
-    )
-    fun onError(
-        call: Call<String>,
-        t: Throwable
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/AuthRequestBody.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/requests/AuthRequestBody.kt
deleted file mode 100644
index d77da1b..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/AuthRequestBody.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dscvit.vitty.network.api.community.requests
-
-data class AuthRequestBodyWithCampus(
-    val reg_no: String,
-    val username: String,
-    val uuid: String,
-    val campus: String,
-)
-
-data class AuthRequestBodyWithoutCampus(
-    val reg_no: String,
-    val username: String,
-    val uuid: String,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/CampusUpdateRequestBody.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/requests/CampusUpdateRequestBody.kt
deleted file mode 100644
index 9b5a24b..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/CampusUpdateRequestBody.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.requests
-
-data class CampusUpdateRequestBody(
-    val campus: String,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/CircleBatchRequestBody.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/requests/CircleBatchRequestBody.kt
deleted file mode 100644
index 6ac5677..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/CircleBatchRequestBody.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.requests
-
-data class CircleBatchRequestBody(
-    val usernames: List<String>,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/UsernameRequestBody.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/requests/UsernameRequestBody.kt
deleted file mode 100644
index 87d6d40..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/requests/UsernameRequestBody.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.requests
-
-data class UsernameRequestBody(
-    val username: String,
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleBatchRequestResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleBatchRequestResponse.kt
deleted file mode 100644
index 75d53d7..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleBatchRequestResponse.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.circle
-
-data class CircleBatchResponseItem(
-    val request_status: String,
-    val username: String,
-)
-
-data class CircleBatchRequestResponse(
-    val data: List<CircleBatchResponseItem>,
-)
-
-
-data class CreateCircleRequest(
-    val circleName: String
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestItem.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestItem.kt
deleted file mode 100644
index 18281d8..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestItem.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.circle
-
-data class CircleRequestItem(
-    val circle_id: String,
-    val circle_name: String,
-    val from_username: String,
-    val to_username: String,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestsResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestsResponse.kt
deleted file mode 100644
index 55d1235..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CircleRequestsResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.circle
-
-data class CircleRequestsResponse(
-    val data: List<CircleRequestItem>,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CreateCircleResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CreateCircleResponse.kt
deleted file mode 100644
index 5880260..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/CreateCircleResponse.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.circle
-
-data class CreateCircleResponse(
-    val circle_id: String,
-    val detail: String,
-    val join_code: String
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/JoinCircleResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/JoinCircleResponse.kt
deleted file mode 100644
index 0aca7cc..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/circle/JoinCircleResponse.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.circle
-
-data class JoinCircleResponse(
-    val detail: String
-)
-
-data class JoinCircleError(
-    val detail: String? = null,
-    val error: String? = null
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponse.kt
deleted file mode 100644
index 2166b55..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponse.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.requests
-
-class RequestsResponse : ArrayList<RequestsResponseItem>()
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponseItem.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponseItem.kt
deleted file mode 100644
index 40aad1e..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/requests/RequestsResponseItem.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.requests
-
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-
-data class RequestsResponseItem(
-    val from: UserResponse
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Course.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Course.kt
deleted file mode 100644
index 34b6929..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Course.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.timetable
-
-data class Course(
-    val code: String,
-    val end_time: String,
-    val name: String,
-    val slot: String,
-    val start_time: String,
-    val type: String,
-    val venue: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/CurrentStatus.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/CurrentStatus.kt
deleted file mode 100644
index 2539537..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/CurrentStatus.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.timetable
-
-
-data class CurrentStatus(
-    val status: String,
-    val `class`: String?,
-    val slot: String?,
-    val venue: String?
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Data.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Data.kt
deleted file mode 100644
index a6ef50a..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/Data.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.timetable
-
-data class Data(
-    val Friday: List<Course>?,
-    val Monday: List<Course>?,
-    val Thursday: List<Course>?,
-    val Tuesday: List<Course>?,
-    val Wednesday: List<Course>?,
-    val Saturday: List<Course>?,
-    val Sunday: List<Course>?
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/TimetableResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/TimetableResponse.kt
deleted file mode 100644
index 326c517..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/timetable/TimetableResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.timetable
-
-data class TimetableResponse(
-    val `data`: Data
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/ActiveFriendResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/ActiveFriendResponse.kt
deleted file mode 100644
index c7a86e3..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/ActiveFriendResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-data class ActiveFriendResponse(
-    val data: List<String>?,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/CircleResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/CircleResponse.kt
deleted file mode 100644
index f98a7f8..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/CircleResponse.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-data class CircleResponse(
-    val `data`: List<CircleItem>?,
-)
-
-data class CircleItem(
-    val circle_id: String,
-    val circle_name: String,
-    val circle_role: String,
-    val circle_join_code: String,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/FriendResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/FriendResponse.kt
deleted file mode 100644
index fd89e97..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/FriendResponse.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-data class FriendResponse(
-    val `data`: List<UserResponse>?,
-    val friend_status: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/GhostPostResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/GhostPostResponse.kt
deleted file mode 100644
index ca109a4..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/GhostPostResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-data class GhostPostResponse(
-    val data: String,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/PostResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/PostResponse.kt
deleted file mode 100644
index 68bd5aa..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/PostResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-data class PostResponse(
-    val detail: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/SignInResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/SignInResponse.kt
deleted file mode 100644
index bb36f29..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/SignInResponse.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-data class SignInResponse(
-    val name: String,
-    val picture: String,
-    val role: String,
-    val token: String,
-    val username: String,
-    val campus: String,
-)
diff --git a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/UserResponse.kt b/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/UserResponse.kt
deleted file mode 100644
index e407575..0000000
--- a/app/src/main/java/com/dscvit/vitty/network/api/community/responses/user/UserResponse.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dscvit.vitty.network.api.community.responses.user
-
-import com.dscvit.vitty.network.api.community.responses.timetable.CurrentStatus
-import com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse
-
-data class UserResponse(
-    var email: String,
-    var friend_status: String,
-    var friends_count: Int,
-    var mutual_friends_count: Int,
-    var name: String,
-    var picture: String,
-    var timetable: TimetableResponse?,
-    var username: String,
-    var current_status: CurrentStatus?
-)
diff --git a/app/src/main/java/com/dscvit/vitty/receiver/DeviceBootReceiver.kt b/app/src/main/java/com/dscvit/vitty/receiver/DeviceBootReceiver.kt
index 8a732e7..d1d5336 100755
--- a/app/src/main/java/com/dscvit/vitty/receiver/DeviceBootReceiver.kt
+++ b/app/src/main/java/com/dscvit/vitty/receiver/DeviceBootReceiver.kt
@@ -18,8 +18,8 @@ class DeviceBootReceiver : BroadcastReceiver() {
         if (intent!!.action.equals(
                 "android.intent.action.BOOT_COMPLETED"
             ) || intent.action.equals(
-                "android.intent.action.MY_PACKAGE_REPLACED"
-            )
+                    "android.intent.action.MY_PACKAGE_REPLACED"
+                )
         ) {
             val prefs = context?.getSharedPreferences(USER_INFO, 0)
             if (!prefs?.getBoolean(EXAM_MODE, false)!!) {
diff --git a/app/src/main/java/com/dscvit/vitty/receiver/ReminderBroadcastReceiver.kt b/app/src/main/java/com/dscvit/vitty/receiver/ReminderBroadcastReceiver.kt
deleted file mode 100644
index a87254c..0000000
--- a/app/src/main/java/com/dscvit/vitty/receiver/ReminderBroadcastReceiver.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.dscvit.vitty.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.dscvit.vitty.data.database.VittyDatabase
-import com.dscvit.vitty.data.repository.ReminderRepository
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-class ReminderBroadcastReceiver : BroadcastReceiver() {
-    override fun onReceive(
-        context: Context,
-        intent: Intent,
-    ) {
-        val reminderId = intent.getLongExtra("reminder_id", -1)
-        val title = intent.getStringExtra("title") ?: ""
-        val description = intent.getStringExtra("description") ?: ""
-        val courseTitle = intent.getStringExtra("course_title") ?: ""
-
-        if (reminderId != -1L) {
-            val reminderNotificationManager = ReminderNotificationManager(context)
-            reminderNotificationManager.showReminderNotification(
-                reminderId = reminderId,
-                title = title,
-                description = description,
-                courseTitle = courseTitle,
-            )
-
-            CoroutineScope(Dispatchers.IO).launch {
-                try {
-                    val database = VittyDatabase.getDatabase(context)
-                    val reminderRepository = ReminderRepository(database.reminderDao())
-                    reminderRepository.updateCompletedStatus(reminderId, true)
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to mark reminder as completed")
-                }
-            }
-        } else {
-            Timber.e("Invalid reminder ID received in broadcast")
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/receiver/ReminderNotificationManager.kt b/app/src/main/java/com/dscvit/vitty/receiver/ReminderNotificationManager.kt
deleted file mode 100644
index a5a5111..0000000
--- a/app/src/main/java/com/dscvit/vitty/receiver/ReminderNotificationManager.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.dscvit.vitty.receiver
-
-import android.app.AlarmManager
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.media.RingtoneManager
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import com.dscvit.vitty.R
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.NotificationPermissionHelper
-import timber.log.Timber
-
-class ReminderNotificationManager(
-    private val context: Context,
-) {
-    init {
-        createNotificationChannel()
-    }
-
-    private fun createNotificationChannel() {
-        val channel =
-            NotificationChannel(
-                Constants.REMINDER_CHANNEL_ID,
-                Constants.REMINDER_CHANNEL_NAME,
-                NotificationManager.IMPORTANCE_HIGH,
-            ).apply {
-                description = Constants.REMINDER_CHANNEL_DESC
-                enableVibration(true)
-                setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION), null)
-            }
-
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.createNotificationChannel(channel)
-    }
-
-    fun scheduleReminderNotification(
-        reminderId: Long,
-        title: String,
-        description: String,
-        triggerTimeMillis: Long,
-        courseTitle: String,
-    ) {
-        val hasNotificationPermission = NotificationPermissionHelper.hasNotificationPermission(context)
-        val canScheduleExactAlarms = NotificationPermissionHelper.canScheduleExactAlarms(context)
-
-        if (!hasNotificationPermission) {
-            Timber.e("No notification permission! Reminders won't work.")
-            return
-        }
-
-        if (!canScheduleExactAlarms) {
-            Timber.w("Cannot schedule exact alarms! Notifications may be delayed.")
-        }
-
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val intent =
-            Intent(context, ReminderBroadcastReceiver::class.java).apply {
-                putExtra("reminder_id", reminderId)
-                putExtra("title", title)
-                putExtra("description", description)
-                putExtra("course_title", courseTitle)
-            }
-
-        val pendingIntent =
-            PendingIntent.getBroadcast(
-                context,
-                reminderId.toInt(),
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
-            )
-
-        try {
-            if (canScheduleExactAlarms) {
-                alarmManager.setExactAndAllowWhileIdle(
-                    AlarmManager.RTC_WAKEUP,
-                    triggerTimeMillis,
-                    pendingIntent,
-                )
-            } else {
-                alarmManager.set(
-                    AlarmManager.RTC_WAKEUP,
-                    triggerTimeMillis,
-                    pendingIntent,
-                )
-            }
-        } catch (e: SecurityException) {
-            Timber.e(e, "Failed to schedule reminder notification")
-        }
-    }
-
-    fun cancelReminderNotification(reminderId: Long) {
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val intent = Intent(context, ReminderBroadcastReceiver::class.java)
-        val pendingIntent =
-            PendingIntent.getBroadcast(
-                context,
-                reminderId.toInt(),
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
-            )
-        alarmManager.cancel(pendingIntent)
-    }
-
-    fun showReminderNotification(
-        reminderId: Long,
-        title: String,
-        description: String,
-        courseTitle: String,
-    ) {
-        val notification =
-            NotificationCompat
-                .Builder(context, Constants.REMINDER_CHANNEL_ID)
-                .setSmallIcon(R.drawable.ic_launcher_foreground)
-                .setContentTitle("Reminder: $title")
-                .setContentText("$courseTitle - $description")
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setDefaults(NotificationCompat.DEFAULT_ALL)
-                .setAutoCancel(true)
-                .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
-                .build()
-
-        try {
-            NotificationManagerCompat.from(context).notify(reminderId.toInt(), notification)
-        } catch (e: SecurityException) {
-            Timber.e(e, "Failed to show notification")
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/service/TileService.kt b/app/src/main/java/com/dscvit/vitty/service/TileService.kt
index a7abff5..cace4c4 100755
--- a/app/src/main/java/com/dscvit/vitty/service/TileService.kt
+++ b/app/src/main/java/com/dscvit/vitty/service/TileService.kt
@@ -3,7 +3,6 @@ package com.dscvit.vitty.service
 import android.content.SharedPreferences
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.core.content.edit
 import com.dscvit.vitty.util.Constants
 import com.dscvit.vitty.util.NotificationHelper
 import com.dscvit.vitty.util.UtilFunctions.reloadWidgets
@@ -40,9 +39,8 @@ class TileService : TileService() {
     private fun changeExamMode() {
         prefs = getSharedPreferences(Constants.USER_INFO, 0)
         val current = !prefs.getBoolean(Constants.EXAM_MODE, false)
-        prefs.edit {
-            putBoolean(Constants.EXAM_MODE, current)
-        }
+        prefs.edit().putBoolean(Constants.EXAM_MODE, current)
+            .apply()
         if (current) {
             NotificationHelper.cancelAlarm(this)
         } else {
diff --git a/app/src/main/java/com/dscvit/vitty/service/TodayWidgetService.kt b/app/src/main/java/com/dscvit/vitty/service/TodayWidgetService.kt
index 96ac685..7d30e80 100755
--- a/app/src/main/java/com/dscvit/vitty/service/TodayWidgetService.kt
+++ b/app/src/main/java/com/dscvit/vitty/service/TodayWidgetService.kt
@@ -9,11 +9,12 @@ import com.dscvit.vitty.R
 import timber.log.Timber
 
 class TodayWidgetService : RemoteViewsService() {
-    override fun onGetViewFactory(intent: Intent): RemoteViewsFactory =
-        AppWidgetListView(
+    override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
+        return AppWidgetListView(
             this.applicationContext,
-            intent,
+            intent
         )
+    }
 }
 
 class AppWidgetListView(
@@ -29,11 +30,10 @@ class AppWidgetListView(
         dataList = loadArray("courses_today", context)
         timeList = loadArray("time_today", context)
         roomList = loadArray("class_rooms", context)
-        appWidgetId =
-            intent.getIntExtra(
-                AppWidgetManager.EXTRA_APPWIDGET_ID,
-                AppWidgetManager.INVALID_APPWIDGET_ID,
-            )
+        appWidgetId = intent.getIntExtra(
+            AppWidgetManager.EXTRA_APPWIDGET_ID,
+            AppWidgetManager.INVALID_APPWIDGET_ID
+        )
     }
 
     override fun onCreate() {
@@ -45,10 +45,11 @@ class AppWidgetListView(
     }
 
     override fun onDestroy() {
-        // No specific cleanup needed
     }
 
-    override fun getCount(): Int = dataList.size
+    override fun getCount(): Int {
+        return dataList.size
+    }
 
     override fun getViewAt(position: Int): RemoteViews {
         val views = RemoteViews(context.packageName, R.layout.item_period)
@@ -64,23 +65,28 @@ class AppWidgetListView(
         return views
     }
 
-    override fun getLoadingView(): RemoteViews? = null
+    override fun getLoadingView(): RemoteViews? {
+        return null
+    }
 
-    override fun getViewTypeCount(): Int = 1
+    override fun getViewTypeCount(): Int {
+        return 1
+    }
 
-    override fun getItemId(position: Int): Long = position.toLong()
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
 
-    override fun hasStableIds(): Boolean = true
+    override fun hasStableIds(): Boolean {
+        return true
+    }
 
     private fun fetch() {
         dataList = loadArray("courses_today", context)
         timeList = loadArray("time_today", context)
     }
 
-    private fun loadArray(
-        arrayName: String,
-        context: Context,
-    ): Array<String?> {
+    private fun loadArray(arrayName: String, context: Context): Array<String?> {
         val prefs = context.getSharedPreferences("login_info", Context.MODE_PRIVATE)
         val size = prefs.getInt(arrayName + "_size", 0)
         val array = arrayOfNulls<String>(size)
diff --git a/app/src/main/java/com/dscvit/vitty/theme/Color.kt b/app/src/main/java/com/dscvit/vitty/theme/Color.kt
deleted file mode 100644
index 646b01a..0000000
--- a/app/src/main/java/com/dscvit/vitty/theme/Color.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dscvit.vitty.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Background = Color(0xFF041727)
-val Secondary = Color(0xFF071F33)
-val Accent = Color(0xFFBBE7FF)
-val TextColor = Color(0xFFF4F4FC)
-val Green = Color(0xFF00FF66)
-val Yellow = Color(0xFFFFF500)
-val Red = Color(0xFFFF0000)
-val DividerColor = Color(0xFF112C45)
diff --git a/app/src/main/java/com/dscvit/vitty/theme/Theme.kt b/app/src/main/java/com/dscvit/vitty/theme/Theme.kt
deleted file mode 100644
index 6ce506c..0000000
--- a/app/src/main/java/com/dscvit/vitty/theme/Theme.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dscvit.vitty.theme
-
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-
-private val VittyColorScheme =
-    lightColorScheme(
-        primary = Accent,
-        secondary = Secondary,
-        background = Background,
-        surface = Secondary,
-        onPrimary = Background,
-        onSecondary = Accent,
-        onBackground = TextColor,
-        onSurface = TextColor,
-    )
-
-@Composable
-fun VittyTheme(content: @Composable () -> Unit) {
-    MaterialTheme(
-        colorScheme = VittyColorScheme,
-        typography = VittyTypography,
-        content = content,
-    )
-}
diff --git a/app/src/main/java/com/dscvit/vitty/theme/Typography.kt b/app/src/main/java/com/dscvit/vitty/theme/Typography.kt
deleted file mode 100644
index 737da37..0000000
--- a/app/src/main/java/com/dscvit/vitty/theme/Typography.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.dscvit.vitty.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.R
-
-val Poppins =
-    FontFamily(
-        Font(R.font.poppins_300, FontWeight.Light),
-        Font(R.font.poppins_400, FontWeight.Normal),
-        Font(R.font.poppins_500, FontWeight.Medium),
-        Font(R.font.poppins_600, FontWeight.SemiBold),
-        Font(R.font.poppins_700, FontWeight.Bold),
-    )
-
-val VittyTypography =
-    Typography(
-        headlineLarge =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.SemiBold,
-                fontSize = 28.sp,
-                lineHeight = 28.sp,
-                letterSpacing = 0.sp,
-                color = TextColor,
-            ),
-        headlineSmall =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.SemiBold,
-                fontSize = 28.sp,
-                lineHeight = 28.sp,
-                letterSpacing = 0.sp,
-            ),
-        titleLarge =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.SemiBold,
-                fontSize = 20.sp,
-                lineHeight = 28.sp,
-                letterSpacing = 0.sp,
-                color = TextColor,
-            ),
-        titleMedium =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.Normal,
-                fontSize = 20.sp,
-                lineHeight = 28.sp,
-                letterSpacing = 0.sp,
-                color = TextColor.copy(alpha = 0.7f),
-            ),
-        labelLarge =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.SemiBold,
-                fontSize = 16.sp,
-                lineHeight = 16.sp,
-                letterSpacing = 0.16.sp,
-            ),
-        bodySmall =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.Normal,
-                fontSize = 16.sp,
-                lineHeight = 11.68.sp,
-                letterSpacing = (-0.16).sp,
-            ),
-        bodyMedium =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.Normal,
-                fontSize = 14.sp,
-                lineHeight = 21.24.sp,
-                letterSpacing = (-0.14).sp,
-            ),
-        bodyLarge =
-            TextStyle(
-                fontFamily = Poppins,
-                fontWeight = FontWeight.Normal,
-                fontSize = 20.sp,
-                lineHeight = 20.sp,
-                letterSpacing = 0.sp,
-            ),
-    )
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsFragment.kt
deleted file mode 100644
index bfc16d8..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsFragment.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.dscvit.vitty.ui.academics
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.fragment.findNavController
-import com.dscvit.vitty.databinding.FragmentAcademicsBinding
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.VittyTheme
-import com.dscvit.vitty.ui.academics.models.Course
-import com.dscvit.vitty.ui.schedule.ScheduleViewModel
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.SemesterUtils
-import com.google.gson.Gson
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-class AcademicsFragment : Fragment() {
-    private var fragmentAcademicsBinding: FragmentAcademicsBinding? = null
-    private val binding get() = fragmentAcademicsBinding!!
-    private lateinit var scheduleViewModel: ScheduleViewModel
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        fragmentAcademicsBinding = FragmentAcademicsBinding.inflate(inflater, container, false)
-        val view = binding.root
-
-        scheduleViewModel = ViewModelProvider(this)[ScheduleViewModel::class.java]
-
-        binding.composeView.apply {
-            setViewCompositionStrategy(
-                ViewCompositionStrategy.DisposeOnLifecycleDestroyed(viewLifecycleOwner),
-            )
-            setContent {
-                VittyTheme {
-                    val prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
-                    val profilePictureUrl = prefs.getString(Constants.COMMUNITY_PICTURE, null)
-
-                    val userResponse by scheduleViewModel.user.observeAsState()
-
-                    var allCourses by remember { mutableStateOf<List<Course>>(emptyList()) }
-                    var isLoading by remember { mutableStateOf(false) }
-
-                    LaunchedEffect(Unit) {
-                        val token = prefs.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                        val username = prefs.getString(Constants.COMMUNITY_USERNAME, null) ?: ""
-
-                        allCourses = loadCachedCourses(prefs)
-
-                        if (token.isNotEmpty() && username.isNotEmpty()) {
-                            isLoading = true
-                            scheduleViewModel.getUserWithTimeTable(token, username)
-                        }
-                    }
-
-                    LaunchedEffect(userResponse) {
-                        userResponse?.let { response ->
-                            isLoading = false
-
-                            allCourses =
-                                withContext(Dispatchers.Default) {
-                                    extractCoursesFromTimetable(response)
-                                }
-                        }
-                    }
-
-                    AcademicsScreenContent(
-                        profilePictureUrl = profilePictureUrl,
-                        allCourses = allCourses,
-                        onCourseClick = { course ->
-                            val action =
-                                AcademicsFragmentDirections
-                                    .actionNavigationAcademicsToCoursePageFragment(
-                                        courseTitle = course.title,
-                                        courseSlot = course.slot,
-                                        courseCode = course.code,
-                                        courseSemester = course.semester,
-                                    )
-                            findNavController().navigate(action)
-                        },
-                        academicsViewModel = viewModel(),
-                        coursePageViewModel = viewModel(),
-                    )
-                }
-            }
-        }
-
-        return view
-    }
-
-    private suspend fun loadCachedCourses(prefs: android.content.SharedPreferences): List<Course> =
-        withContext(Dispatchers.IO) {
-            val cachedData = prefs.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-            if (cachedData != null) {
-                try {
-                    val userResponse = Gson().fromJson(cachedData, UserResponse::class.java)
-                    extractCoursesFromTimetable(userResponse)
-                } catch (e: Exception) {
-                    emptyList()
-                }
-            } else {
-                emptyList()
-            }
-        }
-
-    private fun extractCoursesFromTimetable(userResponse: UserResponse): List<Course> {
-        val timetableData = userResponse.timetable?.data ?: return emptyList()
-
-        val allLectures =
-            listOfNotNull(
-                timetableData.Monday,
-                timetableData.Tuesday,
-                timetableData.Wednesday,
-                timetableData.Thursday,
-                timetableData.Friday,
-                timetableData.Saturday,
-                timetableData.Sunday,
-            ).flatten()
-
-        val currentSemester = SemesterUtils.determineSemester()
-
-        val groupedLectures = allLectures.groupBy { it.name }
-
-        val result = mutableListOf<Course>()
-
-        groupedLectures.keys.sorted().forEach { title ->
-            val lectures = groupedLectures[title] ?: return@forEach
-
-            val uniqueSlots =
-                lectures
-                    .map { it.slot }
-                    .toSet()
-                    .sorted()
-                    .joinToString(" + ")
-            val uniqueCodes =
-                lectures
-                    .map { it.code }
-                    .toSet()
-                    .sorted()
-                    .joinToString(" / ")
-
-            result.add(
-                Course(
-                    title = title,
-                    slot = uniqueSlots,
-                    code = uniqueCodes,
-                    semester = currentSemester,
-                    isStarred = false,
-                ),
-            )
-        }
-
-        return result.sortedBy { it.title }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        fragmentAcademicsBinding = null
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt
deleted file mode 100644
index ca33147..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.dscvit.vitty.ui.academics
-
-import android.widget.Toast
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.academics.components.AcademicsContent
-import com.dscvit.vitty.ui.academics.components.AcademicsHeader
-import com.dscvit.vitty.ui.academics.models.Course
-import com.dscvit.vitty.ui.coursepage.CoursePageViewModel
-import com.dscvit.vitty.ui.coursepage.components.SetReminderBottomSheet
-import com.dscvit.vitty.ui.coursepage.models.Reminder
-import com.dscvit.vitty.util.SemesterUtils
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AcademicsScreenContent(
-    modifier: Modifier = Modifier,
-    profilePictureUrl: String?,
-    allCourses: List<Course>,
-    onCourseClick: (Course) -> Unit = {},
-    onOpenDrawer: () -> Unit = {},
-    academicsViewModel: AcademicsViewModel,
-    coursePageViewModel: CoursePageViewModel,
-) {
-    val context = LocalContext.current
-    val tabs = listOf("Courses", "Reminders")
-    var selectedTab by remember { mutableIntStateOf(0) }
-    var searchQuery by remember { mutableStateOf("") }
-    var reminderSearchQuery by remember { mutableStateOf("") }
-    var isCurrentSemester by remember { mutableStateOf(true) }
-    var reminderStatus by remember { mutableIntStateOf(0) }
-    var showSetReminderBottomSheet by remember { mutableStateOf(false) }
-    var selectedCourseForReminder by remember { mutableStateOf<Course?>(null) }
-    val setReminderSheetState = rememberModalBottomSheetState()
-
-    val allReminders by academicsViewModel.allReminders.collectAsStateWithLifecycle()
-
-    val filteredCourses =
-        remember(allCourses, searchQuery, isCurrentSemester) {
-            allCourses.filter { course ->
-                val matchesSearch =
-                    searchQuery.isBlank() ||
-                        course.title.contains(searchQuery, ignoreCase = true)
-
-                if (isCurrentSemester) {
-                    matchesSearch && course.semester == SemesterUtils.determineSemester()
-                } else {
-                    matchesSearch
-                }
-            }
-        }
-
-    Column(
-        modifier =
-            modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        TopAppBar(
-            title = {
-                Text(
-                    text = "Academics",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-            actions = {
-                Box(modifier = Modifier.padding(end = 8.dp)) {
-                    AsyncImage(
-                        model = profilePictureUrl,
-                        contentDescription = "Profile Picture",
-                        modifier =
-                            Modifier
-                                .size(40.dp)
-                                .clip(CircleShape)
-                                .clickable { onOpenDrawer() },
-                        placeholder = painterResource(R.drawable.ic_gdscvit),
-                        error = painterResource(R.drawable.ic_gdscvit),
-                    )
-                }
-            },
-        )
-
-        AcademicsHeader(
-            tabs = tabs,
-            selectedTab = selectedTab,
-            onTabSelected = { selectedTab = it },
-            searchQuery = searchQuery,
-            onSearchQueryChange = { searchQuery = it },
-            isCurrentSemester = isCurrentSemester,
-            onSemesterFilterChange = { isCurrentSemester = it },
-            reminderStatus = reminderStatus,
-            onReminderStatusChange = { reminderStatus = it },
-            reminderSearchQuery = reminderSearchQuery,
-            onReminderSearchQueryChange = { reminderSearchQuery = it },
-            courses = allCourses,
-            onCourseSelected = { course ->
-                selectedCourseForReminder = course
-                showSetReminderBottomSheet = true
-            },
-        )
-
-        AcademicsContent(
-            selectedTab = selectedTab,
-            courses = filteredCourses,
-            reminders = allReminders,
-            reminderStatus = reminderStatus,
-            reminderSearchQuery = reminderSearchQuery,
-            onCourseClick = onCourseClick,
-            onToggleReminderComplete = { reminderId: Long, isCompleted: Boolean ->
-                academicsViewModel.updateReminderStatus(reminderId, isCompleted)
-            },
-            onDeleteReminder = { reminder: Reminder ->
-                academicsViewModel.deleteReminder(reminder)
-            },
-        )
-    }
-
-    if (showSetReminderBottomSheet && selectedCourseForReminder != null) {
-        ModalBottomSheet(
-            onDismissRequest = { showSetReminderBottomSheet = false },
-            sheetState = setReminderSheetState,
-            containerColor = Background,
-            contentColor = TextColor,
-            dragHandle = { },
-        ) {
-            SetReminderBottomSheet(
-                onDismiss = { showSetReminderBottomSheet = false },
-                courseTitle = selectedCourseForReminder!!.title,
-                onSaveReminder = {
-                    title,
-                    description,
-                    dateMillis,
-                    fromTime,
-                    toTime,
-                    isAllDay,
-                    alertDaysBefore,
-                    attachmentUrl,
-                    ->
-                    coursePageViewModel.addReminder(
-                        title = title,
-                        description = description,
-                        dateMillis = dateMillis,
-                        fromTime = fromTime,
-                        toTime = toTime,
-                        isAllDay = isAllDay,
-                        alertDaysBefore = alertDaysBefore,
-                        attachmentUrl = attachmentUrl,
-                        onSuccess = {
-                            showSetReminderBottomSheet = false
-                            Toast
-                                .makeText(
-                                    context,
-                                    "Reminder created successfully",
-                                    Toast.LENGTH_SHORT,
-                                ).show()
-                        },
-                        onError = { errorMessage ->
-                            Toast.makeText(context, errorMessage, Toast.LENGTH_LONG).show()
-                        },
-                    )
-                },
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsViewModel.kt
deleted file mode 100644
index 1454aa0..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsViewModel.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.dscvit.vitty.ui.academics
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.viewModelScope
-import com.dscvit.vitty.data.database.VittyDatabase
-import com.dscvit.vitty.data.repository.ReminderRepository
-import com.dscvit.vitty.receiver.ReminderNotificationManager
-import com.dscvit.vitty.ui.coursepage.models.Reminder
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-
-class AcademicsViewModel(
-    application: Application,
-) : AndroidViewModel(application) {
-    private val reminderRepository: ReminderRepository
-    private val reminderNotificationManager: ReminderNotificationManager
-
-    init {
-        val database = VittyDatabase.getDatabase(application)
-        reminderRepository = ReminderRepository(database.reminderDao())
-        reminderNotificationManager = ReminderNotificationManager(application)
-    }
-
-    val allReminders: StateFlow<List<Reminder>> =
-        reminderRepository
-            .getAllReminders()
-            .stateIn(
-                scope = viewModelScope,
-                started = SharingStarted.WhileSubscribed(5000),
-                initialValue = emptyList(),
-            )
-
-    fun updateReminderStatus(
-        reminderId: Long,
-        isCompleted: Boolean,
-    ) {
-        viewModelScope.launch {
-            reminderRepository.updateCompletedStatus(reminderId, isCompleted)
-            if (isCompleted) {
-                reminderNotificationManager.cancelReminderNotification(reminderId)
-            }
-        }
-    }
-
-    fun deleteReminder(reminder: Reminder) {
-        viewModelScope.launch {
-            reminderRepository.deleteReminder(reminder, reminder.courseId, reminder.courseTitle, reminder.id)
-            reminderNotificationManager.cancelReminderNotification(reminder.id)
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt
deleted file mode 100644
index 91f9bdb..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt
+++ /dev/null
@@ -1,883 +0,0 @@
-package com.dscvit.vitty.ui.academics.components
-
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Star
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.SwipeToDismissBox
-import androidx.compose.material3.SwipeToDismissBoxValue
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
-import androidx.compose.material3.TabRowDefaults
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberSwipeToDismissBoxState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Green
-import com.dscvit.vitty.theme.Red
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.academics.models.Course
-import com.dscvit.vitty.ui.connect.components.FilterChip
-import com.dscvit.vitty.ui.coursepage.components.RemindersChip
-import com.dscvit.vitty.ui.coursepage.models.Reminder
-import com.dscvit.vitty.ui.coursepage.models.ReminderStatus
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.time.temporal.ChronoUnit
-
-@Composable
-fun AcademicsHeader(
-    tabs: List<String>,
-    selectedTab: Int,
-    onTabSelected: (Int) -> Unit,
-    searchQuery: String,
-    onSearchQueryChange: (String) -> Unit,
-    isCurrentSemester: Boolean,
-    onSemesterFilterChange: (Boolean) -> Unit,
-    reminderStatus: Int,
-    onReminderStatusChange: (Int) -> Unit,
-    reminderSearchQuery: String = "",
-    onReminderSearchQueryChange: (String) -> Unit = {},
-    courses: List<Course> = emptyList(),
-    onCourseSelected: (Course) -> Unit = {},
-) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Background)
-                .padding(bottom = 16.dp),
-    ) {
-        AcademicsTabRow(
-            tabs = tabs,
-            selectedTab = selectedTab,
-            onTabSelected = onTabSelected,
-        )
-
-        Spacer(Modifier.height(20.dp))
-
-        when (selectedTab) {
-            0 ->
-                CoursesTabFilters(
-                    searchQuery = searchQuery,
-                    onSearchQueryChange = onSearchQueryChange,
-                    isCurrentSemester = isCurrentSemester,
-                    onSemesterFilterChange = onSemesterFilterChange,
-                )
-            1 ->
-                RemindersTabFilters(
-                    reminderStatus = reminderStatus,
-                    onReminderStatusChange = onReminderStatusChange,
-                    searchQuery = reminderSearchQuery,
-                    onSearchQueryChange = onReminderSearchQueryChange,
-                    courses = courses,
-                    onCourseSelected = onCourseSelected,
-                )
-        }
-    }
-}
-
-@Composable
-fun AcademicsTabRow(
-    tabs: List<String>,
-    selectedTab: Int,
-    onTabSelected: (Int) -> Unit,
-) {
-    TabRow(
-        modifier = Modifier.padding(horizontal = 20.dp),
-        selectedTabIndex = selectedTab,
-        containerColor = Background,
-        contentColor = TextColor,
-        indicator = { tabPositions ->
-            TabRowDefaults.SecondaryIndicator(
-                modifier =
-                    Modifier
-                        .tabIndicatorOffset(tabPositions[selectedTab])
-                        .height(3.dp),
-                color = TextColor,
-            )
-        },
-        divider = {
-            Spacer(
-                Modifier
-                    .fillMaxWidth()
-                    .height(1.5.dp)
-                    .background(Secondary),
-            )
-        },
-    ) {
-        tabs.forEachIndexed { index, tab ->
-            Tab(
-                selected = selectedTab == index,
-                onClick = { onTabSelected(index) },
-                text = {
-                    Text(
-                        text = tab,
-                        style =
-                            if (selectedTab == index) {
-                                MaterialTheme.typography.titleLarge
-                            } else {
-                                MaterialTheme.typography.titleMedium
-                            },
-                        color = if (selectedTab == index) TextColor else Accent,
-                    )
-                },
-                selectedContentColor = TextColor,
-            )
-        }
-    }
-}
-
-@Composable
-fun CoursesTabFilters(
-    searchQuery: String,
-    onSearchQueryChange: (String) -> Unit,
-    isCurrentSemester: Boolean,
-    onSemesterFilterChange: (Boolean) -> Unit,
-) {
-    Column {
-        SearchBar(
-            searchQuery = searchQuery,
-            onSearchQueryChange = onSearchQueryChange,
-        )
-    }
-}
-
-@Composable
-fun RemindersTabFilters(
-    reminderStatus: Int,
-    onReminderStatusChange: (Int) -> Unit,
-    searchQuery: String = "",
-    onSearchQueryChange: (String) -> Unit = {},
-    courses: List<Course> = emptyList(),
-    onCourseSelected: (Course) -> Unit = {},
-) {
-    var showCourseSelectionBottomSheet by remember { mutableStateOf(false) }
-
-    Column {
-        SearchBar(
-            searchQuery = searchQuery,
-            onSearchQueryChange = onSearchQueryChange,
-            placeholder = "Search",
-        )
-
-        Spacer(Modifier.height(16.dp))
-
-        FilterChipRowWithAddButton(
-            options = listOf("Pending", "Completed"),
-            selectedIndex = reminderStatus,
-            onSelectionChange = onReminderStatusChange,
-            onAddClick = { showCourseSelectionBottomSheet = true },
-        )
-    }
-
-    if (showCourseSelectionBottomSheet) {
-        CourseSelectionBottomSheet(
-            courses = courses,
-            onDismiss = { showCourseSelectionBottomSheet = false },
-            onCourseSelected = { course ->
-                showCourseSelectionBottomSheet = false
-                onCourseSelected(course)
-            },
-        )
-    }
-}
-
-@Composable
-fun SearchBar(
-    searchQuery: String,
-    onSearchQueryChange: (String) -> Unit,
-    placeholder: String = "Search",
-) {
-    Box(
-        Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 20.dp)
-            .border(2.dp, Secondary, RoundedCornerShape(9999.dp))
-            .background(Background, RoundedCornerShape(9999.dp)),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(44.dp)
-                    .padding(horizontal = 16.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            BasicTextField(
-                value = searchQuery,
-                onValueChange = onSearchQueryChange,
-                singleLine = true,
-                cursorBrush = SolidColor(Accent),
-                textStyle =
-                    MaterialTheme.typography.bodyMedium.copy(
-                        color = TextColor,
-                        fontSize = 16.sp,
-                        lineHeight = 16.sp,
-                    ),
-                modifier = Modifier.weight(1f),
-                decorationBox = { innerTextField ->
-                    Box(
-                        modifier = Modifier.fillMaxWidth(),
-                        contentAlignment = Alignment.CenterStart,
-                    ) {
-                        if (searchQuery.isEmpty()) {
-                            Text(
-                                text = placeholder,
-                                color = Accent.copy(alpha = 0.3f),
-                                style =
-                                    MaterialTheme.typography.bodyMedium.copy(
-                                        fontSize = 16.sp,
-                                        lineHeight = 16.sp,
-                                    ),
-                            )
-                        }
-                        innerTextField()
-                    }
-                },
-            )
-            if (searchQuery.isNotEmpty()) {
-                IconButton(onClick = { onSearchQueryChange("") }) {
-                    Icon(
-                        imageVector = Icons.Default.Close,
-                        contentDescription = "Clear",
-                        tint = Accent,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun FilterChipRowWithAddButton(
-    options: List<String>,
-    selectedIndex: Int,
-    onSelectionChange: (Int) -> Unit,
-    onAddClick: () -> Unit,
-) {
-    Row(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 20.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-    ) {
-        Row {
-            options.forEachIndexed { index, label ->
-                FilterChip(
-                    label = label,
-                    isSelected = selectedIndex == index,
-                    onClick = { onSelectionChange(index) },
-                )
-                if (index < options.lastIndex) {
-                    Spacer(Modifier.width(12.dp))
-                }
-            }
-        }
-
-        AddButton(onClick = onAddClick)
-    }
-}
-
-@Composable
-fun AddButton(onClick: () -> Unit) {
-    Box(
-        modifier =
-            Modifier
-                .clip(CircleShape)
-                .background(Secondary)
-                .border(1.dp, Accent, CircleShape)
-                .clickable { onClick() }
-                .padding(8.dp),
-    ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Center,
-        ) {
-            Icon(
-                imageVector = Icons.Default.Add,
-                contentDescription = "Add Reminder",
-                tint = Accent,
-                modifier = Modifier.size(18.dp),
-            )
-        }
-    }
-}
-
-@RequiresApi(Build.VERSION_CODES.O)
-@Composable
-fun AcademicsContent(
-    selectedTab: Int,
-    courses: List<Course>,
-    reminders: List<Reminder> = emptyList(),
-    reminderStatus: Int,
-    reminderSearchQuery: String = "",
-    onCourseClick: (Course) -> Unit,
-    onToggleReminderComplete: (Long, Boolean) -> Unit = { _, _ -> },
-    onDeleteReminder: (Reminder) -> Unit = { },
-) {
-    when (selectedTab) {
-        0 -> CoursesContent(courses = courses, onCourseClick = onCourseClick)
-        1 ->
-            RemindersContent(
-                reminders = reminders,
-                reminderStatus = reminderStatus,
-                searchQuery = reminderSearchQuery,
-                onToggleReminderComplete = onToggleReminderComplete,
-                onDeleteReminder = onDeleteReminder,
-            )
-    }
-}
-
-@Composable
-fun CoursesContent(
-    courses: List<Course>,
-    onCourseClick: (Course) -> Unit,
-) {
-    LazyColumn(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .padding(horizontal = 20.dp),
-    ) {
-        item {
-            Spacer(Modifier.height(16.dp))
-        }
-        items(courses) { course ->
-            CourseCard(
-                course = course,
-                onClick = { onCourseClick(course) },
-            )
-            Spacer(Modifier.height(16.dp))
-        }
-        item {
-            Spacer(Modifier.height(120.dp))
-        }
-    }
-}
-
-@Composable
-fun CourseCard(
-    course: Course,
-    onClick: () -> Unit = {},
-) {
-    Box(
-        Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(20.dp))
-            .background(Secondary)
-            .clickable { onClick() }
-            .padding(20.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Column(
-                modifier = Modifier.weight(1f),
-            ) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Text(
-                        text = course.title,
-                        color = TextColor,
-                        style = MaterialTheme.typography.labelLarge,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                        modifier = Modifier.weight(1f, fill = false),
-                    )
-                    if (course.isStarred) {
-                        Spacer(Modifier.width(6.dp))
-                        Icon(
-                            imageVector = Icons.Default.Star,
-                            contentDescription = "Starred",
-                            tint = Accent,
-                            modifier = Modifier.size(18.dp),
-                        )
-                    }
-                }
-                Spacer(Modifier.height(6.dp))
-                Text(
-                    text = course.details,
-                    color = Accent,
-                    style = MaterialTheme.typography.bodyMedium,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-            Spacer(Modifier.width(16.dp))
-            Icon(
-                imageVector = Icons.Default.Edit,
-                contentDescription = "Edit Course",
-                tint = Accent,
-                modifier = Modifier.size(24.dp),
-            )
-        }
-    }
-}
-
-@RequiresApi(Build.VERSION_CODES.O)
-@Composable
-fun RemindersContent(
-    reminders: List<Reminder>,
-    reminderStatus: Int,
-    searchQuery: String = "",
-    onToggleReminderComplete: (Long, Boolean) -> Unit,
-    onDeleteReminder: (Reminder) -> Unit,
-) {
-    val statusFilteredReminders =
-        reminders.filter { reminder ->
-            when (reminderStatus) {
-                0 -> reminder.status != ReminderStatus.COMPLETED
-                1 -> reminder.status == ReminderStatus.COMPLETED
-                else -> true
-            }
-        }
-
-    val filteredReminders =
-        if (searchQuery.isNotEmpty()) {
-            statusFilteredReminders.filter { reminder ->
-                reminder.title.contains(searchQuery, ignoreCase = true) ||
-                    reminder.description.contains(searchQuery, ignoreCase = true) ||
-                    reminder.courseTitle.contains(searchQuery, ignoreCase = true)
-            }
-        } else {
-            statusFilteredReminders
-        }
-
-    if (filteredReminders.isEmpty()) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 20.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center,
-            ) {
-                Text(
-                    text =
-                        when {
-                            searchQuery.isNotEmpty() -> "No reminders found"
-                            reminderStatus == 0 -> "No pending reminders"
-                            else -> "No completed reminders"
-                        },
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = TextColor.copy(alpha = 0.6f),
-                )
-            }
-        }
-    } else {
-        val groupedReminders = groupRemindersByDate(filteredReminders)
-
-        LazyColumn(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 20.dp),
-        ) {
-            groupedReminders.forEach { (dateHeader, remindersList) ->
-                item {
-                    DateHeaderWithChip(dateHeader = dateHeader, remindersList = remindersList)
-                }
-
-                items(remindersList, key = { it.id }) { reminder ->
-                    SwipeableReminderCard(
-                        reminder = reminder,
-                        onToggleComplete = onToggleReminderComplete,
-                        onDelete = onDeleteReminder,
-                    )
-                    Spacer(Modifier.height(12.dp))
-                }
-
-                item {
-                    Spacer(Modifier.height(8.dp))
-                }
-            }
-
-            item {
-                Spacer(Modifier.height(120.dp))
-            }
-        }
-    }
-}
-
-fun groupRemindersByDate(reminders: List<Reminder>): LinkedHashMap<String, List<Reminder>> =
-    reminders
-        .sortedBy { it.dateMillis }
-        .groupBy { reminder ->
-            val reminderDate =
-                try {
-                    LocalDate.parse(reminder.date)
-                } catch (e: Exception) {
-                    LocalDateTime
-                        .ofEpochSecond(
-                            reminder.dateMillis / 1000,
-                            0,
-                            java.time.ZoneOffset
-                                .systemDefault()
-                                .rules
-                                .getOffset(java.time.Instant.ofEpochMilli(reminder.dateMillis)),
-                        ).toLocalDate()
-                }
-
-            reminderDate.format(DateTimeFormatter.ofPattern("dd MMMM"))
-        }.toList()
-        .sortedBy { (_, remindersList) ->
-
-            remindersList.firstOrNull()?.dateMillis ?: 0L
-        }.toMap(LinkedHashMap())
-
-@RequiresApi(Build.VERSION_CODES.O)
-fun getDateChipInfo(reminderDate: LocalDate): Pair<String, Color> {
-    val today = LocalDate.now()
-    val daysFromNow = ChronoUnit.DAYS.between(today, reminderDate)
-
-    return when {
-        reminderDate.isEqual(today) -> "Today" to Red
-        reminderDate.isEqual(today.plusDays(1)) -> "Tomorrow" to Red
-        daysFromNow in 1..2 -> "$daysFromNow days to go" to Red
-        daysFromNow > 2 -> "$daysFromNow days to go" to com.dscvit.vitty.theme.Yellow
-        reminderDate.isBefore(today) -> {
-            val daysPast = ChronoUnit.DAYS.between(reminderDate, today)
-            if (daysPast == 1L) {
-                "Yesterday" to com.dscvit.vitty.theme.Yellow
-            } else {
-                "$daysPast days ago" to com.dscvit.vitty.theme.Yellow
-            }
-        }
-        else -> "" to Color.Transparent
-    }
-}
-
-@Composable
-fun SwipeableReminderCard(
-    reminder: Reminder,
-    onToggleComplete: (Long, Boolean) -> Unit,
-    onDelete: (Reminder) -> Unit,
-) {
-    var isDismissed by remember { mutableStateOf(false) }
-    var isCompleted by remember { mutableStateOf(false) }
-
-    val dismissState =
-        rememberSwipeToDismissBoxState(
-            confirmValueChange = { dismissValue ->
-                when (dismissValue) {
-                    SwipeToDismissBoxValue.EndToStart -> {
-                        isDismissed = true
-                        true
-                    }
-                    SwipeToDismissBoxValue.StartToEnd -> {
-                        if (reminder.status != ReminderStatus.COMPLETED) {
-                            isCompleted = true
-                            true
-                        } else {
-                            false
-                        }
-                    }
-                    else -> false
-                }
-            },
-        )
-
-    LaunchedEffect(isDismissed) {
-        if (isDismissed) {
-            kotlinx.coroutines.delay(200)
-            onDelete(reminder)
-        }
-    }
-
-    LaunchedEffect(isCompleted) {
-        if (isCompleted) {
-            kotlinx.coroutines.delay(200)
-            onToggleComplete(reminder.id, true)
-        }
-    }
-
-    AnimatedVisibility(
-        visible = !isDismissed && !isCompleted,
-        exit = fadeOut(animationSpec = tween(200)),
-    ) {
-        SwipeToDismissBox(
-            state = dismissState,
-            backgroundContent = {
-                when (dismissState.dismissDirection) {
-                    SwipeToDismissBoxValue.StartToEnd -> {
-                        if (reminder.status != ReminderStatus.COMPLETED) {
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .fillMaxSize()
-                                        .background(
-                                            color = Green,
-                                            shape = RoundedCornerShape(20.dp),
-                                        ).padding(horizontal = 16.dp),
-                                contentAlignment = Alignment.CenterStart,
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Default.Check,
-                                    contentDescription = "Complete",
-                                    tint = Color.White,
-                                    modifier = Modifier.size(24.dp),
-                                )
-                            }
-                        }
-                    }
-                    SwipeToDismissBoxValue.EndToStart -> {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxSize()
-                                    .background(
-                                        color = Red,
-                                        shape = RoundedCornerShape(20.dp),
-                                    ).padding(horizontal = 16.dp),
-                            contentAlignment = Alignment.CenterEnd,
-                        ) {
-                            Icon(
-                                imageVector = Icons.Default.Delete,
-                                contentDescription = "Delete",
-                                tint = Color.White,
-                                modifier = Modifier.size(24.dp),
-                            )
-                        }
-                    }
-                    else -> {
-                    }
-                }
-            },
-            enableDismissFromStartToEnd = reminder.status != ReminderStatus.COMPLETED,
-            enableDismissFromEndToStart = true,
-        ) {
-            ReminderCardContent(
-                reminder = reminder,
-                onClick = {
-                    if (reminder.status != ReminderStatus.COMPLETED) {
-                        onToggleComplete(reminder.id, true)
-                    }
-                },
-            )
-        }
-    }
-}
-
-@Composable
-fun ReminderCardContent(
-    reminder: Reminder,
-    onClick: () -> Unit = {},
-) {
-    Box(
-        Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(20.dp))
-            .background(Secondary)
-            .clickable { onClick() }
-            .padding(20.dp),
-    ) {
-        Column {
-            Text(
-                text = if (reminder.title.isNotEmpty()) reminder.title else "Reminder",
-                color = TextColor,
-                style = MaterialTheme.typography.labelLarge,
-            )
-
-            Spacer(Modifier.height(8.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = reminder.courseTitle.ifEmpty { "Course" },
-                    color = Accent,
-                    style = MaterialTheme.typography.bodyMedium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-        }
-    }
-}
-
-@RequiresApi(Build.VERSION_CODES.O)
-@Composable
-fun DateHeaderWithChip(
-    dateHeader: String,
-    remindersList: List<Reminder>,
-) {
-    val firstReminder = remindersList.firstOrNull() ?: return
-    val reminderDate =
-        try {
-            LocalDate.parse(firstReminder.date)
-        } catch (e: Exception) {
-            LocalDateTime
-                .ofEpochSecond(
-                    firstReminder.dateMillis / 1000,
-                    0,
-                    java.time.ZoneOffset
-                        .systemDefault()
-                        .rules
-                        .getOffset(java.time.Instant.ofEpochMilli(firstReminder.dateMillis)),
-                ).toLocalDate()
-        }
-
-    val (chipText, _) = getDateChipInfo(reminderDate)
-
-    Row(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(vertical = 8.dp),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            text = dateHeader,
-            style = MaterialTheme.typography.titleMedium,
-            color = TextColor,
-            fontWeight = FontWeight.SemiBold,
-        )
-
-        if (chipText.isNotEmpty()) {
-            RemindersChip(
-                text = chipText,
-                reminder = firstReminder,
-            )
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CourseSelectionBottomSheet(
-    courses: List<Course>,
-    onDismiss: () -> Unit,
-    onCourseSelected: (Course) -> Unit,
-) {
-    ModalBottomSheet(
-        onDismissRequest = onDismiss,
-        containerColor = Background,
-        contentColor = TextColor,
-        dragHandle = {
-            Box(
-                modifier =
-                    Modifier
-                        .padding(top = 16.dp)
-                        .width(120.dp)
-                        .height(7.dp)
-                        .background(Accent.copy(alpha = .4f), shape = RoundedCornerShape(44.dp)),
-            ) {
-            }
-        },
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-        ) {
-            Text(
-                text = "Select a Course",
-                style = MaterialTheme.typography.titleLarge,
-                color = TextColor,
-                modifier = Modifier.padding(bottom = 16.dp),
-            )
-
-            LazyColumn(
-                modifier = Modifier.wrapContentHeight(),
-            ) {
-                items(courses) { course ->
-                    CourseItem(
-                        course = course,
-                        onClick = {
-                            onCourseSelected(course)
-                        },
-                    )
-                    Spacer(modifier = Modifier.height(8.dp))
-                }
-                item {
-                    Spacer(modifier = Modifier.height(16.dp))
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun CourseItem(
-    course: Course,
-    onClick: () -> Unit,
-) {
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(12.dp))
-                .background(Secondary)
-                .clickable { onClick() }
-                .padding(16.dp),
-    ) {
-        Text(
-            text = course.title,
-            color = TextColor,
-            style = MaterialTheme.typography.bodyLarge,
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/models/Course.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/models/Course.kt
deleted file mode 100644
index 710b106..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/models/Course.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dscvit.vitty.ui.academics.models
-
-data class Course(
-    val title: String,
-    val slot: String,
-    val code: String,
-    val semester: String,
-    val isStarred: Boolean = false,
-) {
-    val details: String get() = "$slot | $semester"
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/auth/AuthViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/auth/AuthViewModel.kt
deleted file mode 100644
index aef7a0e..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/auth/AuthViewModel.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.dscvit.vitty.ui.auth
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitCommunitySignInListener
-import com.dscvit.vitty.network.api.community.RetrofitSelfUserListener
-import com.dscvit.vitty.network.api.community.RetrofitUserActionListener
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.network.api.community.responses.user.SignInResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import retrofit2.Call
-import timber.log.Timber
-
-class AuthViewModel : ViewModel() {
-    private val _usernameValidity = MutableLiveData<PostResponse?>()
-    private val _signInResponse = MutableLiveData<SignInResponse?>()
-    private val _user = MutableLiveData<UserResponse?>()
-
-    val usernameValidity: MutableLiveData<PostResponse?> = _usernameValidity
-    val signInResponse: MutableLiveData<SignInResponse?> = _signInResponse
-    val user: MutableLiveData<UserResponse?> = _user
-
-    // user response has timetable as well
-
-    fun signInAndGetTimeTable(
-        username: String,
-        regno: String,
-        uuid: String,
-        campus: String,
-    ) {
-        APICommunityRestClient.instance.signInWithUsernameRegNo(
-            username,
-            regno,
-            uuid,
-            campus,
-            object : RetrofitCommunitySignInListener {
-                override fun onSuccess(
-                    call: Call<SignInResponse>?,
-                    response: SignInResponse?,
-                ) {
-                    Timber.d("username: $username regno: $regno uuid: $uuid campus: $campus")
-                    Timber.d("Response: $response")
-                    _signInResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<SignInResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("Error: ${t?.message}")
-                    _signInResponse.postValue(null)
-                }
-            },
-            object : RetrofitSelfUserListener {
-                override fun onSuccess(
-                    call: Call<UserResponse>?,
-                    response: UserResponse?,
-                ) {
-                    _user.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<UserResponse>?,
-                    t: Throwable?,
-                ) {
-                    _user.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun checkUsername(username: String) {
-        APICommunityRestClient.instance.checkUsername(
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    _usernameValidity.postValue(response)
-                    Timber.d("Response: $response")
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("Error: ${t?.message}")
-                }
-            },
-        )
-    }
-
-    fun getUserWithTimeTable(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.getUserWithTimeTable(
-            token,
-            username,
-            object : RetrofitSelfUserListener {
-                override fun onSuccess(
-                    call: Call<UserResponse>?,
-                    response: UserResponse?,
-                ) {
-                    _user.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<UserResponse>?,
-                    t: Throwable?,
-                ) {
-                    _user.postValue(null)
-                }
-            },
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/auth/IntroFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/auth/IntroFragment.kt
index c2e6e28..e93d77f 100755
--- a/app/src/main/java/com/dscvit/vitty/ui/auth/IntroFragment.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/auth/IntroFragment.kt
@@ -38,13 +38,11 @@ class IntroFragment : Fragment() {
                     subHeading.text = requireContext().getString(R.string.intro1_subtitle)
                     illustration.setImageResource(R.drawable.get_notified)
                 }
-
                 1 -> {
                     heading.text = requireContext().getString(R.string.intro2_title)
                     subHeading.text = requireContext().getString(R.string.intro2_subtitle)
                     illustration.setImageResource(R.drawable.widget)
                 }
-
                 2 -> {
                     heading.text = requireContext().getString(R.string.intro3_title)
                     subHeading.text = requireContext().getString(R.string.intro3_subtitle)
diff --git a/app/src/main/java/com/dscvit/vitty/ui/community/AllRequestFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/community/AllRequestFragment.kt
deleted file mode 100644
index 3581584..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/community/AllRequestFragment.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.dscvit.vitty.ui.community
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.dscvit.vitty.R
-import com.dscvit.vitty.adapter.SearchAdapter
-import com.dscvit.vitty.databinding.FragmentAllRequestBinding
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.util.Constants
-import timber.log.Timber
-
-
-class AllRequestFragment : Fragment() {
-
-    private lateinit var binding: FragmentAllRequestBinding
-    private lateinit var prefs: SharedPreferences
-    private lateinit var communityViewModel: CommunityViewModel
-    private lateinit var searchAdapter: SearchAdapter
-
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        binding = FragmentAllRequestBinding.inflate(inflater, container, false)
-        communityViewModel = ViewModelProvider(this)[CommunityViewModel::class.java]
-        val requestList = binding.requestList
-
-        prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
-        val token = prefs.getString(Constants.COMMUNITY_TOKEN, null)
-        if (token != null) {
-            communityViewModel.getFriendRequest(token)
-        }
-        binding.reqToolbar.setNavigationIcon(R.drawable.ic_back)
-        binding.reqToolbar.setNavigationOnClickListener {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        }
-
-
-        communityViewModel.friendRequest.observe(viewLifecycleOwner) {
-            updateViewVisibility(binding.noRequests, it)
-            Timber.d("FriendRequestList--: $it")
-            if (it != null && token != null && it.isNotEmpty()) {
-                val requestListParsed = getRequestList(it)
-                if (requestListParsed.isNotEmpty()) {
-                    requestList.visibility = View.VISIBLE
-                    requestList.scheduleLayoutAnimation()
-                    searchAdapter = SearchAdapter(
-                        requestListParsed,
-                        token, communityViewModel, isSearchMode = false, isAllReqPage = true
-                    )
-                    requestList.adapter = searchAdapter
-
-                    requestList.layoutManager = LinearLayoutManager(context)
-                }
-
-            } else {
-                requestList.visibility = View.GONE
-                binding.noRequests.visibility = View.VISIBLE
-            }
-        }
-
-        communityViewModel.actionResponse.observe(viewLifecycleOwner) {
-            if (it != null) {
-                Timber.d("ActionResponse: $it")
-                Toast.makeText(context, it.detail, Toast.LENGTH_SHORT).show()
-            }
-        }
-
-
-        return binding.root
-    }
-
-    private fun getRequestList(it: RequestsResponse): List<UserResponse> {
-        val requestList = mutableListOf<UserResponse>()
-        for (i in it) {
-            requestList.add(i.from)
-        }
-        return requestList
-    }
-
-    private fun updateViewVisibility(view: View, friendRequestData: RequestsResponse?) {
-        if (friendRequestData.isNullOrEmpty()) {
-            view.visibility = View.VISIBLE
-        } else {
-            view.visibility = View.GONE
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/community/CommunityFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/community/CommunityFragment.kt
index 61e278f..dee1479 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/community/CommunityFragment.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/community/CommunityFragment.kt
@@ -1,57 +1,39 @@
 package com.dscvit.vitty.ui.community
 
-import android.content.Context
 import android.content.SharedPreferences
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.dscvit.vitty.R
-import com.dscvit.vitty.adapter.FriendAdapter
-import com.dscvit.vitty.adapter.PinnedFriendAdapterListener
 import com.dscvit.vitty.databinding.FragmentCommunityBinding
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
 import com.dscvit.vitty.util.Constants
-import timber.log.Timber
 
-class CommunityFragment : Fragment(), PinnedFriendAdapterListener {
+class CommunityFragment : Fragment() {
 
     private var _binding: FragmentCommunityBinding? = null
+    private lateinit var prefs: SharedPreferences
+
 
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
-    private lateinit var communityViewModel: CommunityViewModel
-    private lateinit var sharedPreferences: SharedPreferences
-    private lateinit var friendAdapter: FriendAdapter
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        communityViewModel = ViewModelProvider(this)[CommunityViewModel::class.java]
+        val communityViewModel =
+            ViewModelProvider(this)[CommunityViewModel::class.java]
 
         _binding = FragmentCommunityBinding.inflate(inflater, container, false)
         val root: View = binding.root
-        binding.loadingView.visibility = View.VISIBLE
-        //get token and username from shared preferences
-        sharedPreferences =
-            requireActivity().getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        val username = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-        Timber.d("TokenComm: $token")
-        communityViewModel.getFriendList(token, username)
-        communityViewModel.getFriendRequest(token)
+
+        prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
 
         binding.communityToolbar.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
@@ -60,224 +42,29 @@ class CommunityFragment : Fragment(), PinnedFriendAdapterListener {
                         .navigate(R.id.action_navigation_community_to_navigation_requests)
                     true
                 }
-
                 else -> {
                     false
                 }
             }
         }
 
-        binding.friendRequestsNotification.setOnClickListener {
-            requireView().findNavController()
-                .navigate(R.id.action_navigation_community_to_navigation_requests)
-        }
-
-        getData()
-
-
-        return root
-    }
-
-
-    override fun onResume() {
-        super.onResume()
-
-        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        communityViewModel.getFriendRequest(token)
-    }
-
-    private fun getData() {
-        communityViewModel.friendList.observe(viewLifecycleOwner) {
-            updatePins(it)
-            if (it != null) {
-                val allFriends = it.data
-                binding.apply {
-                    if (!allFriends.isNullOrEmpty()) {
-                        binding.tipText.visibility = View.VISIBLE
-                        friendsList.scheduleLayoutAnimation()
-                        friendAdapter = FriendAdapter(allFriends, this@CommunityFragment)
-                        friendsList.adapter = friendAdapter
-                        friendsList.layoutManager = LinearLayoutManager(context)
-                        noFriends.visibility = View.INVISIBLE
-                        binding.loadingView.visibility = View.GONE
-                    } else {
-                        /*binding.quoteLine.text = try {
-                            Quote.getLine(context)
-                        } catch (_: Exception) {
-                            Constants.DEFAULT_QUOTE
-                        }*/
-                        binding.noFriends.visibility = View.VISIBLE
-                        if (isNetworkAvailable()) {
-                            binding.noFriendsFound.text = "No friends found"
-                            binding.quoteLine.text = "Add friends to see their timetable"
-                        } else {
-                            binding.noFriendsFound.text = "No internet connection"
-                            binding.quoteLine.text = "Please check your internet connection"
-                        }
-                        binding.tipText.visibility = View.INVISIBLE
-                        binding.loadingView.visibility = View.GONE
-                    }
-                }
-            } else {
-                binding.tipText.visibility = View.INVISIBLE
-                binding.loadingView.visibility = View.GONE
-                binding.noFriends.visibility = View.VISIBLE
-                if (isNetworkAvailable()) {
-                    binding.noFriendsFound.text = "No friends found"
-                    binding.quoteLine.text = "Add friends to see their timetable"
-                } else {
-                    binding.noFriendsFound.text = "No internet connection"
-                    binding.quoteLine.text = "Please check your internet connection"
-                }
-            }
-        }
-
-        showFriendReqCount()
-    }
-
-    private fun showFriendReqCount() {
-        Timber.d("showFriendReqCount")
-        communityViewModel.friendRequest.observe(viewLifecycleOwner) {
-
-            Timber.d("showFriendReqCount it $it")
-            if (it != null) {
-                val allRequests = getRequestList(it)
-                binding.apply {
-                    if (!allRequests.isNullOrEmpty()) {
-                        friendRequestsNotification.visibility = View.VISIBLE
-                        friendRequestsNotification.text = "${allRequests.size} req"
-                    } else {
-                        friendRequestsNotification.visibility = View.GONE
-                    }
-                }
-            }
+        if (!prefs.getBoolean("KRISH", false)) {
+            binding.krish.visibility = View.GONE
+        } else {
+            binding.krish.visibility = View.VISIBLE
         }
-    }
 
-    private fun isNetworkAvailable(): Boolean {
-        val connectivityManager =
-            context?.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val network = connectivityManager.activeNetwork
-        val capabilities = connectivityManager.getNetworkCapabilities(network)
-        return capabilities != null && (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
-                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR))
-    }
-
-    private fun getRequestList(it: RequestsResponse): List<UserResponse> {
-        val requestList = mutableListOf<UserResponse>()
-        for (i in it) {
-            requestList.add(i.from)
+        binding.krish.setOnLongClickListener {
+            prefs.edit().putBoolean("KRISH", false).apply()
+            binding.krish.visibility = View.GONE
+            true
         }
-        return requestList
-    }
 
-    private fun updatePins(it: FriendResponse?) {
-        if (it != null) {
-            val pinnedFriends = getPinnedFriends()
-            val allFriendsUsernames = it.data?.map { it.username }
-            for (i in pinnedFriends) {
-                if (!allFriendsUsernames.isNullOrEmpty() && !allFriendsUsernames.contains(i)) {
-                    unPinFriend(i)
-                }
-            }
-        }
+        return root
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-
-    override fun pinFriend(username: String): Boolean {
-
-        val friend1 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_1, null)
-        val friend2 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_2, null)
-        val friend3 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_3, null)
-        if (friend1 == null) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_1, username)
-                .apply()
-        } else if (friend2 == null) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_2, username)
-                .apply()
-        } else if (friend3 == null) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_3, username)
-                .apply()
-        } else {
-            Toast.makeText(context, "You can pin only 3 friends", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        Toast.makeText(context, "Pinned $username", Toast.LENGTH_SHORT).show()
-        return true
-
-    }
-
-    override fun getPinnedFriends(): List<String> {
-        val friend1 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_1, null)
-        val friend2 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_2, null)
-        val friend3 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_3, null)
-
-        val pinnedFriends = mutableListOf<String>()
-        if (friend1 != null) {
-            pinnedFriends.add(friend1)
-        }
-        if (friend2 != null) {
-            pinnedFriends.add(friend2)
-        }
-        if (friend3 != null) {
-            pinnedFriends.add(friend3)
-        }
-
-        return pinnedFriends
-    }
-
-    override fun unPinFriend(username: String): Boolean {
-        val friend1 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_1, null)
-        val friend2 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_2, null)
-        val friend3 = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_3, null)
-        if (friend1 == username) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_1, null).apply()
-        } else if (friend2 == username) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_2, null).apply()
-        } else if (friend3 == username) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_3, null).apply()
-        } else {
-            Toast.makeText(context, "Error in unpinning $username", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        //sort pins
-        val friend1New = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_1, null)
-        val friend2New = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_2, null)
-        val friend3New = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_3, null)
-        if (friend1New == null && friend2New != null) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_1, friend2New)
-                .apply()
-            if (friend3 != null) {
-                sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_2, friend3)
-                    .apply()
-                sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_3, null)
-                    .apply()
-            } else {
-                sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_2, null)
-                    .apply()
-            }
-
-        }
-        if (friend2New == null && friend3New != null) {
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_2, friend3New)
-                .apply()
-            sharedPreferences.edit().putString(Constants.COMMUNITY_PINNED_FRIEND_3, null).apply()
-        }
-
-        val friend1Newt = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_1, null)
-        val friend2Newt = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_2, null)
-        val friend3Newt = sharedPreferences.getString(Constants.COMMUNITY_PINNED_FRIEND_3, null)
-
-        Timber.d("sorted after unpin $friend1Newt $friend2Newt $friend3Newt")
-        Toast.makeText(context, "Unpinned $username", Toast.LENGTH_SHORT).show()
-        return true
-    }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/community/CommunityViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/community/CommunityViewModel.kt
index d1a9843..bdbcb19 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/community/CommunityViewModel.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/community/CommunityViewModel.kt
@@ -1,281 +1,6 @@
 package com.dscvit.vitty.ui.community
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitFriendListListener
-import com.dscvit.vitty.network.api.community.RetrofitFriendRequestListener
-import com.dscvit.vitty.network.api.community.RetrofitSearchResultListener
-import com.dscvit.vitty.network.api.community.RetrofitUserActionListener
-import com.dscvit.vitty.network.api.community.responses.circle.CircleBatchRequestResponse
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import retrofit2.Call
-import timber.log.Timber
 
 class CommunityViewModel : ViewModel() {
-    private val _friendList = MutableLiveData<FriendResponse?>()
-    private val _friendRequest = MutableLiveData<RequestsResponse?>()
-    private val _suggestedFriends = MutableLiveData<List<UserResponse>?>()
-    private val _searchResult = MutableLiveData<List<UserResponse>?>()
-    private val _actionResponse = MutableLiveData<PostResponse?>()
-    private val _batchCircleRequestResponse = MutableLiveData<CircleBatchRequestResponse?>()
-
-    val friendList: MutableLiveData<FriendResponse?> = _friendList
-    val friendRequest: MutableLiveData<RequestsResponse?> = _friendRequest
-    val suggestedFriends: MutableLiveData<List<UserResponse>?> = _suggestedFriends
-    val searchResult: MutableLiveData<List<UserResponse>?> = _searchResult
-    val actionResponse: MutableLiveData<PostResponse?> = _actionResponse
-    val batchCircleRequestResponse: MutableLiveData<CircleBatchRequestResponse?> = _batchCircleRequestResponse
-
-    fun getFriendList(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.getFriendList(
-            token,
-            username,
-            object : RetrofitFriendListListener {
-                override fun onSuccess(
-                    call: Call<FriendResponse>?,
-                    response: FriendResponse?,
-                ) {
-                    _friendList.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<FriendResponse>?,
-                    t: Throwable?,
-                ) {
-                    _friendList.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun getSearchResult(
-        token: String,
-        query: String,
-    ) {
-        APICommunityRestClient.instance.getSearchResult(
-            token,
-            query,
-            object : RetrofitSearchResultListener {
-                override fun onSuccess(
-                    call: Call<List<UserResponse>>?,
-                    response: List<UserResponse>?,
-                ) {
-                    Timber.d("SearchResult2: $response")
-                    _searchResult.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<List<UserResponse>>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("SearchResult3: ${t?.message}")
-                    _searchResult.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun getFriendRequest(token: String) {
-        APICommunityRestClient.instance.getFriendRequest(
-            token,
-            object : RetrofitFriendRequestListener {
-                override fun onSuccess(
-                    call: Call<RequestsResponse>?,
-                    response: RequestsResponse?,
-                ) {
-                    Timber.d("FriendRequest--: $response")
-                    _friendRequest.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<RequestsResponse>?,
-                    t: Throwable?,
-                ) {
-                    _friendRequest.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun getSuggestedFriends(token: String) {
-        APICommunityRestClient.instance.getSuggestedFriends(
-            token,
-            object : RetrofitSearchResultListener {
-                override fun onSuccess(
-                    call: Call<List<UserResponse>>?,
-                    response: List<UserResponse>?,
-                ) {
-                    Timber.d("SearchResult2Sugg: $response")
-                    Timber.d("SearchResult2Sugg Size: ${response?.size ?: 0}")
-                    _suggestedFriends.postValue(response ?: emptyList())
-                }
-
-                override fun onError(
-                    call: Call<List<UserResponse>>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("SearchResult3: ${t?.message}")
-                    _suggestedFriends.postValue(emptyList())
-                }
-            },
-        )
-    }
-
-    fun acceptRequest(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.acceptRequest(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("AcceptRequest: $response")
-                    _actionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("AcceptRequest: ${t?.message}")
-                }
-            },
-        )
-    }
-
-    fun rejectRequest(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.rejectRequest(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("RejectRequest: $response")
-                    _actionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("RejectRequest: ${t?.message}")
-                }
-            },
-        )
-    }
-
-    fun sendRequest(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.sendRequest(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("SendRequest: $response")
-                    _actionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("SendRequest: ${t?.message}")
-                }
-            },
-        )
-    }
-
-    fun sendCircleRequest(
-        token: String,
-        circleId: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.sendCircleRequest(
-            token,
-            circleId,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("SendCircleRequest: $response")
-                    _actionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("SendCircleRequest: ${t?.message}")
-                    _actionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun sendBatchCircleRequest(
-        token: String,
-        circleId: String,
-        usernames: List<String>,
-    ) {
-        APICommunityRestClient.instance.sendBatchCircleRequest(
-            token,
-            circleId,
-            usernames,
-        ) { response ->
-            _batchCircleRequestResponse.postValue(response)
-        }
-    }
-
-    fun clearBatchCircleRequestResponse() {
-        _batchCircleRequestResponse.postValue(null)
-    }
-
-    fun unfriend(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.unfriend(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("Unfriend: $response")
-                    _actionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("Unfriend: ${t?.message}")
-                }
-            },
-        )
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/community/FriendFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/community/FriendFragment.kt
deleted file mode 100644
index 1620ef0..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/community/FriendFragment.kt
+++ /dev/null
@@ -1,288 +0,0 @@
-package com.dscvit.vitty.ui.community
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import coil.load
-import com.dscvit.vitty.R
-import com.dscvit.vitty.adapter.DayAdapter
-import com.dscvit.vitty.databinding.FragmentFriendBinding
-import com.dscvit.vitty.util.Constants
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.tabs.TabLayoutMediator
-import timber.log.Timber
-import java.util.Calendar
-
-
-class FriendFragment : Fragment() {
-
-
-    private lateinit var binding: FragmentFriendBinding
-    private val days = listOf("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
-    private lateinit var communityViewModel: CommunityViewModel
-    private lateinit var token: String
-    private lateinit var sharedPrefs: SharedPreferences
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentFriendBinding.inflate(inflater, container, false)
-        communityViewModel = ViewModelProvider(this)[CommunityViewModel::class.java]
-        sharedPrefs =
-            requireActivity().getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val name = arguments?.getString("name")
-        val username = arguments?.getString("username")
-        val picture = arguments?.getString("profile_picture")
-        val friendStatus = arguments?.getString("friend_status")
-        token = sharedPrefs.getString(Constants.COMMUNITY_TOKEN, null) ?: ""
-
-        setUpPage(name, username, picture, friendStatus)
-        Timber.d("FriendFragment: $name $username $picture $friendStatus")
-        return binding.root
-
-
-    }
-
-    private fun setUpPage(
-        name: String?,
-        username: String?,
-        picture: String?,
-        friendStatus: String?
-    ) {
-
-        binding.friendTimetableName.text = name ?: "Friend"
-        binding.friendToolbar.title = username ?: "username"
-        binding.profileImage.load(picture) {
-            crossfade(true)
-            placeholder(R.drawable.ic_gdscvit)
-            error(R.drawable.ic_gdscvit)
-        }
-
-        binding.friendToolbar.setNavigationIcon(R.drawable.ic_back)
-        binding.friendToolbar.setNavigationOnClickListener {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        }
-
-
-        setUpWithStatus(username, friendStatus)
-
-
-    }
-
-    private fun setUpWithStatus(username: String?, friendStatus: String?) {
-        when (friendStatus) {
-            "received" -> {
-                requestReceivedLayout()
-            }
-
-            "sent" -> {
-                requestSentLayout()
-            }
-
-            "none" -> {
-                sendRequestLayout()
-            }
-
-            else -> {
-                friendLayout(username)
-            }
-        }
-
-        setupActions(username, friendStatus)
-
-    }
-
-    private fun requestReceivedLayout() {
-        binding.acceptRejectLayout.visibility = View.VISIBLE
-        binding.sendRequest.visibility = View.GONE
-        binding.requestSent.visibility = View.GONE
-        binding.unfriend.visibility = View.GONE
-        binding.tabsLayout.visibility = View.GONE
-        binding.pager.visibility = View.GONE
-        binding.notFriend.visibility = View.VISIBLE
-    }
-
-    private fun requestSentLayout() {
-        binding.acceptRejectLayout.visibility = View.GONE
-        binding.sendRequest.visibility = View.GONE
-        binding.requestSent.visibility = View.VISIBLE
-        binding.unfriend.visibility = View.GONE
-        binding.tabsLayout.visibility = View.GONE
-        binding.pager.visibility = View.GONE
-        binding.notFriend.visibility = View.VISIBLE
-    }
-
-    private fun sendRequestLayout() {
-        binding.acceptRejectLayout.visibility = View.GONE
-        binding.sendRequest.visibility = View.VISIBLE
-        binding.requestSent.visibility = View.GONE
-        binding.unfriend.visibility = View.GONE
-
-        binding.tabsLayout.visibility = View.GONE
-        binding.pager.visibility = View.GONE
-        binding.notFriend.visibility = View.VISIBLE
-    }
-
-    private fun setupActions(username: String?, friendStatus: String?) {
-        if (username == null) return
-        binding.accept.setOnClickListener {
-            acceptRequest(username)
-            friendLayout(username)
-
-        }
-        binding.reject.setOnClickListener {
-            handleRejectAction(username)
-
-        }
-        binding.sendRequest.setOnClickListener {
-            sendRequest(username)
-            requestSentLayout()
-        }
-        binding.unfriend.setOnClickListener {
-            handleUnfriendAction(username)
-
-        }
-
-    }
-
-    private fun handleRejectAction(username: String) {
-
-        val v: View = LayoutInflater
-            .from(context)
-            .inflate(R.layout.dialog_setup_complete, null)
-        val dialog = MaterialAlertDialogBuilder(requireContext())
-            .setView(v)
-            .setBackground(
-                AppCompatResources.getDrawable(
-                    requireContext(),
-                    R.color.transparent
-                )
-            )
-            .create()
-        dialog.setCanceledOnTouchOutside(true)
-        dialog.show()
-
-        val skip = v.findViewById<Button>(R.id.skip)
-        val next = v.findViewById<Button>(R.id.next)
-        val title = v.findViewById<TextView>(R.id.title)
-        val desc = v.findViewById<TextView>(R.id.description)
-
-        title.text = "Reject Request"
-        desc.text = "Are you sure you want to reject this request?"
-        skip.text = "Cancel"
-        next.text = "Reject"
-
-        skip.setOnClickListener {
-            dialog.dismiss()
-        }
-
-        next.setOnClickListener {
-            rejectRequest(username)
-            sendRequestLayout()
-            dialog.dismiss()
-        }
-    }
-
-    private fun handleUnfriendAction(username: String) {
-
-        val v: View = LayoutInflater
-            .from(context)
-            .inflate(R.layout.dialog_setup_complete, null)
-        val dialog = MaterialAlertDialogBuilder(requireContext())
-            .setView(v)
-            .setBackground(
-                AppCompatResources.getDrawable(
-                    requireContext(),
-                    R.color.transparent
-                )
-            )
-            .create()
-        dialog.setCanceledOnTouchOutside(true)
-        dialog.show()
-
-        val skip = v.findViewById<Button>(R.id.skip)
-        val next = v.findViewById<Button>(R.id.next)
-        val title = v.findViewById<TextView>(R.id.title)
-        val desc = v.findViewById<TextView>(R.id.description)
-
-        title.text = "Unfriend"
-        desc.text = "Are you sure you want to unfriend this person?"
-        skip.text = "Cancel"
-        next.text = "Unfriend"
-
-        skip.setOnClickListener {
-            dialog.dismiss()
-        }
-
-        next.setOnClickListener {
-            unfriend(username)
-            sendRequestLayout()
-            dialog.dismiss()
-        }
-
-    }
-
-    private fun friendLayout(username: String?) {
-        binding.acceptRejectLayout.visibility = View.GONE
-        binding.sendRequest.visibility = View.GONE
-        binding.requestSent.visibility = View.GONE
-        binding.unfriend.visibility = View.VISIBLE
-        binding.notFriend.visibility = View.GONE
-        binding.tabsLayout.visibility = View.VISIBLE
-        binding.pager.visibility = View.VISIBLE
-        setUpTimeTable(username)
-    }
-
-    private fun setUpTimeTable(username: String?) {
-
-        val calendar: Calendar = Calendar.getInstance()
-        val d = when (calendar.get(Calendar.DAY_OF_WEEK)) {
-            Calendar.MONDAY -> 0
-            Calendar.TUESDAY -> 1
-            Calendar.WEDNESDAY -> 2
-            Calendar.THURSDAY -> 3
-            Calendar.FRIDAY -> 4
-            Calendar.SATURDAY -> 5
-            Calendar.SUNDAY -> 6
-            else -> 0
-        }
-
-        val pagerAdapter = DayAdapter(this, username, true)
-        binding.pager.adapter = pagerAdapter
-        TabLayoutMediator(
-            binding.tabs, binding.pager
-        ) { tab, position -> tab.text = days[position] }
-            .attach()
-
-        binding.pager.currentItem = d
-
-    }
-
-
-    private fun acceptRequest(username: String) {
-        communityViewModel.acceptRequest(token, username)
-
-
-    }
-
-    private fun rejectRequest(username: String) {
-        communityViewModel.rejectRequest(token, username)
-    }
-
-    private fun sendRequest(username: String) {
-        communityViewModel.sendRequest(token, username)
-    }
-
-    private fun unfriend(username: String) {
-        communityViewModel.unfriend(token, username)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/community/RequestsFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/community/RequestsFragment.kt
index 68bf0e8..c31d48c 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/community/RequestsFragment.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/community/RequestsFragment.kt
@@ -5,19 +5,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import coil.load
 import com.dscvit.vitty.R
-import com.dscvit.vitty.adapter.SearchAdapter
 import com.dscvit.vitty.databinding.FragmentRequestsBinding
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
 import com.dscvit.vitty.util.Constants
-import timber.log.Timber
 
 class RequestsFragment : Fragment() {
 
@@ -27,7 +19,6 @@ class RequestsFragment : Fragment() {
     // onDestroyView.
     private val binding get() = _binding!!
     private lateinit var prefs: SharedPreferences
-    private lateinit var communityViewModel: CommunityViewModel
 
 
     override fun onCreateView(
@@ -35,162 +26,42 @@ class RequestsFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        communityViewModel = ViewModelProvider(this)[CommunityViewModel::class.java]
+        val communityViewModel =
+            ViewModelProvider(this)[CommunityViewModel::class.java]
 
         _binding = FragmentRequestsBinding.inflate(inflater, container, false)
         val root: View = binding.root
-        binding.loadingView.visibility = View.VISIBLE
-        prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
-        val token = prefs.getString(Constants.COMMUNITY_TOKEN, null)
-
-        binding.scheduleToolbar.setNavigationIcon(R.drawable.ic_back)
-        binding.scheduleToolbar.setNavigationOnClickListener {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        }
-
-        binding.searchFriendsText.setCompoundDrawablesWithIntrinsicBounds(
-            R.drawable.ic_search,
-            0,
-            0,
-            0
-        )
-
-
-        binding.searchFriendsText.setOnFocusChangeListener { _, hasFocus ->
-            if (hasFocus) {
-                requireView().findNavController()
-                    .navigate(R.id.action_navigation_requests_to_searchFragment)
-            }
-        }
-
-        binding.requestLayout.setOnClickListener {
-            requireView().findNavController()
-                .navigate(R.id.action_navigation_requests_to_allRequestFragment)
-        }
-
-        refreshPage(token)
-
-        return root
-    }
-
-    private fun refreshPage(token: String?) {
-        if (token != null) {
-            communityViewModel.getFriendRequest(token)
-            communityViewModel.getSuggestedFriends(token)
-        }
-        val requestLayout = binding.requestLayout
-        val suggestedList = binding.suggestedList
 
+        prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
 
-        communityViewModel.friendRequest.observe(viewLifecycleOwner) {
-            updateViewVisibility(binding.noRequests, it, communityViewModel.suggestedFriends.value)
-            Timber.d("FriendRequestList--: $it")
-            if (it != null) {
-                val requestListParsed = getRequestList(it)
-                if (requestListParsed.isNotEmpty()) {
-                    binding.pendingRequestsTextView.visibility = View.VISIBLE
-                    requestLayout.visibility = View.VISIBLE
-                    binding.icon.load(requestListParsed[requestListParsed.size - 1].picture) {
-                        crossfade(true)
-                        placeholder(R.drawable.ic_gdscvit)
-                    }
-                    binding.superscriptTextView.text = requestListParsed.size.toString()
-                } else {
-                    binding.pendingRequestsTextView.visibility = View.GONE
-                    requestLayout.visibility = View.GONE
+        binding.scheduleToolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.close -> {
+                    requireActivity().onBackPressed()
+                    true
                 }
-
-            } else {
-                binding.pendingRequestsTextView.visibility = View.GONE
-                requestLayout.visibility = View.GONE
-            }
-        }
-
-
-
-        communityViewModel.suggestedFriends.observe(viewLifecycleOwner) {
-            updateViewVisibility(binding.noRequests, communityViewModel.friendRequest.value, it)
-            val filteredSuggestedFriends = getSuggestedFriends(it)
-            if (it != null) {
-                binding.suggestedFriendsTextView.visibility = View.VISIBLE
-                suggestedList.visibility = View.VISIBLE
-                suggestedList.scheduleLayoutAnimation()
-                suggestedList.adapter =
-                    token?.let { token ->
-                        SearchAdapter(
-                            filteredSuggestedFriends,
-                            token,
-                            communityViewModel,
-                            false,
-                            false
-                        )
-                    }
-                suggestedList.layoutManager = LinearLayoutManager(context)
-            }
-        }
-
-        communityViewModel.actionResponse.observe(viewLifecycleOwner) {
-            if (it != null) {
-                Timber.d("ActionResponse: $it")
-                Toast.makeText(context, it.detail, Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    private fun getSuggestedFriends(it: List<UserResponse>?): List<UserResponse> {
-        val suggestedFriendsList = mutableListOf<UserResponse>()
-        val friendRequestList = communityViewModel.friendRequest.value?.let { it1 ->
-            getRequestList(
-                it1
-            )
-        }
-        if (it != null && friendRequestList != null) {
-            for (i in it) {
-                if (!friendRequestList.contains(i)) {
-                    suggestedFriendsList.add(i)
+                else -> {
+                    false
                 }
             }
-        } else if (
-            it != null
-        ) {
-            suggestedFriendsList.addAll(it)
         }
 
-        return suggestedFriendsList
-    }
-
-
-    private fun getRequestList(it: RequestsResponse): List<UserResponse> {
-        val requestList = mutableListOf<UserResponse>()
-        for (i in it) {
-            requestList.add(i.from)
+        binding.logout.setOnClickListener {
+            prefs.edit().putBoolean("KRISH", true).apply()
+            binding.reqKrish.visibility = View.GONE
         }
-        return requestList
-    }
 
-    private fun updateViewVisibility(
-        view: View,
-        friendRequestData: RequestsResponse?,
-        suggestedFriendsData: List<UserResponse>?
-    ) {
-        if (friendRequestData.isNullOrEmpty() && suggestedFriendsData.isNullOrEmpty()) {
-            view.visibility = View.VISIBLE
+        if (prefs.getBoolean("KRISH", false)) {
+            binding.reqKrish.visibility = View.GONE
         } else {
-            view.visibility = View.GONE
+            binding.reqKrish.visibility = View.VISIBLE
         }
-        binding.loadingView.visibility = View.GONE
-    }
 
+        return root
+    }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-
-    override fun onResume() {
-        super.onResume()
-        refreshPage(prefs.getString(Constants.COMMUNITY_TOKEN, null))
-    }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/community/SearchFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/community/SearchFragment.kt
deleted file mode 100644
index 191224a..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/community/SearchFragment.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.dscvit.vitty.ui.community
-
-import android.content.Context
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.dscvit.vitty.R
-import com.dscvit.vitty.adapter.SearchAdapter
-import com.dscvit.vitty.databinding.FragmentSearchBinding
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.util.Constants
-import timber.log.Timber
-
-
-class SearchFragment : Fragment() {
-
-    private var _binding: FragmentSearchBinding? = null
-    private lateinit var communityViewModel: CommunityViewModel
-
-    private val binding get() = _binding!!
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentSearchBinding.inflate(inflater, container, false)
-        val root: View = binding.root
-        communityViewModel = ViewModelProvider(this)[CommunityViewModel::class.java]
-        //get token from shared prefs
-        val sharedPreferences =
-            activity?.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences?.getString(Constants.COMMUNITY_TOKEN, null)
-        binding.searchToolbar.setNavigationIcon(R.drawable.ic_back)
-        binding.searchToolbar.setNavigationOnClickListener {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        }
-
-
-        handleKeyboardAndNavigation(token)
-
-
-
-        communityViewModel.searchResult.observe(viewLifecycleOwner) {
-            Timber.d("SearchResult: $it")
-            if (it != null) {
-                val searchResult = removeSelfAndFriends(it)
-                binding.apply {
-                    if (searchResult.isNotEmpty()) {
-                        searchList.scheduleLayoutAnimation()
-                        searchList.adapter =
-                            token?.let { token ->
-                                SearchAdapter(
-                                    searchResult,
-                                    token, communityViewModel, true, false
-                                )
-                            }
-                        searchList.layoutManager = LinearLayoutManager(context)
-                        noSearchResults.visibility = View.INVISIBLE
-                        searchList.visibility = View.VISIBLE
-                    } else {
-                        searchList.visibility = View.GONE
-                        noSearchResults.visibility = View.VISIBLE
-                    }
-                }
-            }
-        }
-
-
-
-        return root
-    }
-
-    private fun handleKeyboardAndNavigation(token: String?) {
-
-        val searchEditText = binding.searchFriendsText
-        searchEditText.requestFocus()
-        val imm =
-            requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT)
-        binding.searchFriendsText.setCompoundDrawablesWithIntrinsicBounds(
-            R.drawable.ic_search,
-            0,
-            0,
-            0
-        )
-
-
-        searchEditText.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                val query = s.toString().trim()
-                Timber.d("Query2--$token-: $query")
-                if (token != null) {
-                    Timber.d("Qer---: $query")
-                    if (query.isEmpty()) {
-                        Timber.d("Qur2---: $query")
-                        binding.searchList.visibility = View.GONE
-                        binding.noSearchResults.visibility = View.VISIBLE
-                        binding.searchFriendsText.setCompoundDrawablesWithIntrinsicBounds(
-                            R.drawable.ic_search,
-                            0,
-                            0,
-                            0
-                        )
-                    } else {
-                        Timber.d("Query---: $query")
-                        communityViewModel.getSearchResult(token, query)
-                        binding.searchFriendsText.setCompoundDrawablesWithIntrinsicBounds(
-                            0,
-                            0,
-                            0,
-                            0
-                        )
-                    }
-
-                }
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-
-            }
-        })
-
-
-    }
-
-
-    private fun removeSelfAndFriends(it: List<UserResponse>): List<UserResponse> {
-        val filteredList = it.filter { userResponse ->
-            userResponse.friend_status != "self"
-        }
-        return filteredList
-
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/components/CampusUpdateDialog.kt b/app/src/main/java/com/dscvit/vitty/ui/components/CampusUpdateDialog.kt
deleted file mode 100644
index 17d6868..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/components/CampusUpdateDialog.kt
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.dscvit.vitty.ui.components
-
-import android.widget.Toast
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitUserActionListener
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.util.Constants
-import retrofit2.Call
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CampusUpdateDialog(onDismiss: () -> Unit) {
-    val context = LocalContext.current
-    val prefs = remember { context.getSharedPreferences(Constants.USER_INFO, 0) }
-    val authToken = remember { prefs.getString(Constants.COMMUNITY_TOKEN, "") ?: "" }
-
-    var selectedCampus by remember { mutableStateOf("") }
-    var isLoading by remember { mutableStateOf(false) }
-    var expanded by remember { mutableStateOf(false) }
-
-    val campusOptions = listOf("Vellore", "Chennai", "Bhopal")
-
-    Dialog(
-        onDismissRequest = { /* Prevent dismissal */ },
-        properties =
-            DialogProperties(
-                dismissOnBackPress = false,
-                dismissOnClickOutside = false,
-            ),
-    ) {
-        Card(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-            shape = RoundedCornerShape(16.dp),
-            colors =
-                CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                ),
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(24.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                Text(
-                    text = "Select Your Campus",
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.Bold,
-                    color = MaterialTheme.colorScheme.onSurface,
-                    textAlign = TextAlign.Center,
-                )
-
-                Spacer(modifier = Modifier.height(8.dp))
-
-                Text(
-                    text = "Please select your campus to continue using the app",
-                    fontSize = 14.sp,
-                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f),
-                    textAlign = TextAlign.Center,
-                )
-
-                Spacer(modifier = Modifier.height(24.dp))
-
-                ExposedDropdownMenuBox(
-                    expanded = expanded,
-                    onExpandedChange = { if (!isLoading) expanded = !expanded },
-                ) {
-                    OutlinedTextField(
-                        value = selectedCampus,
-                        onValueChange = { },
-                        readOnly = true,
-                        label = { Text("Campus") },
-                        trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
-                        colors =
-                            OutlinedTextFieldDefaults.colors(
-                                focusedBorderColor = MaterialTheme.colorScheme.primary,
-                                unfocusedBorderColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
-                                focusedLabelColor = MaterialTheme.colorScheme.primary,
-                                unfocusedLabelColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f),
-                            ),
-                        modifier =
-                            Modifier
-                                .menuAnchor(MenuAnchorType.PrimaryNotEditable)
-                                .fillMaxWidth(),
-                        enabled = !isLoading,
-                    )
-
-                    ExposedDropdownMenu(
-                        expanded = expanded,
-                        onDismissRequest = { expanded = false },
-                        modifier = Modifier.exposedDropdownSize(),
-                        containerColor = MaterialTheme.colorScheme.surface,
-                        tonalElevation = 8.dp,
-                        shadowElevation = 8.dp,
-                    ) {
-                        campusOptions.forEach { campus ->
-                            DropdownMenuItem(
-                                text = {
-                                    Text(
-                                        text = campus,
-                                        color = MaterialTheme.colorScheme.onSurface,
-                                    )
-                                },
-                                onClick = {
-                                    selectedCampus = campus
-                                    expanded = false
-                                },
-                                colors =
-                                    MenuDefaults.itemColors(
-                                        textColor = MaterialTheme.colorScheme.onSurface,
-                                        leadingIconColor = MaterialTheme.colorScheme.onSurface,
-                                        trailingIconColor = MaterialTheme.colorScheme.onSurface,
-                                        disabledTextColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f),
-                                        disabledLeadingIconColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f),
-                                        disabledTrailingIconColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f),
-                                    ),
-                            )
-                        }
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(32.dp))
-
-                Button(
-                    onClick = {
-                        if (selectedCampus.isNotEmpty() && !isLoading) {
-                            updateCampus(
-                                authToken = authToken,
-                                campus = selectedCampus,
-                                onLoading = { isLoading = it },
-                                onSuccess = {
-                                    prefs.edit().putString(Constants.COMMUNITY_CAMPUS, selectedCampus).apply()
-                                    Toast.makeText(context, "Campus updated successfully", Toast.LENGTH_SHORT).show()
-                                    onDismiss()
-                                },
-                                onError = { /* Keep dialog open on error */ },
-                            )
-                        }
-                    },
-                    enabled = selectedCampus.isNotEmpty() && !isLoading,
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(48.dp),
-                    colors =
-                        ButtonDefaults.buttonColors(
-                            containerColor = MaterialTheme.colorScheme.primary,
-                            contentColor = MaterialTheme.colorScheme.onPrimary,
-                            disabledContainerColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f),
-                        ),
-                    shape = RoundedCornerShape(12.dp),
-                ) {
-                    if (isLoading) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.Center,
-                        ) {
-                            CircularProgressIndicator(
-                                modifier = Modifier.size(16.dp),
-                                color = MaterialTheme.colorScheme.onPrimary,
-                                strokeWidth = 2.dp,
-                            )
-                            Spacer(modifier = Modifier.width(8.dp))
-                            Text("Updating...")
-                        }
-                    } else {
-                        Text(
-                            text = "Update Campus",
-                            fontSize = 16.sp,
-                            fontWeight = FontWeight.Medium,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-private fun updateCampus(
-    authToken: String,
-    campus: String,
-    onLoading: (Boolean) -> Unit,
-    onSuccess: () -> Unit,
-    onError: (String) -> Unit,
-) {
-    onLoading(true)
-
-    APICommunityRestClient.instance.updateCampus(
-        token = authToken,
-        campus = campus.lowercase(),
-        retrofitUserActionListener =
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    onLoading(false)
-                    onSuccess()
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    onLoading(false)
-                    onError("Failed to update campus: ${t?.message}")
-                }
-            },
-    )
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/AddFriendScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/AddFriendScreenContent.kt
deleted file mode 100644
index ee82259..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/AddFriendScreenContent.kt
+++ /dev/null
@@ -1,534 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.community.CommunityViewModel
-import com.dscvit.vitty.util.Constants
-import kotlinx.coroutines.delay
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AddFriendScreenContent(onBackClick: () -> Unit = {}) {
-    val context = LocalContext.current
-    val communityViewModel: CommunityViewModel = viewModel()
-
-    var searchQuery by remember { mutableStateOf("") }
-    var isSearching by remember { mutableStateOf(false) }
-    var sentRequests by remember { mutableStateOf(setOf<String>()) }
-    var pendingRequest by remember { mutableStateOf<String?>(null) }
-
-    val sharedPreferences =
-        remember {
-            context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        }
-    val currentUsername =
-        remember {
-            sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-        }
-    val currentName =
-        remember {
-            sharedPreferences.getString(Constants.COMMUNITY_NAME, "") ?: ""
-        }
-    val token =
-        remember {
-            sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        }
-
-    val suggestedFriends by communityViewModel.suggestedFriends.observeAsState()
-    val searchResults by communityViewModel.searchResult.observeAsState()
-    val actionResponse by communityViewModel.actionResponse.observeAsState()
-
-    LaunchedEffect(Unit) {
-        if (token.isNotEmpty()) {
-            communityViewModel.getSuggestedFriends(token)
-        }
-    }
-
-    LaunchedEffect(searchQuery) {
-        if (searchQuery.isNotBlank()) {
-            isSearching = true
-            delay(500)
-            if (token.isNotEmpty()) {
-                communityViewModel.getSearchResult(token, searchQuery)
-            }
-            isSearching = false
-        }
-    }
-
-    LaunchedEffect(actionResponse?.detail, pendingRequest) {
-        actionResponse?.let { response ->
-            pendingRequest?.let { username ->
-                if (response.detail == "Friend request sent successfully") {
-                    sentRequests = sentRequests + username
-                }
-
-                pendingRequest = null
-            }
-        }
-    }
-
-    fun sendFriendRequest(user: UserResponse) {
-        if (token.isNotEmpty() && pendingRequest == null) {
-            pendingRequest = user.username
-            communityViewModel.sendRequest(token, user.username)
-        }
-    }
-
-    val filteredSuggestedFriends =
-        suggestedFriends?.filter { user ->
-            user.username != currentUsername && user.name != currentName
-        }
-    val filteredSearchResults =
-        searchResults?.filter { user ->
-            user.username != currentUsername && user.name != currentName
-        }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Add Friends",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = onBackClick) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        Box(
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 20.dp)
-                .border(2.dp, Secondary, RoundedCornerShape(9999.dp))
-                .background(Background, RoundedCornerShape(9999.dp)),
-        ) {
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .height(44.dp)
-                        .padding(horizontal = 16.dp),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween,
-            ) {
-                BasicTextField(
-                    value = searchQuery,
-                    onValueChange = { searchQuery = it },
-                    singleLine = true,
-                    cursorBrush = SolidColor(Accent),
-                    textStyle =
-                        MaterialTheme.typography.bodyMedium.copy(
-                            color = TextColor,
-                            fontSize = 16.sp,
-                            lineHeight = 16.sp,
-                        ),
-                    modifier = Modifier.weight(1f),
-                    decorationBox = { innerTextField ->
-                        Box(
-                            modifier = Modifier.fillMaxWidth(),
-                            contentAlignment = Alignment.CenterStart,
-                        ) {
-                            if (searchQuery.isEmpty()) {
-                                Text(
-                                    text = "Search",
-                                    color = Accent.copy(alpha = 0.3f),
-                                    style =
-                                        MaterialTheme.typography.bodyMedium.copy(
-                                            fontSize = 16.sp,
-                                            lineHeight = 16.sp,
-                                        ),
-                                )
-                            }
-                            innerTextField()
-                        }
-                    },
-                )
-                if (searchQuery.isNotEmpty()) {
-                    IconButton(onClick = { searchQuery = "" }) {
-                        Icon(
-                            imageVector = Icons.Default.Close,
-                            contentDescription = "Clear",
-                            tint = Accent,
-                        )
-                    }
-                }
-            }
-        }
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        if (searchQuery.isBlank()) {
-            SuggestedFriendsContent(
-                suggestedFriends = filteredSuggestedFriends,
-                sentRequests = sentRequests,
-                pendingRequest = pendingRequest,
-                onSendRequest = ::sendFriendRequest,
-            )
-        } else {
-            SearchResultsContent(
-                searchResults = filteredSearchResults,
-                isSearching = isSearching,
-                sentRequests = sentRequests,
-                pendingRequest = pendingRequest,
-                onSendRequest = ::sendFriendRequest,
-            )
-        }
-    }
-}
-
-@Composable
-private fun SuggestedFriendsContent(
-    suggestedFriends: List<UserResponse>?,
-    sentRequests: Set<String>,
-    pendingRequest: String?,
-    onSendRequest: (UserResponse) -> Unit,
-) {
-    Column {
-        Text(
-            text = "Suggested Friends",
-            style = MaterialTheme.typography.titleLarge,
-            fontWeight = FontWeight.Bold,
-            color = TextColor,
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-        )
-
-        if (suggestedFriends == null) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center,
-            ) {
-                CircularProgressIndicator(color = Accent)
-            }
-        } else if (suggestedFriends.isEmpty()) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center,
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_community_outline),
-                        contentDescription = "No suggestions",
-                        modifier = Modifier.size(64.dp),
-                        tint = Accent.copy(alpha = 0.5f),
-                    )
-
-                    Spacer(modifier = Modifier.height(0.dp))
-
-                    Text(
-                        text = "No suggested friends",
-                        style = MaterialTheme.typography.titleLarge,
-                        fontWeight = FontWeight.Medium,
-                        color = TextColor,
-                        textAlign = TextAlign.Center,
-                    )
-                }
-            }
-        } else {
-            LazyColumn(
-                modifier = Modifier.fillMaxSize(),
-                contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 100.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                items(suggestedFriends) { friend ->
-                    UserCard(
-                        user = friend,
-                        sentRequests = sentRequests,
-                        pendingRequest = pendingRequest,
-                        onSendRequest = { onSendRequest(friend) },
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SearchResultsContent(
-    searchResults: List<UserResponse>?,
-    isSearching: Boolean,
-    sentRequests: Set<String>,
-    pendingRequest: String?,
-    onSendRequest: (UserResponse) -> Unit,
-) {
-    if (isSearching) {
-        Box(
-            modifier = Modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center,
-        ) {
-            CircularProgressIndicator(color = Accent)
-        }
-    } else if (searchResults == null) {
-        Box(
-            modifier = Modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text(
-                text = "Start typing to search for friends",
-                style = MaterialTheme.typography.bodyLarge,
-                color = Accent,
-                textAlign = TextAlign.Center,
-            )
-        }
-    } else if (searchResults.isEmpty()) {
-        Box(
-            modifier = Modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_search),
-                    contentDescription = "No results",
-                    modifier = Modifier.size(64.dp),
-                    tint = Accent.copy(alpha = 0.5f),
-                )
-                Text(
-                    text = "No users found",
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = Accent,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-    } else {
-        LazyColumn(
-            modifier = Modifier.fillMaxSize(),
-            contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 100.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            items(searchResults) { user ->
-                UserCard(
-                    user = user,
-                    sentRequests = sentRequests,
-                    pendingRequest = pendingRequest,
-                    onSendRequest = { onSendRequest(user) },
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun UserCard(
-    user: UserResponse,
-    sentRequests: Set<String>,
-    pendingRequest: String?,
-    onSendRequest: () -> Unit,
-) {
-    Card(
-        modifier =
-            Modifier
-                .fillMaxWidth(),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp, vertical = 28.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            if (user.picture.isNotEmpty()) {
-                AsyncImage(
-                    model = user.picture,
-                    contentDescription = null,
-                    modifier =
-                        Modifier
-                            .size(48.dp)
-                            .clip(CircleShape),
-                    placeholder = painterResource(R.drawable.ic_gdscvit),
-                    error = painterResource(R.drawable.ic_gdscvit),
-                )
-            } else {
-                Box(
-                    modifier =
-                        Modifier
-                            .size(48.dp)
-                            .background(Accent.copy(alpha = 0.2f), CircleShape),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Text(
-                        text =
-                            user.name
-                                .take(2)
-                                .map { it.uppercaseChar() }
-                                .joinToString(""),
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 18.sp,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.width(12.dp))
-
-            Column(modifier = Modifier.weight(1f)) {
-                Text(
-                    text = user.name,
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Medium,
-                    color = TextColor,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-
-                Text(
-                    text = "@${user.username}",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Accent,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-
-            Spacer(modifier = Modifier.width(8.dp))
-
-            when {
-                sentRequests.contains(user.username) -> {
-                    IconButton(
-                        onClick = { /* Disabled - no action */ },
-                        enabled = false,
-                        modifier =
-                            Modifier
-                                .size(40.dp),
-                    ) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_request_pending),
-                            contentDescription = "Request Sent",
-                            tint = Accent,
-                            modifier = Modifier.size(20.dp),
-                        )
-                    }
-                }
-                user.friend_status.lowercase() in listOf("request_sent", "pending", "sent") -> {
-                    IconButton(
-                        onClick = { /* Disabled - no action */ },
-                        enabled = false,
-                        modifier =
-                            Modifier
-                                .size(40.dp),
-                    ) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_request_pending),
-                            contentDescription = "Request Pending",
-                            tint = Accent,
-                            modifier = Modifier.size(20.dp),
-                        )
-                    }
-                }
-                user.friend_status.lowercase() == "friends" -> {
-                    IconButton(
-                        onClick = { /* Disabled - already friends */ },
-                        enabled = false,
-                        modifier =
-                            Modifier
-                                .size(40.dp),
-                    ) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_community_filled),
-                            contentDescription = "Already Friends",
-                            tint = Accent,
-                            modifier = Modifier.size(20.dp),
-                        )
-                    }
-                }
-                else -> {
-                    IconButton(
-                        onClick = onSendRequest,
-                        modifier =
-                            Modifier
-                                .size(40.dp),
-                    ) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_add_friend),
-                            contentDescription = "Add Friend",
-                            tint = TextColor,
-                            modifier = Modifier.size(20.dp),
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/AddParticipantsScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/AddParticipantsScreenContent.kt
deleted file mode 100644
index e0d3e6c..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/AddParticipantsScreenContent.kt
+++ /dev/null
@@ -1,612 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import android.widget.Toast
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavController
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Poppins
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.community.CommunityViewModel
-import com.dscvit.vitty.util.Constants
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AddParticipantsScreenContent(
-    navController: NavController,
-    circleId: String,
-) {
-    val context = LocalContext.current
-    val communityViewModel: CommunityViewModel = viewModel()
-    val scope = rememberCoroutineScope()
-
-    var searchQuery by remember { mutableStateOf("") }
-    var isSearching by remember { mutableStateOf(false) }
-    var selectedUsers by remember { mutableStateOf(listOf<UserResponse>()) }
-    var sendingRequests by remember { mutableStateOf(false) }
-
-    val sharedPreferences =
-        remember {
-            context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        }
-    val currentUsername =
-        remember {
-            sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-        }
-    val currentName =
-        remember {
-            sharedPreferences.getString(Constants.COMMUNITY_NAME, "") ?: ""
-        }
-    val token =
-        remember {
-            sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        }
-
-    val suggestedFriends by communityViewModel.suggestedFriends.observeAsState()
-    val searchResults by communityViewModel.searchResult.observeAsState()
-    val batchResponse by communityViewModel.batchCircleRequestResponse.observeAsState()
-
-    LaunchedEffect(batchResponse) {
-        batchResponse?.let { response ->
-            val successCount = response.data.count { it.request_status == "pending" || it.request_status == "added" }
-            val failedCount = response.data.size - successCount
-
-            if (failedCount == 0) {
-                Toast.makeText(
-                    context,
-                    "All requests sent successfully!",
-                    Toast.LENGTH_SHORT,
-                ).show()
-            } else {
-                val failedUsers =
-                    response.data
-                        .filter {
-                            it.request_status != "pending" && it.request_status != "added"
-                        }.map { it.username }
-
-                if (successCount > 0) {
-                    Toast.makeText(
-                        context,
-                        "Sent $successCount requests successfully. Failed: ${failedUsers.joinToString(", ")}",
-                        Toast.LENGTH_LONG,
-                    ).show()
-                } else {
-                    Toast.makeText(
-                        context,
-                        "Failed to send requests to: ${failedUsers.joinToString(", ")}",
-                        Toast.LENGTH_LONG,
-                    ).show()
-                }
-            }
-
-            sendingRequests = false
-            selectedUsers = listOf()
-            communityViewModel.clearBatchCircleRequestResponse()
-
-            if (failedCount == 0) {
-                scope.launch {
-                    navController.popBackStack()
-                }
-            }
-        }
-    }
-
-    LaunchedEffect(Unit) {
-        if (token.isNotEmpty()) {
-            communityViewModel.getSuggestedFriends(token)
-        }
-    }
-
-    LaunchedEffect(searchQuery) {
-        if (searchQuery.isNotBlank()) {
-            isSearching = true
-            delay(300)
-            if (token.isNotEmpty() && searchQuery.isNotBlank()) {
-                communityViewModel.getSearchResult(token, searchQuery)
-            }
-            isSearching = false
-        } else {
-            isSearching = false
-        }
-    }
-
-    val filteredSuggestedFriends =
-        suggestedFriends?.filter { user ->
-            user.username != currentUsername && user.name != currentName
-        }
-    val filteredSearchResults =
-        searchResults?.filter { user ->
-            user.username != currentUsername && user.name != currentName
-        }
-
-    fun sendAllRequests() {
-        if (selectedUsers.isNotEmpty() && !sendingRequests && token.isNotEmpty()) {
-            sendingRequests = true
-            val usernames = selectedUsers.map { it.username }
-            communityViewModel.sendBatchCircleRequest(token, circleId, usernames)
-        }
-    }
-
-    fun addUserToSelection(user: UserResponse) {
-        if (!selectedUsers.any { it.username == user.username }) {
-            selectedUsers = selectedUsers + user
-        }
-    }
-
-    fun removeUserFromSelection(user: UserResponse) {
-        selectedUsers = selectedUsers.filter { it.username != user.username }
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Add Participants",
-                    color = TextColor,
-                    fontFamily = Poppins,
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.SemiBold,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = { navController.popBackStack() }) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.centerAlignedTopAppBarColors(
-                    containerColor = Background,
-                ),
-        )
-
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 24.dp, vertical = 16.dp),
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .border(.8.dp, Accent, RoundedCornerShape(9999.dp))
-                        .background(Background, RoundedCornerShape(9999.dp)),
-            ) {
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(44.dp)
-                            .padding(horizontal = 16.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    BasicTextField(
-                        value = searchQuery,
-                        onValueChange = { searchQuery = it },
-                        singleLine = true,
-                        cursorBrush = SolidColor(Accent),
-                        textStyle =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                color = TextColor,
-                                fontSize = 16.sp,
-                                lineHeight = 16.sp,
-                            ),
-                        modifier = Modifier.weight(1f),
-                        decorationBox = { innerTextField ->
-                            Box(
-                                modifier = Modifier.fillMaxWidth(),
-                                contentAlignment = Alignment.CenterStart,
-                            ) {
-                                if (searchQuery.isEmpty()) {
-                                    Text(
-                                        text = "Search users...",
-                                        color = Accent.copy(alpha = 0.3f),
-                                        style =
-                                            MaterialTheme.typography.bodyMedium.copy(
-                                                fontSize = 16.sp,
-                                                lineHeight = 16.sp,
-                                            ),
-                                    )
-                                }
-                                innerTextField()
-                            }
-                        },
-                    )
-                    if (searchQuery.isNotEmpty()) {
-                        IconButton(onClick = { searchQuery = "" }) {
-                            Icon(
-                                imageVector = Icons.Default.Close,
-                                contentDescription = "Clear",
-                                tint = Accent,
-                            )
-                        }
-                    }
-                }
-            }
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-
-            if (selectedUsers.isNotEmpty()) {
-                LazyColumn(
-                    modifier = Modifier.height(150.dp),
-                    contentPadding = PaddingValues(vertical = 4.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    items(selectedUsers) { user ->
-                        SelectedUserCard(
-                            user = user,
-                            onRemove = {
-                                removeUserFromSelection(user)
-                            },
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                Text(
-                    text = "Add More Users",
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-            }
-
-
-            val displayUsers = if (searchQuery.isBlank()) filteredSuggestedFriends else filteredSearchResults
-            val selectedUsernames = selectedUsers.map { it.username }.toSet()
-            val filteredUsers =
-                displayUsers?.filter { user ->
-                    !selectedUsernames.contains(user.username) &&
-                        (
-                            searchQuery.isBlank() ||
-                                user.name.contains(searchQuery, ignoreCase = true) ||
-                                user.username.contains(searchQuery, ignoreCase = true)
-                        )
-                }
-
-            LazyColumn(
-                modifier =
-                    Modifier
-                        .weight(1f)
-                        .heightIn(max = 300.dp),
-                contentPadding = PaddingValues(vertical = 8.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                if (isSearching) {
-                    item {
-                        Box(
-                            modifier = Modifier.fillMaxWidth(),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            CircularProgressIndicator(color = Accent)
-                        }
-                    }
-                } else if (filteredUsers.isNullOrEmpty()) {
-                    item {
-                        Box(
-                            modifier = Modifier.fillMaxWidth().padding(32.dp),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            Text(
-                                text = if (searchQuery.isNotEmpty()) "No users found" else "No users available",
-                                color = Accent.copy(alpha = 0.7f),
-                                style = MaterialTheme.typography.bodyMedium,
-                            )
-                        }
-                    }
-                } else {
-                    items(filteredUsers) { user ->
-                        UserSelectionCard(
-                            user = user,
-                            isSelected = selectedUsernames.contains(user.username),
-                            onSelectionChanged = { isSelected ->
-                                if (isSelected) {
-                                    addUserToSelection(user)
-                                } else {
-                                    removeUserFromSelection(user)
-                                }
-                            },
-                        )
-                    }
-                }
-            }
-
-
-            if (selectedUsers.isNotEmpty()) {
-                Spacer(modifier = Modifier.height(16.dp))
-                Button(
-                    onClick = { sendAllRequests() },
-                    enabled = !sendingRequests,
-                    modifier = Modifier.fillMaxWidth(),
-                    colors =
-                        ButtonDefaults.buttonColors(
-                            containerColor = Accent,
-                            contentColor = Secondary,
-                        ),
-                    shape = RoundedCornerShape(12.dp),
-                ) {
-                    if (sendingRequests) {
-                        CircularProgressIndicator(
-                            modifier = Modifier.size(16.dp),
-                            color = Secondary,
-                            strokeWidth = 2.dp,
-                        )
-                        Spacer(modifier = Modifier.width(8.dp))
-                    }
-                    Text(
-                        text = if (sendingRequests) "Sending..." else "Add ${selectedUsers.size} Participant${if (selectedUsers.size > 1) "s" else ""}",
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun UserSelectionCard(
-    user: UserResponse,
-    isSelected: Boolean,
-    onSelectionChanged: (Boolean) -> Unit,
-) {
-    Card(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(16.dp))
-                .clickable { onSelectionChanged(!isSelected) },
-        colors =
-            CardDefaults.cardColors(
-                containerColor = Secondary,
-            ),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp, vertical = 20.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .size(48.dp)
-                        .background(Accent.copy(alpha = 0.2f), CircleShape),
-                contentAlignment = Alignment.Center,
-            ) {
-                if (user.picture.isNotEmpty()) {
-                    AsyncImage(
-                        model = user.picture,
-                        contentDescription = null,
-                        modifier =
-                            Modifier
-                                .size(48.dp)
-                                .clip(CircleShape),
-                    )
-                } else {
-                    Text(
-                        text =
-                            user.name
-                                .take(2)
-                                .map { it.uppercaseChar() }
-                                .joinToString(""),
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 18.sp,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.width(12.dp))
-
-
-            Column(modifier = Modifier.weight(1f)) {
-                Text(
-                    text = user.name,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                    fontSize = 16.sp,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-                Text(
-                    text = "@${user.username}",
-                    color = TextColor.copy(alpha = 0.7f),
-                    fontSize = 14.sp,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-
-
-            Box(
-                modifier =
-                    Modifier
-                        .size(24.dp)
-                        .background(
-                            if (isSelected) Accent else Background,
-                            CircleShape,
-                        ).border(
-                            2.dp,
-                            if (isSelected) Accent else TextColor.copy(alpha = 0.3f),
-                            CircleShape,
-                        ),
-                contentAlignment = Alignment.Center,
-            ) {
-                if (isSelected) {
-                    Icon(
-                        imageVector = Icons.Default.Check,
-                        contentDescription = "Selected",
-                        tint = Background,
-                        modifier = Modifier.size(16.dp),
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SelectedUserCard(
-    user: UserResponse,
-    onRemove: () -> Unit,
-) {
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Background, RoundedCornerShape(12.dp))
-                .border(1.dp, Accent.copy(alpha = 0.3f), RoundedCornerShape(12.dp))
-                .padding(horizontal = 16.dp, vertical = 12.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.weight(1f),
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .size(32.dp)
-                            .background(Accent.copy(alpha = 0.2f), CircleShape),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    if (user.picture.isNotEmpty()) {
-                        AsyncImage(
-                            model = user.picture,
-                            contentDescription = null,
-                            modifier =
-                                Modifier
-                                    .size(32.dp)
-                                    .clip(CircleShape),
-                        )
-                    } else {
-                        Text(
-                            text =
-                                user.name
-                                    .take(2)
-                                    .map { it.uppercaseChar() }
-                                    .joinToString(""),
-                            color = TextColor,
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 14.sp,
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.width(12.dp))
-
-                Column {
-                    Text(
-                        text = user.name,
-                        color = TextColor,
-                        fontWeight = FontWeight.Medium,
-                        fontSize = 14.sp,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                    Text(
-                        text = "@${user.username}",
-                        color = TextColor.copy(alpha = 0.6f),
-                        fontSize = 12.sp,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-
-
-            IconButton(
-                onClick = onRemove,
-                modifier = Modifier.size(24.dp),
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Close,
-                    contentDescription = "Remove",
-                    tint = Accent,
-                    modifier = Modifier.size(16.dp),
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleDetailScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/CircleDetailScreenContent.kt
deleted file mode 100644
index 2a1e8f1..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleDetailScreenContent.kt
+++ /dev/null
@@ -1,888 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import android.widget.Toast
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SwipeToDismissBox
-import androidx.compose.material3.SwipeToDismissBoxValue
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberSwipeToDismissBoxState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.user.CircleItem
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.QRCodeGenerator
-import com.dscvit.vitty.util.urlDecode
-import java.util.Locale
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CircleDetailScreenContent(
-    circle: CircleItem,
-    circleMembers: FriendResponse?,
-    onBackClick: () -> Unit = {},
-    onMemberClick: (UserResponse, String) -> Unit = { _, _ -> },
-    onAddParticipantsClick: (String) -> Unit = {},
-    connectViewModel: ConnectViewModel,
-) {
-    val context = LocalContext.current
-    var searchQuery by remember { mutableStateOf("") }
-    var showQrDialog by remember { mutableStateOf(false) }
-    var showDropdownMenu by remember { mutableStateOf(false) }
-    var showDeleteConfirmDialog by remember { mutableStateOf(false) }
-    var showLeaveConfirmDialog by remember { mutableStateOf(false) }
-    var showRemoveUserDialog by remember { mutableStateOf(false) }
-    var userToRemove by remember { mutableStateOf<UserResponse?>(null) }
-    var resetDismissCounter by remember { mutableStateOf(0) }
-
-    val circleFriends = circleMembers?.data
-    val actionResponse by connectViewModel.circleActionResponse.observeAsState()
-
-    val busyCount =
-        circleFriends?.count { friend ->
-            friend.current_status?.status?.lowercase(Locale.ROOT) != "free"
-        } ?: 0
-
-    val availableCount =
-        circleFriends?.count { friend ->
-            friend.current_status?.status?.lowercase(Locale.ROOT) == "free"
-        } ?: 0
-
-    val filteredFriends =
-        circleFriends?.filter { friend ->
-            searchQuery.isBlank() ||
-                friend.name.contains(searchQuery, ignoreCase = true) ||
-                friend.username.contains(searchQuery, ignoreCase = true)
-        }
-
-    LaunchedEffect(actionResponse) {
-        actionResponse?.let { response ->
-            when (response.detail) {
-                "circle deleted successfully" -> {
-                    Toast.makeText(context, "Circle deleted successfully", Toast.LENGTH_SHORT).show()
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    connectViewModel.getCircleList(token)
-                    connectViewModel.refreshCircleRequests(token)
-                    connectViewModel.clearCircleActionResponse()
-                    onBackClick()
-                }
-                "you left the circle " -> {
-                    Toast.makeText(context, "Left circle successfully", Toast.LENGTH_SHORT).show()
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    connectViewModel.getCircleList(token)
-                    connectViewModel.refreshCircleRequests(token)
-                    connectViewModel.clearCircleActionResponse()
-                    onBackClick()
-                }
-                "user removed from circle" -> {
-                    Toast.makeText(context, "User removed from circle", Toast.LENGTH_SHORT).show()
-                    connectViewModel.clearCircleActionResponse()
-                }
-                else -> {
-                    Toast.makeText(context, response.detail, Toast.LENGTH_SHORT).show()
-                    connectViewModel.clearCircleActionResponse()
-                }
-            }
-        }
-    }
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Circle",
-                    style = MaterialTheme.typography.headlineLarge,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = onBackClick) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            actions = {
-                Box {
-                    IconButton(onClick = {
-                        if (circle.circle_role == "admin") {
-                            showDropdownMenu = true
-                        } else {
-                            showLeaveConfirmDialog = true
-                        }
-                    }) {
-                        if (circle.circle_role != "admin") {
-                            Icon(
-                                painter = painterResource(id = R.drawable.ic_logout_2),
-                                contentDescription = "Leave Circle",
-                                modifier = Modifier.size(24.dp),
-                                tint = TextColor,
-                            )
-                        } else {
-                            Icon(
-                                imageVector = Icons.Default.Menu,
-                                contentDescription = "Delete Circle",
-                                modifier = Modifier.size(28.dp),
-                                tint = TextColor,
-                            )
-                        }
-                    }
-
-                    if (showDropdownMenu) {
-                        DropdownMenu(
-                            expanded = showDropdownMenu,
-                            onDismissRequest = { showDropdownMenu = false },
-                            modifier =
-                                Modifier
-                                    .background(Secondary),
-                            shape = RoundedCornerShape(8.dp),
-                        ) {
-                            if (circle.circle_role == "admin") {
-                                DropdownMenuItem(
-                                    onClick = {
-                                        showDeleteConfirmDialog = true
-                                        showDropdownMenu = false
-                                    },
-                                    text = {
-                                        Text(
-                                            text = "Delete Circle",
-                                            style = MaterialTheme.typography.bodyMedium,
-                                            color = TextColor,
-                                        )
-                                    },
-                                )
-                            }
-
-                            DropdownMenuItem(
-                                onClick = {
-                                    showLeaveConfirmDialog = true
-                                    showDropdownMenu = false
-                                },
-                                text = {
-                                    Text(
-                                        text = "Leave Circle",
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        color = TextColor,
-                                    )
-                                },
-                            )
-                        }
-                    }
-                }
-            },
-            colors =
-                TopAppBarDefaults.centerAlignedTopAppBarColors(
-                    containerColor = Background,
-                ),
-        )
-
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 20.dp),
-        ) {
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Box(
-                Modifier
-                    .fillMaxWidth()
-                    .border(2.dp, Secondary, RoundedCornerShape(9999.dp))
-                    .background(Background, RoundedCornerShape(9999.dp)),
-            ) {
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(44.dp)
-                            .padding(horizontal = 16.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    BasicTextField(
-                        value = searchQuery,
-                        onValueChange = { searchQuery = it },
-                        singleLine = true,
-                        cursorBrush = SolidColor(Accent),
-                        textStyle =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                color = TextColor,
-                                fontSize = 16.sp,
-                                lineHeight = 16.sp,
-                            ),
-                        modifier = Modifier.weight(1f),
-                        decorationBox = { innerTextField ->
-                            Box(
-                                modifier = Modifier.fillMaxWidth(),
-                                contentAlignment = Alignment.CenterStart,
-                            ) {
-                                if (searchQuery.isEmpty()) {
-                                    Text(
-                                        text = "Search",
-                                        color = Accent.copy(alpha = 0.3f),
-                                        style =
-                                            MaterialTheme.typography.bodyMedium.copy(
-                                                fontSize = 16.sp,
-                                                lineHeight = 16.sp,
-                                            ),
-                                    )
-                                }
-                                innerTextField()
-                            }
-                        },
-                    )
-                    if (searchQuery.isNotEmpty()) {
-                        IconButton(onClick = { searchQuery = "" }) {
-                            Icon(
-                                imageVector = Icons.Default.Close,
-                                contentDescription = "Clear",
-                                tint = Accent,
-                            )
-                        }
-                    }
-                }
-            }
-
-            Spacer(modifier = Modifier.height(20.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth().padding(start = 8.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = circle.circle_name.urlDecode(),
-                    style =
-                        MaterialTheme.typography.titleLarge.copy(
-                            letterSpacing = (0.28).sp,
-                        ),
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                    modifier = Modifier.weight(1f),
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-
-                Spacer(modifier = Modifier.width(16.dp))
-
-                IconButton(onClick = { showQrDialog = true }) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_qr),
-                        contentDescription = "Generate QR Code",
-                        tint = Accent,
-                        modifier = Modifier.size(24.dp),
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(12.dp),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                if (busyCount > 0) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .background(Secondary, RoundedCornerShape(20.dp))
-                                .padding(horizontal = 12.dp, vertical = 8.dp),
-                    ) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(6.dp),
-                        ) {
-                            Image(
-                                painter = painterResource(id = R.drawable.ic_busy),
-                                contentDescription = "Busy",
-                                modifier = Modifier.size(16.dp),
-                            )
-                            Text(
-                                text = "$busyCount busy",
-                                color = TextColor,
-                                style = MaterialTheme.typography.bodyMedium,
-                                fontWeight = FontWeight.Medium,
-                            )
-                        }
-                    }
-                }
-                if (availableCount > 0) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .background(Secondary, RoundedCornerShape(20.dp))
-                                .padding(horizontal = 12.dp, vertical = 8.dp),
-                    ) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(6.dp),
-                        ) {
-                            Image(
-                                painter = painterResource(id = R.drawable.ic_free),
-                                contentDescription = "Available",
-                                modifier = Modifier.size(16.dp),
-                            )
-                            Text(
-                                text = "$availableCount available",
-                                color = TextColor,
-                                style = MaterialTheme.typography.bodyMedium,
-                                fontWeight = FontWeight.Medium,
-                            )
-                        }
-                    }
-                }
-            }
-
-            if (circle.circle_role == "admin") {
-                Spacer(modifier = Modifier.height(32.dp))
-
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .background(Secondary, RoundedCornerShape(16.dp))
-                            .clickable {
-                                onAddParticipantsClick(circle.circle_id)
-                            }.padding(
-                                horizontal = 12.dp,
-                                vertical = 18.dp,
-                            ),
-                ) {
-                    Row(
-                        horizontalArrangement = Arrangement.Center,
-                        verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .clip(CircleShape)
-                                    .background(Color(0xff477397))
-                                    .padding(4.dp),
-                        ) {
-                            Icon(
-                                imageVector = Icons.Default.Add,
-                                contentDescription = "Add Participants",
-                                tint = Background,
-                            )
-                        }
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Text(
-                            "Add Participants",
-                            style =
-                                MaterialTheme.typography.bodyMedium.copy(
-                                    fontSize = 16.sp,
-                                    letterSpacing = (0.16).sp,
-                                ),
-                            color = TextColor,
-                        )
-                    }
-                }
-            }
-
-            Spacer(modifier = Modifier.height(20.dp))
-
-            LazyColumn(
-                modifier = Modifier.fillMaxSize(),
-                contentPadding = PaddingValues(bottom = 32.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                items(filteredFriends ?: emptyList(), key = { friend -> "${friend.username}-$resetDismissCounter" }) { friend ->
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val currentUsername = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-
-                    if (circle.circle_role == "admin" && friend.username != currentUsername) {
-                        SwipeToDismissCircleFriendCard(
-                            friend = friend,
-                            onClick = { onMemberClick(friend, circle.circle_id) },
-                            onRemove = {
-                                userToRemove = friend
-                                showRemoveUserDialog = true
-                            },
-                        )
-                    } else {
-                        CircleFriendCard(
-                            friend = friend,
-                            onClick = { onMemberClick(friend, circle.circle_id) },
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    if (showQrDialog) {
-        val qrBitmap = remember { QRCodeGenerator.generateQRCode(circle.circle_join_code ?: "", 400) }
-
-        AlertDialog(
-            onDismissRequest = { showQrDialog = false },
-            containerColor = Background,
-            titleContentColor = TextColor,
-            textContentColor = TextColor,
-            title = {
-                Text(
-                    "Circle QR Code",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Medium,
-                    color = TextColor,
-                )
-            },
-            text = {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth(),
-                ) {
-                    Text(
-                        text = "Scan this QR code to join the circle",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = TextColor.copy(alpha = 0.8f),
-                        textAlign = TextAlign.Center,
-                    )
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    qrBitmap?.let { bitmap ->
-                        Box(
-                            modifier =
-                                Modifier
-                                    .size(250.dp)
-                                    .background(Color.White, RoundedCornerShape(12.dp))
-                                    .padding(16.dp),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            Image(
-                                bitmap = bitmap.asImageBitmap(),
-                                contentDescription = "Circle QR Code",
-                                modifier = Modifier.fillMaxSize(),
-                            )
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    Text(
-                        text = "Join Code: ${circle.circle_join_code}",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = Accent,
-                        textAlign = TextAlign.Center,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = { showQrDialog = false },
-                ) {
-                    Text(
-                        "Close",
-                        color = Accent,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-        )
-    }
-
-    if (showDeleteConfirmDialog) {
-        AlertDialog(
-            onDismissRequest = { showDeleteConfirmDialog = false },
-            containerColor = Background,
-            titleContentColor = TextColor,
-            textContentColor = TextColor,
-            title = {
-                Text(
-                    "Delete Circle",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Medium,
-                    color = TextColor,
-                )
-            },
-            text = {
-                Text(
-                    text = "Are you sure you want to delete this circle? This action cannot be undone.",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = TextColor,
-                )
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-                        connectViewModel.deleteCircle(token = token, circleId = circle.circle_id)
-                        showDeleteConfirmDialog = false
-                    },
-                ) {
-                    Text(
-                        "Delete",
-                        color = Accent,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-            dismissButton = {
-                TextButton(
-                    onClick = { showDeleteConfirmDialog = false },
-                ) {
-                    Text(
-                        "Cancel",
-                        color = Accent.copy(alpha = 0.7f),
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-        )
-    }
-
-    if (showLeaveConfirmDialog) {
-        AlertDialog(
-            onDismissRequest = { showLeaveConfirmDialog = false },
-            containerColor = Background,
-            titleContentColor = TextColor,
-            textContentColor = TextColor,
-            title = {
-                Text(
-                    "Leave Circle",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Medium,
-                    color = TextColor,
-                )
-            },
-            text = {
-                Text(
-                    text = "Are you sure you want to leave this circle?",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = TextColor,
-                )
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-                        connectViewModel.leaveCircle(token = token, circleId = circle.circle_id)
-                        showLeaveConfirmDialog = false
-                    },
-                ) {
-                    Text(
-                        "Leave",
-                        color = Accent,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-            dismissButton = {
-                TextButton(
-                    onClick = { showLeaveConfirmDialog = false },
-                ) {
-                    Text(
-                        "Cancel",
-                        color = Accent.copy(alpha = 0.7f),
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-        )
-    }
-
-    if (showRemoveUserDialog) {
-        userToRemove?.let { user ->
-            AlertDialog(
-                onDismissRequest = {
-                    showRemoveUserDialog = false
-                    resetDismissCounter += 1
-                },
-                containerColor = Background,
-                titleContentColor = TextColor,
-                textContentColor = TextColor,
-                title = {
-                    Text(
-                        "Remove User",
-                        style = MaterialTheme.typography.headlineSmall,
-                        fontWeight = FontWeight.Medium,
-                        color = TextColor,
-                    )
-                },
-                text = {
-                    Text(
-                        text = "Are you sure you want to remove ${user.name} from the circle?",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = TextColor,
-                    )
-                },
-                confirmButton = {
-                    TextButton(
-                        onClick = {
-                            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-                            connectViewModel.removeUserFromCircle(
-                                token = token,
-                                circleId = circle.circle_id,
-                                username = user.username,
-                            )
-                            showRemoveUserDialog = false
-                        },
-                    ) {
-                        Text(
-                            "Remove",
-                            color = Accent,
-                            fontWeight = FontWeight.Medium,
-                        )
-                    }
-                },
-                dismissButton = {
-                    TextButton(
-                        onClick = {
-                            showRemoveUserDialog = false
-                            resetDismissCounter += 1
-                        },
-                    ) {
-                        Text(
-                            "Cancel",
-                            color = Accent.copy(alpha = 0.7f),
-                            fontWeight = FontWeight.Medium,
-                        )
-                    }
-                },
-            )
-        }
-    }
-}
-
-@Composable
-fun CircleFriendCard(
-    friend: UserResponse,
-    onClick: () -> Unit = {},
-) {
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Secondary, RoundedCornerShape(16.dp))
-                .clickable { onClick() }
-                .padding(vertical = 28.dp, horizontal = 24.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .size(52.dp)
-                        .background(Accent.copy(alpha = 0.2f), CircleShape),
-                contentAlignment = Alignment.Center,
-            ) {
-                if (friend.picture.isNotEmpty()) {
-                    AsyncImage(
-                        model = friend.picture,
-                        contentDescription = null,
-                        modifier =
-                            Modifier
-                                .size(52.dp)
-                                .clip(CircleShape),
-                    )
-                } else {
-                    Text(
-                        text =
-                            friend.name
-                                .take(2)
-                                .map { it.uppercaseChar() }
-                                .joinToString(""),
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 16.sp,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.width(16.dp))
-
-            Column(modifier = Modifier.weight(1f)) {
-                Text(
-                    text = friend.name,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                    fontSize = 16.sp,
-                )
-
-                Spacer(modifier = Modifier.height(4.dp))
-
-                val currentStatus = friend.current_status
-                val statusIcon =
-                    when {
-                        currentStatus?.status?.lowercase() == "free" -> R.drawable.ic_free
-                        currentStatus?.status?.lowercase() == "busy" -> R.drawable.ic_busy
-                        else -> R.drawable.ic_busy
-                    }
-                val statusText =
-                    when {
-                        currentStatus?.venue?.isNotEmpty() == true -> currentStatus.venue
-                        currentStatus?.status?.lowercase(Locale.ROOT) == "free" -> "Available"
-                        else -> "Not in a class right now"
-                    }
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(4.dp),
-                ) {
-                    Image(
-                        painter = painterResource(id = statusIcon),
-                        contentDescription = "Status Icon",
-                        modifier = Modifier.size(12.dp),
-                    )
-
-                    Text(
-                        text = statusText,
-                        color = Accent,
-                        fontSize = 14.sp,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SwipeToDismissCircleFriendCard(
-    friend: UserResponse,
-    onClick: () -> Unit = {},
-    onRemove: () -> Unit = {},
-) {
-    var isDismissed by remember { mutableStateOf(false) }
-
-    val dismissState =
-        rememberSwipeToDismissBoxState(
-            confirmValueChange = { dismissValue ->
-                when (dismissValue) {
-                    SwipeToDismissBoxValue.EndToStart -> {
-                        isDismissed = true
-                        true
-                    }
-                    else -> false
-                }
-            },
-        )
-
-    LaunchedEffect(isDismissed) {
-        if (isDismissed) {
-            kotlinx.coroutines.delay(200)
-            onRemove()
-        }
-    }
-
-    AnimatedVisibility(
-        visible = !isDismissed,
-        exit = fadeOut(animationSpec = tween(200)),
-        enter = fadeIn(animationSpec = tween(200)),
-    ) {
-        SwipeToDismissBox(
-            state = dismissState,
-            backgroundContent = {
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxSize()
-                            .background(
-                                color = Color(0xffd9534f),
-                                shape = RoundedCornerShape(16.dp),
-                            ).padding(horizontal = 16.dp),
-                    contentAlignment = Alignment.CenterEnd,
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Delete,
-                        contentDescription = "Remove User",
-                        tint = Color.White,
-                        modifier = Modifier.size(24.dp),
-                    )
-                }
-            },
-            enableDismissFromEndToStart = true,
-            enableDismissFromStartToEnd = false,
-        ) {
-            CircleFriendCard(
-                friend = friend,
-                onClick = onClick,
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt
deleted file mode 100644
index 537736a..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt
+++ /dev/null
@@ -1,604 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRowDefaults
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.model.PeriodDetails
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Poppins
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.schedule.ScheduleViewModel
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.Quote
-import com.dscvit.vitty.util.VITMap
-import com.dscvit.vitty.widget.parseTimeToTimestamp
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CircleMemberDetailScreenContent(
-    member: UserResponse,
-    circleId: String,
-    onBackClick: () -> Unit = {},
-) {
-    val context = LocalContext.current
-    val scheduleViewModel: ScheduleViewModel = viewModel()
-    val scope = rememberCoroutineScope()
-    var quote by remember { mutableStateOf("") }
-    var memberTimetableData by remember { mutableStateOf<Map<Int, List<PeriodDetails>>>(emptyMap()) }
-    var isLoadingTimetable by remember { mutableStateOf(false) }
-    var hasLoadedData by remember { mutableStateOf(false) }
-
-    val days = listOf("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
-    val currentDay =
-        remember {
-            when (Calendar.getInstance().get(Calendar.DAY_OF_WEEK)) {
-                Calendar.MONDAY -> 0
-                Calendar.TUESDAY -> 1
-                Calendar.WEDNESDAY -> 2
-                Calendar.THURSDAY -> 3
-                Calendar.FRIDAY -> 4
-                Calendar.SATURDAY -> 5
-                Calendar.SUNDAY -> 6
-                else -> 0
-            }
-        }
-
-    val pagerState =
-        rememberPagerState(
-            initialPage = currentDay,
-            pageCount = { 7 },
-        )
-
-    LaunchedEffect(member.username, circleId) {
-        if (hasLoadedData) return@LaunchedEffect
-
-        quote = Quote.getLine(context)
-
-        val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-        if (token.isNotEmpty()) {
-            isLoadingTimetable = true
-            scheduleViewModel.getCircleTimeTable(token, circleId, member.username)
-        } else {
-            hasLoadedData = true
-        }
-    }
-
-    val timetableResponse by scheduleViewModel.timetable.observeAsState()
-
-    LaunchedEffect(timetableResponse) {
-        timetableResponse?.let { response ->
-            scope.launch {
-                withContext(Dispatchers.Default) {
-                    try {
-                        val processedData = processFriendTimetableData(response)
-                        withContext(Dispatchers.Main) {
-                            memberTimetableData = processedData
-                            isLoadingTimetable = false
-                            hasLoadedData = true
-                        }
-                    } catch (e: Exception) {
-                        Timber.e("Error processing member timetable: ${e.message}")
-                        withContext(Dispatchers.Main) {
-                            isLoadingTimetable = false
-                            hasLoadedData = true
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Member Profile",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = onBackClick) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        CircleMemberProfileCard(member = member)
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        Text(
-            text = "Schedule",
-            style = MaterialTheme.typography.titleLarge,
-            fontWeight = FontWeight.Bold,
-            color = TextColor,
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-        )
-
-        ScrollableTabRow(
-            selectedTabIndex = pagerState.currentPage,
-            containerColor = MaterialTheme.colorScheme.surface,
-            contentColor = MaterialTheme.colorScheme.onSurface,
-            divider = {},
-            edgePadding = 0.dp,
-            indicator = { tabPositions ->
-                if (pagerState.currentPage < tabPositions.size) {
-                    TabRowDefaults.SecondaryIndicator(
-                        modifier = Modifier.tabIndicatorOffset(tabPositions[pagerState.currentPage]),
-                        color = TextColor,
-                    )
-                }
-            },
-        ) {
-            days.forEachIndexed { index, day ->
-                Tab(
-                    selected = pagerState.currentPage == index,
-                    onClick = {
-                        scope.launch {
-                            pagerState.animateScrollToPage(index)
-                        }
-                    },
-                    text = {
-                        Text(
-                            text = day,
-                            fontFamily = Poppins,
-                            fontWeight = if (pagerState.currentPage == index) FontWeight.Medium else FontWeight.Normal,
-                            fontSize = 20.sp,
-                            lineHeight = (20 * 1.4).sp,
-                            color = if (pagerState.currentPage == index) TextColor else Accent,
-                            textAlign = TextAlign.Center,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                    },
-                )
-            }
-        }
-
-        Box(modifier = Modifier.height(16.dp))
-
-        Box(modifier = Modifier.weight(1f)) {
-            if (isLoadingTimetable) {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    CircularProgressIndicator()
-                }
-            } else {
-                HorizontalPager(
-                    state = pagerState,
-                    modifier = Modifier.fillMaxSize(),
-                ) { page ->
-                    DayScheduleContent(
-                        periods = memberTimetableData[page] ?: emptyList(),
-                        dayIndex = page,
-                        quote = quote,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun CircleMemberProfileCard(member: UserResponse) {
-    Card(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(20.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                if (member.picture.isNotEmpty()) {
-                    AsyncImage(
-                        model = member.picture,
-                        contentDescription = null,
-                        modifier =
-                            Modifier
-                                .size(64.dp)
-                                .clip(CircleShape),
-                        placeholder = painterResource(R.drawable.ic_gdscvit),
-                        error = painterResource(R.drawable.ic_gdscvit),
-                    )
-                } else {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(64.dp)
-                                .background(Accent.copy(alpha = 0.2f), CircleShape),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Text(
-                            text =
-                                member.name
-                                    .take(2)
-                                    .map { it.uppercaseChar() }
-                                    .joinToString(""),
-                            color = TextColor,
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 22.sp,
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.width(16.dp))
-
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = member.name,
-                        style = MaterialTheme.typography.titleLarge,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                        lineHeight = 24.sp,
-                    )
-
-                    Spacer(modifier = Modifier.height(4.dp))
-
-                    Text(
-                        text = "@${member.username}",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = Accent,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DayScheduleContent(
-    periods: List<PeriodDetails>,
-    dayIndex: Int,
-    quote: String = "Every day is a new opportunity to learn and grow.",
-) {
-    val context = LocalContext.current
-
-    if (periods.isEmpty()) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 18.dp, vertical = 32.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_timetable_outline),
-                    contentDescription = "No Classes",
-                    modifier = Modifier.size(64.dp),
-                    tint = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f),
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                Text(
-                    text = "No classes today!",
-                    style = MaterialTheme.typography.headlineMedium,
-                    color = MaterialTheme.colorScheme.onBackground,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(
-                    text = quote,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f),
-                    textAlign = TextAlign.Center,
-                    lineHeight = 20.sp,
-                )
-            }
-        }
-    } else {
-        LazyColumn(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 18.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-            contentPadding = PaddingValues(top = 16.dp, bottom = 64.dp),
-        ) {
-            items(
-                items = periods,
-                key = { period -> "${period.courseCode}_${period.slot}" },
-            ) { period ->
-                CircleMemberPeriodCard(
-                    period = period,
-                    dayIndex = dayIndex,
-                    onLocationClick = { roomNo ->
-                        VITMap.openClassMap(context, roomNo)
-                    },
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun CircleMemberPeriodCard(
-    period: PeriodDetails,
-    dayIndex: Int,
-    onLocationClick: (String) -> Unit,
-) {
-    val timeFormat = remember { SimpleDateFormat("h:mm a", Locale.getDefault()) }
-    val startTimeStr =
-        remember(period.startTime) {
-            timeFormat.format(period.startTime.toDate()).uppercase()
-        }
-    val endTimeStr =
-        remember(period.endTime) {
-            timeFormat.format(period.endTime.toDate()).uppercase()
-        }
-
-    val now = Calendar.getInstance()
-
-    val isToday =
-        remember(dayIndex) {
-            val todayIndex =
-                when (now.get(Calendar.DAY_OF_WEEK)) {
-                    Calendar.MONDAY -> 0
-                    Calendar.TUESDAY -> 1
-                    Calendar.WEDNESDAY -> 2
-                    Calendar.THURSDAY -> 3
-                    Calendar.FRIDAY -> 4
-                    Calendar.SATURDAY -> 5
-                    Calendar.SUNDAY -> 6
-                    else -> -1
-                }
-            dayIndex == todayIndex
-        }
-
-    val isActive =
-        if (!isToday) {
-            false
-        } else {
-            val startTime = Calendar.getInstance().apply { time = period.startTime.toDate() }
-            val endTime = Calendar.getInstance().apply { time = period.endTime.toDate() }
-            val currentTime = Calendar.getInstance()
-
-            val currentHourMinute = currentTime.get(Calendar.HOUR_OF_DAY) * 60 + currentTime.get(Calendar.MINUTE)
-            val startHourMinute = startTime.get(Calendar.HOUR_OF_DAY) * 60 + startTime.get(Calendar.MINUTE)
-            val endHourMinute = endTime.get(Calendar.HOUR_OF_DAY) * 60 + endTime.get(Calendar.MINUTE)
-
-            currentHourMinute in startHourMinute..endHourMinute
-        }
-
-    Card(
-        modifier =
-            Modifier
-                .fillMaxWidth(),
-        colors =
-            CardDefaults.cardColors(
-                containerColor = Secondary,
-            ),
-        border =
-            if (isActive) {
-                BorderStroke(
-                    1.dp,
-                    Accent,
-                )
-            } else {
-                null
-            },
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp, vertical = 28.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.Top,
-            ) {
-                Column(
-                    modifier = Modifier.weight(1f),
-                ) {
-                    Text(
-                        text = period.courseName,
-                        style = MaterialTheme.typography.labelLarge,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(4.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = "$startTimeStr - $endTimeStr | ${period.slot}",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Accent,
-                    fontWeight = FontWeight.Medium,
-                )
-
-                if (period.roomNo.isNotEmpty()) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .clip(RoundedCornerShape(9999.dp))
-                                .clickable(
-                                    onClick = { onLocationClick(period.roomNo) },
-                                ).border(
-                                    width = 1.dp,
-                                    color = Accent,
-                                    shape = RoundedCornerShape(9999.dp),
-                                ).padding(horizontal = 8.dp, vertical = 4.dp),
-                    ) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Image(
-                                painter = painterResource(id = R.drawable.ic_compass),
-                                contentDescription = "Compass icon",
-                                modifier = Modifier.size(12.dp),
-                                alignment = Alignment.Center,
-                            )
-                            Spacer(modifier = Modifier.width(4.dp))
-                            Text(
-                                text = period.roomNo,
-                                style =
-                                    MaterialTheme.typography.bodyMedium.copy(
-                                        fontSize = 12.sp,
-                                        lineHeight = 12.sp,
-                                        letterSpacing = (-0.12).sp,
-                                        textAlign = TextAlign.Center,
-                                    ),
-                                color = MaterialTheme.colorScheme.primary,
-                                fontWeight = FontWeight.Medium,
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-private suspend fun processFriendTimetableData(
-    friend: com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse,
-): Map<Int, List<PeriodDetails>> =
-    withContext(Dispatchers.Default) {
-        val timetableData = friend.data
-        val dayNames = listOf("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday")
-
-        val result = mutableMapOf<Int, List<PeriodDetails>>()
-
-        dayNames.forEachIndexed { index, dayName ->
-            val courses =
-                when (dayName) {
-                    "monday" -> timetableData.Monday
-                    "tuesday" -> timetableData.Tuesday
-                    "wednesday" -> timetableData.Wednesday
-                    "thursday" -> timetableData.Thursday
-                    "friday" -> timetableData.Friday
-                    "saturday" -> timetableData.Saturday
-                    "sunday" -> timetableData.Sunday
-                    else -> emptyList()
-                }
-
-            val periods =
-                courses
-                    ?.map { course ->
-                        PeriodDetails(
-                            courseCode = course.code,
-                            courseName = course.name,
-                            startTime = parseTimeToTimestamp(course.start_time),
-                            endTime = parseTimeToTimestamp(course.end_time),
-                            slot = course.slot,
-                            roomNo = course.venue,
-                        )
-                    }?.sortedBy { it.startTime.toDate() } ?: emptyList()
-
-            result[index] = periods
-        }
-
-        result
-    }
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleRequestsScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/CircleRequestsScreenContent.kt
deleted file mode 100644
index bd8d0b6..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleRequestsScreenContent.kt
+++ /dev/null
@@ -1,433 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import android.widget.Toast
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
-import androidx.compose.material3.TabRowDefaults
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.circle.CircleRequestItem
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Green
-import com.dscvit.vitty.theme.Red
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.urlDecode
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CircleRequestsScreenContent(
-    onBackClick: () -> Unit = {},
-    connectViewModel: ConnectViewModel,
-) {
-    val context = LocalContext.current
-    var selectedTab by remember { mutableIntStateOf(0) }
-    var processedRequests by remember { mutableStateOf(setOf<String>()) }
-    val tabs = listOf("Received", "Sent")
-
-    val receivedCircleRequests by connectViewModel.receivedCircleRequests.observeAsState()
-    val sentCircleRequests by connectViewModel.sentCircleRequests.observeAsState()
-    val isLoading by connectViewModel.isCircleRequestsLoading.observeAsState(false)
-    val circleActionResponse by connectViewModel.circleActionResponse.observeAsState()
-
-    LaunchedEffect(receivedCircleRequests, sentCircleRequests) {
-        processedRequests = setOf()
-    }
-
-    LaunchedEffect(circleActionResponse) {
-        circleActionResponse?.let { response ->
-            when (response.detail) {
-                "request accepted successfully" -> {
-                    Toast.makeText(context, "Circle request accepted", Toast.LENGTH_SHORT).show()
-                    connectViewModel.clearCircleActionResponse()
-
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    if (token.isNotEmpty()) {
-                        connectViewModel.refreshCircleRequests(token)
-                        connectViewModel.getCircleList(token)
-                    }
-                }
-                "request declined successfully" -> {
-                    Toast.makeText(context, "Circle request declined", Toast.LENGTH_SHORT).show()
-                    connectViewModel.clearCircleActionResponse()
-
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    if (token.isNotEmpty()) {
-                        connectViewModel.refreshCircleRequests(token)
-                    }
-                }
-                "request unsent successfully" -> {
-                    Toast.makeText(context, "Circle request unsent", Toast.LENGTH_SHORT).show()
-                    connectViewModel.clearCircleActionResponse()
-
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    if (token.isNotEmpty()) {
-                        connectViewModel.refreshCircleRequests(token)
-                    }
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Circle Requests",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = onBackClick) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        TabRow(
-            modifier = Modifier.padding(horizontal = 20.dp),
-            selectedTabIndex = selectedTab,
-            containerColor = Background,
-            contentColor = TextColor,
-            indicator = { tabPositions ->
-                TabRowDefaults.SecondaryIndicator(
-                    modifier =
-                        Modifier
-                            .tabIndicatorOffset(tabPositions[selectedTab])
-                            .height(3.dp),
-                    color = TextColor,
-                )
-            },
-            divider = {
-                Spacer(
-                    Modifier
-                        .fillMaxWidth()
-                        .height(1.5.dp)
-                        .background(Secondary),
-                )
-            },
-        ) {
-            tabs.forEachIndexed { index, tab ->
-                Tab(
-                    selected = selectedTab == index,
-                    onClick = { selectedTab = index },
-                    text = {
-                        Text(
-                            text = tab,
-                            style =
-                                if (selectedTab == index) {
-                                    MaterialTheme.typography.titleLarge
-                                } else {
-                                    MaterialTheme.typography.titleMedium
-                                },
-                            color = if (selectedTab == index) TextColor else Accent,
-                        )
-                    },
-                    selectedContentColor = TextColor,
-                )
-            }
-        }
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        if (isLoading) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center,
-            ) {
-                CircularProgressIndicator(color = Accent)
-            }
-        } else {
-            when (selectedTab) {
-                0 -> {
-                    val requests = receivedCircleRequests?.data ?: emptyList()
-                    val pendingRequests = requests.filter { !processedRequests.contains(it.circle_id) }
-                    CircleRequestsList(
-                        requests = pendingRequests,
-                        isReceived = true,
-                        emptyTitle = "No circle requests",
-                        emptySubtitle = "You have no pending circle invitations",
-                        connectViewModel = connectViewModel,
-                        processedRequests = processedRequests,
-                        onRequestProcessed = { circleId ->
-                            processedRequests = processedRequests + circleId
-                        },
-                    )
-                }
-                1 -> {
-                    val requests = sentCircleRequests?.data ?: emptyList()
-                    val pendingRequests = requests.filter { !processedRequests.contains(it.circle_id) }
-                    CircleRequestsList(
-                        requests = pendingRequests,
-                        isReceived = false,
-                        emptyTitle = "No sent requests",
-                        emptySubtitle = "You haven't sent any circle requests",
-                        connectViewModel = connectViewModel,
-                        processedRequests = processedRequests,
-                        onRequestProcessed = { circleId ->
-                            processedRequests = processedRequests + circleId
-                        },
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun CircleRequestsList(
-    requests: List<CircleRequestItem>,
-    isReceived: Boolean,
-    emptyTitle: String,
-    emptySubtitle: String,
-    connectViewModel: ConnectViewModel,
-    processedRequests: Set<String>,
-    onRequestProcessed: (String) -> Unit,
-) {
-    if (requests.isEmpty()) {
-        Box(
-            modifier = Modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_group_add),
-                    contentDescription = "No requests",
-                    modifier = Modifier.size(64.dp),
-                    tint = Accent.copy(alpha = 0.5f),
-                )
-                Text(
-                    text = emptyTitle,
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = Accent,
-                    textAlign = TextAlign.Center,
-                )
-                Text(
-                    text = emptySubtitle,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Accent.copy(alpha = 0.7f),
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-    } else {
-        LazyColumn(
-            modifier = Modifier.fillMaxSize(),
-            contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 100.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            items(requests) { request ->
-                CircleRequestCard(
-                    request = request,
-                    isReceived = isReceived,
-                    connectViewModel = connectViewModel,
-                    processedRequests = processedRequests,
-                    onRequestProcessed = onRequestProcessed,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun CircleRequestCard(
-    request: CircleRequestItem,
-    isReceived: Boolean,
-    connectViewModel: ConnectViewModel,
-    processedRequests: Set<String>,
-    onRequestProcessed: (String) -> Unit,
-) {
-    val context = LocalContext.current
-
-    Card(
-        modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(start = 24.dp, top = 20.dp, end = 16.dp, bottom = 20.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .size(48.dp)
-                            .background(Accent.copy(alpha = 0.2f), CircleShape),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Text(
-                        text =
-                            request.circle_name
-                                .take(2)
-                                .map { it.uppercaseChar() }
-                                .joinToString(""),
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 18.sp,
-                    )
-                }
-
-                Spacer(modifier = Modifier.width(12.dp))
-
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = request.circle_name.urlDecode(),
-                        style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Medium,
-                        color = TextColor,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-
-                    Spacer(modifier = Modifier.height(4.dp))
-
-                    val displayText =
-                        if (isReceived) {
-                            "Invitation from @${request.from_username}"
-                        } else {
-                            "Sent to @${request.to_username}"
-                        }
-
-                    Text(
-                        text = displayText,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = Accent,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-
-                if (isReceived) {
-                    IconButton(
-                        onClick = {
-                            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                            if (token.isNotEmpty()) {
-                                onRequestProcessed(request.circle_id)
-                                connectViewModel.declineCircleRequest(token, request.circle_id)
-                            }
-                        },
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Close,
-                            contentDescription = "Decline",
-                            tint = Red,
-                        )
-                    }
-
-                    IconButton(
-                        onClick = {
-                            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                            if (token.isNotEmpty()) {
-                                onRequestProcessed(request.circle_id)
-                                connectViewModel.acceptCircleRequest(token, request.circle_id)
-                            }
-                        },
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Check,
-                            contentDescription = "Accept",
-                            tint = Green,
-                        )
-                    }
-                } else {
-                    IconButton(
-                        onClick = {
-                            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                            if (token.isNotEmpty()) {
-                                onRequestProcessed(request.circle_id)
-                                connectViewModel.unsendCircleRequest(token, request.circle_id, request.to_username)
-                            }
-                        },
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Close,
-                            contentDescription = "Unsend",
-                            tint = Red,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectFragment.kt
deleted file mode 100644
index f61a0b3..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectFragment.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.dscvit.vitty.databinding.FragmentConnectBinding
-import com.dscvit.vitty.theme.VittyTheme
-
-class ConnectFragment : Fragment() {
-    private var fragmentConnectBinding: FragmentConnectBinding? = null
-    private val binding get() = fragmentConnectBinding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        fragmentConnectBinding = FragmentConnectBinding.inflate(inflater, container, false)
-        val view = binding.root
-
-        binding.composeView.apply {
-            setViewCompositionStrategy(
-                ViewCompositionStrategy.DisposeOnLifecycleDestroyed(viewLifecycleOwner),
-            )
-            setContent {
-                VittyTheme {
-                    val connectViewModel: ConnectViewModel = viewModel()
-                    ConnectScreenContent(
-                        onSearchClick = {},
-                        connectViewModel = connectViewModel,
-                    )
-                }
-            }
-        }
-
-        return view
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        fragmentConnectBinding = null
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectScreenContent.kt
deleted file mode 100644
index 6697bdc..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectScreenContent.kt
+++ /dev/null
@@ -1,352 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import android.widget.Toast
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.user.CircleItem
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.connect.components.CircleActionBottomSheet
-import com.dscvit.vitty.ui.connect.components.ConnectHeader
-import com.dscvit.vitty.ui.connect.components.ConnectTabContent
-import com.dscvit.vitty.ui.connect.components.NoNetworkMessage
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.UtilFunctions.isNetworkAvailable
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ConnectScreenContent(
-    onSearchClick: () -> Unit = {},
-    onFriendClick: (UserResponse) -> Unit = {},
-    onCircleClick: (CircleItem, FriendResponse?) -> Unit = { _: CircleItem, _: FriendResponse? -> },
-    onFriendRequestsClick: () -> Unit = {},
-    onCircleRequestsClick: () -> Unit = {},
-    connectViewModel: ConnectViewModel,
-) {
-    val context = LocalContext.current
-    val friendList by connectViewModel.friendList.observeAsState()
-    val circleList by connectViewModel.circleList.observeAsState()
-    val createCircleResponse by connectViewModel.createCircleResponse.observeAsState()
-    val joinCircleResponse by connectViewModel.joinCircleResponse.observeAsState()
-    val joinCircleError by connectViewModel.joinCircleError.observeAsState()
-    val isLoading by connectViewModel.isLoading.observeAsState(false)
-    val isRefreshing by connectViewModel.isRefreshing.observeAsState(false)
-    val isCircleLoading by connectViewModel.isCircleLoading.observeAsState(false)
-    val isCircleRefreshing by connectViewModel.isCircleRefreshing.observeAsState(false)
-    val friendRequests by connectViewModel.friendRequest.observeAsState()
-    val receivedCircleRequests by connectViewModel.receivedCircleRequests.observeAsState()
-    val requestActionResponse by connectViewModel.requestActionResponse.observeAsState()
-    val circleActionResponse by connectViewModel.circleActionResponse.observeAsState()
-
-    val isNetworkAvailable = remember { mutableStateOf(isNetworkAvailable(context)) }
-
-    var isCircleActionSheetVisible by remember { mutableStateOf(false) }
-
-    val totalCircleRequests = (receivedCircleRequests?.data?.size ?: 0)
-
-    LaunchedEffect(Unit) {
-        while (true) {
-            isNetworkAvailable.value = isNetworkAvailable(context)
-            kotlinx.coroutines.delay(5000)
-        }
-    }
-
-    LaunchedEffect(requestActionResponse) {
-        requestActionResponse?.let { response ->
-            if (response.detail == "Friend request accepted successfully!" ||
-                response.detail == "Friend request rejected successfully"
-            ) {
-                connectViewModel.clearRequestActionResponse()
-
-                val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                val username = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-
-                if (token.isNotEmpty()) {
-                    connectViewModel.getFriendRequest(token)
-                    connectViewModel.getFriendList(token, username)
-                }
-            }
-        }
-    }
-
-    LaunchedEffect(circleActionResponse) {
-        circleActionResponse?.let { response ->
-            when (response.detail) {
-                "request accepted successfully" -> {
-                    connectViewModel.clearCircleActionResponse()
-
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    if (token.isNotEmpty()) {
-                        connectViewModel.refreshCircleRequests(token)
-                        connectViewModel.getCircleList(token)
-                    }
-                }
-                "request declined successfully" -> {
-                    connectViewModel.clearCircleActionResponse()
-
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    if (token.isNotEmpty()) {
-                        connectViewModel.refreshCircleRequests(token)
-                    }
-                }
-                "request unsent successfully" -> {
-                    connectViewModel.clearCircleActionResponse()
-
-                    val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                    if (token.isNotEmpty()) {
-                        connectViewModel.refreshCircleRequests(token)
-                    }
-                }
-            }
-        }
-    }
-
-    val tabs = listOf("Friends", "Circles")
-    var selectedTab by rememberSaveable { mutableIntStateOf(0) }
-    var searchQuery by remember { mutableStateOf("") }
-    var friendsFilter by remember { mutableIntStateOf(0) }
-
-    val onCreateCircleClick = {
-        isCircleActionSheetVisible = false
-    }
-
-    val onJoinCircleClick = {
-        isCircleActionSheetVisible = false
-    }
-
-    val pagerState = rememberPagerState(pageCount = { tabs.size })
-    val coroutineScope = rememberCoroutineScope()
-
-    val handleActionButtonClick = {
-        if (selectedTab == 1) {
-            isCircleActionSheetVisible = true
-        } else {
-            onSearchClick()
-        }
-    }
-
-    val refreshFriendsData =
-        remember {
-            {
-                val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                val username = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-
-                if (token.isNotEmpty()) {
-                    connectViewModel.refreshFriendList(token, username)
-                    connectViewModel.getFriendRequest(token)
-                }
-            }
-        }
-
-    val refreshCirclesData =
-        remember {
-            {
-                val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-                if (token.isNotEmpty()) {
-                    connectViewModel.refreshCircleList(token)
-                    connectViewModel.refreshCircleRequests(token)
-                }
-            }
-        }
-
-    CircleActionBottomSheet(
-        isVisible = isCircleActionSheetVisible,
-        onDismiss = { isCircleActionSheetVisible = false },
-        onCreateCircleClick = onCreateCircleClick,
-        onJoinCircleClick = onJoinCircleClick,
-        connectViewModel = connectViewModel,
-    )
-
-    LaunchedEffect(isNetworkAvailable.value) {
-        if (isNetworkAvailable.value && friendList == null && !isLoading) {
-            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-            val username = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-
-            if (token.isNotEmpty()) {
-                connectViewModel.getFriendList(token, username)
-                connectViewModel.getCircleList(token)
-                connectViewModel.getFriendRequest(token)
-                connectViewModel.refreshCircleRequests(token)
-            }
-        }
-    }
-
-    LaunchedEffect(selectedTab) {
-        coroutineScope.launch {
-            pagerState.animateScrollToPage(selectedTab)
-        }
-    }
-
-    LaunchedEffect(pagerState.currentPage) {
-        selectedTab = pagerState.currentPage
-    }
-
-    LaunchedEffect(createCircleResponse) {
-        createCircleResponse?.let { response ->
-            Toast
-                .makeText(
-                    context,
-                    "Circle created successfully! Join code: ${response.join_code}",
-                    Toast.LENGTH_LONG,
-                ).show()
-
-            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-            if (token.isNotEmpty()) {
-                connectViewModel.refreshCircleList(token)
-            }
-
-            connectViewModel.clearCreateCircleResponse()
-        }
-    }
-
-    LaunchedEffect(joinCircleResponse) {
-        joinCircleResponse?.let { response ->
-            Toast
-                .makeText(
-                    context,
-                    response.detail,
-                    Toast.LENGTH_LONG,
-                ).show()
-
-            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-            if (token.isNotEmpty()) {
-                connectViewModel.refreshCircleList(token)
-            }
-
-            connectViewModel.clearJoinCircleResponse()
-        }
-    }
-
-    LaunchedEffect(joinCircleError) {
-        joinCircleError?.let { error ->
-            Toast
-                .makeText(
-                    context,
-                    error,
-                    Toast.LENGTH_LONG,
-                ).show()
-
-            connectViewModel.clearJoinCircleError()
-        }
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        TopAppBar(
-            title = {
-                Text(
-                    text = "Connect",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            actions = {
-                if (isNetworkAvailable.value) {
-                    IconButton(
-                        modifier = Modifier.padding(end = 4.dp),
-                        onClick = { handleActionButtonClick() },
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_group_add),
-                            contentDescription = "Add",
-                            tint = TextColor,
-                        )
-                    }
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        if (isNetworkAvailable.value) {
-            ConnectHeader(
-                tabs = tabs,
-                selectedTab = selectedTab,
-                onTabSelected = { index ->
-                    selectedTab = index
-                },
-                searchQuery = searchQuery,
-                onSearchQueryChange = { searchQuery = it },
-                friendsFilter = friendsFilter,
-                onFriendsFilterChange = { friendsFilter = it },
-                friendRequests = friendRequests,
-                onFriendRequestsClick = onFriendRequestsClick,
-                circleRequests = totalCircleRequests,
-                onCircleRequestsClick = onCircleRequestsClick,
-            )
-
-            HorizontalPager(
-                state = pagerState,
-                modifier = Modifier.fillMaxSize(),
-                beyondViewportPageCount = 1,
-            ) { page ->
-                ConnectTabContent(
-                    tabIndex = page,
-                    searchQuery = searchQuery,
-                    friendsFilter = friendsFilter,
-                    friendList = friendList,
-                    circleList = circleList,
-                    isLoading = isLoading,
-                    isRefreshing = isRefreshing,
-                    isCircleLoading = isCircleLoading,
-                    isCircleRefreshing = isCircleRefreshing,
-                    viewModel = connectViewModel,
-                    onFriendClick = onFriendClick,
-                    onCircleClick = onCircleClick,
-                    onFriendsRefresh = refreshFriendsData,
-                    onCirclesRefresh = refreshCirclesData,
-                )
-            }
-        } else {
-            NoNetworkMessage()
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectViewModel.kt
deleted file mode 100644
index 1e31f21..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/ConnectViewModel.kt
+++ /dev/null
@@ -1,784 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitActiveFriendsListener
-import com.dscvit.vitty.network.api.community.RetrofitCircleListener
-import com.dscvit.vitty.network.api.community.RetrofitCircleRequestListener
-import com.dscvit.vitty.network.api.community.RetrofitCreateCircleListener
-import com.dscvit.vitty.network.api.community.RetrofitFriendListListener
-import com.dscvit.vitty.network.api.community.RetrofitFriendRequestListener
-import com.dscvit.vitty.network.api.community.RetrofitGhostActionListener
-import com.dscvit.vitty.network.api.community.RetrofitJoinCircleListener
-import com.dscvit.vitty.network.api.community.RetrofitUserActionListener
-import com.dscvit.vitty.network.api.community.responses.circle.CircleRequestsResponse
-import com.dscvit.vitty.network.api.community.responses.circle.CreateCircleResponse
-import com.dscvit.vitty.network.api.community.responses.circle.JoinCircleResponse
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.user.ActiveFriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.CircleResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.GhostPostResponse
-import com.dscvit.vitty.network.api.community.responses.user.PostResponse
-import com.dscvit.vitty.util.Constants
-import com.google.gson.Gson
-import retrofit2.Call
-import timber.log.Timber
-
-class ConnectViewModel : ViewModel() {
-    private val _friendList = MutableLiveData<FriendResponse?>()
-    private val _friendRequest = MutableLiveData<RequestsResponse?>()
-    private val _requestActionResponse = MutableLiveData<PostResponse?>()
-    private val _sendRequestResponse = MutableLiveData<PostResponse?>()
-    private val _isLoading = MutableLiveData<Boolean>()
-    private val _isRefreshing = MutableLiveData<Boolean>()
-    private val _unfriendSuccess = MutableLiveData<String?>()
-    private val _circleList = MutableLiveData<CircleResponse?>()
-    private val _createCircleResponse = MutableLiveData<CreateCircleResponse?>()
-    private val _joinCircleResponse = MutableLiveData<JoinCircleResponse?>()
-    private val _joinCircleError = MutableLiveData<String?>()
-    private val _isCircleLoading = MutableLiveData<Boolean>()
-    private val _isCircleRefreshing = MutableLiveData<Boolean>()
-    private val _circleMembers = MutableLiveData<Map<String, FriendResponse>>()
-    private val _circleMembersLoading = MutableLiveData<Set<String>>()
-    private val _receivedCircleRequests = MutableLiveData<CircleRequestsResponse?>()
-    private val _sentCircleRequests = MutableLiveData<CircleRequestsResponse?>()
-    private val _isCircleRequestsLoading = MutableLiveData<Boolean>()
-    private val _circleActionResponse = MutableLiveData<PostResponse?>()
-    private val _activeFriends = MutableLiveData<List<String>??>()
-    private val _ghostModeResponse = MutableLiveData<GhostModeResponse?>()
-
-    val ghostModeResponse: MutableLiveData<GhostModeResponse?> = _ghostModeResponse
-    val friendList: MutableLiveData<FriendResponse?> = _friendList
-    val friendRequest: MutableLiveData<RequestsResponse?> = _friendRequest
-    val requestActionResponse: MutableLiveData<PostResponse?> = _requestActionResponse
-    val sendRequestResponse: MutableLiveData<PostResponse?> = _sendRequestResponse
-    val isLoading: MutableLiveData<Boolean> = _isLoading
-    val isRefreshing: MutableLiveData<Boolean> = _isRefreshing
-    val unfriendSuccess: MutableLiveData<String?> = _unfriendSuccess
-    val circleList: MutableLiveData<CircleResponse?> = _circleList
-    val createCircleResponse: MutableLiveData<CreateCircleResponse?> = _createCircleResponse
-    val joinCircleResponse: MutableLiveData<JoinCircleResponse?> = _joinCircleResponse
-    val joinCircleError: MutableLiveData<String?> = _joinCircleError
-    val isCircleLoading: MutableLiveData<Boolean> = _isCircleLoading
-    val isCircleRefreshing: MutableLiveData<Boolean> = _isCircleRefreshing
-    val circleMembers: MutableLiveData<Map<String, FriendResponse>> = _circleMembers
-    val circleMembersLoading: MutableLiveData<Set<String>> = _circleMembersLoading
-    val receivedCircleRequests: MutableLiveData<CircleRequestsResponse?> = _receivedCircleRequests
-    val sentCircleRequests: MutableLiveData<CircleRequestsResponse?> = _sentCircleRequests
-    val isCircleRequestsLoading: MutableLiveData<Boolean> = _isCircleRequestsLoading
-    val circleActionResponse: MutableLiveData<PostResponse?> = _circleActionResponse
-    val activeFriends: MutableLiveData<List<String>??> = _activeFriends
-
-    fun getFriendList(
-        token: String,
-        username: String,
-    ) {
-        _isLoading.postValue(true)
-        APICommunityRestClient.instance.getFriendList(
-            token,
-            username,
-            object : RetrofitFriendListListener {
-                override fun onSuccess(
-                    call: Call<FriendResponse>?,
-                    response: FriendResponse?,
-                ) {
-                    Timber.d("ConnectFriendList: $response")
-                    _friendList.postValue(response)
-                    _isLoading.postValue(false)
-                }
-
-                override fun onError(
-                    call: Call<FriendResponse>?,
-                    t: Throwable?,
-                ) {
-                    _friendList.postValue(null)
-                    _isLoading.postValue(false)
-                }
-            },
-        )
-    }
-
-    fun refreshFriendList(
-        token: String,
-        username: String,
-    ) {
-        _isRefreshing.postValue(true)
-        APICommunityRestClient.instance.getFriendList(
-            token,
-            username,
-            object : RetrofitFriendListListener {
-                override fun onSuccess(
-                    call: Call<FriendResponse>?,
-                    response: FriendResponse?,
-                ) {
-                    _friendList.postValue(response)
-                    _isRefreshing.postValue(false)
-                }
-
-                override fun onError(
-                    call: Call<FriendResponse>?,
-                    t: Throwable?,
-                ) {
-                    _friendList.postValue(null)
-                    _isRefreshing.postValue(false)
-                }
-            },
-        )
-    }
-
-    fun getFriendRequest(token: String) {
-        APICommunityRestClient.instance.getFriendRequest(
-            token,
-            object : RetrofitFriendRequestListener {
-                override fun onSuccess(
-                    call: Call<RequestsResponse>?,
-                    response: RequestsResponse?,
-                ) {
-                    Timber.d("ConnectFriendRequest: $response")
-                    _friendRequest.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<RequestsResponse>?,
-                    t: Throwable?,
-                ) {
-                    _friendRequest.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun sendRequest(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.sendRequest(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("ConnectSendRequest: $response")
-                    _sendRequestResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("ConnectSendRequestError: ${t?.message}")
-                    _sendRequestResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun unfriend(
-        token: String,
-        username: String,
-        prefs: SharedPreferences,
-    ) {
-        APICommunityRestClient.instance.unfriend(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("ConnectUnfriend: $response")
-                    fetchActiveFriends(token, prefs)
-                    _unfriendSuccess.postValue(username)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("ConnectUnfriendError: ${t?.message}")
-                    _unfriendSuccess.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun clearUnfriendSuccess() {
-        _unfriendSuccess.postValue(null)
-    }
-
-    fun clearSendRequestResponse() {
-        _sendRequestResponse.postValue(null)
-    }
-
-    fun clearRequestActionResponse() {
-        _requestActionResponse.postValue(null)
-    }
-
-    fun acceptRequest(
-        token: String,
-        username: String,
-        prefs: SharedPreferences,
-    ) {
-        APICommunityRestClient.instance.acceptRequest(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("AcceptRequest: $response")
-                    fetchActiveFriends(token, prefs)
-                    _requestActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("AcceptRequest: ${t?.message}")
-                    _requestActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun rejectRequest(
-        token: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.rejectRequest(
-            token,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("RejectRequest: $response")
-                    _requestActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("RejectRequest: ${t?.message}")
-                    _requestActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun getCircleList(token: String) {
-        _isCircleLoading.postValue(true)
-        APICommunityRestClient.instance.getCircles(
-            token,
-            object : RetrofitCircleListener {
-                override fun onSuccess(
-                    call: Call<CircleResponse>?,
-                    response: CircleResponse?,
-                ) {
-                    Timber.d("ConnectCircleList: $response")
-                    _circleList.postValue(response)
-                    _isCircleLoading.postValue(false)
-                }
-
-                override fun onError(
-                    call: Call<CircleResponse>?,
-                    t: Throwable?,
-                ) {
-                    _circleList.postValue(null)
-                    _isCircleLoading.postValue(false)
-                }
-            },
-        )
-    }
-
-    fun refreshCircleList(token: String) {
-        _isCircleRefreshing.postValue(true)
-        _circleMembers.postValue(emptyMap())
-        _circleMembersLoading.postValue(emptySet())
-
-        APICommunityRestClient.instance.getCircles(
-            token,
-            object : RetrofitCircleListener {
-                override fun onSuccess(
-                    call: Call<CircleResponse>?,
-                    response: CircleResponse?,
-                ) {
-                    Timber.d("ConnectCircleList: $response")
-                    _circleList.postValue(response)
-                    _isCircleRefreshing.postValue(false)
-
-                    response?.data?.forEach { circle ->
-                        getCircleDetails(token, circle.circle_id)
-                    }
-                }
-
-                override fun onError(
-                    call: Call<CircleResponse>?,
-                    t: Throwable?,
-                ) {
-                    _circleList.postValue(null)
-                    _isCircleRefreshing.postValue(false)
-                }
-            },
-        )
-    }
-
-    fun getCircleDetails(
-        token: String,
-        circleId: String,
-    ) {
-        val currentLoading = _circleMembersLoading.value?.toMutableSet() ?: mutableSetOf()
-        currentLoading.add(circleId)
-        _circleMembersLoading.postValue(currentLoading)
-
-        APICommunityRestClient.instance.getCircleDetails(
-            token,
-            circleId,
-            object : RetrofitFriendListListener {
-                override fun onSuccess(
-                    call: Call<FriendResponse>?,
-                    response: FriendResponse?,
-                ) {
-                    Timber.d("CircleDetails for $circleId: $response")
-                    val currentMembers = _circleMembers.value?.toMutableMap() ?: mutableMapOf()
-                    if (response != null) {
-                        currentMembers[circleId] = response
-                        _circleMembers.postValue(currentMembers)
-                    }
-
-                    val updatedLoading =
-                        _circleMembersLoading.value?.toMutableSet() ?: mutableSetOf()
-                    updatedLoading.remove(circleId)
-                    _circleMembersLoading.postValue(updatedLoading)
-                }
-
-                override fun onError(
-                    call: Call<FriendResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("CircleDetailsError for $circleId: ${t?.message}")
-
-                    val updatedLoading =
-                        _circleMembersLoading.value?.toMutableSet() ?: mutableSetOf()
-                    updatedLoading.remove(circleId)
-                    _circleMembersLoading.postValue(updatedLoading)
-                }
-            },
-        )
-    }
-
-    fun createCircle(
-        token: String,
-        circleName: String,
-    ) {
-        Timber.d(
-            "ConnectViewModel.createCircle called with token: ${if (token.isNotEmpty()) "exists" else "empty"}, circleName: $circleName",
-        )
-
-        APICommunityRestClient.instance.createCircle(
-            token,
-            circleName,
-            object : RetrofitCreateCircleListener {
-                override fun onSuccess(
-                    call: Call<CreateCircleResponse>?,
-                    response: CreateCircleResponse?,
-                ) {
-                    Timber.d("CreateCircle: $response")
-                    _createCircleResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<CreateCircleResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("CreateCircle Error: ${t?.message}")
-                    _createCircleResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun joinCircleByCode(
-        token: String,
-        joinCode: String,
-    ) {
-        Timber.d(
-            "ConnectViewModel.joinCircleByCode called with token: ${if (token.isNotEmpty()) "exists" else "empty"}, joinCode: $joinCode",
-        )
-
-        _joinCircleResponse.postValue(null)
-        _joinCircleError.postValue(null)
-
-        APICommunityRestClient.instance.joinCircleByCode(
-            token,
-            joinCode,
-            object : RetrofitJoinCircleListener {
-                override fun onSuccess(
-                    call: Call<JoinCircleResponse>?,
-                    response: JoinCircleResponse?,
-                ) {
-                    Timber.d("JoinCircle Success: $response")
-                    _joinCircleResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<JoinCircleResponse>?,
-                    t: Throwable?,
-                ) {
-                    val errorMessage = t?.message ?: "Unknown error occurred"
-                    Timber.d("JoinCircle Error: $errorMessage")
-                    _joinCircleError.postValue(errorMessage)
-                }
-            },
-        )
-    }
-
-    fun clearCreateCircleResponse() {
-        _createCircleResponse.postValue(null)
-    }
-
-    fun clearJoinCircleResponse() {
-        _joinCircleResponse.postValue(null)
-    }
-
-    fun clearJoinCircleError() {
-        _joinCircleError.postValue(null)
-    }
-
-    fun getReceivedCircleRequests(token: String) {
-        _isCircleRequestsLoading.postValue(true)
-        APICommunityRestClient.instance.getReceivedCircleRequests(
-            token,
-            object : RetrofitCircleRequestListener {
-                override fun onSuccess(
-                    call: Call<CircleRequestsResponse>?,
-                    response: CircleRequestsResponse?,
-                ) {
-                    Timber.d("ReceivedCircleRequests: $response")
-                    _receivedCircleRequests.postValue(response)
-                    _isCircleRequestsLoading.postValue(false)
-                }
-
-                override fun onError(
-                    call: Call<CircleRequestsResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("ReceivedCircleRequestsError: ${t?.message}")
-                    _receivedCircleRequests.postValue(null)
-                    _isCircleRequestsLoading.postValue(false)
-                }
-            },
-        )
-    }
-
-    fun getSentCircleRequests(token: String) {
-        _isCircleRequestsLoading.postValue(true)
-        APICommunityRestClient.instance.getSentCircleRequests(
-            token,
-            object : RetrofitCircleRequestListener {
-                override fun onSuccess(
-                    call: Call<CircleRequestsResponse>?,
-                    response: CircleRequestsResponse?,
-                ) {
-                    Timber.d("SentCircleRequests: $response")
-                    _sentCircleRequests.postValue(response)
-                    _isCircleRequestsLoading.postValue(false)
-                }
-
-                override fun onError(
-                    call: Call<CircleRequestsResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("SentCircleRequestsError: ${t?.message}")
-                    _sentCircleRequests.postValue(null)
-                    _isCircleRequestsLoading.postValue(false)
-                }
-            },
-        )
-    }
-
-    fun refreshCircleRequests(token: String) {
-        getReceivedCircleRequests(token)
-        getSentCircleRequests(token)
-    }
-
-    fun deleteCircle(
-        token: String,
-        circleId: String,
-    ) {
-        APICommunityRestClient.instance.deleteCircle(
-            token,
-            circleId,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("DeleteCircle: $response")
-                    _circleActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("DeleteCircleError: ${t?.message}")
-                    _circleActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun leaveCircle(
-        token: String,
-        circleId: String,
-    ) {
-        APICommunityRestClient.instance.leaveCircle(
-            token,
-            circleId,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("LeaveCircle: $response")
-                    _circleActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("LeaveCircleError: ${t?.message}")
-                    _circleActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun clearCircleActionResponse() {
-        _circleActionResponse.postValue(null)
-    }
-
-    fun acceptCircleRequest(
-        token: String,
-        circleId: String,
-    ) {
-        APICommunityRestClient.instance.acceptCircleRequest(
-            token,
-            circleId,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("AcceptCircleRequest: $response")
-                    _circleActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("AcceptCircleRequestError: ${t?.message}")
-                    _circleActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun declineCircleRequest(
-        token: String,
-        circleId: String,
-    ) {
-        APICommunityRestClient.instance.declineCircleRequest(
-            token,
-            circleId,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("DeclineCircleRequest: $response")
-                    _circleActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("DeclineCircleRequestError: ${t?.message}")
-                    _circleActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun unsendCircleRequest(
-        token: String,
-        circleId: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.unsendCircleRequest(
-            token,
-            circleId,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("UnsendCircleRequest: $response")
-                    _circleActionResponse.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("UnsendCircleRequestError: ${t?.message}")
-                    _circleActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun removeUserFromCircle(
-        token: String,
-        circleId: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.removeUserFromCircle(
-            token,
-            circleId,
-            username,
-            object : RetrofitUserActionListener {
-                override fun onSuccess(
-                    call: Call<PostResponse>?,
-                    response: PostResponse?,
-                ) {
-                    Timber.d("RemoveUserFromCircle: $response")
-                    _circleActionResponse.postValue(response)
-
-                    getCircleDetails(token, circleId)
-                }
-
-                override fun onError(
-                    call: Call<PostResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.d("RemoveUserFromCircleError: ${t?.message}")
-                    _circleActionResponse.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun fetchActiveFriends(
-        token: String,
-        prefs: SharedPreferences,
-    ) {
-        APICommunityRestClient.instance.getActiveFriends(
-            token,
-            object : RetrofitActiveFriendsListener {
-                override fun onSuccess(
-                    call: Call<ActiveFriendResponse>,
-                    response: ActiveFriendResponse?,
-                ) {
-                    val list = response?.data ?: emptyList()
-                    _activeFriends.postValue(list)
-
-                    prefs.edit {
-                        putBoolean(Constants.ACTIVE_FRIENDS_FETCHED, true)
-                            .putString(Constants.ACTIVE_FRIENDS_LIST, Gson().toJson(list))
-                    }
-                }
-
-                override fun onError(
-                    call: Call<ActiveFriendResponse>,
-                    t: Throwable,
-                ) {
-                    _activeFriends.postValue(emptyList())
-                }
-            },
-        )
-    }
-
-    fun toggleGhostMode(
-        token: String,
-        username: String,
-        enable: Boolean,
-    ) {
-        _ghostModeResponse.postValue(null)
-        val api = APICommunityRestClient.instance
-        if (enable) {
-            api.enableGhostMode(
-                token,
-                username,
-                object : RetrofitGhostActionListener {
-                    override fun onSuccess(
-                        call: Call<GhostPostResponse>?,
-                        response: GhostPostResponse?,
-                    ) {
-                        val success =
-                            response?.data?.contains("hidden", true) == true ||
-                                response?.data?.contains("visible", true) == true
-                        _ghostModeResponse.postValue(GhostModeResponse(success))
-                    }
-
-                    override fun onError(
-                        call: Call<GhostPostResponse>?,
-                        t: Throwable?,
-                    ) {
-                        _ghostModeResponse.postValue(GhostModeResponse(false))
-                    }
-                },
-            )
-        } else {
-            api.disableGhostMode(
-                token,
-                username,
-                object : RetrofitGhostActionListener {
-                    override fun onSuccess(
-                        call: Call<GhostPostResponse>?,
-                        response: GhostPostResponse?,
-                    ) {
-                        val success =
-                            response?.data?.contains("hidden", true) == true ||
-                                response?.data?.contains("visible", true) == true
-                        _ghostModeResponse.postValue(GhostModeResponse(success))
-                    }
-
-                    override fun onError(
-                        call: Call<GhostPostResponse>?,
-                        t: Throwable?,
-                    ) {
-                        _ghostModeResponse.postValue(GhostModeResponse(false))
-                    }
-                },
-            )
-        }
-    }
-
-    fun clearGhostModeResponse() {
-        _ghostModeResponse.postValue(null)
-    }
-
-    fun updateActiveFriendsList(data: List<String>?) {
-        _activeFriends.postValue(data)
-    }
-
-    data class GhostModeResponse(
-        val success: Boolean,
-    )
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt
deleted file mode 100644
index 086e683..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt
+++ /dev/null
@@ -1,972 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import android.widget.Toast
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRowDefaults
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.core.content.edit
-import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.model.PeriodDetails
-import com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Poppins
-import com.dscvit.vitty.theme.Red
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.schedule.ScheduleViewModel
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.Quote
-import com.dscvit.vitty.widget.parseTimeToTimestamp
-import com.google.gson.Gson
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun FriendDetailScreenContent(
-    friend: UserResponse,
-    onBackClick: () -> Unit = {},
-    connectViewModel: ConnectViewModel,
-) {
-    val context = LocalContext.current
-    val scheduleViewModel: ScheduleViewModel = viewModel()
-    val scope = rememberCoroutineScope()
-    var quote by remember { mutableStateOf("") }
-    var friendTimetableData by remember {
-        mutableStateOf<Map<Int, List<PeriodDetails>>>(emptyMap())
-    }
-    var isLoadingTimetable by remember { mutableStateOf(false) }
-    var hasLoadedData by remember { mutableStateOf(false) }
-    var hasUnfriended by remember { mutableStateOf(false) }
-    var isSendingRequest by remember { mutableStateOf(false) }
-    var hasRequestSent by remember { mutableStateOf(false) }
-    var showUnfriendDialog by remember { mutableStateOf(false) }
-
-    var isFriendGhosted by remember { mutableStateOf(false) }
-    var isTogglingGhostMode by remember { mutableStateOf(false) }
-
-    val unfriendSuccess by connectViewModel.unfriendSuccess.observeAsState()
-    val sendRequestResponse by connectViewModel.sendRequestResponse.observeAsState()
-    val activeFriends by connectViewModel.activeFriends.observeAsState()
-    val ghostModeResponse by connectViewModel.ghostModeResponse.observeAsState()
-
-    LaunchedEffect(activeFriends) {
-        Timber.d("Active friends: $activeFriends")
-        activeFriends?.let { activeList -> isFriendGhosted = !activeList.contains(friend.username) }
-    }
-
-    LaunchedEffect(ghostModeResponse) {
-        if (ghostModeResponse != null && isTogglingGhostMode) {
-            isTogglingGhostMode = false
-
-            val sharedPreferences =
-                context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-
-            if (ghostModeResponse!!.success) {
-                val currentActiveFriends = activeFriends?.toMutableList() ?: mutableListOf()
-                val gson = Gson()
-
-                if (isFriendGhosted) {
-                    currentActiveFriends.removeAll { it == friend.username }
-                } else {
-                    if (!currentActiveFriends.contains(friend.username)) {
-                        currentActiveFriends.add(friend.username)
-                    }
-                }
-
-                val activeFriendsJson = gson.toJson(currentActiveFriends)
-                sharedPreferences.edit {
-                    putString(Constants.ACTIVE_FRIENDS_LIST, activeFriendsJson)
-                }
-
-                Toast
-                    .makeText(
-                        context,
-                        if (isFriendGhosted) {
-                            "${friend.name} is now ghosted"
-                        } else {
-                            "${friend.name} is now visible"
-                        },
-                        Toast.LENGTH_SHORT,
-                    ).show()
-                connectViewModel.updateActiveFriendsList(currentActiveFriends)
-            } else {
-                isFriendGhosted = !isFriendGhosted
-            }
-
-            connectViewModel.clearGhostModeResponse()
-        }
-    }
-
-    LaunchedEffect(unfriendSuccess) {
-        if (unfriendSuccess == friend.username) {
-            hasUnfriended = true
-            connectViewModel.clearUnfriendSuccess()
-        }
-    }
-
-    LaunchedEffect(sendRequestResponse) {
-        if (sendRequestResponse != null && isSendingRequest) {
-            isSendingRequest = false
-            if (sendRequestResponse!!.detail == "Friend request sent successfully") {
-                hasRequestSent = true
-                connectViewModel.clearSendRequestResponse()
-
-                val sharedPreferences =
-                    context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                val username = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-                if (token.isNotEmpty() && username.isNotEmpty()) {
-                    connectViewModel.refreshFriendList(token, username)
-                }
-            } else {
-                connectViewModel.clearSendRequestResponse()
-            }
-        }
-    }
-
-    val days = listOf("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
-    val currentDay =
-        remember {
-            when (Calendar.getInstance().get(Calendar.DAY_OF_WEEK)) {
-                Calendar.MONDAY -> 0
-                Calendar.TUESDAY -> 1
-                Calendar.WEDNESDAY -> 2
-                Calendar.THURSDAY -> 3
-                Calendar.FRIDAY -> 4
-                Calendar.SATURDAY -> 5
-                Calendar.SUNDAY -> 6
-                else -> 0
-            }
-        }
-
-    val pagerState =
-        rememberPagerState(
-            initialPage = currentDay,
-            pageCount = { 7 },
-        )
-
-    LaunchedEffect(friend.username) {
-        if (hasLoadedData) return@LaunchedEffect
-
-        quote = Quote.getLine(context)
-
-        val sharedPreferences =
-            context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-        if (token.isNotEmpty()) {
-            isLoadingTimetable = true
-            scheduleViewModel.getTimeTable(token, friend.username)
-        } else {
-            hasLoadedData = true
-        }
-    }
-
-    val timetableResponse by scheduleViewModel.timetable.observeAsState()
-
-    LaunchedEffect(timetableResponse) {
-        timetableResponse?.let { response ->
-            scope.launch {
-                withContext(Dispatchers.Default) {
-                    try {
-                        val processedData = processFriendTimetableData(response)
-                        withContext(Dispatchers.Main) {
-                            friendTimetableData = processedData
-                            isLoadingTimetable = false
-                            hasLoadedData = true
-                        }
-                    } catch (e: Exception) {
-                        Timber.e("Error processing friend timetable: ${e.message}")
-                        withContext(Dispatchers.Main) {
-                            isLoadingTimetable = false
-                            hasLoadedData = true
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier = Modifier.fillMaxSize().background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Friend Profile",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = onBackClick) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        FriendProfileCard(
-            friend = friend,
-            hasUnfriended = hasUnfriended,
-            isSendingRequest = isSendingRequest,
-            hasRequestSent = hasRequestSent,
-            isFriendGhosted = isFriendGhosted,
-            isTogglingGhostMode = isTogglingGhostMode,
-            onUnfriendClick = { showUnfriendDialog = true },
-            onSendRequestClick = {
-                val sharedPreferences =
-                    context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                if (token.isNotEmpty()) {
-                    isSendingRequest = true
-                    connectViewModel.sendRequest(token, friend.username)
-                }
-            },
-            onToggleGhostMode = { newValue ->
-                if (!isTogglingGhostMode) {
-                    isTogglingGhostMode = true
-                    isFriendGhosted = newValue
-
-                    val sharedPreferences =
-                        context.getSharedPreferences(
-                            Constants.USER_INFO,
-                            Context.MODE_PRIVATE,
-                        )
-                    val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-                    connectViewModel.toggleGhostMode(token, friend.username, newValue)
-                }
-            },
-        )
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        if (!hasUnfriended) {
-            Text(
-                text = "Schedule",
-                style = MaterialTheme.typography.titleLarge,
-                fontWeight = FontWeight.Bold,
-                color = TextColor,
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            )
-
-            ScrollableTabRow(
-                selectedTabIndex = pagerState.currentPage,
-                containerColor = MaterialTheme.colorScheme.surface,
-                contentColor = MaterialTheme.colorScheme.onSurface,
-                divider = {},
-                edgePadding = 0.dp,
-                indicator = { tabPositions ->
-                    if (pagerState.currentPage < tabPositions.size) {
-                        TabRowDefaults.SecondaryIndicator(
-                            modifier =
-                                Modifier.tabIndicatorOffset(
-                                    tabPositions[pagerState.currentPage],
-                                ),
-                            color = TextColor,
-                        )
-                    }
-                },
-            ) {
-                days.forEachIndexed { index, day ->
-                    Tab(
-                        selected = pagerState.currentPage == index,
-                        onClick = { scope.launch { pagerState.animateScrollToPage(index) } },
-                        text = {
-                            Text(
-                                text = day,
-                                fontFamily = Poppins,
-                                fontWeight =
-                                    if (pagerState.currentPage == index) {
-                                        FontWeight.Medium
-                                    } else {
-                                        FontWeight.Normal
-                                    },
-                                fontSize = 20.sp,
-                                lineHeight = (20 * 1.4).sp,
-                                color =
-                                    if (pagerState.currentPage == index) {
-                                        TextColor
-                                    } else {
-                                        Accent
-                                    },
-                                textAlign = TextAlign.Center,
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis,
-                            )
-                        },
-                    )
-                }
-            }
-
-            Box(modifier = Modifier.height(16.dp))
-
-            Box(modifier = Modifier.weight(1f)) {
-                if (isLoadingTimetable) {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center,
-                    ) { CircularProgressIndicator() }
-                } else {
-                    HorizontalPager(
-                        state = pagerState,
-                        modifier = Modifier.fillMaxSize(),
-                    ) { page ->
-                        DayScheduleContent(
-                            periods = friendTimetableData[page] ?: emptyList(),
-                            dayIndex = page,
-                            quote = quote,
-                        )
-                    }
-                }
-            }
-        } else {
-            Box(
-                modifier = Modifier.fillMaxWidth().weight(1f).padding(32.dp),
-                contentAlignment = Alignment.Center,
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(16.dp),
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_community_outline),
-                        contentDescription = "No Access",
-                        modifier = Modifier.size(64.dp),
-                        tint = Accent.copy(alpha = 0.5f),
-                    )
-                    Text(
-                        text = "Schedule Not Available",
-                        style = MaterialTheme.typography.headlineSmall,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        textAlign = TextAlign.Center,
-                    )
-                    Text(
-                        text =
-                            "You can no longer view ${friend.name}'s schedule as they are not in your friends list.",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = Accent,
-                        textAlign = TextAlign.Center,
-                        lineHeight = 20.sp,
-                    )
-                }
-            }
-        }
-    }
-
-    if (showUnfriendDialog) {
-        AlertDialog(
-            onDismissRequest = { showUnfriendDialog = false },
-            title = {
-                Text(
-                    text = "Unfriend ${friend.name}?",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            text = {
-                Text(
-                    text =
-                        "Are you sure you want to remove ${friend.name} from your friends list? " +
-                            "You won't be able to see their schedule anymore.",
-                    style =
-                        MaterialTheme.typography.bodyMedium.copy(
-                            color = Accent,
-                        ),
-                )
-            },
-            containerColor = Secondary,
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        showUnfriendDialog = false
-                        val sharedPreferences =
-                            context.getSharedPreferences(
-                                Constants.USER_INFO,
-                                Context.MODE_PRIVATE,
-                            )
-                        val token =
-                            sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "")
-                                ?: ""
-                        val username =
-                            sharedPreferences.getString(
-                                Constants.COMMUNITY_USERNAME,
-                                "",
-                            )
-                                ?: ""
-                        if (token.isNotEmpty()) {
-                            connectViewModel.unfriend(token, friend.username, sharedPreferences)
-                            connectViewModel.getFriendList(token, username)
-                        }
-                    },
-                ) {
-                    Text(
-                        text = "Unfriend",
-                        color = Red,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-            dismissButton = {
-                TextButton(
-                    onClick = { showUnfriendDialog = false },
-                ) {
-                    Text(
-                        text = "Cancel",
-                        color = TextColor,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            },
-        )
-    }
-}
-
-@Composable
-fun FriendProfileCard(
-    friend: UserResponse,
-    hasUnfriended: Boolean,
-    isSendingRequest: Boolean,
-    hasRequestSent: Boolean,
-    isFriendGhosted: Boolean,
-    isTogglingGhostMode: Boolean,
-    onUnfriendClick: () -> Unit,
-    onSendRequestClick: () -> Unit,
-    onToggleGhostMode: (Boolean) -> Unit,
-) {
-    Card(
-        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Column(
-            modifier = Modifier.fillMaxWidth().padding(20.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                if (friend.picture.isNotEmpty()) {
-                    AsyncImage(
-                        model = friend.picture,
-                        contentDescription = null,
-                        modifier = Modifier.size(64.dp).clip(CircleShape),
-                        placeholder = painterResource(R.drawable.ic_gdscvit),
-                        error = painterResource(R.drawable.ic_gdscvit),
-                    )
-                } else {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(64.dp)
-                                .background(Accent.copy(alpha = 0.2f), CircleShape),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Text(
-                            text =
-                                friend.name
-                                    .take(2)
-                                    .map { it.uppercaseChar() }
-                                    .joinToString(""),
-                            color = TextColor,
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 22.sp,
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.width(16.dp))
-
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = friend.name,
-                        style = MaterialTheme.typography.titleLarge,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                        lineHeight = 24.sp,
-                    )
-
-                    Spacer(modifier = Modifier.height(4.dp))
-
-                    Text(
-                        text = "@${friend.username}",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = Accent,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            if (!hasUnfriended) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    Column {
-                        Text(
-                            text =
-                                if (isFriendGhosted) {
-                                    "Friend is ghosted"
-                                } else {
-                                    "Friend is visible"
-                                },
-                            style = MaterialTheme.typography.bodyMedium,
-                            fontWeight = FontWeight.Medium,
-                            color =
-                                if (isFriendGhosted) {
-                                    Accent.copy(alpha = 0.6f)
-                                } else {
-                                    TextColor
-                                },
-                        )
-                        Text(
-                            text =
-                                if (isFriendGhosted) {
-                                    "They won't see your activity"
-                                } else {
-                                    "They can see your activity"
-                                },
-                            style = MaterialTheme.typography.bodySmall,
-                            color = Accent.copy(alpha = 0.7f),
-                        )
-                    }
-
-                    Switch(
-                        checked = isFriendGhosted,
-                        onCheckedChange = onToggleGhostMode,
-                        enabled = !isTogglingGhostMode,
-                        colors =
-                            SwitchDefaults.colors(
-                                checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
-                                checkedTrackColor = Accent,
-                                uncheckedThumbColor = Accent,
-                                uncheckedTrackColor = Secondary,
-                                checkedBorderColor = Accent,
-                                uncheckedBorderColor = Accent,
-                            ),
-                    )
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-            }
-
-            if (hasUnfriended) {
-                if (hasRequestSent) {
-                    Button(
-                        onClick = {},
-                        enabled = false,
-                        colors =
-                            ButtonDefaults.buttonColors(
-                                containerColor = Accent.copy(alpha = 0.1f),
-                                contentColor = Accent.copy(alpha = 0.6f),
-                            ),
-                        modifier = Modifier.fillMaxWidth().height(48.dp),
-                        shape = RoundedCornerShape(12.dp),
-                    ) {
-                        Text(
-                            text = "Request Sent",
-                            style = MaterialTheme.typography.labelLarge,
-                            fontWeight = FontWeight.Medium,
-                        )
-                    }
-                } else {
-                    Button(
-                        onClick = onSendRequestClick,
-                        enabled = !isSendingRequest,
-                        colors =
-                            ButtonDefaults.buttonColors(
-                                containerColor =
-                                    if (isSendingRequest) {
-                                        Accent.copy(alpha = 0.1f)
-                                    } else {
-                                        Accent
-                                    },
-                                contentColor =
-                                    if (isSendingRequest) {
-                                        Accent.copy(alpha = 0.6f)
-                                    } else {
-                                        MaterialTheme.colorScheme.onPrimary
-                                    },
-                            ),
-                        modifier = Modifier.fillMaxWidth().height(48.dp),
-                        shape = RoundedCornerShape(12.dp),
-                    ) {
-                        if (isSendingRequest) {
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                            ) {
-                                CircularProgressIndicator(
-                                    modifier = Modifier.size(18.dp),
-                                    strokeWidth = 2.dp,
-                                    color = Accent.copy(alpha = 0.7f),
-                                )
-                                Text(
-                                    text = "Sending Request...",
-                                    style = MaterialTheme.typography.labelLarge,
-                                    fontWeight = FontWeight.Medium,
-                                )
-                            }
-                        } else {
-                            Text(
-                                text = "Send Friend Request",
-                                style = MaterialTheme.typography.labelLarge,
-                                fontWeight = FontWeight.Medium,
-                            )
-                        }
-                    }
-                }
-            } else {
-                Button(
-                    onClick = onUnfriendClick,
-                    colors =
-                        ButtonDefaults.buttonColors(
-                            containerColor = Red.copy(alpha = 0.1f),
-                            contentColor = Red,
-                        ),
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(48.dp)
-                            .border(
-                                width = 1.dp,
-                                color = Red,
-                                shape = RoundedCornerShape(12.dp),
-                            ),
-                    shape = RoundedCornerShape(12.dp),
-                ) {
-                    Text(
-                        text = "Unfriend",
-                        style = MaterialTheme.typography.labelLarge,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DayScheduleContent(
-    periods: List<PeriodDetails>,
-    dayIndex: Int,
-    quote: String = "Every day is a new opportunity to learn and grow.",
-) {
-    if (periods.isEmpty()) {
-        Box(
-            modifier = Modifier.fillMaxSize().padding(horizontal = 18.dp, vertical = 32.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_timetable_outline),
-                    contentDescription = "No Classes",
-                    modifier = Modifier.size(64.dp),
-                    tint = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f),
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                Text(
-                    text = "No classes today!",
-                    style = MaterialTheme.typography.headlineMedium,
-                    color = MaterialTheme.colorScheme.onBackground,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(
-                    text = quote,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f),
-                    textAlign = TextAlign.Center,
-                    lineHeight = 20.sp,
-                )
-            }
-        }
-    } else {
-        LazyColumn(
-            modifier = Modifier.fillMaxSize().padding(horizontal = 18.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-            contentPadding = PaddingValues(top = 16.dp, bottom = 64.dp),
-        ) {
-            items(
-                items = periods,
-                key = { period -> "${period.courseCode}_${period.slot}" },
-            ) { period ->
-                FriendPeriodCard(
-                    period = period,
-                    dayIndex = dayIndex,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun FriendPeriodCard(
-    period: PeriodDetails,
-    dayIndex: Int,
-) {
-    val timeFormat = remember { SimpleDateFormat("h:mm a", Locale.getDefault()) }
-    val startTimeStr =
-        remember(period.startTime) { timeFormat.format(period.startTime.toDate()).uppercase() }
-    val endTimeStr =
-        remember(period.endTime) { timeFormat.format(period.endTime.toDate()).uppercase() }
-
-    val now = Calendar.getInstance()
-
-    val isToday =
-        remember(dayIndex) {
-            val todayIndex =
-                when (now.get(Calendar.DAY_OF_WEEK)) {
-                    Calendar.MONDAY -> 0
-                    Calendar.TUESDAY -> 1
-                    Calendar.WEDNESDAY -> 2
-                    Calendar.THURSDAY -> 3
-                    Calendar.FRIDAY -> 4
-                    Calendar.SATURDAY -> 5
-                    Calendar.SUNDAY -> 6
-                    else -> -1
-                }
-            dayIndex == todayIndex
-        }
-
-    val isActive =
-        if (!isToday) {
-            false
-        } else {
-            val startTime = Calendar.getInstance().apply { time = period.startTime.toDate() }
-            val endTime = Calendar.getInstance().apply { time = period.endTime.toDate() }
-            val currentTime = Calendar.getInstance()
-
-            val currentHourMinute =
-                currentTime.get(Calendar.HOUR_OF_DAY) * 60 +
-                    currentTime.get(Calendar.MINUTE)
-            val startHourMinute =
-                startTime.get(Calendar.HOUR_OF_DAY) * 60 + startTime.get(Calendar.MINUTE)
-            val endHourMinute =
-                endTime.get(Calendar.HOUR_OF_DAY) * 60 + endTime.get(Calendar.MINUTE)
-
-            currentHourMinute in startHourMinute..endHourMinute
-        }
-
-    Card(
-        modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        border =
-            if (isActive) {
-                BorderStroke(
-                    1.dp,
-                    Accent,
-                )
-            } else {
-                null
-            },
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Column(
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp, vertical = 28.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.Top,
-            ) {
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = period.courseName,
-                        style = MaterialTheme.typography.labelLarge,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(4.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = "$startTimeStr - $endTimeStr | ${period.slot}",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Accent,
-                    fontWeight = FontWeight.Medium,
-                )
-
-                if (period.roomNo.isNotEmpty()) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .clip(RoundedCornerShape(9999.dp))
-                                .border(
-                                    width = 1.dp,
-                                    color = Accent,
-                                    shape = RoundedCornerShape(9999.dp),
-                                ).padding(horizontal = 8.dp, vertical = 4.dp),
-                    ) {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
-                            Image(
-                                painter = painterResource(id = R.drawable.ic_compass),
-                                contentDescription = "Compass icon",
-                                modifier = Modifier.size(12.dp),
-                                alignment = Alignment.Center,
-                            )
-                            Spacer(modifier = Modifier.width(4.dp))
-                            Text(
-                                text = period.roomNo,
-                                style =
-                                    MaterialTheme.typography.bodyMedium.copy(
-                                        fontSize = 12.sp,
-                                        lineHeight = 12.sp,
-                                        letterSpacing = (-0.12).sp,
-                                        textAlign = TextAlign.Center,
-                                    ),
-                                color = MaterialTheme.colorScheme.primary,
-                                fontWeight = FontWeight.Medium,
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-private suspend fun processFriendTimetableData(friend: TimetableResponse): Map<Int, List<PeriodDetails>> =
-    withContext(Dispatchers.Default) {
-        val timetableData = friend.data
-        val dayNames =
-            listOf(
-                "monday",
-                "tuesday",
-                "wednesday",
-                "thursday",
-                "friday",
-                "saturday",
-                "sunday",
-            )
-
-        val result = mutableMapOf<Int, List<PeriodDetails>>()
-
-        dayNames.forEachIndexed { index, dayName ->
-            val courses =
-                when (dayName) {
-                    "monday" -> timetableData.Monday
-                    "tuesday" -> timetableData.Tuesday
-                    "wednesday" -> timetableData.Wednesday
-                    "thursday" -> timetableData.Thursday
-                    "friday" -> timetableData.Friday
-                    "saturday" -> timetableData.Saturday
-                    "sunday" -> timetableData.Sunday
-                    else -> emptyList()
-                }
-
-            val periods =
-                courses
-                    ?.map { course ->
-                        PeriodDetails(
-                            courseCode = course.code,
-                            courseName = course.name,
-                            startTime = parseTimeToTimestamp(course.start_time),
-                            endTime = parseTimeToTimestamp(course.end_time),
-                            slot = course.slot,
-                            roomNo = course.venue,
-                        )
-                    }?.sortedBy { it.startTime.toDate() }
-                    ?: emptyList()
-
-            result[index] = periods
-        }
-
-        result
-    }
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/FriendRequestsScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/FriendRequestsScreenContent.kt
deleted file mode 100644
index 6142d02..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/FriendRequestsScreenContent.kt
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.dscvit.vitty.ui.connect
-
-import android.content.Context
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Green
-import com.dscvit.vitty.theme.Red
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.util.Constants
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun FriendRequestsScreenContent(
-    onBackClick: () -> Unit = {},
-    connectViewModel: ConnectViewModel,
-) {
-    val context = LocalContext.current
-
-    var processedRequests by remember { mutableStateOf(setOf<String>()) }
-    var isLoading by remember { mutableStateOf(true) }
-
-    val friendRequests by connectViewModel.friendRequest.observeAsState()
-    val requestActionResponse by connectViewModel.requestActionResponse.observeAsState()
-
-    LaunchedEffect(friendRequests) {
-        isLoading = false
-        processedRequests = setOf()
-    }
-
-    LaunchedEffect(requestActionResponse?.detail) {
-        requestActionResponse?.let { response ->
-            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-            val username = sharedPreferences.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-
-            connectViewModel.clearRequestActionResponse()
-            if (response.detail == "Friend request accepted successfully!") {
-                if (token.isNotEmpty()) {
-                    connectViewModel.getFriendRequest(token)
-                    connectViewModel.getFriendList(token, username)
-                }
-            } else if (response.detail == "Friend request rejected successfully!") {
-                if (token.isNotEmpty()) {
-                    connectViewModel.getFriendRequest(token)
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Friend Requests",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            navigationIcon = {
-                IconButton(onClick = onBackClick) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                        contentDescription = "Back",
-                        tint = TextColor,
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        val requests = friendRequests ?: emptyList()
-        val pendingRequests = requests.filter { !processedRequests.contains(it.from.username) }
-
-        if (isLoading) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center,
-            ) {
-                CircularProgressIndicator(color = Accent)
-            }
-        } else if (pendingRequests.isEmpty()) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center,
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_community_outline),
-                        contentDescription = "No requests",
-                        modifier = Modifier.size(64.dp),
-                        tint = Accent.copy(alpha = 0.5f),
-                    )
-                    Text(
-                        text = "No friend requests",
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = Accent,
-                        textAlign = TextAlign.Center,
-                    )
-                    Text(
-                        text = "You're all caught up!",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = Accent.copy(alpha = 0.7f),
-                        textAlign = TextAlign.Center,
-                    )
-                }
-            }
-        } else {
-            LazyColumn(
-                modifier = Modifier.fillMaxSize(),
-                contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 100.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                items(pendingRequests) { request ->
-                    FriendRequestCard(
-                        user = request.from,
-                        onAccept = { user ->
-                            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                            if (token.isNotEmpty()) {
-                                processedRequests = processedRequests + user.username
-                                connectViewModel.acceptRequest(token, user.username, sharedPreferences)
-                            }
-                        },
-                        onReject = { user ->
-                            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-                            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-                            if (token.isNotEmpty()) {
-                                processedRequests = processedRequests + user.username
-                                connectViewModel.rejectRequest(token, user.username)
-                            }
-                        },
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun FriendRequestCard(
-    user: UserResponse,
-    onAccept: (UserResponse) -> Unit,
-    onReject: (UserResponse) -> Unit,
-) {
-    Card(
-        modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(start = 24.dp, top = 20.dp, end = 16.dp, bottom = 20.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                if (user.picture.isNotEmpty()) {
-                    AsyncImage(
-                        model = user.picture,
-                        contentDescription = null,
-                        modifier =
-                            Modifier
-                                .size(48.dp)
-                                .clip(CircleShape),
-                        placeholder = painterResource(R.drawable.ic_gdscvit),
-                        error = painterResource(R.drawable.ic_gdscvit),
-                    )
-                } else {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(48.dp)
-                                .background(Accent.copy(alpha = 0.2f), CircleShape),
-                        contentAlignment = Alignment.Center,
-                    ) {
-                        Text(
-                            text =
-                                user.name
-                                    .take(2)
-                                    .map { it.uppercaseChar() }
-                                    .joinToString(""),
-                            color = TextColor,
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 18.sp,
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.width(12.dp))
-
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = user.name,
-                        style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Medium,
-                        color = TextColor,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-
-                    Text(
-                        text = "@${user.username}",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = Accent,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-
-                IconButton(
-                    onClick = { onReject(user) },
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Close,
-                        contentDescription = "Reject",
-                        tint = Red,
-                    )
-                }
-
-                IconButton(
-                    onClick = { onAccept(user) },
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Check,
-                        contentDescription = "Accept",
-                        tint = Green,
-                    )
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/components/CircleActionBottomSheet.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/components/CircleActionBottomSheet.kt
deleted file mode 100644
index 5b33164..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/components/CircleActionBottomSheet.kt
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.dscvit.vitty.ui.connect.components
-
-import android.content.Context
-import android.net.Uri
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.R
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.connect.ConnectViewModel
-import com.dscvit.vitty.util.Constants
-import timber.log.Timber
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CircleActionBottomSheet(
-    isVisible: Boolean,
-    onDismiss: () -> Unit,
-    onCreateCircleClick: () -> Unit,
-    onJoinCircleClick: () -> Unit,
-    connectViewModel: ConnectViewModel,
-) {
-    val context = LocalContext.current
-    var isJoinCircleSheetVisible by remember { mutableStateOf(false) }
-
-    var isCreateCircleSheetVisible by remember { mutableStateOf(false) }
-
-    val handleJoinWithCode = { code: String ->
-        Timber.d("handleJoinWithCode called with code: $code")
-
-        val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-        Timber.d("Token retrieved for join: ${if (token.isNotEmpty()) "Token exists" else "Token is empty"}")
-
-        if (token.isNotEmpty() && code.isNotBlank()) {
-            Timber.d("Calling connectViewModel.joinCircleByCode with token and code: $code")
-            connectViewModel.joinCircleByCode(token, code)
-
-            isJoinCircleSheetVisible = false
-        } else {
-            Timber.e("Cannot join circle: ${if (token.isEmpty()) "Token is empty" else "Code is blank"}")
-        }
-    }
-
-    val handleCreateCircle = { name: String, _: Uri? ->
-        Timber.d("handleCreateCircle called with name: $name")
-
-        val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-        Timber.d("Token retrieved: ${if (token.isNotEmpty()) "Token exists" else "Token is empty"}")
-
-        if (token.isNotEmpty() && name.isNotBlank()) {
-            Timber.d("Calling connectViewModel.createCircle with token and name: $name")
-            connectViewModel.createCircle(token, name)
-
-            isCreateCircleSheetVisible = false
-        } else {
-            Timber.e("Cannot create circle - token empty: ${token.isEmpty()}, name blank: ${name.isBlank()}")
-        }
-    }
-
-    val handleJoinCircleClick = {
-        onJoinCircleClick()
-        isJoinCircleSheetVisible = true
-    }
-
-    val handleCreateCircleClick = {
-        onCreateCircleClick()
-        isCreateCircleSheetVisible = true
-    }
-
-    JoinCircleBottomSheet(
-        isVisible = isJoinCircleSheetVisible,
-        onDismiss = { isJoinCircleSheetVisible = false },
-        onJoinWithCode = handleJoinWithCode,
-    )
-
-    CreateCircleBottomSheet(
-        isVisible = isCreateCircleSheetVisible,
-        onDismiss = { isCreateCircleSheetVisible = false },
-        onCreateCircle = handleCreateCircle,
-    )
-
-    if (isVisible) {
-        val sheetState = rememberModalBottomSheetState()
-
-        ModalBottomSheet(
-            onDismissRequest = onDismiss,
-            sheetState = sheetState,
-            containerColor = Secondary,
-            dragHandle = {
-                Box(
-                    modifier =
-                        Modifier
-                            .padding(top = 16.dp)
-                            .width(120.dp)
-                            .height(7.dp)
-                            .background(Accent.copy(alpha = .4f), shape = RoundedCornerShape(44.dp)),
-                ) {
-                }
-            },
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(24.dp),
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceAround,
-                ) {
-                    CircleActionButton(
-                        icon = painterResource(R.drawable.ic_circle_join),
-                        label = "Join Circle",
-                        onClick = {
-                            handleJoinCircleClick()
-                        },
-                    )
-
-                    CircleActionButton(
-                        icon = painterResource(R.drawable.ic_community_outline),
-                        label = "Create Circle",
-                        onClick = {
-                            handleCreateCircleClick()
-                        },
-                    )
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-            }
-        }
-    }
-}
-
-@Composable
-fun CircleActionButton(
-    icon: Painter,
-    label: String,
-    onClick: () -> Unit,
-) {
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        modifier =
-            Modifier
-                .clip(RoundedCornerShape(16.dp))
-                .clickable(onClick = onClick)
-                .padding(16.dp),
-    ) {
-        Box(
-            modifier =
-                Modifier
-                    .size(45.dp)
-                    .clip(CircleShape)
-                    .background(TextColor),
-            contentAlignment = Alignment.Center,
-        ) {
-            Icon(
-                painter = icon,
-                contentDescription = label,
-                tint = Background,
-                modifier = Modifier.size(24.dp),
-            )
-        }
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        Text(
-            text = label,
-            color = TextColor,
-            style =
-                MaterialTheme.typography.bodyMedium.copy(
-                    fontSize = 16.sp,
-                    letterSpacing = (-0.16).sp,
-                ),
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/components/ConnectScreenComponents.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/components/ConnectScreenComponents.kt
deleted file mode 100644
index 39ea8de..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/components/ConnectScreenComponents.kt
+++ /dev/null
@@ -1,939 +0,0 @@
-package com.dscvit.vitty.ui.connect.components
-
-import android.content.Context
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Warning
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
-import androidx.compose.material3.TabRowDefaults
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.requests.RequestsResponse
-import com.dscvit.vitty.network.api.community.responses.user.CircleItem
-import com.dscvit.vitty.network.api.community.responses.user.CircleResponse
-import com.dscvit.vitty.network.api.community.responses.user.FriendResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.connect.ConnectViewModel
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.urlDecode
-import java.util.Locale
-
-@Composable
-fun ConnectHeader(
-    tabs: List<String>,
-    selectedTab: Int,
-    onTabSelected: (Int) -> Unit,
-    searchQuery: String,
-    onSearchQueryChange: (String) -> Unit,
-    friendsFilter: Int,
-    onFriendsFilterChange: (Int) -> Unit,
-    friendRequests: RequestsResponse? = null,
-    onFriendRequestsClick: () -> Unit = {},
-    circleRequests: Int = 0,
-    onCircleRequestsClick: () -> Unit = {},
-) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Background)
-                .padding(bottom = 16.dp),
-    ) {
-        TabRow(
-            modifier = Modifier.padding(horizontal = 20.dp),
-            selectedTabIndex = selectedTab,
-            containerColor = Background,
-            contentColor = TextColor,
-            indicator = { tabPositions ->
-                TabRowDefaults.SecondaryIndicator(
-                    modifier =
-                        Modifier
-                            .tabIndicatorOffset(tabPositions[selectedTab])
-                            .height(3.dp),
-                    color = TextColor,
-                )
-            },
-            divider = {
-                Spacer(
-                    Modifier
-                        .fillMaxWidth()
-                        .height(1.5.dp)
-                        .background(Secondary),
-                )
-            },
-        ) {
-            tabs.forEachIndexed { index, tab ->
-                Tab(
-                    selected = selectedTab == index,
-                    onClick = { onTabSelected(index) },
-                    text = {
-                        Text(
-                            text = tab,
-                            style =
-                                if (selectedTab == index) {
-                                    MaterialTheme.typography.titleLarge
-                                } else {
-                                    MaterialTheme.typography.titleMedium
-                                },
-                            color = if (selectedTab == index) TextColor else Accent,
-                        )
-                    },
-                    selectedContentColor = TextColor,
-                )
-            }
-        }
-
-        Spacer(modifier = Modifier.height(20.dp))
-
-        Column {
-            Box(
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 20.dp)
-                    .border(2.dp, Secondary, RoundedCornerShape(9999.dp))
-                    .background(Background, RoundedCornerShape(9999.dp)),
-            ) {
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(44.dp)
-                            .padding(horizontal = 16.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    BasicTextField(
-                        value = searchQuery,
-                        onValueChange = onSearchQueryChange,
-                        singleLine = true,
-                        cursorBrush = SolidColor(Accent),
-                        textStyle =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                color = TextColor,
-                                fontSize = 16.sp,
-                                lineHeight = 16.sp,
-                            ),
-                        modifier = Modifier.weight(1f),
-                        decorationBox = { innerTextField ->
-                            Box(
-                                modifier = Modifier.fillMaxWidth(),
-                                contentAlignment = Alignment.CenterStart,
-                            ) {
-                                if (searchQuery.isEmpty()) {
-                                    Text(
-                                        text = "Search",
-                                        color = Accent.copy(alpha = 0.3f),
-                                        style =
-                                            MaterialTheme.typography.bodyMedium.copy(
-                                                fontSize = 16.sp,
-                                                lineHeight = 16.sp,
-                                            ),
-                                    )
-                                }
-                                innerTextField()
-                            }
-                        },
-                    )
-                    if (searchQuery.isNotEmpty()) {
-                        IconButton(onClick = { onSearchQueryChange("") }) {
-                            Icon(
-                                imageVector = Icons.Default.Close,
-                                contentDescription = "Clear",
-                                tint = Accent,
-                            )
-                        }
-                    }
-                }
-            }
-
-            if (selectedTab == 0) {
-                Spacer(modifier = Modifier.height(16.dp))
-
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 20.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    Row {
-                        val options = listOf("Available", "View All")
-                        options.forEachIndexed { index, label ->
-                            FilterChip(
-                                label = label,
-                                isSelected = friendsFilter == index,
-                                onClick = { onFriendsFilterChange(index) },
-                            )
-                            if (index < options.lastIndex) {
-                                Spacer(Modifier.width(12.dp))
-                            }
-                        }
-                    }
-
-                    val requestCount = friendRequests?.size ?: 0
-                    if (requestCount > 0) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .clip(RoundedCornerShape(20.dp))
-                                    .background(Secondary)
-                                    .clickable { onFriendRequestsClick() }
-                                    .padding(horizontal = 12.dp, vertical = 8.dp),
-                        ) {
-                            Text(
-                                text = "$requestCount new request${if (requestCount > 1) "s" else ""}",
-                                color = Accent,
-                                fontWeight = FontWeight.Medium,
-                                style = MaterialTheme.typography.bodyMedium,
-                            )
-                        }
-                    }
-                }
-            }
-
-            if (selectedTab == 1) {
-                Spacer(modifier = Modifier.height(16.dp))
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 20.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.End,
-                ) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .clip(RoundedCornerShape(20.dp))
-                                .background(Secondary)
-                                .clickable { onCircleRequestsClick() }
-                                .padding(horizontal = 12.dp, vertical = 8.dp),
-                    ) {
-                        Text(
-                            text = "$circleRequests ${if (circleRequests == 0) "new" else "circle"} request${if (circleRequests > 1 || circleRequests == 0) "s" else ""}",
-                            color = Accent,
-                            fontWeight = FontWeight.Medium,
-                            style = MaterialTheme.typography.bodyMedium,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun FilterChip(
-    label: String,
-    isSelected: Boolean,
-    onClick: () -> Unit,
-) {
-    Box(
-        modifier =
-            Modifier
-                .clip(RoundedCornerShape(24.dp))
-                .background(Secondary)
-                .border(
-                    1.dp,
-                    if (isSelected) Accent else Color.Transparent,
-                    RoundedCornerShape(24.dp),
-                ).clickable { onClick() }
-                .padding(horizontal = 12.dp, vertical = 8.dp),
-    ) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            if (isSelected) {
-                Icon(
-                    imageVector = Icons.Default.Check,
-                    contentDescription = null,
-                    tint = Accent,
-                    modifier = Modifier.size(18.dp),
-                )
-                Spacer(Modifier.width(4.dp))
-            }
-            Text(
-                text = label,
-                color = if (isSelected) Accent else TextColor.copy(alpha = 0.5f),
-                fontWeight = FontWeight.Normal,
-                style = MaterialTheme.typography.bodyMedium,
-            )
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-fun ConnectTabContent(
-    tabIndex: Int,
-    searchQuery: String,
-    friendsFilter: Int,
-    friendList: FriendResponse? = null,
-    circleList: CircleResponse? = null,
-    isLoading: Boolean = false,
-    isRefreshing: Boolean = false,
-    isCircleLoading: Boolean = false,
-    isCircleRefreshing: Boolean = false,
-    viewModel: ConnectViewModel,
-    onFriendClick: (UserResponse) -> Unit = {},
-    onCircleClick: (CircleItem, FriendResponse?) -> Unit = { _: CircleItem, _: FriendResponse? -> },
-    onFriendsRefresh: () -> Unit = {},
-    onCirclesRefresh: () -> Unit = {},
-) {
-    val allFriends = friendList?.data ?: emptyList()
-    val displayedFriends =
-        allFriends.filter { friend ->
-            val matchesSearch =
-                searchQuery.isBlank() ||
-                    friend.name.contains(searchQuery, ignoreCase = true) ||
-                    friend.username.contains(searchQuery, ignoreCase = true)
-
-            val matchesFilter =
-                when (friendsFilter) {
-                    0 -> friend.current_status?.status?.lowercase(Locale.ROOT) == "free"
-                    else -> true
-                }
-
-            matchesSearch && matchesFilter
-        }
-
-    val apiCircles = circleList?.data ?: emptyList()
-    val filteredCircles =
-        apiCircles.filter { circle ->
-            val matchesSearch =
-                searchQuery.isBlank() ||
-                    circle.circle_name.contains(searchQuery, ignoreCase = true)
-
-            matchesSearch
-        }
-
-    when (tabIndex) {
-        0 -> {
-            val pullToRefreshState =
-                rememberPullRefreshState(
-                    refreshing = isRefreshing,
-                    onRefresh = onFriendsRefresh,
-                )
-
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .pullRefresh(pullToRefreshState),
-            ) {
-                LazyColumn(
-                    modifier = Modifier.fillMaxSize(),
-                    contentPadding =
-                        PaddingValues(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 144.dp),
-                    verticalArrangement = Arrangement.spacedBy(12.dp),
-                ) {
-                    if (isLoading) {
-                        items(4) {
-                            ShimmerListItem()
-                        }
-                    } else if (displayedFriends.isEmpty()) {
-                        item {
-                            EmptyStateContent(
-                                title =
-                                    if (searchQuery.isNotBlank()) {
-                                        "No friends found"
-                                    } else {
-                                        if (friendsFilter == 0) {
-                                            "No friends available"
-                                        } else {
-                                            "No friends added"
-                                        }
-                                    },
-                                subtitle =
-                                    if (searchQuery.isNotBlank()) {
-                                        "Try a different search term"
-                                    } else {
-                                        if (friendsFilter == 0) {
-                                            "Your friends are currently in class"
-                                        } else {
-                                            "Start connecting with your classmates"
-                                        }
-                                    },
-                                icon = R.drawable.ic_community_outline,
-                            )
-                        }
-                    } else {
-                        items(displayedFriends) { friend ->
-                            FriendCard(
-                                friend = friend,
-                                onClick = { onFriendClick(friend) },
-                            )
-                        }
-                    }
-                }
-                PullRefreshIndicator(
-                    refreshing = isRefreshing,
-                    state = pullToRefreshState,
-                    modifier = Modifier.align(Alignment.TopCenter),
-                    backgroundColor = MaterialTheme.colorScheme.primary,
-                    contentColor = MaterialTheme.colorScheme.surface,
-                )
-            }
-        }
-        1 -> {
-            val pullToRefreshState =
-                rememberPullRefreshState(
-                    refreshing = isCircleRefreshing,
-                    onRefresh = onCirclesRefresh,
-                )
-
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .pullRefresh(pullToRefreshState),
-            ) {
-                LazyColumn(
-                    modifier = Modifier.fillMaxSize(),
-                    contentPadding =
-                        PaddingValues(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 144.dp),
-                    verticalArrangement = Arrangement.spacedBy(12.dp),
-                ) {
-                    if (isCircleLoading) {
-                        items(4) {
-                            ShimmerListItem()
-                        }
-                    } else if (filteredCircles.isEmpty()) {
-                        item {
-                            EmptyStateContent(
-                                title = if (searchQuery.isNotBlank()) "No circles found" else "No circles joined",
-                                subtitle = if (searchQuery.isNotBlank()) "Try a different search term" else "Join or create study circles",
-                                icon = R.drawable.ic_group_add,
-                            )
-                        }
-                    } else {
-                        items(filteredCircles) { circle ->
-                            CircleCard(
-                                circle = circle,
-                                viewModel = viewModel,
-                                onClick = onCircleClick,
-                            )
-                        }
-                    }
-                }
-                PullRefreshIndicator(
-                    refreshing = isCircleRefreshing,
-                    state = pullToRefreshState,
-                    modifier = Modifier.align(Alignment.TopCenter),
-                    backgroundColor = MaterialTheme.colorScheme.primary,
-                    contentColor = MaterialTheme.colorScheme.surface,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun EmptyStateContent(
-    title: String,
-    subtitle: String,
-    icon: Int,
-) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(vertical = 64.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        Icon(
-            painter = painterResource(id = icon),
-            contentDescription = null,
-            tint = Accent,
-            modifier = Modifier.size(64.dp),
-        )
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        Text(
-            text = title,
-            style = MaterialTheme.typography.titleLarge,
-            color = TextColor,
-            fontWeight = FontWeight.Medium,
-            textAlign = TextAlign.Center,
-        )
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        Text(
-            text = subtitle,
-            style = MaterialTheme.typography.bodyMedium,
-            color = Accent,
-            textAlign = TextAlign.Center,
-        )
-    }
-}
-
-@Composable
-fun FriendCard(
-    friend: UserResponse,
-    onClick: () -> Unit = {},
-) {
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Secondary, RoundedCornerShape(16.dp))
-                .clickable { onClick() }
-                .padding(vertical = 28.dp, horizontal = 24.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .size(52.dp)
-                        .background(Accent.copy(alpha = 0.2f), CircleShape),
-                contentAlignment = Alignment.Center,
-            ) {
-                if (friend.picture.isNotEmpty()) {
-                    AsyncImage(
-                        model = friend.picture,
-                        contentDescription = null,
-                        modifier =
-                            Modifier
-                                .size(52.dp)
-                                .clip(CircleShape),
-                    )
-                } else {
-                    Text(
-                        text =
-                            friend.name
-                                .take(2)
-                                .map { it.uppercaseChar() }
-                                .joinToString(""),
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 16.sp,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.width(16.dp))
-
-            Column(modifier = Modifier.weight(1f)) {
-                Text(
-                    text = friend.name,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                    fontSize = 16.sp,
-                )
-
-                Spacer(modifier = Modifier.height(4.dp))
-
-                val currentStatus = friend.current_status
-                val statusIcon =
-                    when {
-                        currentStatus?.status?.lowercase() == "free" -> R.drawable.ic_free
-                        currentStatus?.status?.lowercase() == "busy" -> R.drawable.ic_busy
-                        else -> R.drawable.ic_busy
-                    }
-                val statusText =
-                    when {
-                        currentStatus?.venue?.isNotEmpty() == true -> currentStatus.venue
-                        currentStatus?.status?.lowercase(Locale.ROOT) == "free" -> "Available"
-                        else -> "Not in a class right now"
-                    }
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(4.dp),
-                ) {
-                    Image(
-                        painter = painterResource(id = statusIcon),
-                        contentDescription = "Status Icon",
-                        modifier = Modifier.size(12.dp),
-                    )
-
-                    Text(
-                        text = statusText,
-                        color = Accent,
-                        fontSize = 14.sp,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun CircleCard(
-    circle: CircleItem,
-    viewModel: ConnectViewModel,
-    onClick: (CircleItem, FriendResponse?) -> Unit = { _: CircleItem, _: FriendResponse? -> },
-) {
-    val context = LocalContext.current
-    val circleMembers by viewModel.circleMembers.observeAsState()
-    val circleMembersLoading by viewModel.circleMembersLoading.observeAsState()
-
-    val circleData = circleMembers?.get(circle.circle_id)
-    val isLoadingMembers = circleMembersLoading?.contains(circle.circle_id) == true
-
-    LaunchedEffect(circle.circle_id, circleData, isLoadingMembers) {
-        if (circleData == null && !isLoadingMembers) {
-            val sharedPreferences = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-            val token = sharedPreferences.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-
-            if (token.isNotEmpty()) {
-                viewModel.getCircleDetails(token, circle.circle_id)
-            }
-        }
-    }
-
-    val availableCount =
-        circleData?.data?.count { member ->
-            member.current_status?.status?.lowercase(Locale.ROOT) == "free"
-        } ?: 0
-
-    val totalMembers = circleData?.data?.size ?: 0
-    val busyCount = totalMembers - availableCount
-
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Secondary, RoundedCornerShape(16.dp))
-                .clickable(enabled = !isLoadingMembers) {
-                    onClick(circle, circleData)
-                }.padding(horizontal = 24.dp, vertical = 28.dp),
-    ) {
-        Column {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Box(
-                    modifier =
-                        Modifier
-                            .size(52.dp)
-                            .background(Accent.copy(alpha = 0.2f), CircleShape),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Text(
-                        text =
-                            circle.circle_name
-                                .take(2)
-                                .map { it.uppercaseChar() }
-                                .joinToString(""),
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 16.sp,
-                    )
-                }
-
-                Spacer(modifier = Modifier.width(16.dp))
-
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = circle.circle_name.urlDecode(),
-                        color = TextColor,
-                        fontWeight = FontWeight.Medium,
-                        fontSize = 16.sp,
-                    )
-
-                    Spacer(modifier = Modifier.height(4.dp))
-
-                    if (isLoadingMembers) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(4.dp),
-                        ) {
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .size(12.dp)
-                                        .background(
-                                            shimmerBrush(),
-                                            CircleShape,
-                                        ),
-                            )
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .width(80.dp)
-                                        .height(14.dp)
-                                        .background(
-                                            shimmerBrush(),
-                                            RoundedCornerShape(4.dp),
-                                        ),
-                            )
-                        }
-                    } else if (circleData != null && totalMembers > 0) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(16.dp),
-                        ) {
-                            if (busyCount > 0) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    horizontalArrangement = Arrangement.spacedBy(4.dp),
-                                ) {
-                                    Image(
-                                        painter = painterResource(id = R.drawable.ic_busy),
-                                        contentDescription = "Busy Icon",
-                                        modifier = Modifier.size(12.dp),
-                                    )
-                                    Text(
-                                        text = "$busyCount busy",
-                                        color = Accent,
-                                        fontSize = 14.sp,
-                                    )
-                                }
-                            }
-                            if (availableCount > 0) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    horizontalArrangement = Arrangement.spacedBy(4.dp),
-                                ) {
-                                    Image(
-                                        painter = painterResource(id = R.drawable.ic_free),
-                                        contentDescription = "Available Icon",
-                                        modifier = Modifier.size(12.dp),
-                                    )
-                                    Text(
-                                        text = "$availableCount available",
-                                        color = Accent,
-                                        fontSize = 14.sp,
-                                    )
-                                }
-                            }
-                        }
-                    } else if (circleData != null && totalMembers == 0) {
-                        Text(
-                            text = "No members in this circle",
-                            color = Accent.copy(alpha = 0.7f),
-                            fontSize = 14.sp,
-                        )
-                    } else {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(4.dp),
-                        ) {
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .size(12.dp)
-                                        .background(
-                                            shimmerBrush(),
-                                            CircleShape,
-                                        ),
-                            )
-                            Box(
-                                modifier =
-                                    Modifier
-                                        .width(80.dp)
-                                        .height(14.dp)
-                                        .background(
-                                            shimmerBrush(),
-                                            RoundedCornerShape(4.dp),
-                                        ),
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun shimmerBrush(): Brush {
-    val infiniteTransition = rememberInfiniteTransition(label = "shimmer")
-    val shimmerTranslateAnim =
-        infiniteTransition.animateFloat(
-            initialValue = -200f,
-            targetValue = 1000f,
-            animationSpec =
-                infiniteRepeatable(
-                    animation = tween(durationMillis = 1500, easing = LinearEasing),
-                    repeatMode = RepeatMode.Restart,
-                ),
-            label = "shimmerTranslateAnim",
-        )
-
-    return Brush.linearGradient(
-        colors =
-            listOf(
-                Background.copy(alpha = 0.9f),
-                Background.copy(alpha = 0.3f),
-                Background.copy(alpha = 0.9f),
-            ),
-        start = Offset(shimmerTranslateAnim.value - 200f, 0f),
-        end = Offset(shimmerTranslateAnim.value, 0f),
-    )
-}
-
-@Composable
-fun ShimmerListItem() {
-    val infiniteTransition = rememberInfiniteTransition(label = "shimmer")
-    val shimmerTranslateAnim =
-        infiniteTransition.animateFloat(
-            initialValue = -200f,
-            targetValue = 1000f,
-            animationSpec =
-                infiniteRepeatable(
-                    animation = tween(durationMillis = 1500, easing = LinearEasing),
-                    repeatMode = RepeatMode.Restart,
-                ),
-            label = "shimmerTranslateAnim",
-        )
-
-    val shimmerBrush =
-        Brush.linearGradient(
-            colors =
-                listOf(
-                    Background.copy(alpha = 0.9f),
-                    Background.copy(alpha = 0.3f),
-                    Background.copy(alpha = 0.9f),
-                ),
-            start = Offset(shimmerTranslateAnim.value - 200f, 0f),
-            end = Offset(shimmerTranslateAnim.value, 0f),
-        )
-
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Secondary, RoundedCornerShape(16.dp))
-                .padding(vertical = 28.dp, horizontal = 24.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .size(52.dp)
-                        .background(shimmerBrush, CircleShape),
-            )
-
-            Spacer(modifier = Modifier.width(16.dp))
-
-            Column(modifier = Modifier.weight(1f)) {
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth(0.6f)
-                            .height(16.dp)
-                            .background(shimmerBrush, RoundedCornerShape(8.dp)),
-                )
-
-                Spacer(modifier = Modifier.height(8.dp))
-
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth(0.4f)
-                            .height(14.dp)
-                            .background(shimmerBrush, RoundedCornerShape(7.dp)),
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun NoNetworkMessage() {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .padding(32.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-    ) {
-        Icon(
-            imageVector = Icons.Default.Warning,
-            contentDescription = null,
-            tint = Accent,
-            modifier = Modifier.size(64.dp),
-        )
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        Text(
-            text = "No Internet Connection",
-            style = MaterialTheme.typography.titleLarge,
-            color = TextColor,
-            fontWeight = FontWeight.Medium,
-            textAlign = TextAlign.Center,
-        )
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        Text(
-            text = "Please check your internet settings and try again.",
-            style = MaterialTheme.typography.bodyMedium,
-            color = Accent,
-            textAlign = TextAlign.Center,
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/components/CreateCircleBottomSheet.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/components/CreateCircleBottomSheet.kt
deleted file mode 100644
index 298a39e..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/components/CreateCircleBottomSheet.kt
+++ /dev/null
@@ -1,347 +0,0 @@
-package com.dscvit.vitty.ui.connect.components
-
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Poppins
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CreateCircleBottomSheet(
-    isVisible: Boolean,
-    onDismiss: () -> Unit,
-    onCreateCircle: (String, Uri?) -> Unit,
-) {
-    if (isVisible) {
-        val sheetState = rememberModalBottomSheetState()
-
-        var circleName by remember { mutableStateOf("") }
-        var selectedImageUri by remember { mutableStateOf<Uri?>(null) }
-
-        val isCreateEnabled = circleName.isNotBlank()
-
-        val imagePickerLauncher =
-            rememberLauncherForActivityResult(
-                contract = ActivityResultContracts.GetContent(),
-            ) { uri: Uri? ->
-                selectedImageUri = uri
-            }
-
-        ModalBottomSheet(
-            onDismissRequest = onDismiss,
-            sheetState = sheetState,
-            containerColor = Secondary,
-            dragHandle = {
-                Box(
-                    modifier =
-                        Modifier
-                            .padding(top = 16.dp)
-                            .width(120.dp)
-                            .height(7.dp)
-                            .background(Accent.copy(alpha = .4f), shape = RoundedCornerShape(44.dp)),
-                )
-            },
-        ) {
-            CreateCircleMainPage(
-                circleName = circleName,
-                onCircleNameChange = { circleName = it },
-                isCreateEnabled = isCreateEnabled,
-                selectedImageUri = selectedImageUri,
-                onImagePickerClick = {
-                    imagePickerLauncher.launch("image/*")
-                },
-                onCreateCircle = {
-                    onCreateCircle(circleName, selectedImageUri)
-                    onDismiss()
-                },
-            )
-        }
-    }
-}
-
-@Composable
-fun CreateCircleMainPage(
-    circleName: String,
-    onCircleNameChange: (String) -> Unit,
-    isCreateEnabled: Boolean,
-    selectedImageUri: Uri?,
-    onImagePickerClick: () -> Unit,
-    onCreateCircle: () -> Unit,
-) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp, vertical = 16.dp),
-        horizontalAlignment = Alignment.Start,
-    ) {
-        Row(modifier = Modifier.padding(bottom = 24.dp)) {
-            Spacer(modifier = Modifier.weight(1f))
-            Text(text = "Create Circle", style = MaterialTheme.typography.headlineLarge, textAlign = TextAlign.Center)
-            Spacer(modifier = Modifier.weight(1f).padding(bottom = 24.dp))
-        }
-
-        Box(
-            modifier =
-                Modifier
-                    .size(89.dp)
-                    .background(Accent, CircleShape)
-                    .clip(CircleShape)
-                    .clickable { onImagePickerClick() }
-                    .padding(if (selectedImageUri != null) 0.dp else 33.dp)
-                    .align(Alignment.CenterHorizontally),
-            contentAlignment = Alignment.Center,
-        ) {
-            if (selectedImageUri != null) {
-                AsyncImage(
-                    model = selectedImageUri,
-                    contentDescription = "Circle Image",
-                    modifier =
-                        Modifier
-                            .size(89.dp)
-                            .clip(CircleShape),
-                    contentScale = ContentScale.Crop,
-                )
-            } else {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_add_a_photo),
-                    contentDescription = "Add Photo",
-                    tint = Background,
-                    modifier = Modifier.size(24.dp),
-                )
-            }
-        }
-
-        Spacer(modifier = Modifier.height(32.dp))
-
-        Text(
-            text = "Enter Circle Name",
-            color = Accent,
-            fontFamily = Poppins,
-            fontSize = 18.sp,
-            fontWeight = FontWeight.SemiBold,
-            letterSpacing = 0.18.sp,
-            modifier = Modifier.padding(bottom = 16.dp),
-        )
-
-        BasicTextField(
-            value = circleName,
-            onValueChange = onCircleNameChange,
-            singleLine = true,
-            cursorBrush = SolidColor(Accent),
-            textStyle =
-                MaterialTheme.typography.bodyMedium.copy(
-                    color = TextColor,
-                    fontSize = 18.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    letterSpacing = 0.18.sp,
-                ),
-            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-            modifier = Modifier.fillMaxWidth(),
-            decorationBox = { innerTextField ->
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(44.dp)
-                            .border(
-                                width = 1.dp,
-                                color = Accent.copy(alpha = 0.5f),
-                                shape = RoundedCornerShape(7.dp),
-                            ).background(Background, RoundedCornerShape(7.dp))
-                            .padding(horizontal = 12.dp),
-                    contentAlignment = Alignment.CenterStart,
-                ) {
-                    innerTextField()
-                }
-            },
-        )
-
-        Spacer(modifier = Modifier.height(32.dp))
-
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(top = 16.dp),
-            horizontalArrangement = Arrangement.End,
-        ) {
-            Button(
-                onClick = {
-                    if (isCreateEnabled) {
-                        onCreateCircle()
-                    }
-                },
-                enabled = isCreateEnabled,
-                shape = RoundedCornerShape(7.dp),
-                colors =
-                    ButtonDefaults.buttonColors(
-                        containerColor = Accent,
-                        disabledContainerColor = Accent.copy(alpha = 0.5f),
-                    ),
-                modifier =
-                    Modifier
-                        .height(37.dp)
-                        .padding(horizontal = 0.dp),
-                contentPadding = PaddingValues(horizontal = 20.dp, vertical = 7.dp),
-            ) {
-                Text(
-                    text = "Create",
-                    fontFamily = Poppins,
-                    fontSize = 17.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    letterSpacing = 0.17.sp,
-                    color = Secondary,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-
-        Spacer(modifier = Modifier.height(24.dp))
-    }
-}
-
-@Composable
-fun getPlaceholderFriends(): List<UserResponse> =
-    remember {
-        listOf(
-            UserResponse(
-                name = "Alex Johnson",
-                username = "alexj",
-                email = "alex@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 10,
-                mutual_friends_count = 1,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "Sarah Chen",
-                username = "sarahc",
-                email = "sarah@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 8,
-                mutual_friends_count = 2,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "Mike Rodriguez",
-                username = "mikerod",
-                email = "mike@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 5,
-                mutual_friends_count = 0,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "Emma Wilson",
-                username = "emmaw",
-                email = "emma@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 12,
-                mutual_friends_count = 3,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "David Kim",
-                username = "davidk",
-                email = "david@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 7,
-                mutual_friends_count = 1,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "Lisa Thompson",
-                username = "lisat",
-                email = "lisa@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 9,
-                mutual_friends_count = 2,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "Ryan Martinez",
-                username = "ryanm",
-                email = "ryan@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 6,
-                mutual_friends_count = 0,
-                timetable = null,
-            ),
-            UserResponse(
-                name = "Ashley Davis",
-                username = "ashleyd",
-                email = "ashley@example.com",
-                picture = "",
-                friend_status = "not_friends",
-                current_status = null,
-                friends_count = 11,
-                mutual_friends_count = 4,
-                timetable = null,
-            ),
-        )
-    }
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/components/JoinCircleBottomSheet.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/components/JoinCircleBottomSheet.kt
deleted file mode 100644
index 766d4a7..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/components/JoinCircleBottomSheet.kt
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.dscvit.vitty.ui.connect.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Poppins
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun JoinCircleBottomSheet(
-    isVisible: Boolean,
-    onDismiss: () -> Unit,
-    onJoinWithCode: (String) -> Unit,
-) {
-    if (isVisible) {
-        val sheetState = rememberModalBottomSheetState()
-        var circleCode by remember { mutableStateOf("") }
-        val isJoinEnabled = circleCode.isNotBlank()
-
-        ModalBottomSheet(
-            onDismissRequest = onDismiss,
-            sheetState = sheetState,
-            containerColor = Secondary,
-            dragHandle = {
-                Box(
-                    modifier =
-                        Modifier
-                            .padding(top = 16.dp)
-                            .width(120.dp)
-                            .height(7.dp)
-                            .background(Accent.copy(alpha = .4f), shape = RoundedCornerShape(44.dp)),
-                )
-            },
-        ) {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 24.dp, vertical = 16.dp),
-                horizontalAlignment = Alignment.Start,
-            ) {
-                Row {
-                    Spacer(modifier = Modifier.weight(1f))
-                    Text(
-                        text = "Join Circle",
-                        style = MaterialTheme.typography.headlineLarge,
-                        textAlign = TextAlign.Center,
-                    )
-                    Spacer(modifier = Modifier.weight(1f))
-                }
-
-                Spacer(modifier = Modifier.height(24.dp))
-
-                Text(
-                    text = "Enter Circle Code",
-                    color = Accent,
-                    fontFamily = Poppins,
-                    fontSize = 18.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    letterSpacing = 0.18.sp,
-                    modifier = Modifier.padding(bottom = 16.dp),
-                )
-
-                BasicTextField(
-                    value = circleCode,
-                    onValueChange = { circleCode = it },
-                    singleLine = true,
-                    cursorBrush = SolidColor(Accent),
-                    textStyle =
-                        MaterialTheme.typography.bodyMedium.copy(
-                            color = TextColor,
-                            fontSize = 18.sp,
-                            fontWeight = FontWeight.SemiBold,
-                            letterSpacing = 0.18.sp,
-                            textAlign = TextAlign.Start,
-                        ),
-                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-                    modifier = Modifier.fillMaxWidth(),
-                    decorationBox = { innerTextField ->
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .height(44.dp)
-                                    .border(
-                                        width = 1.dp,
-                                        color = Accent.copy(alpha = 0.5f),
-                                        shape = RoundedCornerShape(7.dp),
-                                    ).background(Background, RoundedCornerShape(7.dp))
-                                    .padding(horizontal = 12.dp),
-                            contentAlignment = Alignment.CenterStart,
-                        ) {
-                            innerTextField()
-                        }
-                    },
-                )
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                Row {
-                    Spacer(modifier = Modifier.weight(1f))
-
-                    Text(
-                        text = "OR",
-                        color = TextColor,
-                        fontFamily = Poppins,
-                        fontSize = 18.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        lineHeight = 18.sp,
-                        letterSpacing = 0.18.sp,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier.padding(vertical = 16.dp),
-                    )
-                    Spacer(modifier = Modifier.weight(1f))
-                }
-
-                Text(
-                    text = "Scan QR Code",
-                    color = Accent,
-                    fontFamily = Poppins,
-                    fontSize = 18.sp,
-                    fontWeight = FontWeight.SemiBold,
-                    letterSpacing = 0.18.sp,
-                    modifier = Modifier.padding(bottom = 16.dp),
-                )
-
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(239.dp)
-                            .background(Background, RoundedCornerShape(7.dp))
-                            .padding(10.dp),
-                ) {
-                    QRCodeScanner(
-                        onQRCodeScanned = { scannedCode ->
-                            onJoinWithCode(scannedCode)
-                            onDismiss()
-                        },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-                }
-
-                Spacer(modifier = Modifier.height(24.dp))
-
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(top = 16.dp),
-                    horizontalArrangement = Arrangement.End,
-                ) {
-                    Button(
-                        onClick = {
-                            if (isJoinEnabled) {
-                                onJoinWithCode(circleCode)
-                                onDismiss()
-                            }
-                        },
-                        enabled = isJoinEnabled,
-                        shape = RoundedCornerShape(7.dp),
-                        colors =
-                            ButtonDefaults.buttonColors(
-                                containerColor = Accent,
-                                disabledContainerColor = Accent.copy(alpha = 0.5f),
-                            ),
-                        modifier =
-                            Modifier
-                                .height(37.dp)
-                                .padding(horizontal = 0.dp),
-                        contentPadding = PaddingValues(horizontal = 20.dp, vertical = 7.dp),
-                    ) {
-                        Text(
-                            text = "Join",
-                            fontFamily = Poppins,
-                            fontSize = 17.sp,
-                            fontWeight = FontWeight.SemiBold,
-                            letterSpacing = 0.17.sp,
-                            color = Secondary,
-                            textAlign = TextAlign.Center,
-                        )
-                    }
-                }
-                Spacer(modifier = Modifier.height(24.dp))
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/components/QRCodeScanner.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/components/QRCodeScanner.kt
deleted file mode 100644
index e164e94..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/components/QRCodeScanner.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.dscvit.vitty.ui.connect.components
-
-import android.Manifest
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.content.ContextCompat
-import androidx.core.content.PermissionChecker
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Poppins
-import com.journeyapps.barcodescanner.BarcodeCallback
-import com.journeyapps.barcodescanner.CompoundBarcodeView
-
-@Composable
-fun QRCodeScanner(
-    onQRCodeScanned: (String) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val context = LocalContext.current
-    var hasCameraPermission by remember {
-        mutableStateOf(
-            ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
-                PermissionChecker.PERMISSION_GRANTED,
-        )
-    }
-
-    var hasScannedCode by remember { mutableStateOf(false) }
-    var scannedText by remember { mutableStateOf<String?>(null) }
-
-    val permissionLauncher =
-        rememberLauncherForActivityResult(
-            contract = ActivityResultContracts.RequestPermission(),
-        ) { isGranted ->
-            hasCameraPermission = isGranted
-        }
-
-    LaunchedEffect(Unit) {
-        if (!hasCameraPermission) {
-            permissionLauncher.launch(Manifest.permission.CAMERA)
-        }
-    }
-
-    if (hasCameraPermission) {
-        var barcodeView by remember { mutableStateOf<CompoundBarcodeView?>(null) }
-
-        AndroidView(
-            factory = { context ->
-                CompoundBarcodeView(context).apply {
-                    val callback =
-                        BarcodeCallback { result ->
-                            result?.text?.let { newScannedText ->
-                                if (!hasScannedCode || scannedText != newScannedText) {
-                                    hasScannedCode = true
-                                    scannedText = newScannedText
-                                    onQRCodeScanned(newScannedText)
-                                }
-                            }
-                        }
-                    this.decodeContinuous(callback)
-                    barcodeView = this
-                }
-            },
-            modifier =
-                modifier
-                    .fillMaxSize()
-                    .clip(RoundedCornerShape(7.dp)),
-            update = { view ->
-                if (view != barcodeView) {
-                    barcodeView?.pause()
-                    barcodeView = view
-                }
-                view.resume()
-            },
-        )
-
-        DisposableEffect(Unit) {
-            onDispose {
-                barcodeView?.pause()
-                barcodeView = null
-                hasScannedCode = false
-                scannedText = null
-            }
-        }
-    } else {
-        Box(
-            modifier = modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text(
-                text = "Camera permission is required to scan QR codes",
-                color = Accent,
-                textAlign = TextAlign.Center,
-                fontFamily = Poppins,
-                fontSize = 14.sp,
-                modifier = Modifier.padding(16.dp),
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageContent.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageContent.kt
deleted file mode 100644
index fac6fb2..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageContent.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.dscvit.vitty.ui.coursepage
-
-import android.widget.Toast
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.coursepage.components.AnimatedFabGroup
-import com.dscvit.vitty.ui.coursepage.components.CourseInfoSection
-import com.dscvit.vitty.ui.coursepage.components.CoursePageHeader
-import com.dscvit.vitty.ui.coursepage.components.FullScreenImageDialog
-import com.dscvit.vitty.ui.coursepage.components.NoteList
-import com.dscvit.vitty.ui.coursepage.components.SearchBar
-import com.dscvit.vitty.ui.coursepage.components.SetReminderBottomSheet
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CoursePageContent(
-    courseTitle: String,
-    courseCode: String,
-    onBackClick: () -> Unit,
-    onNavigateToNote: (courseCode: String, noteId: String?, onSaveNote: (String, String) -> Unit) -> Unit = { _, _, _ -> },
-    viewModel: CoursePageViewModel = viewModel(),
-) {
-    val context = LocalContext.current
-    var showBottomModal by remember { mutableStateOf(false) }
-    var showSetReminderModal by remember { mutableStateOf(false) }
-    var fullScreenImageUrl by remember { mutableStateOf<String?>(null) }
-    val setReminderSheetState = rememberModalBottomSheetState()
-
-    val searchQuery by viewModel.searchQuery.collectAsStateWithLifecycle()
-    val notes by viewModel.notes.collectAsStateWithLifecycle()
-    val reminders by viewModel.reminders.collectAsStateWithLifecycle()
-
-    val imagePickerLauncher =
-        rememberLauncherForActivityResult(
-            contract = ActivityResultContracts.GetContent(),
-        ) { uri ->
-            uri?.let {
-                viewModel.addImageNote(it.toString())
-            }
-        }
-
-    LaunchedEffect(courseCode) {
-        viewModel.setCourseId(courseCode)
-        viewModel.setCourseTitle(courseTitle)
-    }
-
-    Box(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-    ) {
-        val backgroundAlpha by animateFloatAsState(
-            targetValue = if (showBottomModal) 0.4f else 1f,
-            animationSpec = tween(durationMillis = 300),
-            label = "background_alpha",
-        )
-
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .alpha(backgroundAlpha),
-        ) {
-            CoursePageHeader(
-                onBackClick = onBackClick,
-            )
-            SearchBar(
-                searchQuery = searchQuery,
-                onSearchQueryChange = { viewModel.setSearchQuery(it) },
-            )
-            Spacer(Modifier.height(20.dp))
-            CourseInfoSection(
-                courseTitle = courseTitle,
-                reminders = reminders,
-            )
-
-            NoteList(
-                notes = notes,
-                onImageClick = { imagePath -> fullScreenImageUrl = imagePath },
-                onStarClick = { note -> viewModel.toggleStarredStatus(note) },
-                onNoteClick = { note ->
-
-                    onNavigateToNote(courseCode, note.id.toString()) { title, content ->
-                        viewModel.updateNote(note.copy(title = title, content = content), note.id)
-                    }
-                },
-                onDeleteNote = { note ->
-                    viewModel.deleteNote(note, note.id)
-                },
-            )
-        }
-
-        if (showBottomModal) {
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() },
-                        ) {
-                            showBottomModal = false
-                        },
-            )
-        }
-
-        AnimatedFabGroup(
-            showExpanded = showBottomModal,
-            onToggleExpanded = { showBottomModal = !showBottomModal },
-            onWriteNote = {
-                showBottomModal = false
-                onNavigateToNote(courseCode, null) { title, content ->
-                    viewModel.addTextNote(title, content)
-                }
-            },
-            onSetReminder = {
-                showBottomModal = false
-                showSetReminderModal = true
-            },
-            onUploadFile = {
-                showBottomModal = false
-                imagePickerLauncher.launch("image/*")
-            },
-        )
-    }
-
-    if (showSetReminderModal) {
-        ModalBottomSheet(
-            onDismissRequest = { showSetReminderModal = false },
-            sheetState = setReminderSheetState,
-            containerColor = Background,
-            contentColor = TextColor,
-            dragHandle = { },
-        ) {
-            SetReminderBottomSheet(
-                onDismiss = { showSetReminderModal = false },
-                courseTitle = courseTitle,
-                onSaveReminder = { title, description, dateMillis, fromTime, toTime, isAllDay, alertDaysBefore, attachmentUrl ->
-                    viewModel.addReminder(
-                        title = title,
-                        description = description,
-                        dateMillis = dateMillis,
-                        fromTime = fromTime,
-                        toTime = toTime,
-                        isAllDay = isAllDay,
-                        alertDaysBefore = alertDaysBefore,
-                        attachmentUrl = attachmentUrl,
-                        onSuccess = {
-                            showSetReminderModal = false
-                            Toast.makeText(context, "Reminder created successfully", Toast.LENGTH_SHORT).show()
-                        },
-                        onError = { errorMessage ->
-                            Toast.makeText(context, errorMessage, Toast.LENGTH_LONG).show()
-                        },
-                    )
-                },
-            )
-        }
-    }
-
-    fullScreenImageUrl?.let { imageUrl ->
-        FullScreenImageDialog(
-            imageUrl = imageUrl,
-            onDismiss = { fullScreenImageUrl = null },
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageFragment.kt
deleted file mode 100644
index 9e41e20..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageFragment.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.dscvit.vitty.ui.coursepage
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import com.dscvit.vitty.databinding.FragmentCoursePageBinding
-import com.dscvit.vitty.theme.VittyTheme
-
-class CoursePageFragment : Fragment() {
-    private var fragmentCoursePageBinding: FragmentCoursePageBinding? = null
-    private val binding get() = fragmentCoursePageBinding!!
-    private val args: CoursePageFragmentArgs by navArgs()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        fragmentCoursePageBinding = FragmentCoursePageBinding.inflate(inflater, container, false)
-
-        binding.composeView.apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                VittyTheme {
-                    CoursePageContent(
-                        courseTitle = args.courseTitle,
-                        courseCode = args.courseCode,
-                        onBackClick = { findNavController().popBackStack() },
-                        onNavigateToNote = { courseCode, noteId, _ ->
-                            val action =
-                                CoursePageFragmentDirections
-                                    .actionCoursePageFragmentToNoteFragment(courseCode, noteId)
-                            findNavController().navigate(action)
-                        },
-                    )
-                }
-            }
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        fragmentCoursePageBinding = null
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageViewModel.kt
deleted file mode 100644
index cf00bf8..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/coursepage/CoursePageViewModel.kt
+++ /dev/null
@@ -1,318 +0,0 @@
-package com.dscvit.vitty.ui.coursepage
-
-import android.app.Application
-import android.net.Uri
-import androidx.core.net.toUri
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.viewModelScope
-import com.dscvit.vitty.data.database.VittyDatabase
-import com.dscvit.vitty.data.repository.NoteRepository
-import com.dscvit.vitty.data.repository.ReminderRepository
-import com.dscvit.vitty.receiver.ReminderNotificationManager
-import com.dscvit.vitty.ui.coursepage.models.Note
-import com.dscvit.vitty.ui.coursepage.models.NoteType
-import com.dscvit.vitty.ui.coursepage.models.Reminder
-import com.dscvit.vitty.ui.coursepage.models.ReminderStatus
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.io.InputStream
-
-class CoursePageViewModel(
-    application: Application,
-) : AndroidViewModel(application) {
-    private val noteRepository: NoteRepository
-    private val reminderRepository: ReminderRepository
-    private val reminderNotificationManager: ReminderNotificationManager
-
-    init {
-        val database = VittyDatabase.getDatabase(application)
-        noteRepository = NoteRepository(database.noteDao())
-        reminderRepository = ReminderRepository(database.reminderDao())
-        reminderNotificationManager = ReminderNotificationManager(application)
-    }
-
-    private val _courseId = MutableStateFlow("")
-    val courseId: StateFlow<String> = _courseId.asStateFlow()
-
-    private val _courseTitle = MutableStateFlow("")
-    val courseTitle: StateFlow<String> = _courseTitle.asStateFlow()
-
-    private val _searchQuery = MutableStateFlow("")
-    val searchQuery: StateFlow<String> = _searchQuery.asStateFlow()
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    val notes: StateFlow<List<Note>> =
-        combine(
-            _courseId,
-            _searchQuery,
-        ) { courseId, query ->
-            if (query.isBlank()) {
-                noteRepository.getNotesByCourse(courseId)
-            } else {
-                noteRepository.searchNotes(courseId, query)
-            }
-        }.flatMapLatest { it }
-            .stateIn(
-                scope = viewModelScope,
-                started = SharingStarted.WhileSubscribed(5000),
-                initialValue = emptyList(),
-            )
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    val reminders: StateFlow<List<Reminder>> =
-        _courseId
-            .flatMapLatest { courseId ->
-                reminderRepository.getRemindersByCourse(courseId)
-            }.stateIn(
-                scope = viewModelScope,
-                started = SharingStarted.WhileSubscribed(5000),
-                initialValue = emptyList(),
-            )
-
-    fun setCourseId(courseId: String) {
-        _courseId.value = courseId
-    }
-
-    fun setCourseTitle(courseTitle: String) {
-        _courseTitle.value = courseTitle
-    }
-
-    fun setSearchQuery(query: String) {
-        _searchQuery.value = query
-    }
-
-    private fun addNote(note: Note) {
-        viewModelScope.launch {
-            noteRepository.insertNote(note, _courseId.value)
-        }
-    }
-
-    fun updateNote(
-        note: Note,
-        noteId: Long,
-    ) {
-        viewModelScope.launch {
-            noteRepository.updateNote(note, _courseId.value, noteId)
-        }
-    }
-
-    fun deleteNote(
-        note: Note,
-        noteId: Long,
-    ) {
-        viewModelScope.launch {
-            if (note.type == NoteType.IMAGE && !note.imagePath.isNullOrEmpty()) {
-                deleteImageFile(note.imagePath)
-            }
-            noteRepository.deleteNote(note, _courseId.value, noteId)
-        }
-    }
-
-    private suspend fun deleteImageFile(imagePath: String) =
-        withContext(Dispatchers.IO) {
-            try {
-                val file = File(imagePath)
-                if (file.exists()) {
-                    file.delete()
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-
-    fun toggleStarredStatus(note: Note) {
-        viewModelScope.launch {
-            noteRepository.updateStarredStatus(note.id, !note.isStarred)
-        }
-    }
-
-    fun addTextNote(
-        title: String,
-        content: String,
-        isStarred: Boolean = false,
-    ) {
-        val note =
-            Note(
-                title = title,
-                content = content,
-                type = NoteType.TEXT,
-                isStarred = isStarred,
-            )
-        addNote(note)
-    }
-
-    fun addImageNote(
-        imageUri: String,
-        isStarred: Boolean = false,
-    ) {
-        viewModelScope.launch {
-            try {
-                val localImagePath = copyImageToInternalStorage(imageUri.toUri())
-                localImagePath?.let { path ->
-                    val note =
-                        Note(
-                            title = "",
-                            content = "",
-                            type = NoteType.IMAGE,
-                            isStarred = isStarred,
-                            imagePath = path,
-                        )
-                    addNote(note)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-    }
-
-    private suspend fun copyImageToInternalStorage(uri: Uri): String? =
-        withContext(Dispatchers.IO) {
-            try {
-                val context = getApplication<Application>()
-                val inputStream: InputStream? = context.contentResolver.openInputStream(uri)
-
-                val timestamp = System.currentTimeMillis()
-                val filename = "note_image_$timestamp.jpg"
-
-                val imagesDir = File(context.filesDir, "images")
-                if (!imagesDir.exists()) {
-                    imagesDir.mkdirs()
-                }
-
-                val outputFile = File(imagesDir, filename)
-                val outputStream = FileOutputStream(outputFile)
-
-                inputStream?.use { input ->
-                    outputStream.use { output ->
-                        input.copyTo(output)
-                    }
-                }
-
-                return@withContext outputFile.absolutePath
-            } catch (e: Exception) {
-                e.printStackTrace()
-                return@withContext null
-            }
-        }
-
-    suspend fun getNoteById(noteId: String): Note? =
-        try {
-            noteRepository.getNoteById(noteId.toLong())
-        } catch (e: NumberFormatException) {
-            null
-        }
-
-    fun updateExistingNote(
-        noteId: String,
-        title: String,
-        content: String,
-        isStarred: Boolean = false,
-    ) {
-        viewModelScope.launch {
-            try {
-                val id = noteId.toLong()
-                val note =
-                    Note(
-                        id = id,
-                        title = title,
-                        content = content,
-                        type = NoteType.TEXT,
-                        isStarred = isStarred,
-                    )
-                noteRepository.updateNote(note, _courseId.value, id)
-            } catch (e: NumberFormatException) {
-                Timber.e(e, "Invalid note ID format")
-            }
-        }
-    }
-
-    fun addReminder(
-        title: String,
-        description: String,
-        dateMillis: Long,
-        fromTime: String,
-        toTime: String,
-        isAllDay: Boolean,
-        alertDaysBefore: Int,
-        attachmentUrl: String,
-        onSuccess: () -> Unit = {},
-        onError: (String) -> Unit = {},
-    ) {
-        viewModelScope.launch {
-            try {
-                val reminder =
-                    Reminder(
-                        title = title,
-                        description = description,
-                        dueDate = "",
-                        status = ReminderStatus.UPCOMING,
-                        dateMillis = dateMillis,
-                        fromTime = fromTime,
-                        toTime = toTime,
-                        isAllDay = isAllDay,
-                        alertDaysBefore = alertDaysBefore,
-                        attachmentUrl = attachmentUrl.ifBlank { null },
-                    )
-
-                val reminderId = reminderRepository.insertReminder(reminder, _courseId.value, _courseTitle.value)
-
-                reminderNotificationManager.scheduleReminderNotification(
-                    reminderId = reminderId,
-                    title = title,
-                    description = description,
-                    triggerTimeMillis = calculateNotificationTime(dateMillis, alertDaysBefore, fromTime, isAllDay),
-                    courseTitle = _courseTitle.value,
-                )
-
-                onSuccess()
-            } catch (e: Exception) {
-                Timber.e(e, "Error adding reminder")
-                onError("Failed to create reminder: ${e.message}")
-            }
-        }
-    }
-
-    private fun calculateNotificationTime(
-        dateMillis: Long,
-        alertDaysBefore: Int,
-        fromTime: String,
-        isAllDay: Boolean,
-    ): Long {
-        val calendar = java.util.Calendar.getInstance()
-        calendar.timeInMillis = dateMillis
-
-        if (!isAllDay && fromTime.isNotBlank()) {
-            val timeParts = fromTime.split(":")
-            if (timeParts.size >= 2) {
-                val hour = timeParts[0].toIntOrNull() ?: 9
-                val minute = timeParts[1].toIntOrNull() ?: 0
-                calendar.set(java.util.Calendar.HOUR_OF_DAY, hour)
-                calendar.set(java.util.Calendar.MINUTE, minute)
-            }
-        } else {
-            calendar.set(java.util.Calendar.HOUR_OF_DAY, 9)
-            calendar.set(java.util.Calendar.MINUTE, 0)
-        }
-
-        calendar.set(java.util.Calendar.SECOND, 0)
-        calendar.set(java.util.Calendar.MILLISECOND, 0)
-
-        if (alertDaysBefore > 0) {
-            calendar.add(java.util.Calendar.DAY_OF_YEAR, -alertDaysBefore)
-        }
-
-        return calendar.timeInMillis
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/ReminderBroadcastReceiver.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/ReminderBroadcastReceiver.kt
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/ReminderNotificationManager.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/ReminderNotificationManager.kt
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/components/CoursePageComponents.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/components/CoursePageComponents.kt
deleted file mode 100644
index 2833927..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/coursepage/components/CoursePageComponents.kt
+++ /dev/null
@@ -1,718 +0,0 @@
-package com.dscvit.vitty.ui.coursepage.components
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
-import androidx.compose.animation.scaleOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.*
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Green
-import com.dscvit.vitty.theme.Red
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.theme.Yellow
-import com.dscvit.vitty.ui.coursepage.models.Note
-import com.dscvit.vitty.ui.coursepage.models.NoteType
-import com.dscvit.vitty.ui.coursepage.models.Reminder
-import com.dscvit.vitty.ui.coursepage.models.ReminderStatus
-import dev.jeziellago.compose.markdowntext.MarkdownText
-
-@Composable
-fun NoteList(
-    notes: List<Note>,
-    onImageClick: (String) -> Unit = {},
-    onStarClick: (Note) -> Unit = {},
-    onNoteClick: (Note) -> Unit = {},
-    onDeleteNote: (Note) -> Unit = {},
-) {
-    if (notes.isEmpty()) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 20.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center,
-            ) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_edit_document),
-                    contentDescription = "No notes",
-                    tint = TextColor.copy(alpha = 0.3f),
-                    modifier = Modifier.size(64.dp),
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-                Text(
-                    text = "No notes yet",
-                    style = MaterialTheme.typography.headlineSmall,
-                    color = TextColor.copy(alpha = 0.6f),
-                    textAlign = TextAlign.Center,
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                Text(
-                    text = "Tap the + button to add your first note",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = TextColor.copy(alpha = 0.4f),
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
-    } else {
-        LazyColumn(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 20.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(bottom = 100.dp),
-        ) {
-            items(
-                count = notes.size,
-                key = { index -> notes[index].id },
-            ) { index ->
-                val note = notes[index]
-                SwipeToDismissNote(
-                    note = note,
-                    onNoteClick = { onNoteClick(note) },
-                    onImageClick = onImageClick,
-                    onStarClick = onStarClick,
-                    onDelete = { onDeleteNote(note) },
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun NoteItem(
-    note: Note,
-    onNoteClick: () -> Unit = {},
-    onImageClick: (String) -> Unit = {},
-    onStarClick: (Note) -> Unit = {},
-    onImageLoaded: () -> Unit = {},
-) {
-    when (note.type) {
-        NoteType.IMAGE -> {
-            note.imagePath?.let { imagePath ->
-                AsyncImage(
-                    model = imagePath,
-                    contentDescription = "Image note",
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .height(140.dp)
-                            .clip(RoundedCornerShape(16.dp))
-                            .clickable { onImageClick(imagePath) },
-                    contentScale = ContentScale.Crop,
-                    onSuccess = { onImageLoaded() },
-                    onError = { onImageLoaded() },
-                )
-            }
-        }
-        NoteType.TEXT -> {
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(16.dp))
-                        .clickable { onNoteClick() }
-                        .background(Secondary)
-                        .padding(16.dp),
-            ) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Text(
-                        text = note.title,
-                        style = MaterialTheme.typography.titleMedium,
-                        color = TextColor,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                    if (note.isStarred) {
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_star),
-                            contentDescription = "Starred",
-                            tint = Accent,
-                            modifier =
-                                Modifier
-                                    .padding(bottom = 4.dp)
-                                    .clickable { onStarClick(note) },
-                        )
-                    } else {
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_star),
-                            contentDescription = "Not Starred",
-                            tint = TextColor.copy(alpha = 0.3f),
-                            modifier =
-                                Modifier
-                                    .padding(bottom = 4.dp)
-                                    .clickable { onStarClick(note) },
-                        )
-                    }
-                }
-                Spacer(modifier = Modifier.height(4.dp))
-                MarkdownText(
-                    markdown = note.content,
-                    style = MaterialTheme.typography.bodyMedium.copy(color = TextColor),
-                    truncateOnTextOverflow = true,
-                    maxLines = 3,
-                    checkboxColor = TextColor.copy(alpha = 0.7f),
-                    checkedCheckboxColor = Accent,
-                    checkmarkColor = Background,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun SwipeToDismissNote(
-    note: Note,
-    onNoteClick: () -> Unit = {},
-    onImageClick: (String) -> Unit = {},
-    onStarClick: (Note) -> Unit = {},
-    onDelete: () -> Unit = {},
-) {
-    var isImageLoaded by remember { mutableStateOf(note.type != NoteType.IMAGE) }
-    var isDismissed by remember { mutableStateOf(false) }
-
-    val dismissState =
-        rememberSwipeToDismissBoxState(
-            confirmValueChange = { dismissValue ->
-                when (dismissValue) {
-                    SwipeToDismissBoxValue.EndToStart -> {
-                        if (isImageLoaded) {
-                            isDismissed = true
-                            true
-                        } else {
-                            false
-                        }
-                    }
-                    else -> false
-                }
-            },
-        )
-
-    LaunchedEffect(isDismissed) {
-        if (isDismissed) {
-            kotlinx.coroutines.delay(200)
-            onDelete()
-        }
-    }
-
-    AnimatedVisibility(
-        visible = !isDismissed,
-        exit = fadeOut(animationSpec = tween(200)),
-    ) {
-        SwipeToDismissBox(
-            state = dismissState,
-            backgroundContent = {
-                Box(
-                    modifier =
-                        Modifier
-                            .fillMaxSize()
-                            .background(
-                                color = Red,
-                                shape = RoundedCornerShape(16.dp),
-                            ).padding(horizontal = 16.dp),
-                    contentAlignment = Alignment.CenterEnd,
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Delete,
-                        contentDescription = "Delete",
-                        tint = Color.White,
-                        modifier = Modifier.size(24.dp),
-                    )
-                }
-            },
-            enableDismissFromEndToStart = isImageLoaded,
-            enableDismissFromStartToEnd = false,
-        ) {
-            NoteItem(
-                note = note,
-                onNoteClick = onNoteClick,
-                onImageClick = onImageClick,
-                onStarClick = onStarClick,
-                onImageLoaded = { isImageLoaded = true },
-            )
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CoursePageHeader(onBackClick: () -> Unit) {
-    CenterAlignedTopAppBar(
-        title = {
-            Text(
-                text = "Course Page",
-                style = MaterialTheme.typography.headlineSmall,
-                fontWeight = FontWeight.Medium,
-            )
-        },
-        navigationIcon = {
-            IconButton(onClick = onBackClick) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                    contentDescription = "Back",
-                    tint = MaterialTheme.colorScheme.onBackground,
-                )
-            }
-        },
-        colors =
-            TopAppBarDefaults.topAppBarColors(
-                containerColor = MaterialTheme.colorScheme.background,
-                titleContentColor = MaterialTheme.colorScheme.onBackground,
-            ),
-    )
-}
-
-@Composable
-fun SearchBar(
-    searchQuery: String,
-    onSearchQueryChange: (String) -> Unit,
-    placeholder: String = "Search",
-) {
-    Box(
-        Modifier
-            .fillMaxWidth()
-            .padding(start = 20.dp, end = 20.dp, top = 16.dp)
-            .border(2.dp, Secondary, RoundedCornerShape(9999.dp))
-            .background(Background, RoundedCornerShape(9999.dp)),
-    ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .height(44.dp)
-                    .padding(horizontal = 16.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            BasicTextField(
-                value = searchQuery,
-                onValueChange = onSearchQueryChange,
-                singleLine = true,
-                cursorBrush = SolidColor(Accent),
-                textStyle =
-                    MaterialTheme.typography.bodyMedium.copy(
-                        color = TextColor,
-                        fontSize = 16.sp,
-                        lineHeight = 16.sp,
-                    ),
-                modifier = Modifier.weight(1f),
-                decorationBox = { innerTextField ->
-                    Box(
-                        modifier = Modifier.fillMaxWidth(),
-                        contentAlignment = Alignment.CenterStart,
-                    ) {
-                        if (searchQuery.isEmpty()) {
-                            Text(
-                                text = placeholder,
-                                color = Accent.copy(alpha = 0.3f),
-                                style =
-                                    MaterialTheme.typography.bodyMedium.copy(
-                                        fontSize = 16.sp,
-                                        lineHeight = 16.sp,
-                                    ),
-                            )
-                        }
-                        innerTextField()
-                    }
-                },
-            )
-            if (searchQuery.isNotEmpty()) {
-                IconButton(onClick = { onSearchQueryChange("") }) {
-                    Icon(
-                        imageVector = Icons.Default.Close,
-                        contentDescription = "Clear",
-                        tint = Accent,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun CourseInfoSection(
-    courseTitle: String,
-    reminders: List<Reminder>,
-) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 20.dp, vertical = 16.dp),
-    ) {
-        Text(
-            text = courseTitle,
-            style = MaterialTheme.typography.labelLarge.copy(fontSize = 20.sp, lineHeight = 20.sp),
-            color = TextColor,
-            fontWeight = FontWeight.SemiBold,
-            modifier = Modifier.fillMaxWidth(),
-        )
-        Spacer(Modifier.height(12.dp))
-
-        val prioritizedReminders =
-            remember(reminders) {
-                mutableListOf<Reminder>().apply {
-                    addAll(reminders.filter { it.status == ReminderStatus.UPCOMING })
-                    addAll(reminders.filter { it.status == ReminderStatus.CAN_WAIT })
-                    addAll(reminders.filter { it.status == ReminderStatus.COMPLETED })
-                }
-            }
-
-        val displayedReminders = prioritizedReminders.take(3)
-        val remainingCount = prioritizedReminders.size - 3
-
-        if (displayedReminders.isNotEmpty()) {
-            LazyRow(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                contentPadding = PaddingValues(horizontal = 0.dp),
-            ) {
-                items(displayedReminders.size) { index ->
-                    RemindersChip(
-                        text = "${displayedReminders[index].title} by ${displayedReminders[index].dueDate}",
-                        reminder = displayedReminders[index],
-                    )
-                }
-
-                if (remainingCount > 0) {
-                    item {
-                        RemindersChip(
-                            text = "+$remainingCount",
-                            reminder = null,
-                        )
-                    }
-                }
-            }
-            Spacer(Modifier.height(12.dp))
-        }
-    }
-}
-
-@Composable
-fun RemindersChip(
-    text: String,
-    reminder: Reminder?,
-) {
-    Box(
-        modifier =
-            Modifier
-                .clip(RoundedCornerShape(20.dp))
-                .background(Secondary)
-                .padding(horizontal = 12.dp, vertical = 8.dp),
-    ) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            when {
-                reminder == null -> {
-                    Text(
-                        text = text,
-                        color = TextColor,
-                        style =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                fontSize = 14.sp,
-                                fontWeight = FontWeight.Medium,
-                            ),
-                    )
-                }
-                reminder.status == ReminderStatus.COMPLETED -> {
-                    Icon(
-                        imageVector = Icons.Default.Check,
-                        contentDescription = null,
-                        tint = Green,
-                        modifier = Modifier.size(16.dp),
-                    )
-                    Spacer(Modifier.width(8.dp))
-                    Text(
-                        text = text,
-                        color = TextColor,
-                        style = MaterialTheme.typography.bodyMedium.copy(fontSize = 14.sp),
-                    )
-                }
-                else -> {
-                    Box(
-                        modifier =
-                            Modifier
-                                .size(10.dp)
-                                .clip(RoundedCornerShape(10.dp))
-                                .background(
-                                    when (reminder.status) {
-                                        ReminderStatus.UPCOMING -> Red
-                                        ReminderStatus.CAN_WAIT -> Yellow
-                                        else -> Secondary
-                                    },
-                                ),
-                    )
-                    Spacer(Modifier.width(8.dp))
-                    Text(
-                        text = text,
-                        color = TextColor,
-                        style = MaterialTheme.typography.bodyMedium.copy(fontSize = 14.sp),
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun AnimatedFabGroup(
-    showExpanded: Boolean,
-    onToggleExpanded: () -> Unit,
-    onWriteNote: () -> Unit,
-    onSetReminder: () -> Unit,
-    onUploadFile: () -> Unit,
-) {
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .wrapContentSize(Alignment.BottomEnd)
-                .padding(16.dp),
-        horizontalAlignment = Alignment.End,
-        verticalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        AnimatedVisibility(
-            visible = showExpanded,
-            enter =
-                fadeIn(animationSpec = tween(300)) +
-                    slideInVertically(
-                        animationSpec = spring(dampingRatio = 0.8f),
-                        initialOffsetY = { it / 3 },
-                    ),
-            exit =
-                fadeOut(animationSpec = tween(200)) +
-                    slideOutVertically(
-                        animationSpec = tween(200),
-                        targetOffsetY = { it / 3 },
-                    ),
-        ) {
-            Column(
-                horizontalAlignment = Alignment.End,
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                FabWithTooltip("Write Note", R.drawable.ic_edit_document, onWriteNote)
-                FabWithTooltip("Set Reminder", R.drawable.ic_clock, onSetReminder)
-                FabWithTooltip("Upload File", R.drawable.ic_upload, onUploadFile)
-            }
-        }
-
-        FloatingActionButton(
-            onClick = onToggleExpanded,
-            containerColor = Secondary,
-            contentColor = TextColor,
-            elevation =
-                FloatingActionButtonDefaults.elevation(
-                    defaultElevation = 6.dp,
-                    pressedElevation = 8.dp,
-                    hoveredElevation = 8.dp,
-                    focusedElevation = 8.dp,
-                ),
-            shape = RoundedCornerShape(9999.dp),
-        ) {
-            val rotation by animateFloatAsState(
-                targetValue = if (showExpanded) 45f else 0f,
-                animationSpec = spring(dampingRatio = 0.8f),
-                label = "fab_rotation",
-            )
-
-            Icon(
-                imageVector = Icons.Default.Add,
-                contentDescription = if (showExpanded) "Close" else "Add content",
-                modifier =
-                    Modifier
-                        .size(24.dp)
-                        .graphicsLayer(rotationZ = rotation),
-            )
-        }
-    }
-}
-
-@Composable
-fun FabWithTooltip(
-    text: String,
-    iconRes: Int,
-    onClick: () -> Unit,
-) {
-    Row(
-        modifier = Modifier.padding(end = 4.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        AnimatedVisibility(
-            visible = true,
-            enter =
-                scaleIn(
-                    animationSpec = spring(dampingRatio = 0.8f),
-                    initialScale = 0.8f,
-                ) + fadeIn(animationSpec = tween(200)),
-            exit =
-                scaleOut(
-                    animationSpec = tween(150),
-                    targetScale = 0.8f,
-                ) + fadeOut(animationSpec = tween(150)),
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .clip(RoundedCornerShape(8.dp))
-                        .border(2.dp, Secondary, RoundedCornerShape(8.dp))
-                        .background(Background)
-                        .clickable {
-                            onClick()
-                        }.padding(horizontal = 12.dp, vertical = 6.dp),
-            ) {
-                Text(
-                    text = text,
-                    style = MaterialTheme.typography.bodySmall,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                )
-            }
-        }
-
-        AnimatedVisibility(
-            visible = true,
-            enter =
-                scaleIn(
-                    animationSpec = spring(dampingRatio = 0.8f),
-                    initialScale = 0.6f,
-                ) + fadeIn(animationSpec = tween(200)),
-            exit =
-                scaleOut(
-                    animationSpec = tween(150),
-                    targetScale = 0.6f,
-                ) + fadeOut(animationSpec = tween(150)),
-        ) {
-            FloatingActionButton(
-                onClick = onClick,
-                containerColor = TextColor,
-                contentColor = Secondary,
-                modifier = Modifier.size(48.dp),
-                shape = RoundedCornerShape(9999.dp),
-                elevation =
-                    FloatingActionButtonDefaults.elevation(
-                        defaultElevation = 6.dp,
-                        pressedElevation = 8.dp,
-                        hoveredElevation = 8.dp,
-                        focusedElevation = 8.dp,
-                    ),
-            ) {
-                Icon(
-                    painter = painterResource(id = iconRes),
-                    contentDescription = text,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun FullScreenImageDialog(
-    imageUrl: String,
-    onDismiss: () -> Unit,
-) {
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                dismissOnBackPress = true,
-                dismissOnClickOutside = true,
-            ),
-    ) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .background(Color.Black.copy(alpha = 0.9f))
-                    .clickable { onDismiss() },
-            contentAlignment = Alignment.Center,
-        ) {
-            AsyncImage(
-                model = imageUrl,
-                contentDescription = "Full screen image",
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .padding(16.dp),
-                contentScale = ContentScale.Fit,
-            )
-
-            IconButton(
-                onClick = onDismiss,
-                modifier =
-                    Modifier
-                        .align(Alignment.TopEnd)
-                        .padding(16.dp),
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Close,
-                    contentDescription = "Close",
-                    tint = Color.White,
-                    modifier = Modifier.size(32.dp),
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/components/ReminderComponents.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/components/ReminderComponents.kt
deleted file mode 100644
index e7d99f5..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/coursepage/components/ReminderComponents.kt
+++ /dev/null
@@ -1,892 +0,0 @@
-package com.dscvit.vitty.ui.coursepage.components
-
-import android.widget.Toast
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowDown
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.DatePicker
-import androidx.compose.material3.DatePickerDefaults
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MenuDefaults
-import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TimePicker
-import androidx.compose.material3.TimePickerDefaults
-import androidx.compose.material3.rememberDatePickerState
-import androidx.compose.material3.rememberTimePickerState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.DividerColor
-import com.dscvit.vitty.theme.Red
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.coursepage.models.AlertOption
-import java.util.Locale
-
-@Composable
-fun SetReminderBottomSheet(
-    onDismiss: () -> Unit,
-    courseTitle: String,
-    onSaveReminder: (
-        title: String,
-        description: String,
-        dateMillis: Long,
-        fromTime: String,
-        toTime: String,
-        isAllDay: Boolean,
-        alertDaysBefore: Int,
-        attachmentUrl: String,
-    ) -> Unit = { _, _, _, _, _, _, _, _ -> },
-) {
-    var currentPage by remember { mutableIntStateOf(0) }
-    var selectedDateMillis by remember { mutableStateOf<Long?>(null) }
-    var isAllDay by remember { mutableStateOf(false) }
-    var fromTime by remember { mutableStateOf("07:00") }
-    var toTime by remember { mutableStateOf("18:00") }
-    var title by remember { mutableStateOf("") }
-    var description by remember { mutableStateOf("") }
-    var attachmentUrl by remember { mutableStateOf("") }
-    var selectedAlert by remember { mutableStateOf(AlertOption.NONE) }
-
-    when (currentPage) {
-        0 ->
-            FirstPage(
-                selectedDateMillis = selectedDateMillis,
-                onDateSelected = { selectedDateMillis = it },
-                isAllDay = isAllDay,
-                onAllDayToggle = { isAllDay = it },
-                fromTime = fromTime,
-                onFromTimeChange = { fromTime = it },
-                toTime = toTime,
-                onToTimeChange = { toTime = it },
-                onDismiss = onDismiss,
-                onNext = { currentPage = 1 },
-            )
-        1 ->
-            SecondPage(
-                title = title,
-                onTitleChange = { title = it },
-                description = description,
-                onDescriptionChange = { description = it },
-                subject = courseTitle,
-                attachmentUrl = attachmentUrl,
-                onAttachmentUrlChange = { attachmentUrl = it },
-                selectedAlert = selectedAlert,
-                onAlertChange = { selectedAlert = it },
-                onBack = { currentPage = 0 },
-                onAdd = {
-                    selectedDateMillis?.let { dateMillis ->
-                        onSaveReminder(
-                            title,
-                            description,
-                            dateMillis,
-                            fromTime,
-                            toTime,
-                            isAllDay,
-                            selectedAlert.days,
-                            attachmentUrl,
-                        )
-                    }
-                    onDismiss()
-                },
-            )
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun FirstPage(
-    selectedDateMillis: Long?,
-    onDateSelected: (Long?) -> Unit,
-    isAllDay: Boolean,
-    onAllDayToggle: (Boolean) -> Unit,
-    fromTime: String,
-    onFromTimeChange: (String) -> Unit,
-    toTime: String,
-    onToTimeChange: (String) -> Unit,
-    onDismiss: () -> Unit,
-    onNext: () -> Unit,
-) {
-    val context = LocalContext.current
-    val datePickerState =
-        rememberDatePickerState(
-            initialSelectedDateMillis = selectedDateMillis,
-        )
-
-    var showFromTimePicker by remember { mutableStateOf(false) }
-    var showToTimePicker by remember { mutableStateOf(false) }
-
-    val fromTimePickerState =
-        rememberTimePickerState(
-            initialHour = fromTime.split(":")[0].toIntOrNull() ?: 7,
-            initialMinute = fromTime.split(":")[1].toIntOrNull() ?: 0,
-            is24Hour = true,
-        )
-
-    val toTimePickerState =
-        rememberTimePickerState(
-            initialHour = toTime.split(":")[0].toIntOrNull() ?: 18,
-            initialMinute = toTime.split(":")[1].toIntOrNull() ?: 0,
-            is24Hour = true,
-        )
-
-    fun validateInput(): Boolean {
-        if (selectedDateMillis == null) {
-            Toast.makeText(context, "Please select a date", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        val currentTimeMillis = System.currentTimeMillis()
-        val selectedDateOnly = selectedDateMillis - (selectedDateMillis % (24 * 60 * 60 * 1000))
-        val currentDateOnly = currentTimeMillis - (currentTimeMillis % (24 * 60 * 60 * 1000))
-
-        if (selectedDateOnly < currentDateOnly) {
-            Toast.makeText(context, "Cannot set reminder for a past date", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        if (!isAllDay && selectedDateOnly == currentDateOnly) {
-            val fromTimeParts = fromTime.split(":")
-            val fromHour = fromTimeParts[0].toInt()
-            val fromMinute = fromTimeParts[1].toInt()
-
-            val currentTime = java.util.Calendar.getInstance()
-            val currentHour = currentTime.get(java.util.Calendar.HOUR_OF_DAY)
-            val currentMinute = currentTime.get(java.util.Calendar.MINUTE)
-
-            val fromTimeInMinutes = fromHour * 60 + fromMinute
-            val currentTimeInMinutes = currentHour * 60 + currentMinute
-
-            if (fromTimeInMinutes <= currentTimeInMinutes) {
-                Toast.makeText(context, "Cannot set reminder for a past time", Toast.LENGTH_SHORT).show()
-                return false
-            }
-        }
-
-        if (!isAllDay) {
-            val fromTimeParts = fromTime.split(":")
-            val toTimeParts = toTime.split(":")
-
-            val fromHour = fromTimeParts[0].toInt()
-            val fromMinute = fromTimeParts[1].toInt()
-            val toHour = toTimeParts[0].toInt()
-            val toMinute = toTimeParts[1].toInt()
-
-            val fromTimeInMinutes = fromHour * 60 + fromMinute
-            val toTimeInMinutes = toHour * 60 + toMinute
-
-            if (fromTimeInMinutes >= toTimeInMinutes) {
-                Toast.makeText(context, "Start time must be before end time", Toast.LENGTH_SHORT).show()
-                return false
-            }
-        }
-
-        return true
-    }
-
-    LaunchedEffect(datePickerState.selectedDateMillis) {
-        onDateSelected(datePickerState.selectedDateMillis)
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 20.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            TextButton(
-                onClick = onDismiss,
-                colors = ButtonDefaults.textButtonColors(contentColor = Red),
-            ) {
-                Text("Cancel", style = MaterialTheme.typography.bodySmall)
-            }
-
-            TextButton(
-                onClick = {
-                    if (validateInput()) {
-                        onNext()
-                    }
-                },
-                enabled = selectedDateMillis != null,
-                colors = ButtonDefaults.textButtonColors(contentColor = Accent),
-            ) {
-                Text("Next", style = MaterialTheme.typography.bodySmall)
-            }
-        }
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        DatePicker(
-            state = datePickerState,
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp)),
-            colors =
-                DatePickerDefaults.colors(
-                    containerColor = Secondary,
-                    titleContentColor = TextColor,
-                    headlineContentColor = TextColor,
-                    weekdayContentColor = TextColor,
-                    subheadContentColor = TextColor,
-                    navigationContentColor = TextColor,
-                    yearContentColor = TextColor,
-                    disabledYearContentColor = TextColor.copy(alpha = 0.38f),
-                    currentYearContentColor = Accent,
-                    selectedYearContentColor = Background,
-                    disabledSelectedYearContentColor = Background.copy(alpha = 0.38f),
-                    selectedYearContainerColor = Accent,
-                    disabledSelectedYearContainerColor = Accent.copy(alpha = 0.12f),
-                    dayContentColor = TextColor,
-                    disabledDayContentColor = TextColor.copy(alpha = 0.38f),
-                    selectedDayContentColor = Background,
-                    disabledSelectedDayContentColor = Background.copy(alpha = 0.38f),
-                    selectedDayContainerColor = Accent,
-                    disabledSelectedDayContainerColor = Accent.copy(alpha = 0.12f),
-                    todayContentColor = Accent,
-                    todayDateBorderColor = Accent,
-                    dayInSelectionRangeContentColor = TextColor,
-                    dayInSelectionRangeContainerColor = Secondary,
-                    dividerColor = DividerColor,
-                ),
-        )
-
-        Spacer(modifier = Modifier.height(14.dp))
-
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(Secondary)
-                    .padding(horizontal = 8.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = "All-day",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = TextColor,
-                    fontWeight = FontWeight.Medium,
-                )
-                Switch(
-                    checked = isAllDay,
-                    onCheckedChange = onAllDayToggle,
-                    colors =
-                        SwitchDefaults.colors(
-                            checkedThumbColor = Background,
-                            checkedTrackColor = Accent,
-                            uncheckedThumbColor = Color(0xff768EA4),
-                            uncheckedTrackColor = Color(0x33475985),
-                            uncheckedBorderColor = Color.Transparent,
-                        ),
-                )
-            }
-        }
-
-        if (!isAllDay) {
-            Spacer(modifier = Modifier.height(14.dp))
-
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(10.dp))
-                        .background(Secondary)
-                        .padding(horizontal = 8.dp),
-            ) {
-                Column {
-                    Row(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 8.dp, vertical = 6.dp),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                        Text(
-                            text = "From",
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = Color(0xff566A7B),
-                        )
-                        Box(
-                            modifier =
-                                Modifier
-                                    .clip(RoundedCornerShape(8.dp))
-                                    .background(Color(0x33475985))
-                                    .clickable { showFromTimePicker = true }
-                                    .padding(horizontal = 10.dp, vertical = 4.dp),
-                        ) {
-                            Text(
-                                text = fromTime,
-                                style =
-                                    MaterialTheme.typography.labelLarge.copy(
-                                        fontWeight = FontWeight.Light,
-                                    ),
-                                color = TextColor,
-                            )
-                        }
-                    }
-
-                    HorizontalDivider(
-                        color = DividerColor,
-                        thickness = 1.dp,
-                    )
-
-                    Row(
-                        modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 8.dp, vertical = 6.dp),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                        Text(
-                            text = "To",
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = Color(0xff566A7B),
-                        )
-                        Box(
-                            modifier =
-                                Modifier
-                                    .clip(RoundedCornerShape(8.dp))
-                                    .background(Color(0x33475985))
-                                    .clickable { showToTimePicker = true }
-                                    .padding(horizontal = 10.dp, vertical = 4.dp),
-                        ) {
-                            Text(
-                                text = toTime,
-                                style =
-                                    MaterialTheme.typography.labelLarge.copy(
-                                        fontWeight = FontWeight.Light,
-                                    ),
-                                color = TextColor,
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
-        Spacer(modifier = Modifier.height(32.dp))
-    }
-
-    if (showFromTimePicker) {
-        AlertDialog(
-            onDismissRequest = { showFromTimePicker = false },
-            title = { Text("Select From Time") },
-            text = {
-                TimePicker(
-                    state = fromTimePickerState,
-                    colors =
-                        TimePickerDefaults.colors(
-                            containerColor = Secondary,
-                            timeSelectorSelectedContainerColor = Accent,
-                            timeSelectorUnselectedContainerColor = Background,
-                            timeSelectorSelectedContentColor = Background,
-                            timeSelectorUnselectedContentColor = TextColor,
-                            clockDialColor = Secondary,
-                            clockDialUnselectedContentColor = TextColor,
-                            clockDialSelectedContentColor = Secondary,
-                        ),
-                )
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        onFromTimeChange(
-                            String.format(Locale.getDefault(), "%02d:%02d", fromTimePickerState.hour, fromTimePickerState.minute),
-                        )
-                        showFromTimePicker = false
-                    },
-                ) {
-                    Text("OK", color = Accent)
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { showFromTimePicker = false }) {
-                    Text("Cancel", color = Red)
-                }
-            },
-            containerColor = Background,
-        )
-    }
-
-    if (showToTimePicker) {
-        AlertDialog(
-            onDismissRequest = { showToTimePicker = false },
-            title = { Text("Select To Time") },
-            text = {
-                TimePicker(
-                    state = toTimePickerState,
-                    colors =
-                        TimePickerDefaults.colors(
-                            containerColor = Secondary,
-                            timeSelectorSelectedContainerColor = Accent,
-                            timeSelectorUnselectedContainerColor = Background,
-                            timeSelectorSelectedContentColor = Background,
-                            timeSelectorUnselectedContentColor = TextColor,
-                            clockDialColor = Secondary,
-                            clockDialUnselectedContentColor = TextColor,
-                            clockDialSelectedContentColor = Secondary,
-                        ),
-                )
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        onToTimeChange(String.format(Locale.getDefault(), "%02d:%02d", toTimePickerState.hour, toTimePickerState.minute))
-                        showToTimePicker = false
-                    },
-                ) {
-                    Text("OK", color = Accent)
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { showToTimePicker = false }) {
-                    Text("Cancel", color = Red)
-                }
-            },
-            containerColor = Background,
-        )
-    }
-}
-
-@Composable
-fun SecondPage(
-    title: String,
-    onTitleChange: (String) -> Unit,
-    description: String,
-    onDescriptionChange: (String) -> Unit,
-    subject: String,
-    attachmentUrl: String,
-    onAttachmentUrlChange: (String) -> Unit,
-    selectedAlert: AlertOption,
-    onAlertChange: (AlertOption) -> Unit,
-    onBack: () -> Unit,
-    onAdd: () -> Unit,
-) {
-    val context = LocalContext.current
-
-    fun validateInput(): Boolean {
-        if (title.trim().isEmpty()) {
-            Toast.makeText(context, "Title is required", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        if (title.trim().length > 100) {
-            Toast.makeText(context, "Title must be less than 100 characters", Toast.LENGTH_SHORT).show()
-            return false
-        }
-        if (description.trim().isEmpty()) {
-            Toast.makeText(context, "Description is required", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        if (description.trim().length > 500) {
-            Toast.makeText(context, "Description must be less than 500 characters", Toast.LENGTH_SHORT).show()
-            return false
-        }
-
-        if (attachmentUrl.trim().isNotEmpty()) {
-            val urlPattern =
-                Regex(
-                    "((http|https)://)(www.)?" +
-                        "[a-zA-Z0-9@:%._+~#?&/=]" +
-                        "{2,256}\\.[a-z]" +
-                        "{2,6}\\b([-a-zA-Z0-9@:%" +
-                        "._+~#?&/=]*)",
-                )
-            if (!urlPattern.matches(attachmentUrl.trim())) {
-                Toast.makeText(context, "Please enter a valid URL", Toast.LENGTH_SHORT).show()
-                return false
-            }
-        }
-        return true
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 20.dp),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            TextButton(
-                onClick = onBack,
-                colors = ButtonDefaults.textButtonColors(contentColor = Red),
-            ) {
-                Text("Back", style = MaterialTheme.typography.bodySmall)
-            }
-
-            TextButton(
-                onClick = {
-                    if (validateInput()) {
-                        onAdd()
-                    }
-                },
-                colors = ButtonDefaults.textButtonColors(contentColor = Accent),
-            ) {
-                Text("Add", fontSize = 16.sp, fontWeight = FontWeight.Medium)
-            }
-        }
-
-        Text(
-            text = "Set New Reminder",
-            style = MaterialTheme.typography.headlineLarge,
-            color = TextColor,
-            fontWeight = FontWeight.Medium,
-            modifier = Modifier.fillMaxWidth(),
-            textAlign = TextAlign.Center,
-        )
-
-        Spacer(modifier = Modifier.height(22.dp))
-
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(Secondary)
-                    .padding(horizontal = 4.dp),
-        ) {
-            Column {
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 12.dp, vertical = 6.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    ReminderTextField(
-                        value = title,
-                        onValueChange = onTitleChange,
-                        placeholder = "Title",
-                        maxLines = 1,
-                    )
-                }
-
-                HorizontalDivider(
-                    color = DividerColor,
-                    thickness = 1.dp,
-                )
-
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 12.dp, vertical = 6.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    ReminderTextField(
-                        value = description,
-                        onValueChange = onDescriptionChange,
-                        placeholder = "Description",
-                        maxLines = 3,
-                    )
-                }
-            }
-        }
-
-        Spacer(modifier = Modifier.height(14.dp))
-
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(Secondary)
-                    .padding(horizontal = 8.dp),
-        ) {
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 8.dp, vertical = 6.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = "Subject",
-                    style =
-                        MaterialTheme.typography.bodyMedium.copy(
-                            fontSize = 16.sp,
-                            letterSpacing = (-0.16).sp,
-                        ),
-                    color = TextColor,
-                )
-
-                Spacer(modifier = Modifier.width(32.dp))
-
-                Box(
-                    modifier =
-                        Modifier
-                            .clip(RoundedCornerShape(8.dp))
-                            .background(Color(0x33475985))
-                            .padding(horizontal = 10.dp, vertical = 4.dp),
-                ) {
-                    Text(
-                        text = subject,
-                        style =
-                            MaterialTheme.typography.labelLarge.copy(
-                                fontWeight = FontWeight.Light,
-                            ),
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1,
-                        color = TextColor,
-                    )
-                }
-            }
-        }
-
-        Spacer(modifier = Modifier.height(14.dp))
-
-        AlertDropdownBox(
-            selectedAlert = selectedAlert,
-            onAlertChange = onAlertChange,
-        )
-
-        Spacer(modifier = Modifier.height(14.dp))
-
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp))
-                    .background(Secondary)
-                    .padding(horizontal = 4.dp),
-        ) {
-            Column {
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 12.dp, vertical = 6.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Text(
-                        text = "Add attachment...",
-                        style =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                fontSize = 16.sp,
-                                letterSpacing = (-0.16).sp,
-                            ),
-                        color = TextColor,
-                    )
-                }
-
-                HorizontalDivider(
-                    color = DividerColor,
-                    thickness = 1.dp,
-                )
-
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 12.dp, vertical = 6.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    ReminderTextField(
-                        value = attachmentUrl,
-                        onValueChange = onAttachmentUrlChange,
-                        placeholder = "URL",
-                        maxLines = 1,
-                    )
-                }
-            }
-        }
-
-        Spacer(modifier = Modifier.height(32.dp))
-    }
-}
-
-@Composable
-fun ReminderTextField(
-    value: String,
-    onValueChange: (String) -> Unit,
-    placeholder: String,
-    minLines: Int = 1,
-    maxLines: Int = Int.MAX_VALUE,
-) {
-    BasicTextField(
-        value = value,
-        onValueChange = onValueChange,
-        textStyle =
-            MaterialTheme.typography.bodyMedium.copy(
-                color = TextColor,
-                fontSize = 16.sp,
-                letterSpacing = (-0.16).sp,
-            ),
-        cursorBrush = SolidColor(Accent),
-        minLines = minLines,
-        maxLines = maxLines,
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(8.dp))
-                .background(Color.Transparent),
-        decorationBox = { innerTextField ->
-            Box {
-                if (value.isEmpty() && placeholder.isNotEmpty()) {
-                    Text(
-                        text = placeholder,
-                        style =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                color = TextColor,
-                                fontSize = 16.sp,
-                                letterSpacing = (-0.16).sp,
-                            ),
-                        color = Color(0xff566A7B),
-                        fontSize = 16.sp,
-                    )
-                }
-                innerTextField()
-            }
-        },
-    )
-}
-
-@Composable
-fun AlertDropdownBox(
-    selectedAlert: AlertOption,
-    onAlertChange: (AlertOption) -> Unit,
-) {
-    var expanded by remember { mutableStateOf(false) }
-
-    Box(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(10.dp))
-                .background(Secondary)
-                .clickable { expanded = true }
-                .padding(horizontal = 4.dp),
-    ) {
-        Column {
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 12.dp, vertical = 6.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = "Alert",
-                    style =
-                        MaterialTheme.typography.bodyMedium.copy(
-                            fontSize = 16.sp,
-                            letterSpacing = (-0.16).sp,
-                        ),
-                    color = TextColor,
-                )
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Text(
-                        text = selectedAlert.displayText,
-                        style =
-                            MaterialTheme.typography.bodyMedium.copy(
-                                fontSize = 16.sp,
-                                letterSpacing = (-0.16).sp,
-                            ),
-                        color = Color(0xff334759),
-                    )
-
-                    Spacer(modifier = Modifier.width(4.dp))
-
-                    Icon(
-                        imageVector = Icons.Default.KeyboardArrowDown,
-                        contentDescription = "Expand dropdown",
-                        tint = Color(0xff334759),
-                        modifier = Modifier.size(16.dp),
-                    )
-                }
-            }
-        }
-
-        DropdownMenu(
-            expanded = expanded,
-            onDismissRequest = { expanded = false },
-            modifier = Modifier.background(Secondary),
-        ) {
-            AlertOption.entries.forEach { option: AlertOption ->
-                DropdownMenuItem(
-                    text = {
-                        Text(
-                            text = option.displayText,
-                            color = TextColor,
-                            style = MaterialTheme.typography.bodyMedium,
-                        )
-                    },
-                    onClick = {
-                        onAlertChange(option)
-                        expanded = false
-                    },
-                    colors =
-                        MenuDefaults.itemColors(
-                            textColor = TextColor,
-                        ),
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/coursepage/models/CoursePageModels.kt b/app/src/main/java/com/dscvit/vitty/ui/coursepage/models/CoursePageModels.kt
deleted file mode 100644
index 0613b1b..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/coursepage/models/CoursePageModels.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.dscvit.vitty.ui.coursepage.models
-
-enum class NoteType {
-    TEXT,
-    IMAGE,
-}
-
-data class Note(
-    val id: Long = 0,
-    val title: String,
-    val content: String,
-    val type: NoteType,
-    val isStarred: Boolean,
-    val imagePath: String? = null,
-)
-
-data class Reminder(
-    val id: Long = 0,
-    val title: String,
-    val description: String,
-    val dueDate: String,
-    val date: String = dueDate,
-    val status: ReminderStatus,
-    val dateMillis: Long,
-    val fromTime: String,
-    val toTime: String,
-    val isAllDay: Boolean,
-    val alertDaysBefore: Int,
-    val attachmentUrl: String? = null,
-    val courseId: String = "",
-    val courseTitle: String = "",
-)
-
-enum class ReminderStatus {
-    UPCOMING,
-    CAN_WAIT,
-    COMPLETED,
-}
-
-enum class AlertOption(
-    val displayText: String,
-    val days: Int,
-) {
-    NONE("None", 0),
-    SAME_DAY("Same day", 0),
-    ONE_DAY("1 day before", 1),
-    TWO_DAYS("2 days before", 2),
-    THREE_DAYS("3 days before", 3),
-    ONE_WEEK("1 week before", 7),
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/emptyclassrooms/EmptyClassroomsContent.kt b/app/src/main/java/com/dscvit/vitty/ui/emptyclassrooms/EmptyClassroomsContent.kt
deleted file mode 100644
index 2c97b80..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/emptyclassrooms/EmptyClassroomsContent.kt
+++ /dev/null
@@ -1,379 +0,0 @@
-package com.dscvit.vitty.ui.emptyclassrooms
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.GridItemSpan
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.LocationOn
-import androidx.compose.material.icons.filled.Refresh
-import androidx.compose.material.icons.filled.Warning
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.R
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.util.Constants
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun EmptyClassroomsContent(
-    onBackClick: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val context = LocalContext.current
-    val prefs = remember { context.getSharedPreferences(Constants.USER_INFO, 0) }
-    val token = remember { prefs.getString(Constants.COMMUNITY_TOKEN, "") ?: "" }
-
-    var emptyClassrooms by remember { mutableStateOf<List<String>>(emptyList()) }
-    var isLoading by remember { mutableStateOf(true) }
-    var selectedSlot by remember { mutableStateOf("A1") }
-    var errorMessage by remember { mutableStateOf<String?>(null) }
-
-    val regularSlots =
-        listOf(
-            "A1",
-            "A2",
-            "B1",
-            "B2",
-            "C1",
-            "C2",
-            "D1",
-            "D2",
-            "E1",
-            "E2",
-            "F1",
-            "F2",
-            "G1",
-            "G2",
-            "V1",
-            "V2",
-            "TA1",
-            "TA2",
-            "TB1",
-            "TB2",
-            "TC1",
-            "TC2",
-            "TD1",
-            "TD2",
-            "TE1",
-            "TE2",
-            "TF1",
-            "TF2",
-            "TG1",
-            "TG2",
-        )
-
-    fun fetchEmptyClassrooms(slot: String) {
-        if (token.isEmpty()) {
-            errorMessage = "Authentication required"
-            isLoading = false
-            return
-        }
-
-        isLoading = true
-        errorMessage = null
-        APICommunityRestClient.instance.getEmptyClassrooms(token, slot) { response ->
-            isLoading = false
-            if (response != null) {
-                emptyClassrooms = response[slot] ?: emptyList()
-            } else {
-                errorMessage = "Failed to fetch empty classrooms"
-                emptyClassrooms = emptyList()
-            }
-        }
-    }
-
-    LaunchedEffect(selectedSlot) {
-        fetchEmptyClassrooms(selectedSlot)
-    }
-
-    Scaffold(
-        topBar = {
-            CenterAlignedTopAppBar(
-                title = {
-                    Text(
-                        text = "Empty Classrooms",
-                        color = TextColor,
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                },
-                navigationIcon = {
-                    IconButton(onClick = onBackClick) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_round_chevron_left),
-                            contentDescription = "Back",
-                            tint = TextColor,
-                        )
-                    }
-                },
-                actions = {
-                    IconButton(onClick = { fetchEmptyClassrooms(selectedSlot) }) {
-                        Icon(
-                            imageVector = Icons.Default.Refresh,
-                            contentDescription = "Refresh",
-                            tint = TextColor,
-                        )
-                    }
-                },
-                colors =
-                    TopAppBarDefaults.centerAlignedTopAppBarColors(
-                        containerColor = Background,
-                    ),
-            )
-        },
-        containerColor = Background,
-        modifier = modifier,
-    ) { paddingValues ->
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(paddingValues),
-        ) {
-            Column(
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
-            ) {
-                LazyRow(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    contentPadding = PaddingValues(horizontal = 4.dp),
-                ) {
-                    items(regularSlots) { slot ->
-                        SlotChip(
-                            slot = slot,
-                            isSelected = selectedSlot == slot,
-                            onClick = { selectedSlot = slot },
-                        )
-                    }
-                }
-            }
-
-            LazyVerticalGrid(
-                columns = GridCells.Fixed(2),
-                modifier = Modifier.fillMaxSize(),
-                contentPadding = PaddingValues(16.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-                horizontalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                if (isLoading) {
-                    item(span = { GridItemSpan(2) }) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .height(200.dp),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            Column(
-                                horizontalAlignment = Alignment.CenterHorizontally,
-                            ) {
-                                CircularProgressIndicator(color = Accent)
-                            }
-                        }
-                    }
-                } else if (errorMessage != null) {
-                    item(span = { GridItemSpan(2) }) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxSize()
-                                    .padding(32.dp),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            Column(
-                                horizontalAlignment = Alignment.CenterHorizontally,
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Default.Warning,
-                                    contentDescription = null,
-                                    tint = Accent,
-                                    modifier = Modifier.size(48.dp),
-                                )
-                                Spacer(modifier = Modifier.height(16.dp))
-                                Text(
-                                    text = errorMessage!!,
-                                    color = TextColor,
-                                    fontSize = 16.sp,
-                                    textAlign = TextAlign.Center,
-                                )
-                            }
-                        }
-                    }
-                } else if (emptyClassrooms.isEmpty()) {
-                    item(span = { GridItemSpan(2) }) {
-                        Box(
-                            modifier =
-                                Modifier
-                                    .fillMaxSize()
-                                    .padding(32.dp),
-                            contentAlignment = Alignment.Center,
-                        ) {
-                            Column(
-                                horizontalAlignment = Alignment.CenterHorizontally,
-                            ) {
-                                Icon(
-                                    painter = painterResource(R.drawable.ic_empty_classroom),
-                                    contentDescription = null,
-                                    tint = Accent,
-                                    modifier = Modifier.size(48.dp),
-                                )
-                                Spacer(modifier = Modifier.height(16.dp))
-                                Text(
-                                    text = "No empty classrooms found",
-                                    color = TextColor,
-                                    fontSize = 16.sp,
-                                    fontWeight = FontWeight.Medium,
-                                )
-                                Spacer(modifier = Modifier.height(4.dp))
-                                Text(
-                                    text = "All classrooms are occupied during $selectedSlot slot",
-                                    color = Accent,
-                                    fontSize = 14.sp,
-                                    textAlign = TextAlign.Center,
-                                )
-                            }
-                        }
-                    }
-                } else {
-                    item(span = { GridItemSpan(2) }) {
-                        Text(
-                            text = "${emptyClassrooms.size} empty classrooms found for $selectedSlot",
-                            style = MaterialTheme.typography.titleMedium,
-                            color = TextColor,
-                            modifier = Modifier.padding(bottom = 8.dp),
-                        )
-                    }
-
-                    items(emptyClassrooms) { classroom ->
-                        ClassroomCard(classroom = classroom)
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SlotChip(
-    slot: String,
-    isSelected: Boolean,
-    onClick: () -> Unit,
-) {
-    Box(
-        modifier =
-            Modifier
-                .clip(RoundedCornerShape(20.dp))
-                .background(
-                    if (isSelected) Accent else Secondary,
-                ).border(
-                    1.dp,
-                    if (isSelected) Accent else Secondary,
-                    RoundedCornerShape(20.dp),
-                ).clickable { onClick() }
-                .padding(horizontal = 16.dp, vertical = 8.dp),
-    ) {
-        Text(
-            text = slot,
-            color = if (isSelected) Background else TextColor,
-            fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal,
-            fontSize = 14.sp,
-        )
-    }
-}
-
-@Composable
-private fun ClassroomCard(classroom: String) {
-    Card(
-        modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(containerColor = Secondary),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
-        shape = RoundedCornerShape(12.dp),
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .size(40.dp)
-                        .background(Accent.copy(alpha = 0.1f), CircleShape),
-                contentAlignment = Alignment.Center,
-            ) {
-                Icon(
-                    imageVector = Icons.Default.LocationOn,
-                    contentDescription = null,
-                    tint = Accent,
-                    modifier = Modifier.size(24.dp),
-                )
-            }
-
-            Spacer(modifier = Modifier.height(12.dp))
-
-            Text(
-                text = classroom,
-                style = MaterialTheme.typography.titleMedium,
-                color = TextColor,
-                fontWeight = FontWeight.SemiBold,
-                textAlign = TextAlign.Center,
-            )
-
-            Spacer(modifier = Modifier.height(4.dp))
-
-            Text(
-                text = "Available",
-                style = MaterialTheme.typography.bodySmall,
-                color = Accent,
-                textAlign = TextAlign.Center,
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/events/VITEventsViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/events/VITEventsViewModel.kt
index f282c98..83f0ef5 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/events/VITEventsViewModel.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/events/VITEventsViewModel.kt
@@ -3,9 +3,9 @@ package com.dscvit.vitty.ui.events
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.dscvit.vitty.api.ApiEventRestClient
+import com.dscvit.vitty.api.RetrofitEventListener
 import com.dscvit.vitty.model.EventDetails
-import com.dscvit.vitty.network.api.events.ApiEventRestClient
-import com.dscvit.vitty.network.api.events.RetrofitEventListener
 import retrofit2.Call
 
 class VITEventsViewModel : ViewModel() {
@@ -21,7 +21,6 @@ class VITEventsViewModel : ViewModel() {
             override fun onSuccess(call: Call<EventDetails>?, response: EventDetails?) {
                 _events.postValue(response)
             }
-
             override fun onError(call: Call<EventDetails>?, t: Throwable?) {
                 _events.postValue(null)
             }
diff --git a/app/src/main/java/com/dscvit/vitty/ui/main/MainComposeApp.kt b/app/src/main/java/com/dscvit/vitty/ui/main/MainComposeApp.kt
deleted file mode 100644
index 58d4ad1..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/main/MainComposeApp.kt
+++ /dev/null
@@ -1,1445 +0,0 @@
-package com.dscvit.vitty.ui.main
-
-import android.app.Activity
-import android.content.Intent
-import android.content.SharedPreferences
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
-import androidx.compose.animation.scaleOut
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.DrawerValue
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalDrawerSheet
-import androidx.compose.material3.ModalNavigationDrawer
-import androidx.compose.material3.NavigationDrawerItem
-import androidx.compose.material3.NavigationDrawerItemDefaults
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberDrawerState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.navigation.compose.rememberNavController
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.activity.SettingsActivity
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.theme.VittyTheme
-import com.dscvit.vitty.ui.academics.AcademicsScreenContent
-import com.dscvit.vitty.ui.academics.AcademicsViewModel
-import com.dscvit.vitty.ui.academics.models.Course
-import com.dscvit.vitty.ui.components.CampusUpdateDialog
-import com.dscvit.vitty.ui.connect.AddFriendScreenContent
-import com.dscvit.vitty.ui.connect.AddParticipantsScreenContent
-import com.dscvit.vitty.ui.connect.CircleDetailScreenContent
-import com.dscvit.vitty.ui.connect.CircleMemberDetailScreenContent
-import com.dscvit.vitty.ui.connect.CircleRequestsScreenContent
-import com.dscvit.vitty.ui.connect.ConnectScreenContent
-import com.dscvit.vitty.ui.connect.ConnectViewModel
-import com.dscvit.vitty.ui.connect.FriendDetailScreenContent
-import com.dscvit.vitty.ui.connect.FriendRequestsScreenContent
-import com.dscvit.vitty.ui.coursepage.CoursePageContent
-import com.dscvit.vitty.ui.coursepage.CoursePageViewModel
-import com.dscvit.vitty.ui.coursepage.models.Note
-import com.dscvit.vitty.ui.emptyclassrooms.EmptyClassroomsContent
-import com.dscvit.vitty.ui.notes.NoteScreenContent
-import com.dscvit.vitty.ui.schedule.ScheduleScreenContent
-import com.dscvit.vitty.ui.schedule.ScheduleViewModel
-import com.dscvit.vitty.util.Analytics
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.LogoutHelper
-import com.dscvit.vitty.util.MaintenanceChecker
-import com.dscvit.vitty.util.SemesterUtils
-import com.dscvit.vitty.util.UtilFunctions
-import com.dscvit.vitty.ui.maintenance.MaintenanceBannerDialog
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import java.net.URLDecoder
-import java.net.URLEncoder
-import java.nio.charset.StandardCharsets
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-
-@Composable
-fun MainComposeApp() {
-    val navController = rememberNavController()
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
-    val currentRoute = navBackStackEntry?.destination?.route
-    val scope = rememberCoroutineScope()
-    val connectViewModel: ConnectViewModel = viewModel()
-    val academicsViewModel: AcademicsViewModel = viewModel()
-    val coursePageViewModel: CoursePageViewModel = viewModel()
-
-    val context = LocalContext.current
-    val prefs = remember { context.getSharedPreferences(Constants.USER_INFO, 0) }
-
-    var campus by remember { mutableStateOf(prefs.getString(Constants.COMMUNITY_CAMPUS, "") ?: "") }
-    var showCampusDialog by remember { mutableStateOf(campus.isEmpty()) }
-    
-    // Maintenance banner state
-    var showMaintenanceBanner by remember { mutableStateOf(false) }
-
-    DisposableEffect(Unit) {
-        val listener =
-                SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-                    if (key == Constants.COMMUNITY_CAMPUS) {
-                        val newCampus = prefs.getString(Constants.COMMUNITY_CAMPUS, "") ?: ""
-                        campus = newCampus
-                        showCampusDialog = newCampus.isEmpty()
-                    }
-                }
-        prefs.registerOnSharedPreferenceChangeListener(listener)
-
-        onDispose { prefs.unregisterOnSharedPreferenceChangeListener(listener) }
-    }
-
-    var bottomNavVisible by remember { mutableStateOf(true) }
-    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
-
-    LaunchedEffect(currentRoute) {
-        bottomNavVisible =
-                currentRoute?.let { route ->
-                    !route.startsWith("course_page") &&
-                            !route.startsWith("note_screen") &&
-                            route != "empty_classrooms" &&
-                            !route.startsWith("friend_detail") &&
-                            !route.startsWith("circle_detail") &&
-                            route != "add_friend" &&
-                            route != "friend_requests" &&
-                            route != "circle_requests" &&
-                            !route.startsWith("circle_member_detail") &&
-                            !route.startsWith("add_participants")
-                }
-                        ?: true
-
-        currentRoute?.let { route ->
-            val screenName =
-                    when {
-                        route == "academics" -> "Academics Screen"
-                        route == "schedule" -> "Schedule Screen"
-                        route == "connect" -> "Connect Screen"
-                        route.startsWith("course_page") -> "Course Detail Screen"
-                        route.startsWith("note_screen") -> "Note Editor Screen"
-                        route == "empty_classrooms" -> "Empty Classrooms Screen"
-                        route.startsWith("friend_detail") -> "Friend Detail Screen"
-                        route.startsWith("circle_detail") -> "Circle Detail Screen"
-                        route == "add_friend" -> "Add Friend Screen"
-                        route == "friend_requests" -> "Friend Requests Screen"
-                        route == "circle_requests" -> "Circle Requests Screen"
-                        route.startsWith("circle_member_detail") -> "Circle Member Detail Screen"
-                        route.startsWith("add_participants") -> "Add Participants Screen"
-                        else -> route
-                    }
-            Analytics.appNavigation(screenName)
-        }
-    }
-
-    LaunchedEffect(Unit) {
-        val activeFriendsFetched = prefs.getBoolean(Constants.ACTIVE_FRIENDS_FETCHED, false)
-        val activeFriendsList = prefs.getString(Constants.ACTIVE_FRIENDS_LIST, "")
-        val listType = object : TypeToken<List<String>>() {}.type
-        val cachedList: List<String> =
-                try {
-                    Gson().fromJson(activeFriendsList, listType) ?: emptyList()
-                } catch (e: Exception) {
-                    emptyList()
-                }
-
-        if (!activeFriendsFetched) {
-            val token = prefs.getString(Constants.COMMUNITY_TOKEN, null)
-            if (!token.isNullOrEmpty()) {
-                connectViewModel.fetchActiveFriends(token, prefs)
-            }
-        }
-
-        if (activeFriendsFetched) {
-            connectViewModel.updateActiveFriendsList(cachedList)
-        }
-    }
-
-    LaunchedEffect(Unit) {
-        if (UtilFunctions.isNetworkAvailable(context)) {
-            MaintenanceChecker.checkMaintenanceStatusAsync(context) { isUnderMaintenance ->
-                Timber.d("Dialog check result: isUnderMaintenance=%s", isUnderMaintenance)
-                showMaintenanceBanner = isUnderMaintenance
-            }
-        } else {
-            Timber.d("No network available")
-        }
-    }
-
-    VittyTheme {
-        ModalNavigationDrawer(
-                drawerState = drawerState,
-                drawerContent = {
-                    DrawerContent(
-                            navController = navController,
-                            onCloseDrawer = { scope.launch { drawerState.close() } }
-                    )
-                },
-        ) {
-            Box(
-                    modifier =
-                            Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background),
-            ) {
-                NavHost(
-                        navController = navController,
-                        startDestination = "schedule",
-                        modifier = Modifier.fillMaxSize(),
-                ) {
-                    composable(
-                            "academics",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { -it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.8f,
-                                                        stiffness = 300f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(300))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { -it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.8f,
-                                                        stiffness = 300f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(200))
-                            },
-                    ) {
-                        AcademicsComposeScreen(
-                                navController = navController,
-                                onOpenDrawer = { scope.launch { drawerState.open() } },
-                                academicsViewModel,
-                                coursePageViewModel,
-                        )
-                    }
-                    composable(
-                            "schedule",
-                            enterTransition = {
-                                when (initialState.destination.route) {
-                                    "academics" ->
-                                            slideInHorizontally(
-                                                    initialOffsetX = { it },
-                                                    animationSpec =
-                                                            spring(
-                                                                    dampingRatio = 0.8f,
-                                                                    stiffness = 300f,
-                                                            ),
-                                            ) + fadeIn(animationSpec = tween(300))
-                                    "connect" ->
-                                            slideInHorizontally(
-                                                    initialOffsetX = { -it },
-                                                    animationSpec =
-                                                            spring(
-                                                                    dampingRatio = 0.8f,
-                                                                    stiffness = 300f,
-                                                            ),
-                                            ) + fadeIn(animationSpec = tween(300))
-                                    else -> fadeIn(animationSpec = tween(300))
-                                }
-                            },
-                            exitTransition = {
-                                when (targetState.destination.route) {
-                                    "academics" ->
-                                            slideOutHorizontally(
-                                                    targetOffsetX = { it },
-                                                    animationSpec =
-                                                            spring(
-                                                                    dampingRatio = 0.8f,
-                                                                    stiffness = 300f,
-                                                            ),
-                                            ) + fadeOut(animationSpec = tween(200))
-                                    "connect" ->
-                                            slideOutHorizontally(
-                                                    targetOffsetX = { -it },
-                                                    animationSpec =
-                                                            spring(
-                                                                    dampingRatio = 0.8f,
-                                                                    stiffness = 300f,
-                                                            ),
-                                            ) + fadeOut(animationSpec = tween(200))
-                                    else -> fadeOut(animationSpec = tween(200))
-                                }
-                            },
-                    ) {
-                        ScheduleComposeScreen(
-                                navController = navController,
-                                onOpenDrawer = { scope.launch { drawerState.open() } },
-                        )
-                    }
-                    composable(
-                            "connect",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.8f,
-                                                        stiffness = 300f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(300))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.8f,
-                                                        stiffness = 300f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(200))
-                            },
-                    ) {
-                        ConnectComposeScreen(
-                                navController = navController,
-                                connectViewModel = connectViewModel,
-                        )
-                    }
-                    composable(
-                            "friend_detail/{friendData}",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) { backStackEntry ->
-                        val encodedFriendData =
-                                backStackEntry.arguments?.getString("friendData") ?: ""
-                        val friendData =
-                                URLDecoder.decode(
-                                        encodedFriendData,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-
-                        val friend =
-                                try {
-                                    Gson().fromJson(friendData, UserResponse::class.java)
-                                } catch (e: Exception) {
-                                    null
-                                }
-
-                        if (friend != null) {
-                            FriendDetailScreenContent(
-                                    friend = friend,
-                                    onBackClick = { navController.popBackStack() },
-                                    connectViewModel = connectViewModel,
-                            )
-                        } else {
-                            LaunchedEffect(Unit) { navController.popBackStack() }
-                        }
-                    }
-                    composable(
-                            "add_friend",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) {
-                        AddFriendScreenContent(
-                                onBackClick = { navController.popBackStack() },
-                        )
-                    }
-                    composable(
-                            "friend_requests",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) {
-                        FriendRequestsScreenContent(
-                                onBackClick = { navController.popBackStack() },
-                                connectViewModel = connectViewModel,
-                        )
-                    }
-                    composable(
-                            "circle_requests",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) {
-                        CircleRequestsScreenContent(
-                                onBackClick = { navController.popBackStack() },
-                                connectViewModel = connectViewModel,
-                        )
-                    }
-                    composable(
-                            "add_participants/{circleId}",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) { backStackEntry ->
-                        val circleId = backStackEntry.arguments?.getString("circleId") ?: ""
-                        AddParticipantsScreenContent(
-                                navController = navController,
-                                circleId = circleId,
-                        )
-                    }
-                    composable(
-                            "course_page/{courseTitle}/{courseCode}",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) { backStackEntry ->
-                        val encodedCourseTitle =
-                                backStackEntry.arguments?.getString("courseTitle") ?: ""
-                        val encodedCourseCode =
-                                backStackEntry.arguments?.getString("courseCode") ?: ""
-                        val courseTitle =
-                                URLDecoder.decode(
-                                        encodedCourseTitle,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-                        val courseCode =
-                                URLDecoder.decode(
-                                        encodedCourseCode,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-                        CoursePageContent(
-                                courseTitle = courseTitle,
-                                courseCode = courseCode,
-                                onBackClick = { navController.popBackStack() },
-                                onNavigateToNote = { courseCodeParam, noteId, _ ->
-                                    val encodedCourseCodeParam =
-                                            URLEncoder.encode(
-                                                    courseCodeParam,
-                                                    StandardCharsets.UTF_8.toString(),
-                                            )
-                                    val encodedNoteId =
-                                            noteId?.let {
-                                                URLEncoder.encode(
-                                                        it,
-                                                        StandardCharsets.UTF_8.toString(),
-                                                )
-                                            }
-                                                    ?: "new"
-                                    navController.navigate(
-                                            "note_screen/$encodedCourseCodeParam/$encodedNoteId",
-                                    )
-                                },
-                        )
-                    }
-                    composable(
-                            "note_screen/{courseCode}/{noteId}",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) { backStackEntry ->
-                        val encodedCourseCode =
-                                backStackEntry.arguments?.getString("courseCode") ?: ""
-                        val encodedNoteId = backStackEntry.arguments?.getString("noteId") ?: "new"
-                        val courseCode =
-                                URLDecoder.decode(
-                                        encodedCourseCode,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-                        val noteId =
-                                if (encodedNoteId == "new") {
-                                    null
-                                } else {
-                                    URLDecoder.decode(
-                                            encodedNoteId,
-                                            StandardCharsets.UTF_8.toString(),
-                                    )
-                                }
-
-                        val viewModel: CoursePageViewModel = viewModel()
-                        var noteToEdit by remember { mutableStateOf<Note?>(null) }
-
-                        LaunchedEffect(noteId) {
-                            if (noteId != null) {
-                                noteToEdit = viewModel.getNoteById(noteId)
-                            }
-                        }
-
-                        NoteScreenContent(
-                                onBackClick = { navController.popBackStack() },
-                                noteToEdit = noteToEdit,
-                                onSaveNote = { title, content ->
-                                    viewModel.setCourseId(courseCode)
-                                    if (noteToEdit != null) {
-                                        viewModel.updateExistingNote(
-                                                noteId = noteToEdit!!.id.toString(),
-                                                title = title,
-                                                content = content,
-                                                isStarred = noteToEdit!!.isStarred,
-                                        )
-                                    } else {
-                                        viewModel.addTextNote(title, content)
-                                    }
-                                    navController.popBackStack()
-                                },
-                        )
-                    }
-                    composable(
-                            "empty_classrooms",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) {
-                        EmptyClassroomsContent(
-                                onBackClick = { navController.popBackStack() },
-                        )
-                    }
-                    composable(
-                            "circle_detail/{circleData}/{circleMembersData}",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) { backStackEntry ->
-                        val encodedCircleData =
-                                backStackEntry.arguments?.getString("circleData") ?: ""
-                        val encodedCircleMembersData =
-                                backStackEntry.arguments?.getString("circleMembersData")
-                        val circleData =
-                                URLDecoder.decode(
-                                        encodedCircleData,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-                        val circleMembersData =
-                                URLDecoder.decode(
-                                        encodedCircleMembersData,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-
-                        val circle =
-                                try {
-                                    Gson().fromJson(
-                                                    circleData,
-                                                    com.dscvit.vitty.network.api.community.responses
-                                                                    .user.CircleItem::class
-                                                            .java,
-                                            )
-                                } catch (e: Exception) {
-                                    null
-                                }
-
-                        val circleMembers =
-                                try {
-                                    Gson().fromJson(
-                                                    circleMembersData,
-                                                    com.dscvit.vitty.network.api.community.responses
-                                                                    .user.FriendResponse::class
-                                                            .java,
-                                            )
-                                } catch (e: Exception) {
-                                    null
-                                }
-
-                        if (circle != null) {
-                            CircleDetailScreenContent(
-                                    circle = circle,
-                                    circleMembers = circleMembers,
-                                    onBackClick = { navController.popBackStack() },
-                                    onMemberClick = { member, circleId ->
-                                        val memberJson = Gson().toJson(member)
-                                        val encodedMemberData =
-                                                URLEncoder.encode(
-                                                        memberJson,
-                                                        StandardCharsets.UTF_8.toString(),
-                                                )
-                                        navController.navigate(
-                                                "circle_member_detail/$encodedMemberData/$circleId",
-                                        )
-                                    },
-                                    onAddParticipantsClick = { circleId: String ->
-                                        navController.navigate("add_participants/$circleId")
-                                    },
-                                    connectViewModel = connectViewModel,
-                            )
-                        } else {
-                            LaunchedEffect(Unit) { navController.popBackStack() }
-                        }
-                    }
-                    composable(
-                            "circle_member_detail/{memberData}/{circleId}",
-                            enterTransition = {
-                                slideInHorizontally(
-                                        initialOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeIn(animationSpec = tween(250))
-                            },
-                            exitTransition = {
-                                slideOutHorizontally(
-                                        targetOffsetX = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 400f,
-                                                ),
-                                ) + fadeOut(animationSpec = tween(150))
-                            },
-                    ) { backStackEntry ->
-                        val encodedMemberData =
-                                backStackEntry.arguments?.getString("memberData") ?: ""
-                        val circleId = backStackEntry.arguments?.getString("circleId") ?: ""
-                        val memberData =
-                                URLDecoder.decode(
-                                        encodedMemberData,
-                                        StandardCharsets.UTF_8.toString(),
-                                )
-
-                        val member =
-                                try {
-                                    Gson().fromJson(memberData, UserResponse::class.java)
-                                } catch (e: Exception) {
-                                    null
-                                }
-
-                        if (member != null && circleId.isNotEmpty()) {
-                            CircleMemberDetailScreenContent(
-                                    member = member,
-                                    circleId = circleId,
-                                    onBackClick = { navController.popBackStack() },
-                            )
-                        } else {
-                            LaunchedEffect(Unit) { navController.popBackStack() }
-                        }
-                    }
-                }
-
-                AnimatedVisibility(
-                        visible = bottomNavVisible,
-                        enter =
-                                slideInVertically(
-                                        initialOffsetY = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.8f,
-                                                        stiffness = 300f,
-                                                ),
-                                ) +
-                                        fadeIn(
-                                                animationSpec =
-                                                        spring(
-                                                                dampingRatio = 0.8f,
-                                                                stiffness = 400f,
-                                                        ),
-                                        ) +
-                                        scaleIn(
-                                                initialScale = 0.6f,
-                                                animationSpec =
-                                                        spring(
-                                                                dampingRatio = 0.7f,
-                                                                stiffness = 350f,
-                                                        ),
-                                        ),
-                        exit =
-                                slideOutVertically(
-                                        targetOffsetY = { it },
-                                        animationSpec =
-                                                spring(
-                                                        dampingRatio = 0.9f,
-                                                        stiffness = 500f,
-                                                ),
-                                ) +
-                                        fadeOut(
-                                                animationSpec =
-                                                        spring(
-                                                                dampingRatio = 1.0f,
-                                                                stiffness = 600f,
-                                                        ),
-                                        ) +
-                                        scaleOut(
-                                                targetScale = 0.6f,
-                                                animationSpec =
-                                                        spring(
-                                                                dampingRatio = 0.8f,
-                                                                stiffness = 500f,
-                                                        ),
-                                        ),
-                        modifier = Modifier.align(Alignment.BottomCenter),
-                ) {
-                    BottomNavigationBar(
-                            currentRoute = currentRoute,
-                            onDestinationClick = { route ->
-                                navController.navigate(route) {
-                                    popUpTo(navController.graph.startDestinationId) {
-                                        saveState = true
-                                    }
-                                    launchSingleTop = true
-                                    restoreState = true
-                                }
-                            },
-                            modifier = Modifier.padding(bottom = 48.dp),
-                    )
-                }
-
-                if (showCampusDialog) {
-                    CampusUpdateDialog(
-                            onDismiss = { showCampusDialog = false },
-                    )
-                }
-                
-                // Maintenance Banner Dialog
-                MaintenanceBannerDialog(
-                    isVisible = showMaintenanceBanner,
-                    onDismiss = { 
-                        showMaintenanceBanner = false 
-                    },
-                    onRetryClick = {
-                        MaintenanceChecker.checkMaintenanceStatusAsync(context) { isUnderMaintenance ->
-                            showMaintenanceBanner = isUnderMaintenance
-                        }
-                    }
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun AcademicsComposeScreen(
-        navController: NavHostController,
-        onOpenDrawer: () -> Unit,
-        academicsViewModel: AcademicsViewModel,
-        coursePageViewModel: CoursePageViewModel,
-) {
-    val context = LocalContext.current
-    val prefs = remember { context.getSharedPreferences(Constants.USER_INFO, 0) }
-    val scheduleViewModel: ScheduleViewModel = viewModel()
-
-    var allCourses by remember { mutableStateOf<List<Course>>(emptyList()) }
-    var isLoading by remember { mutableStateOf(false) }
-    var hasLoadedData by remember { mutableStateOf(false) }
-
-    LaunchedEffect(Unit) {
-        if (hasLoadedData) return@LaunchedEffect
-
-        allCourses = loadCachedCourses(prefs)
-
-        val token = prefs.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        val username = prefs.getString(Constants.COMMUNITY_USERNAME, null) ?: ""
-
-        if (token.isNotEmpty() && username.isNotEmpty()) {
-            isLoading = true
-            scheduleViewModel.getUserWithTimeTable(token, username)
-        }
-
-        hasLoadedData = true
-    }
-
-    val userResponse by scheduleViewModel.user.observeAsState()
-
-    LaunchedEffect(userResponse) {
-        userResponse?.let { response ->
-            allCourses = withContext(Dispatchers.Default) { extractCoursesFromTimetable(response) }
-            isLoading = false
-        }
-    }
-
-    val profilePictureUrl = remember { prefs.getString(Constants.COMMUNITY_PICTURE, null) }
-
-    AcademicsScreenContent(
-            profilePictureUrl = profilePictureUrl,
-            allCourses = allCourses,
-            onCourseClick = { course ->
-                val encodedTitle =
-                        URLEncoder.encode(course.title, StandardCharsets.UTF_8.toString())
-                val encodedCode = URLEncoder.encode(course.code, StandardCharsets.UTF_8.toString())
-                navController.navigate("course_page/$encodedTitle/$encodedCode")
-            },
-            onOpenDrawer = onOpenDrawer,
-            academicsViewModel = academicsViewModel,
-            coursePageViewModel = coursePageViewModel,
-    )
-}
-
-@Composable
-fun ScheduleComposeScreen(
-        onOpenDrawer: () -> Unit,
-        navController: NavHostController,
-) {
-    ScheduleScreenContent(
-            onOpenDrawer = onOpenDrawer,
-            onCardClick = { title: String, code: String ->
-                val encodedTitle = URLEncoder.encode(title, StandardCharsets.UTF_8.toString())
-                val encodedCode = URLEncoder.encode(code, StandardCharsets.UTF_8.toString())
-                navController.navigate("course_page/$encodedTitle/$encodedCode")
-            },
-    )
-}
-
-@Composable
-fun ConnectComposeScreen(
-        navController: NavHostController,
-        connectViewModel: ConnectViewModel,
-) {
-    ConnectScreenContent(
-            onSearchClick = { navController.navigate("add_friend") },
-            onFriendClick = { friend ->
-                val friendJson = Gson().toJson(friend)
-                val encodedFriendData =
-                        URLEncoder.encode(friendJson, StandardCharsets.UTF_8.toString())
-                navController.navigate("friend_detail/$encodedFriendData")
-            },
-            onCircleClick = { circle, circleMembers ->
-                val circleJson = Gson().toJson(circle)
-                val encodedCircleData =
-                        URLEncoder.encode(circleJson, StandardCharsets.UTF_8.toString())
-                val encodedCircleMembers =
-                        URLEncoder.encode(
-                                Gson().toJson(circleMembers),
-                                StandardCharsets.UTF_8.toString(),
-                        )
-
-                navController.navigate("circle_detail/$encodedCircleData/$encodedCircleMembers")
-            },
-            onFriendRequestsClick = { navController.navigate("friend_requests") },
-            onCircleRequestsClick = { navController.navigate("circle_requests") },
-            connectViewModel = connectViewModel,
-    )
-}
-
-@Composable
-fun BottomNavigationBar(
-        currentRoute: String?,
-        onDestinationClick: (String) -> Unit,
-        modifier: Modifier = Modifier,
-) {
-    val cardScale by
-            animateFloatAsState(
-                    targetValue = 1.0f,
-                    animationSpec =
-                            spring(
-                                    dampingRatio = 0.6f,
-                                    stiffness = 200f,
-                            ),
-                    label = "cardScale",
-            )
-
-    Card(
-            modifier = modifier.padding(horizontal = 16.dp).scale(cardScale),
-            shape = RoundedCornerShape(120.dp),
-            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
-            colors =
-                    CardDefaults.cardColors(
-                            containerColor = Background,
-                    ),
-            border = BorderStroke(width = 1.dp, color = Secondary),
-    ) {
-        Row(
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                verticalAlignment = Alignment.CenterVertically,
-        ) {
-            NavigationItem(
-                    icon = R.drawable.ic_academics_outline,
-                    text = "Academics",
-                    isSelected = currentRoute == "academics",
-                    onClick = { onDestinationClick("academics") },
-            )
-
-            NavigationItem(
-                    icon = R.drawable.ic_timetable_outline,
-                    text = "Schedule",
-                    isSelected = currentRoute == "schedule",
-                    onClick = { onDestinationClick("schedule") },
-            )
-
-            NavigationItem(
-                    icon = R.drawable.ic_community_outline,
-                    text = "Connect",
-                    isSelected = currentRoute == "connect",
-                    onClick = { onDestinationClick("connect") },
-            )
-        }
-    }
-}
-
-@Composable
-fun NavigationItem(
-        icon: Int,
-        text: String,
-        isSelected: Boolean,
-        onClick: () -> Unit,
-        modifier: Modifier = Modifier,
-) {
-    val scale by
-            animateFloatAsState(
-                    targetValue = if (isSelected) 1.0f else 0.95f,
-                    animationSpec = tween(150),
-                    label = "scale",
-            )
-
-    val backgroundColor =
-            if (isSelected) {
-                Secondary
-            } else {
-                Color.Transparent
-            }
-
-    Row(
-            modifier =
-                    modifier.scale(scale)
-                            .clip(RoundedCornerShape(120.dp))
-                            .background(backgroundColor)
-                            .clickable(
-                                    indication = null,
-                                    interactionSource = remember { MutableInteractionSource() },
-                            ) { onClick() }
-                            .padding(horizontal = 20.dp, vertical = 14.dp),
-            horizontalArrangement = Arrangement.spacedBy(6.dp),
-            verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-                painter = painterResource(id = icon),
-                contentDescription = text,
-                tint = TextColor,
-                modifier = Modifier.size(24.dp),
-        )
-
-        AnimatedVisibility(
-                visible = isSelected,
-                enter = fadeIn(animationSpec = tween(150)),
-                exit = fadeOut(animationSpec = tween(100)),
-        ) {
-            Text(
-                    text = text,
-                    color = TextColor,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.Medium,
-                    maxLines = 1,
-            )
-        }
-    }
-}
-
-@Composable
-fun DrawerContent(
-        navController: NavHostController,
-        onCloseDrawer: () -> Unit
-) {
-    val context = LocalContext.current
-    val prefs = remember { context.getSharedPreferences(Constants.USER_INFO, 0) }
-    val profilePictureUrl = remember { prefs.getString(Constants.COMMUNITY_PICTURE, "") }
-    val username = remember { prefs.getString(Constants.COMMUNITY_USERNAME, "") ?: "User" }
-    val name = remember { prefs.getString(Constants.COMMUNITY_NAME, "") ?: "Name" }
-
-    var campus by remember { mutableStateOf(prefs.getString(Constants.COMMUNITY_CAMPUS, "") ?: "") }
-
-    DisposableEffect(Unit) {
-        val listener =
-                SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-                    when (key) {
-                        Constants.COMMUNITY_CAMPUS -> {
-                            campus = prefs.getString(Constants.COMMUNITY_CAMPUS, "") ?: ""
-                        }
-                    }
-                }
-        prefs.registerOnSharedPreferenceChangeListener(listener)
-
-        onDispose { prefs.unregisterOnSharedPreferenceChangeListener(listener) }
-    }
-
-    ModalDrawerSheet(
-            drawerContainerColor = Secondary,
-            drawerContentColor = TextColor,
-            modifier = Modifier.fillMaxWidth(0.8f),
-    ) {
-        Column(
-                modifier =
-                        Modifier.fillMaxWidth()
-                                .fillMaxHeight()
-                                .padding(horizontal = 26.dp, vertical = 28.dp),
-        ) {
-            Row(
-                    modifier = Modifier.fillMaxWidth().padding(top = 20.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-            ) {
-                AsyncImage(
-                        model = profilePictureUrl,
-                        contentDescription = "Profile Picture",
-                        modifier = Modifier.size(52.dp).clip(CircleShape),
-                        placeholder = painterResource(R.drawable.ic_gdscvit),
-                        error = painterResource(R.drawable.ic_gdscvit),
-                )
-            }
-
-            Spacer(modifier = Modifier.height(4.dp))
-
-            Text(
-                    text = name,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    style =
-                            MaterialTheme.typography.labelLarge.copy(
-                                    fontWeight = FontWeight.Normal
-                            ),
-            )
-
-            Spacer(modifier = Modifier.height(4.dp))
-
-            Text(
-                    text = "@$username",
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    style =
-                            TextStyle(
-                                    fontSize = 14.sp,
-                                    lineHeight = 20.sp,
-                                    fontWeight = FontWeight.Normal,
-                                    letterSpacing = (-.14).sp,
-                                    color = Accent,
-                            ),
-            )
-
-            Spacer(modifier = Modifier.height(32.dp))
-
-            HorizontalDivider(color = Accent, thickness = 1.dp)
-
-            Spacer(modifier = Modifier.height(24.dp))
-
-            if (campus.lowercase() == "vellore") {
-                NavigationDrawerItem(
-                        icon = {
-                            Icon(
-                                    painter = painterResource(R.drawable.ic_empty_classroom),
-                                    contentDescription = "Find Empty Classroom",
-                                    tint = TextColor,
-                            )
-                        },
-                        label = {
-                            Text(
-                                    modifier = Modifier.padding(start = 24.dp),
-                                    text = "Find Empty Classroom",
-                                    color = TextColor,
-                                    style =
-                                            MaterialTheme.typography.labelLarge.copy(
-                                                    fontWeight = FontWeight.Normal
-                                            ),
-                            )
-                        },
-                        selected = false,
-                        onClick = {
-                            onCloseDrawer()
-                            navController.navigate("empty_classrooms")
-                        },
-                        colors =
-                                NavigationDrawerItemDefaults.colors(
-                                        unselectedContainerColor = Color.Transparent,
-                                        selectedContainerColor = Secondary,
-                                ),
-                )
-            }
-
-            NavigationDrawerItem(
-                    icon = {
-                        Icon(
-                                painter = painterResource(R.drawable.ic_settings),
-                                contentDescription = "Settings",
-                                tint = TextColor,
-                        )
-                    },
-                    label = {
-                        Text(
-                                modifier = Modifier.padding(start = 24.dp),
-                                text = "Settings",
-                                color = TextColor,
-                                style =
-                                        MaterialTheme.typography.labelLarge.copy(
-                                                fontWeight = FontWeight.Normal
-                                        ),
-                        )
-                    },
-                    selected = false,
-                    onClick = {
-                        onCloseDrawer()
-                        context.startActivity(Intent(context, SettingsActivity::class.java))
-                    },
-                    colors =
-                            NavigationDrawerItemDefaults.colors(
-                                    unselectedContainerColor = Color.Transparent,
-                                    selectedContainerColor = Secondary,
-                            ),
-            )
-
-            Spacer(modifier = Modifier.height(24.dp))
-
-            HorizontalDivider(color = Accent, thickness = 1.dp)
-
-            Spacer(modifier = Modifier.height(24.dp))
-
-            NavigationDrawerItem(
-                    icon = {
-                        Icon(
-                                painter = painterResource(R.drawable.ic_share),
-                                contentDescription = "Share",
-                                tint = TextColor,
-                        )
-                    },
-                    label = {
-                        Text(
-                                modifier = Modifier.padding(start = 24.dp),
-                                text = "Share",
-                                color = TextColor,
-                                style =
-                                        MaterialTheme.typography.labelLarge.copy(
-                                                fontWeight = FontWeight.Normal
-                                        ),
-                        )
-                    },
-                    selected = false,
-                    onClick = {
-                        onCloseDrawer()
-                        val shareIntent =
-                                Intent().apply {
-                                    action = Intent.ACTION_SEND
-                                    type = "text/plain"
-                                    putExtra(
-                                            Intent.EXTRA_TEXT,
-                                            context.getString(R.string.share_text)
-                                    )
-                                }
-                        context.startActivity(Intent.createChooser(shareIntent, null))
-                    },
-                    colors =
-                            NavigationDrawerItemDefaults.colors(
-                                    unselectedContainerColor = Color.Transparent,
-                                    selectedContainerColor = Secondary,
-                            ),
-            )
-
-            NavigationDrawerItem(
-                    icon = {
-                        Icon(
-                                painter = painterResource(R.drawable.ic_support),
-                                contentDescription = "Support",
-                                tint = TextColor,
-                        )
-                    },
-                    label = {
-                        Text(
-                                modifier = Modifier.padding(start = 24.dp),
-                                text = "Support",
-                                color = TextColor,
-                                style =
-                                        MaterialTheme.typography.labelLarge.copy(
-                                                fontWeight = FontWeight.Normal
-                                        ),
-                        )
-                    },
-                    selected = false,
-                    onClick = {
-                        onCloseDrawer()
-                        UtilFunctions.openLink(context, context.getString(R.string.telegram_link))
-                    },
-                    colors =
-                            NavigationDrawerItemDefaults.colors(
-                                    unselectedContainerColor = Color.Transparent,
-                                    selectedContainerColor = Secondary,
-                            ),
-            )
-
-            Spacer(modifier = Modifier.height(24.dp))
-
-            HorizontalDivider(color = Accent, thickness = 1.dp)
-
-            Spacer(modifier = Modifier.weight(1f))
-
-            NavigationDrawerItem(
-                    icon = {
-                        Icon(
-                                painter = painterResource(R.drawable.ic_logout_2),
-                                contentDescription = "Log out",
-                                tint = Color(0xFFFF0000),
-                        )
-                    },
-                    label = {
-                        Text(
-                                text = "Log out",
-                                color = Color(0xFFFF0000),
-                                style =
-                                        MaterialTheme.typography.labelLarge.copy(
-                                                fontWeight = FontWeight.Normal
-                                        ),
-                        )
-                    },
-                    selected = false,
-                    onClick = {
-                        onCloseDrawer()
-                        val activity = context as? Activity
-                        if (activity != null) {
-                            LogoutHelper.logout(context, activity, prefs)
-                        }
-                    },
-                    colors =
-                            NavigationDrawerItemDefaults.colors(
-                                    unselectedContainerColor = Color.Transparent,
-                                    selectedContainerColor = Secondary,
-                            ),
-            )
-        }
-    }
-}
-
-private suspend fun loadCachedCourses(prefs: SharedPreferences): List<Course> =
-        withContext(Dispatchers.IO) {
-            try {
-                val cachedData =
-                        prefs.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-                                ?: return@withContext emptyList()
-
-                val userResponse =
-                        Gson().fromJson(cachedData, UserResponse::class.java)
-                                ?: return@withContext emptyList()
-
-                extractCoursesFromTimetable(userResponse)
-            } catch (e: Exception) {
-                e.printStackTrace()
-                emptyList()
-            }
-        }
-
-private fun extractCoursesFromTimetable(userResponse: UserResponse): List<Course> {
-    val timetableData = userResponse.timetable?.data ?: return emptyList()
-
-    val allLectures =
-            sequenceOf(
-                            timetableData.Monday,
-                            timetableData.Tuesday,
-                            timetableData.Wednesday,
-                            timetableData.Thursday,
-                            timetableData.Friday,
-                            timetableData.Saturday,
-                            timetableData.Sunday,
-                    )
-                    .filterNotNull()
-                    .flatten()
-
-    val currentSemester = SemesterUtils.determineSemester()
-
-    return allLectures
-            .groupBy { it.name }
-            .mapNotNull { (title, lectures) ->
-                if (title.isBlank()) return@mapNotNull null
-
-                val uniqueSlots =
-                        lectures.mapTo(LinkedHashSet()) { it.slot }.sorted().joinToString(" + ")
-
-                val uniqueCodes =
-                        lectures.mapTo(LinkedHashSet()) { it.code }.sorted().joinToString(" / ")
-
-                Course(
-                        title = title,
-                        slot = uniqueSlots,
-                        code = uniqueCodes,
-                        semester = currentSemester,
-                        isStarred = false,
-                )
-            }
-            .sortedBy { it.title }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceBanner.kt b/app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceBanner.kt
deleted file mode 100644
index 161adc5..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceBanner.kt
+++ /dev/null
@@ -1,270 +0,0 @@
-package com.dscvit.vitty.ui.maintenance
-
-import androidx.compose.animation.*
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Warning
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.dscvit.vitty.R
-import com.dscvit.vitty.theme.*
-
-@Composable
-fun MaintenanceBannerDialog(
-    isVisible: Boolean,
-    onDismiss: () -> Unit,
-    onRetryClick: () -> Unit
-) {
-    if (isVisible) {
-        Dialog(
-            onDismissRequest = onDismiss,
-            properties = DialogProperties(
-                dismissOnBackPress = true,
-                dismissOnClickOutside = true
-            )
-        ) {
-            Card(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                shape = RoundedCornerShape(20.dp),
-                colors = CardDefaults.cardColors(
-                    containerColor = Background
-                ),
-                elevation = CardDefaults.cardElevation(
-                    defaultElevation = 8.dp
-                )
-            ) {
-                Column(
-                    modifier = Modifier.padding(20.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    // Header with close button
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        IconButton(
-                            onClick = onDismiss,
-                            modifier = Modifier.size(24.dp)
-                        ) {
-                            Icon(
-                                imageVector = Icons.Default.Close,
-                                contentDescription = "Close",
-                                tint = Accent.copy(alpha = 0.7f),
-                                modifier = Modifier.size(20.dp)
-                            )
-                        }
-                    }
-                    
-                    Spacer(modifier = Modifier.height(16.dp))
-                    
-                    // Maintenance icon with gradient background
-                    Box(
-                        modifier = Modifier
-                            .size(80.dp)
-                            .clip(RoundedCornerShape(16.dp))
-                            .background(
-                                brush = Brush.radialGradient(
-                                    colors = listOf(
-                                        Accent.copy(alpha = 0.2f),
-                                        Accent.copy(alpha = 0.1f)
-                                    )
-                                )
-                            ),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_maintenance),
-                            contentDescription = "Maintenance",
-                            modifier = Modifier.size(40.dp),
-                            tint = Accent
-                        )
-                    }
-                    
-                    Spacer(modifier = Modifier.height(16.dp))
-                    
-                    // Title
-                    Text(
-                        text = "Server Maintenance",
-                        fontSize = 22.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        textAlign = TextAlign.Center
-                    )
-                    
-                    Spacer(modifier = Modifier.height(8.dp))
-                    
-                    // Message
-                    Text(
-                        text = "The server is currently under maintenance. Some features may be temporarily unavailable.",
-                        fontSize = 14.sp,
-                        color = Accent.copy(alpha = 0.8f),
-                        textAlign = TextAlign.Center,
-                        lineHeight = 18.sp
-                    )
-                    
-                    Spacer(modifier = Modifier.height(20.dp))
-                    
-                    // Action buttons
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        // Retry button
-                        Button(
-                            onClick = onRetryClick,
-                            modifier = Modifier.weight(1f),
-                            colors = ButtonDefaults.buttonColors(
-                                containerColor = Accent,
-                                contentColor = Background
-                            ),
-                            shape = RoundedCornerShape(12.dp)
-                        ) {
-                            Text(
-                                text = "Retry",
-                                fontSize = 14.sp,
-                                fontWeight = FontWeight.Medium
-                            )
-                        }
-                        
-                        // Dismiss button
-                        OutlinedButton(
-                            onClick = onDismiss,
-                            modifier = Modifier.weight(1f),
-                            colors = ButtonDefaults.outlinedButtonColors(
-                                contentColor = Accent.copy(alpha = 0.8f)
-                            ),
-                            shape = RoundedCornerShape(12.dp)
-                        ) {
-                            Text(
-                                text = "Continue",
-                                fontSize = 14.sp,
-                                fontWeight = FontWeight.Medium
-                            )
-                        }
-                    }
-                    
-                    Spacer(modifier = Modifier.height(8.dp))
-                    
-                    // Footer
-                    Text(
-                        text = "Thank you for your patience",
-                        fontSize = 12.sp,
-                        color = Accent.copy(alpha = 0.6f),
-                        textAlign = TextAlign.Center,
-                        fontWeight = FontWeight.Medium
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun MaintenanceBanner(
-    isVisible: Boolean,
-    onDismiss: () -> Unit,
-    onRetryClick: () -> Unit
-) {
-    AnimatedVisibility(
-        visible = isVisible,
-        enter = slideInVertically(
-            initialOffsetY = { -it }
-        ) + fadeIn(),
-        exit = slideOutVertically(
-            targetOffsetY = { -it }
-        ) + fadeOut()
-    ) {
-        Card(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            shape = RoundedCornerShape(16.dp),
-            colors = CardDefaults.cardColors(
-                containerColor = Secondary.copy(alpha = 0.95f)
-            ),
-            elevation = CardDefaults.cardElevation(
-                defaultElevation = 6.dp
-            )
-        ) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                // Icon
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_maintenance),
-                    contentDescription = "Maintenance",
-                    modifier = Modifier.size(24.dp),
-                    tint = Accent
-                )
-                
-                Spacer(modifier = Modifier.width(12.dp))
-                
-                // Text content
-                Column(
-                    modifier = Modifier.weight(1f)
-                ) {
-                    Text(
-                        text = "Server Maintenance",
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        color = Accent
-                    )
-                    Text(
-                        text = "Some features may be limited",
-                        fontSize = 12.sp,
-                        color = Accent.copy(alpha = 0.7f)
-                    )
-                }
-                
-                // Action buttons
-                Row(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
-                    TextButton(
-                        onClick = onRetryClick,
-                        contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp)
-                    ) {
-                        Text(
-                            text = "Retry",
-                            fontSize = 12.sp,
-                            color = Accent,
-                            fontWeight = FontWeight.Medium
-                        )
-                    }
-                    
-                    IconButton(
-                        onClick = onDismiss,
-                        modifier = Modifier.size(24.dp)
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Close,
-                            contentDescription = "Dismiss",
-                            tint = Accent.copy(alpha = 0.7f),
-                            modifier = Modifier.size(16.dp)
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceScreen.kt b/app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceScreen.kt
deleted file mode 100644
index 429d00d..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/maintenance/MaintenanceScreen.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.dscvit.vitty.ui.maintenance
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.dscvit.vitty.R
-import com.dscvit.vitty.theme.*
-
-@Composable
-fun MaintenanceScreen(
-    onRetryClick: () -> Unit,
-    onExitClick: () -> Unit
-) {
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(32.dp),
-        contentAlignment = Alignment.Center
-    ) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
-        ) {
-            Image(
-                painter = painterResource(id = R.drawable.ic_maintenance),
-                contentDescription = stringResource(R.string.maintenance_icon_desc),
-                modifier = Modifier.size(120.dp),
-                colorFilter = ColorFilter.tint(Accent)
-            )
-            
-            Spacer(modifier = Modifier.height(32.dp))
-            
-            Text(
-                text = stringResource(R.string.maintenance_title),
-                fontSize = 28.sp,
-                fontWeight = FontWeight.SemiBold,
-                color = TextColor,
-                textAlign = TextAlign.Center,
-                lineHeight = 36.sp
-            )
-            
-            Spacer(modifier = Modifier.height(16.dp))
-            
-            Text(
-                text = stringResource(R.string.maintenance_message),
-                fontSize = 16.sp,
-                color = Accent,
-                textAlign = TextAlign.Center,
-                lineHeight = 20.sp
-            )
-            
-            Spacer(modifier = Modifier.height(24.dp))
-            
-            Text(
-                text = stringResource(R.string.maintenance_description),
-                fontSize = 14.sp,
-                color = Accent.copy(alpha = 0.8f),
-                textAlign = TextAlign.Center,
-                lineHeight = 16.sp
-            )
-            
-            Spacer(modifier = Modifier.height(48.dp))
-            
-            Button(
-                onClick = onRetryClick,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(56.dp),
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = Accent,
-                    contentColor = Background
-                ),
-                shape = RoundedCornerShape(12.dp)
-            ) {
-                Text(
-                    text = stringResource(R.string.retry_connection),
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.Medium
-                )
-            }
-            
-            Spacer(modifier = Modifier.height(16.dp))
-            
-            TextButton(
-                onClick = onExitClick
-            ) {
-                Text(
-                    text = stringResource(R.string.exit_app),
-                    fontSize = 14.sp,
-                    color = Accent.copy(alpha = 0.7f)
-                )
-            }
-            
-            Spacer(modifier = Modifier.height(32.dp))
-            
-            Text(
-                text = stringResource(R.string.maintenance_footer),
-                fontSize = 12.sp,
-                color = Accent.copy(alpha = 0.6f),
-                textAlign = TextAlign.Center
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/notes/NoteFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/notes/NoteFragment.kt
deleted file mode 100644
index d972c42..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/notes/NoteFragment.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.dscvit.vitty.ui.notes
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import com.dscvit.vitty.theme.VittyTheme
-import com.dscvit.vitty.ui.coursepage.CoursePageViewModel
-import com.dscvit.vitty.ui.coursepage.models.Note
-import kotlinx.coroutines.launch
-
-class NoteFragment : Fragment() {
-    private val args: NoteFragmentArgs by navArgs()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View =
-        ComposeView(requireContext()).apply {
-            setContent {
-                VittyTheme {
-                    val viewModel: CoursePageViewModel = viewModel()
-                    var noteToEdit by remember { mutableStateOf<Note?>(null) }
-                    val scope = rememberCoroutineScope()
-
-                    LaunchedEffect(args.noteId) {
-                        if (!args.noteId.isNullOrEmpty()) {
-                            scope.launch {
-                                noteToEdit = viewModel.getNoteById(args.noteId!!)
-                            }
-                        }
-                    }
-
-                    NoteScreenContent(
-                        onBackClick = {
-                            findNavController().popBackStack()
-                        },
-                        noteToEdit = noteToEdit,
-                        onSaveNote = { title, content ->
-                            viewModel.setCourseId(args.courseCode)
-                            if (noteToEdit != null) {
-                                viewModel.updateExistingNote(
-                                    noteId = noteToEdit!!.id.toString(),
-                                    title = title,
-                                    content = content,
-                                    isStarred = noteToEdit!!.isStarred,
-                                )
-                            } else {
-                                viewModel.addTextNote(title, content)
-                            }
-                            findNavController().popBackStack()
-                        },
-                    )
-                }
-            }
-        }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/notes/NoteScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/notes/NoteScreenContent.kt
deleted file mode 100644
index f7ad3cf..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/notes/NoteScreenContent.kt
+++ /dev/null
@@ -1,311 +0,0 @@
-package com.dscvit.vitty.ui.notes
-
-import android.widget.Toast
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.unit.dp
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.ui.coursepage.models.Note
-import com.dscvit.vitty.ui.notes.components.NoteHeader
-import com.dscvit.vitty.ui.notes.components.NoteToolbar
-import com.dscvit.vitty.ui.notes.components.applyFormatting
-import com.dscvit.vitty.ui.notes.components.applyListFormatting
-import dev.jeziellago.compose.markdowntext.MarkdownText
-import kotlinx.coroutines.delay
-
-@Composable
-fun NoteScreenContent(
-    onBackClick: () -> Unit,
-    noteToEdit: Note? = null,
-    onSaveNote: (title: String, content: String) -> Unit = { _, _ -> },
-) {
-    val context = LocalContext.current
-    var noteTitle by remember { mutableStateOf(noteToEdit?.title ?: "") }
-    var noteText by remember { mutableStateOf(TextFieldValue(noteToEdit?.content ?: "")) }
-    var isPreviewMode by remember { mutableStateOf(false) }
-    var undoStack by remember { mutableStateOf(listOf<TextFieldValue>()) }
-    var redoStack by remember { mutableStateOf(listOf<TextFieldValue>()) }
-    var lastSavedText by remember { mutableStateOf(TextFieldValue(noteToEdit?.content ?: "")) }
-    var showUnsavedChangesDialog by remember { mutableStateOf(false) }
-
-    val hasUnsavedChanges =
-        remember(noteTitle, noteText, noteToEdit) {
-            val originalTitle = noteToEdit?.title ?: ""
-            val originalContent = noteToEdit?.content ?: ""
-            noteTitle != originalTitle || noteText.text != originalContent
-        }
-
-    fun validateAndSaveNote(): Boolean =
-        when {
-            noteTitle.isBlank() && noteText.text.isBlank() -> {
-                Toast.makeText(context, "Please add a title and content to save the note", Toast.LENGTH_SHORT).show()
-                false
-            }
-            noteTitle.isBlank() -> {
-                Toast.makeText(context, "Please add a title to save the note", Toast.LENGTH_SHORT).show()
-                false
-            }
-            noteText.text.isBlank() -> {
-                Toast.makeText(context, "Please add some content to save the note", Toast.LENGTH_SHORT).show()
-                false
-            }
-            else -> {
-                onSaveNote(noteTitle, noteText.text)
-                Toast.makeText(context, "Note saved successfully!", Toast.LENGTH_SHORT).show()
-                true
-            }
-        }
-
-    LaunchedEffect(noteToEdit) {
-        noteToEdit?.let { note ->
-            noteTitle = note.title
-            noteText = TextFieldValue(note.content)
-            lastSavedText = TextFieldValue(note.content)
-        }
-    }
-
-    LaunchedEffect(noteText) {
-        delay(1000)
-        if (noteText.text != lastSavedText.text && noteText.text.isNotEmpty()) {
-            undoStack = (undoStack + lastSavedText).takeLast(50)
-            redoStack = emptyList()
-            lastSavedText = noteText
-        }
-    }
-
-    fun saveToUndoStack() {
-        if (noteText != lastSavedText) {
-            undoStack = (undoStack + noteText).takeLast(50)
-            redoStack = emptyList()
-            lastSavedText = noteText
-        }
-    }
-
-    Scaffold(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(Background),
-        containerColor = Background,
-        topBar = {
-            NoteHeader(
-                onBackClick = {
-                    if (hasUnsavedChanges) {
-                        showUnsavedChangesDialog = true
-                    } else {
-                        onBackClick()
-                    }
-                },
-                isPreviewMode = isPreviewMode,
-                onTogglePreview = { isPreviewMode = !isPreviewMode },
-                onSaveNote = {
-                    validateAndSaveNote()
-                },
-                canSave = noteTitle.isNotBlank() || noteText.text.isNotBlank(),
-            )
-        },
-        bottomBar = {
-            NoteToolbar(
-                onBoldClick = {
-                    saveToUndoStack()
-                    noteText = applyFormatting(noteText, "**", "**")
-                },
-                onItalicClick = {
-                    saveToUndoStack()
-                    noteText = applyFormatting(noteText, "*", "*")
-                },
-                onUnderlineClick = {
-                    saveToUndoStack()
-                    noteText = applyFormatting(noteText, "<u>", "</u>")
-                },
-                onBulletClick = {
-                    saveToUndoStack()
-                    noteText = applyListFormatting(noteText, "- ")
-                },
-                onChecklistClick = {
-                    saveToUndoStack()
-                    noteText = applyListFormatting(noteText, "- [ ] ")
-                },
-                onUndoClick = {
-                    if (undoStack.isNotEmpty()) {
-                        redoStack = (redoStack + noteText).takeLast(50)
-                        noteText = undoStack.last()
-                        undoStack = undoStack.dropLast(1)
-                        lastSavedText = noteText
-                    }
-                },
-                onRedoClick = {
-                    if (redoStack.isNotEmpty()) {
-                        undoStack = (undoStack + noteText).takeLast(50)
-                        noteText = redoStack.last()
-                        redoStack = redoStack.dropLast(1)
-                        lastSavedText = noteText
-                    }
-                },
-                canUndo = undoStack.isNotEmpty(),
-                canRedo = redoStack.isNotEmpty(),
-            )
-        },
-    ) { paddingValues ->
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(paddingValues),
-        ) {
-            BasicTextField(
-                value = noteTitle,
-                onValueChange = { noteTitle = it },
-                maxLines = 1,
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 20.dp),
-                textStyle =
-                    MaterialTheme.typography.headlineSmall.copy(
-                        color = TextColor,
-                        fontWeight = FontWeight.Bold,
-                    ),
-                cursorBrush = SolidColor(Accent),
-                decorationBox = { innerTextField ->
-                    Box(
-                        modifier = Modifier.fillMaxWidth(),
-                    ) {
-                        if (noteTitle.isEmpty()) {
-                            Text(
-                                text = "Note title...",
-                                style =
-                                    MaterialTheme.typography.headlineSmall.copy(
-                                        color = TextColor.copy(alpha = 0.5f),
-                                        fontWeight = FontWeight.Bold,
-                                    ),
-                            )
-                        }
-                        innerTextField()
-                    }
-                },
-            )
-
-            Spacer(modifier = Modifier.height(8.dp))
-
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .clip(RoundedCornerShape(12.dp))
-                        .background(Background)
-                        .padding(16.dp),
-            ) {
-                if (isPreviewMode) {
-                    MarkdownText(
-                        markdown = noteText.text,
-                        modifier =
-                            Modifier
-                                .fillMaxSize()
-                                .verticalScroll(rememberScrollState()),
-                        style = MaterialTheme.typography.bodyMedium.copy(color = TextColor),
-                        checkboxColor = TextColor.copy(alpha = 0.7f), // Unchecked checkbox border
-                        checkedCheckboxColor = Accent, // Checked checkbox fill color
-                        checkmarkColor = Background, // Checkmark color (your dark background)
-                    )
-                } else {
-                    BasicTextField(
-                        value = noteText,
-                        onValueChange = { newValue ->
-                            noteText = newValue
-                        },
-                        modifier =
-                            Modifier
-                                .fillMaxSize()
-                                .verticalScroll(rememberScrollState()),
-                        textStyle = MaterialTheme.typography.bodyMedium.copy(color = TextColor),
-                        cursorBrush = SolidColor(Accent),
-                        decorationBox = { innerTextField ->
-                            Box(
-                                modifier = Modifier.fillMaxSize(),
-                            ) {
-                                if (noteText.text.isEmpty()) {
-                                    Text(
-                                        text = "Start writing your note...\n\nMarkdown supported:\n**bold** *italic* <u>underline</u>\n- bullet points\n- [ ] checkboxes",
-                                        color = TextColor.copy(alpha = 0.5f),
-                                        style = MaterialTheme.typography.bodyMedium,
-                                    )
-                                }
-                                innerTextField()
-                            }
-                        },
-                    )
-                }
-            }
-        }
-    }
-
-    if (showUnsavedChangesDialog) {
-        AlertDialog(
-            onDismissRequest = { showUnsavedChangesDialog = false },
-            title = {
-                Text(
-                    text = "Unsaved Changes",
-                    color = TextColor,
-                )
-            },
-            text = {
-                Text(
-                    text = "You have unsaved changes. Do you want to save them before leaving?",
-                    color = TextColor,
-                )
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        if (validateAndSaveNote()) {
-                            showUnsavedChangesDialog = false
-                        }
-                    },
-                ) {
-                    Text("Save", color = Accent)
-                }
-            },
-            dismissButton = {
-                TextButton(
-                    onClick = {
-                        showUnsavedChangesDialog = false
-                        onBackClick()
-                    },
-                ) {
-                    Text("Discard", color = TextColor)
-                }
-            },
-            containerColor = Background,
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/notes/components/NoteScreenComponents.kt b/app/src/main/java/com/dscvit/vitty/ui/notes/components/NoteScreenComponents.kt
deleted file mode 100644
index 472b993..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/notes/components/NoteScreenComponents.kt
+++ /dev/null
@@ -1,263 +0,0 @@
-package com.dscvit.vitty.ui.notes.components
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.unit.dp
-import com.dscvit.vitty.R
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Background
-import com.dscvit.vitty.theme.TextColor
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3Api::class)
-@Composable
-fun NoteHeader(
-    onBackClick: () -> Unit,
-    isPreviewMode: Boolean,
-    onTogglePreview: () -> Unit,
-    onSaveNote: () -> Unit = {},
-    canSave: Boolean = false,
-) {
-    CenterAlignedTopAppBar(
-        title = {
-            Text(
-                text = "Note",
-                style = MaterialTheme.typography.headlineSmall,
-                color = TextColor,
-                fontWeight = FontWeight.Medium,
-            )
-        },
-        navigationIcon = {
-            IconButton(onClick = onBackClick) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_round_chevron_left),
-                    contentDescription = "Back",
-                    tint = TextColor,
-                )
-            }
-        },
-        actions = {
-            IconButton(
-                onClick = onSaveNote,
-                enabled = canSave,
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Check,
-                    contentDescription = "Save",
-                    tint = if (canSave) Accent else TextColor.copy(alpha = 0.5f),
-                )
-            }
-
-            IconButton(onClick = onTogglePreview) {
-                Icon(
-                    painter =
-                        painterResource(
-                            id = if (isPreviewMode) R.drawable.ic_edit_document else R.drawable.ic_visibility_outlined,
-                        ),
-                    contentDescription = if (isPreviewMode) "Edit" else "Preview",
-                    tint = if (isPreviewMode) Accent else TextColor,
-                )
-            }
-        },
-        colors =
-            TopAppBarDefaults.centerAlignedTopAppBarColors(
-                containerColor = Background,
-                navigationIconContentColor = TextColor,
-                titleContentColor = TextColor,
-                actionIconContentColor = TextColor,
-            ),
-    )
-}
-
-@Composable
-fun NoteToolbar(
-    onBoldClick: () -> Unit,
-    onItalicClick: () -> Unit,
-    onUnderlineClick: () -> Unit,
-    onBulletClick: () -> Unit,
-    onChecklistClick: () -> Unit,
-    onUndoClick: () -> Unit,
-    onRedoClick: () -> Unit,
-    canUndo: Boolean,
-    canRedo: Boolean,
-) {
-    Row(
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp, vertical = 32.dp),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        ToolbarButton(
-            onClick = onBulletClick,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_format_list_bulleted),
-                contentDescription = "Bullet List",
-                tint = Accent,
-            )
-        }
-
-        ToolbarButton(
-            onClick = onChecklistClick,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_library_add_check),
-                contentDescription = "CheckList",
-                tint = Accent,
-            )
-        }
-
-        ToolbarButton(
-            onClick = onBoldClick,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_format_bold),
-                contentDescription = "Bold",
-                tint = Accent,
-            )
-        }
-
-        ToolbarButton(
-            onClick = onItalicClick,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_format_italic),
-                contentDescription = "Italic",
-                tint = Accent,
-            )
-        }
-
-        ToolbarButton(
-            onClick = onUnderlineClick,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_format_underlined),
-                contentDescription = "Underline",
-                tint = Accent,
-            )
-        }
-
-        ToolbarButton(
-            onClick = onUndoClick,
-            enabled = canUndo,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_undo),
-                contentDescription = "Undo",
-                tint = if (canUndo) Accent else TextColor.copy(alpha = 0.3f),
-            )
-        }
-
-        ToolbarButton(
-            onClick = onRedoClick,
-            enabled = canRedo,
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.ic_redo),
-                contentDescription = "Redo",
-                tint = if (canRedo) Accent else TextColor.copy(alpha = 0.3f),
-            )
-        }
-    }
-}
-
-@Composable
-fun ToolbarButton(
-    onClick: () -> Unit,
-    enabled: Boolean = true,
-    content: @Composable () -> Unit,
-) {
-    IconButton(
-        onClick = onClick,
-        modifier = Modifier.size(36.dp),
-        enabled = enabled,
-    ) {
-        content()
-    }
-}
-
-fun applyFormatting(
-    textFieldValue: TextFieldValue,
-    prefix: String,
-    suffix: String,
-): TextFieldValue {
-    val text = textFieldValue.text
-    val selection = textFieldValue.selection
-
-    return if (selection.collapsed) {
-        val newText =
-            text.substring(0, selection.start) +
-                prefix + suffix +
-                text.substring(selection.start)
-        TextFieldValue(
-            text = newText,
-            selection = TextRange(selection.start + prefix.length),
-        )
-    } else {
-        val selectedText = text.substring(selection.start, selection.end)
-        val newText =
-            text.substring(0, selection.start) +
-                prefix + selectedText + suffix +
-                text.substring(selection.end)
-        TextFieldValue(
-            text = newText,
-            selection =
-                TextRange(
-                    selection.start + prefix.length,
-                    selection.end + prefix.length,
-                ),
-        )
-    }
-}
-
-fun applyListFormatting(
-    textFieldValue: TextFieldValue,
-    listPrefix: String,
-): TextFieldValue {
-    val text = textFieldValue.text
-    val selection = textFieldValue.selection
-
-    val lineStart = text.lastIndexOf('\n', selection.start - 1) + 1
-    val lineEnd = text.indexOf('\n', selection.start).let { if (it == -1) text.length else it }
-    val currentLine = text.substring(lineStart, lineEnd)
-
-    return if (currentLine.startsWith(listPrefix)) {
-        val newText =
-            text.substring(0, lineStart) +
-                currentLine.removePrefix(listPrefix) +
-                text.substring(lineEnd)
-        TextFieldValue(
-            text = newText,
-            selection = TextRange(maxOf(0, selection.start - listPrefix.length)),
-        )
-    } else {
-        val newText =
-            text.substring(0, lineStart) +
-                listPrefix + currentLine +
-                text.substring(lineEnd)
-        TextFieldValue(
-            text = newText,
-            selection = TextRange(selection.start + listPrefix.length),
-        )
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/schedule/DayFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/schedule/DayFragment.kt
index 4319312..819adbf 100755
--- a/app/src/main/java/com/dscvit/vitty/ui/schedule/DayFragment.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/schedule/DayFragment.kt
@@ -6,29 +6,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dscvit.vitty.R
 import com.dscvit.vitty.adapter.PeriodAdapter
 import com.dscvit.vitty.databinding.FragmentDayBinding
 import com.dscvit.vitty.model.PeriodDetails
-import com.dscvit.vitty.network.api.community.responses.timetable.Course
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.util.Constants
 import com.dscvit.vitty.util.Constants.DEFAULT_QUOTE
 import com.dscvit.vitty.util.Constants.USER_INFO
 import com.dscvit.vitty.util.Quote
 import com.dscvit.vitty.util.UtilFunctions
-import com.google.firebase.Timestamp
 import com.google.firebase.firestore.FirebaseFirestore
-import com.google.gson.Gson
+import com.google.firebase.firestore.Source
 import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.TimeZone
 
 class DayFragment : Fragment() {
 
@@ -40,9 +31,6 @@ class DayFragment : Fragment() {
     private val days =
         listOf("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday")
     lateinit var day: String
-    private lateinit var scheduleViewModel: ScheduleViewModel
-    private var isFriendsTimetable = false
-
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -55,176 +43,46 @@ class DayFragment : Fragment() {
             container,
             false
         )
-        binding.loadingView.visibility = View.VISIBLE
-        scheduleViewModel = ViewModelProvider(this)[ScheduleViewModel::class.java]
-        //get token and username from shared preferences
-        val sharedPreferences = activity?.getSharedPreferences(USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences?.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        val username = requireArguments().getString("username") ?: sharedPreferences?.getString(
-            Constants.COMMUNITY_USERNAME,
-            null
-        ) ?: ""
-        isFriendsTimetable = requireArguments().getBoolean("isFriendsTimetable")
-        Timber.d("token $token username $username")
-        Timber.d(
-            "pref username is ${
-                sharedPreferences?.getString(
-                    Constants.COMMUNITY_USERNAME,
-                    null
-                )
-            }"
-        )
-        scheduleViewModel.getUserWithTimeTable(token, username)
         fragID = requireArguments().getString("frag_id")?.toInt()!!
         getData()
-
-        binding.dayList.isNestedScrollingEnabled = false
         return binding.root
     }
 
     private fun getData() {
         sharedPref = activity?.getSharedPreferences(USER_INFO, Context.MODE_PRIVATE)!!
         courseList.clear()
-        //val uid = sharedPref.getString("uid", "")
+        val uid = sharedPref.getString("uid", "")
         day = if (days[fragID] == "saturday") sharedPref.getString(
             UtilFunctions.getSatModeCode(),
             "saturday"
         ).toString() else days[fragID]
-
-        val cachedData = sharedPref.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-        if (cachedData != null && !isFriendsTimetable) {
-            // If cached data is available, load from cache
-            Timber.d("Loading from cache")
-            Timber.d("$cachedData")
-            val response = Gson().fromJson(cachedData, UserResponse::class.java)
-//            Toast.makeText(context, "Loaded from cache", Toast.LENGTH_SHORT).show()
-            processTimetableData(response)
-
-        }
-
-        UtilFunctions.reloadWidgets(requireContext())
-
-        scheduleViewModel.user.observe(viewLifecycleOwner) {
-            if (it != null) {
-                //cache response for widget
-                if(!isFriendsTimetable) {
-                    val response = Gson().toJson(it)
-                    val editor = sharedPref.edit()
-                    editor.putString(Constants.CACHE_COMMUNITY_TIMETABLE, response)
-                    editor.apply()
-                    val cachedData = sharedPref.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-                    Timber.d("cached data is $cachedData")
+        if (uid != null) {
+            db.collection("users")
+                .document(uid)
+                .collection("timetable")
+                .document(day)
+                .collection("periods")
+                .get(Source.CACHE)
+                .addOnSuccessListener { result ->
+                    for (document in result) {
+                        try {
+                            val pd = PeriodDetails(
+                                document.getString("courseCode")!!,
+                                document.getString("courseName")!!,
+                                document.getTimestamp("startTime")!!,
+                                document.getTimestamp("endTime")!!,
+                                document.getString("slot")!!,
+                                document.getString("location")!!
+                            )
+                            courseList.add(pd)
+                        } catch (e: Exception) {
+                        }
+                    }
+                    scheduleSetup()
                 }
-
-//                Toast.makeText(context, "Updated Timetable from internet.", Toast.LENGTH_SHORT).show()
-
-
-                Timber.d(it.toString())
-
-                processTimetableData(it)
-
-            } else {
-                if (cachedData == null) {
-                    Toast.makeText(context, "Error fetching timetable", Toast.LENGTH_SHORT).show()
-
+                .addOnFailureListener { e ->
+                    Timber.d("Auth error: $e")
                 }
-                binding.loadingView.visibility = View.GONE
-            }
-        }
-
-    }
-
-    private fun processTimetableData(userResponse: UserResponse?) {
-        val timetableDays = userResponse?.timetable?.data
-        when (day) {
-            "monday" -> {
-                val monday = timetableDays?.Monday
-                setUpDayTimeTable(monday)
-            }
-
-            "tuesday" -> {
-                val tuesday = timetableDays?.Tuesday
-                setUpDayTimeTable(tuesday)
-            }
-
-            "wednesday" -> {
-                val wednesday = timetableDays?.Wednesday
-                setUpDayTimeTable(wednesday)
-            }
-
-            "thursday" -> {
-                val thursday = timetableDays?.Thursday
-                setUpDayTimeTable(thursday)
-            }
-
-            "friday" -> {
-                val friday = timetableDays?.Friday
-                setUpDayTimeTable(friday)
-            }
-
-            "saturday" -> {
-                val saturday = timetableDays?.Saturday
-                setUpDayTimeTable(saturday)
-            }
-
-            "sunday" -> {
-                val sunday = timetableDays?.Sunday
-                setUpDayTimeTable(sunday)
-            }
-
-        }
-    }
-
-    private fun setUpDayTimeTable(day: List<Course>?) {
-        courseList.clear()
-        if (!day.isNullOrEmpty()) {
-            for (course in day) {
-                val pd = PeriodDetails(
-                    course.code,
-                    course.name,
-                    parseTimeToTimestamp(course.start_time),
-                    parseTimeToTimestamp(course.end_time),
-                    course.slot,
-                    course.venue
-                )
-                courseList.add(pd)
-            }
-            courseList.sortBy { it.startTime }
-
-        }
-        scheduleSetup()
-
-    }
-
-
-    private fun parseTimeToTimestamp(timeString: String): Timestamp {
-        try {
-            val time = replaceYearIfZero(timeString)
-            val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
-            // Set the time zone of the date format to UTC
-            val date = dateFormat.parse(time)
-            Timber.d("Date----: $date")
-
-            if (date != null) {
-                val localTimeZone = TimeZone.getDefault()
-                val localDate = Date(date.time)
-                return Timestamp(localDate)
-            } else {
-                return Timestamp.now()
-            }
-        } catch (e: Exception) {
-            Timber.d("Date----: ${e.message}")
-            return Timestamp.now()
-        }
-    }
-
-    private fun replaceYearIfZero(dateStr: String): String {
-        if (dateStr.startsWith("0")) {
-            // Replace the first 4 characters with "2023"
-            return "2023" + dateStr.substring(4)
-        } else {
-            // No change needed
-            return dateStr
         }
     }
 
@@ -235,7 +93,6 @@ class DayFragment : Fragment() {
                 dayList.adapter = PeriodAdapter(courseList, fragID)
                 dayList.layoutManager = LinearLayoutManager(context)
                 noPeriod.visibility = View.INVISIBLE
-                binding.loadingView.visibility = View.GONE
             } else {
                 binding.quoteLine.text = try {
                     Quote.getLine(context)
@@ -243,7 +100,6 @@ class DayFragment : Fragment() {
                     DEFAULT_QUOTE
                 }
                 noPeriod.visibility = View.VISIBLE
-                binding.loadingView.visibility = View.GONE
             }
         }
     }
diff --git a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleFragment.kt
index 0b3a2c0..b8b1f4f 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleFragment.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleFragment.kt
@@ -10,13 +10,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.PopupMenu
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
-import coil.load
+import androidx.lifecycle.ViewModelProvider
 import com.dscvit.vitty.BuildConfig
 import com.dscvit.vitty.R
 import com.dscvit.vitty.activity.InstructionsActivity
@@ -42,7 +41,6 @@ class ScheduleFragment : Fragment() {
     private lateinit var prefs: SharedPreferences
     private var uid = ""
     private val db = FirebaseFirestore.getInstance()
-    private var username: String? = null
 
     // This property is only valid between onCreateView and
     // onDestroyView.
@@ -53,12 +51,12 @@ class ScheduleFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        //val scheduleViewModel = ViewModelProvider(this)[ScheduleViewModel::class.java]
+        val scheduleViewModel =
+            ViewModelProvider(this)[ScheduleViewModel::class.java]
 
         _binding = FragmentScheduleBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-
         prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
         uid = prefs.getString("uid", "").toString()
         val classLocation = prefs.getString("openClassId", "").toString()
@@ -117,8 +115,6 @@ class ScheduleFragment : Fragment() {
     }
 
     private fun pageSetup() {
-        username = prefs.getString(Constants.COMMUNITY_USERNAME, "")
-
         val calendar: Calendar = Calendar.getInstance()
         val d = when (calendar.get(Calendar.DAY_OF_WEEK)) {
             Calendar.MONDAY -> 0
@@ -143,20 +139,53 @@ class ScheduleFragment : Fragment() {
 //            UtilFunctions.takeScreenshotAndShare(this, UtilFunctions.getBitmapFromView(rootView))
 //        }
 
-
-        val profilePicture = prefs.getString(Constants.COMMUNITY_PICTURE, "")
-        binding.profileImage.load(profilePicture) {
-            crossfade(true)
-            placeholder(R.drawable.ic_gdscvit)
-            error(R.drawable.ic_gdscvit)
-        }
-
-        binding.profileImage.setOnClickListener {
-            // Open the existing menu when the ImageView is clicked
-            showPopupMenu(it)
+        binding.scheduleToolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.logout -> {
+                    LogoutHelper.logout(requireContext(), requireContext() as Activity, prefs)
+                    true
+                }
+                R.id.settings -> {
+                    startActivity(Intent(context, SettingsActivity::class.java))
+                    true
+                }
+                R.id.support -> {
+                    UtilFunctions.openLink(requireContext(), getString(R.string.telegram_link))
+                    true
+                }
+                R.id.share -> {
+                    val shareIntent = Intent().apply {
+                        action = Intent.ACTION_SEND
+                        type = "text/plain"
+                    }
+                    shareIntent.putExtra(
+                        Intent.EXTRA_TEXT,
+                        getString(R.string.share_text)
+                    )
+                    val pendingIntent = PendingIntent.getBroadcast(
+                        context,
+                        Constants.SHARE_INTENT,
+                        Intent(context, ShareReceiver::class.java),
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+                            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
+                        else
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                    )
+//                    val broadcastReceiver: BroadcastReceiver = ShareReceiver()
+//                    registerReceiver(broadcastReceiver, IntentFilter(SHARE_ACTION))
+                    startActivity(
+                        Intent.createChooser(
+                            shareIntent,
+                            null,
+                            pendingIntent.intentSender
+                        )
+                    )
+                    true
+                }
+                else -> false
+            }
         }
-
-        val pagerAdapter = DayAdapter(this, username)
+        val pagerAdapter = DayAdapter(this)
         binding.pager.adapter = pagerAdapter
         TabLayoutMediator(
             binding.tabs, binding.pager
@@ -166,7 +195,6 @@ class ScheduleFragment : Fragment() {
         binding.pager.currentItem = d
     }
 
-
     private fun firstTimeSetup() {
         val max = 6
         val upCode = prefs.getInt(Constants.UPDATE_CODE, 0)
@@ -244,72 +272,15 @@ class ScheduleFragment : Fragment() {
     private fun introMessage(pos: Int): List<String> {
         return when (pos) {
             0 -> listOf(getString(R.string.congratulations), getString(R.string.complete_msg))
-            1 -> listOf(getString(R.string.new_updates), getString(R.string.about_new_updates))
-            2 -> listOf(getString(R.string.widgets), getString(R.string.about_widgets))
-            3 -> listOf(getString(R.string.notifications), getString(R.string.about_notifications))
-            4 -> listOf(getString(R.string.battery), getString(R.string.about_battery))
-            5 -> listOf(getString(R.string.nav), getString(R.string.about_nav))
+            1 -> listOf(getString(R.string.widgets), getString(R.string.about_widgets))
+            2 -> listOf(getString(R.string.notifications), getString(R.string.about_notifications))
+            3 -> listOf(getString(R.string.battery), getString(R.string.about_battery))
+            4 -> listOf(getString(R.string.nav), getString(R.string.about_nav))
+            5 -> listOf(getString(R.string.new_updates), getString(R.string.about_new_updates))
             else -> listOf(getString(R.string.final_heading), getString(R.string.about_final))
         }
     }
 
-    private fun showPopupMenu(view: View) {
-        val popupMenu = PopupMenu(requireContext(), view)
-        val inflater = popupMenu.menuInflater
-        inflater.inflate(R.menu.schedule_menu, popupMenu.menu)
-        popupMenu.setOnMenuItemClickListener { menuItem ->
-            when (menuItem.itemId) {
-                R.id.logout -> {
-                    LogoutHelper.logout(requireContext(), requireContext() as Activity, prefs)
-                    true
-                }
-
-                R.id.settings -> {
-                    startActivity(Intent(context, SettingsActivity::class.java))
-                    true
-                }
-
-                R.id.support -> {
-                    UtilFunctions.openLink(requireContext(), getString(R.string.telegram_link))
-                    true
-                }
-
-                R.id.share -> {
-                    val shareIntent = Intent().apply {
-                        action = Intent.ACTION_SEND
-                        type = "text/plain"
-                    }
-                    shareIntent.putExtra(
-                        Intent.EXTRA_TEXT,
-                        getString(R.string.share_text)
-                    )
-                    val pendingIntent = PendingIntent.getBroadcast(
-                        context,
-                        Constants.SHARE_INTENT,
-                        Intent(context, ShareReceiver::class.java),
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-                            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-                        else
-                            PendingIntent.FLAG_UPDATE_CURRENT
-                    )
-//                    val broadcastReceiver: BroadcastReceiver = ShareReceiver()
-//                    registerReceiver(broadcastReceiver, IntentFilter(SHARE_ACTION))
-                    startActivity(
-                        Intent.createChooser(
-                            shareIntent,
-                            null,
-                            pendingIntent.intentSender
-                        )
-                    )
-                    true
-                }
-
-                else -> false
-            }
-        }
-        popupMenu.show()
-    }
-
     override fun onStart() {
         super.onStart()
         setupOnStart()
diff --git a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt
deleted file mode 100644
index 93d5d26..0000000
--- a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt
+++ /dev/null
@@ -1,628 +0,0 @@
-package com.dscvit.vitty.ui.schedule
-
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRowDefaults
-import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.core.content.edit
-import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
-import com.dscvit.vitty.R
-import com.dscvit.vitty.activity.SettingsActivity
-import com.dscvit.vitty.model.PeriodDetails
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import com.dscvit.vitty.theme.Accent
-import com.dscvit.vitty.theme.Poppins
-import com.dscvit.vitty.theme.Secondary
-import com.dscvit.vitty.theme.TextColor
-import com.dscvit.vitty.util.Constants
-import com.dscvit.vitty.util.Quote
-import com.dscvit.vitty.util.UtilFunctions
-import com.dscvit.vitty.util.VITMap
-import com.dscvit.vitty.widget.parseTimeToTimestamp
-import com.google.gson.Gson
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ScheduleScreenContent(
-    onOpenDrawer: () -> Unit = {},
-    onCardClick: (String, String) -> Unit = { _, _ -> },
-) {
-    val context = LocalContext.current
-    val prefs = context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-    val scheduleViewModel: ScheduleViewModel = viewModel()
-    val scope = rememberCoroutineScope()
-
-    val days = listOf("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
-    val currentDay =
-        remember {
-            when (Calendar.getInstance().get(Calendar.DAY_OF_WEEK)) {
-                Calendar.MONDAY -> 0
-                Calendar.TUESDAY -> 1
-                Calendar.WEDNESDAY -> 2
-                Calendar.THURSDAY -> 3
-                Calendar.FRIDAY -> 4
-                Calendar.SATURDAY -> 5
-                Calendar.SUNDAY -> 6
-                else -> 0
-            }
-        }
-
-    val pagerState =
-        rememberPagerState(
-            initialPage = currentDay,
-            pageCount = { 7 },
-        )
-
-    var allDaysData by remember { mutableStateOf<Map<Int, List<PeriodDetails>>>(emptyMap()) }
-    var isInitialLoading by remember { mutableStateOf(true) }
-    var quote by remember { mutableStateOf("") }
-    var hasLoadedData by remember { mutableStateOf(false) }
-
-    var showExamModeAlert by remember { mutableStateOf(prefs.getBoolean(Constants.EXAM_MODE, false)) }
-    var satModeSettingKey by remember { mutableStateOf(UtilFunctions.getSatModeCode()) }
-
-    DisposableEffect(context) {
-        val listener =
-            SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-                when (key) {
-                    Constants.EXAM_MODE -> {
-                        showExamModeAlert = prefs.getBoolean(Constants.EXAM_MODE, false)
-                    }
-                    satModeSettingKey -> {
-                        scope.launch {
-                            withContext(Dispatchers.Default) {
-                                val cachedData = prefs.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-                                if (cachedData != null) {
-                                    try {
-                                        val response = Gson().fromJson(cachedData, UserResponse::class.java)
-                                        val processedData = processAllDaysData(response, prefs)
-                                        withContext(Dispatchers.Main) {
-                                            allDaysData = processedData
-                                        }
-                                    } catch (e: Exception) {
-                                        Timber.e("Error refreshing schedule data: ${e.message}")
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        prefs.registerOnSharedPreferenceChangeListener(listener)
-        onDispose {
-            prefs.unregisterOnSharedPreferenceChangeListener(listener)
-        }
-    }
-
-    LaunchedEffect(hasLoadedData) {
-        if (hasLoadedData) return@LaunchedEffect
-        withContext(Dispatchers.Default) {
-            quote =
-                try {
-                    Quote.getLine(context)
-                } catch (e: Exception) {
-                    Constants.DEFAULT_QUOTE
-                }
-
-            val cachedData = prefs.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-            if (cachedData != null) {
-                try {
-                    val response = Gson().fromJson(cachedData, UserResponse::class.java)
-                    val processedData = processAllDaysData(response, prefs)
-                    withContext(Dispatchers.Main) {
-                        allDaysData = processedData
-                        isInitialLoading = false
-                    }
-                } catch (e: Exception) {
-                    Timber.e("Error loading cached data: ${e.message}")
-                }
-            }
-        }
-
-        val token = prefs.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        val username = prefs.getString(Constants.COMMUNITY_USERNAME, "") ?: ""
-
-        if (token.isNotEmpty() && username.isNotEmpty()) {
-            scheduleViewModel.getUserWithTimeTable(token, username)
-        } else {
-            isInitialLoading = false
-        }
-
-        hasLoadedData = true
-    }
-
-    val userResponse by scheduleViewModel.user.observeAsState()
-    LaunchedEffect(userResponse) {
-        userResponse?.let { response ->
-            withContext(Dispatchers.Default) {
-                val responseJson = Gson().toJson(response)
-                prefs.edit { putString(Constants.CACHE_COMMUNITY_TIMETABLE, responseJson) }
-
-                val processedData = processAllDaysData(response, prefs)
-                withContext(Dispatchers.Main) {
-                    allDaysData = processedData
-                    isInitialLoading = false
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.background),
-    ) {
-        TopAppBar(
-            title = {
-                Text(
-                    text = "Schedule",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold,
-                )
-            },
-            actions = {
-                val profilePicture = prefs.getString(Constants.COMMUNITY_PICTURE, "")
-                Box(modifier = Modifier.padding(end = 8.dp)) {
-                    AsyncImage(
-                        model = profilePicture,
-                        contentDescription = "Profile Picture",
-                        modifier =
-                            Modifier
-                                .size(40.dp)
-                                .clip(CircleShape)
-                                .clickable { onOpenDrawer() },
-                        placeholder = painterResource(R.drawable.ic_gdscvit),
-                        error = painterResource(R.drawable.ic_gdscvit),
-                    )
-                }
-            },
-            colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.background,
-                    titleContentColor = MaterialTheme.colorScheme.onBackground,
-                ),
-        )
-
-        ScrollableTabRow(
-            selectedTabIndex = pagerState.currentPage,
-            containerColor = MaterialTheme.colorScheme.surface,
-            contentColor = MaterialTheme.colorScheme.onSurface,
-            divider = {},
-            edgePadding = 0.dp,
-            indicator = { tabPositions ->
-                if (pagerState.currentPage < tabPositions.size) {
-                    TabRowDefaults.SecondaryIndicator(
-                        modifier = Modifier.tabIndicatorOffset(tabPositions[pagerState.currentPage]),
-                        color = TextColor,
-                    )
-                }
-            },
-        ) {
-            days.forEachIndexed { index, day ->
-                Tab(
-                    selected = pagerState.currentPage == index,
-                    onClick = {
-                        scope.launch {
-                            pagerState.animateScrollToPage(index)
-                        }
-                    },
-                    text = {
-                        Text(
-                            text = day,
-                            fontFamily = Poppins,
-                            fontWeight = if (pagerState.currentPage == index) FontWeight.Medium else FontWeight.Normal,
-                            fontSize = 20.sp,
-                            lineHeight = (20 * 1.4).sp,
-                            color = if (pagerState.currentPage == index) TextColor else Accent,
-                            textAlign = TextAlign.Center,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                    },
-                )
-            }
-        }
-
-        Box(modifier = Modifier.height(16.dp))
-
-        Box(modifier = Modifier.weight(1f)) {
-            if (isInitialLoading) {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    CircularProgressIndicator()
-                }
-            } else {
-                HorizontalPager(
-                    state = pagerState,
-                    modifier = Modifier.fillMaxSize(),
-                ) { page ->
-                    DayContent(
-                        periods = allDaysData[page] ?: emptyList(),
-                        quote = quote,
-                        dayIndex = page,
-                        onCardClick = onCardClick,
-                    )
-                }
-            }
-        }
-
-        AnimatedVisibility(
-            visible = showExamModeAlert,
-            enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
-            exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
-        ) {
-            Box(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clickable {
-                            context.startActivity(Intent(context, SettingsActivity::class.java))
-                        }.background(Secondary),
-            ) {
-                Row(
-                    modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = 16.dp),
-                    horizontalArrangement = Arrangement.Center,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_snooze_notifications),
-                        contentDescription = "Exam Mode",
-                        tint = Accent,
-                        modifier = Modifier.size(16.dp),
-                    )
-                    Spacer(modifier = Modifier.width(4.dp))
-                    Text(
-                        text = "No Classes Mode Turned On",
-                        color = Accent,
-                        style = MaterialTheme.typography.bodyMedium,
-                        fontWeight = FontWeight.Medium,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DayContent(
-    periods: List<PeriodDetails>,
-    quote: String,
-    dayIndex: Int,
-    onCardClick: (String, String) -> Unit = { _, _ -> },
-) {
-    val context = LocalContext.current
-
-    if (periods.isEmpty()) {
-        Box(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 18.dp, vertical = 32.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_timetable_outline),
-                    contentDescription = "No Classes",
-                    modifier = Modifier.size(64.dp),
-                    tint = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f),
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                Text(
-                    text = "No classes today!",
-                    style = MaterialTheme.typography.headlineMedium,
-                    color = MaterialTheme.colorScheme.onBackground,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(
-                    text = quote,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f),
-                    textAlign = TextAlign.Center,
-                    lineHeight = 20.sp,
-                )
-            }
-        }
-    } else {
-        LazyColumn(
-            modifier =
-                Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 18.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-            contentPadding = PaddingValues(top = 16.dp, bottom = 136.dp),
-        ) {
-            items(
-                items = periods,
-                key = { period -> "${period.startTime}_${period.courseCode}_${period.slot}_${period.endTime}" },
-            ) { period ->
-                PeriodCard(
-                    period = period,
-                    dayIndex = dayIndex,
-                    onLocationClick = { roomNo ->
-                        VITMap.openClassMap(context, roomNo)
-                    },
-                    onCardClick = onCardClick,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun PeriodCard(
-    period: PeriodDetails,
-    dayIndex: Int,
-    onLocationClick: (String) -> Unit,
-    onCardClick: (String, String) -> Unit = { _, _ -> },
-) {
-    val timeFormat = remember { SimpleDateFormat("h:mm a", Locale.getDefault()) }
-    val startTimeStr =
-        remember(period.startTime) {
-            timeFormat.format(period.startTime.toDate()).uppercase()
-        }
-    val endTimeStr =
-        remember(period.endTime) {
-            timeFormat.format(period.endTime.toDate()).uppercase()
-        }
-
-    val now = Calendar.getInstance()
-
-    val isToday =
-        remember(dayIndex) {
-            val todayIndex =
-                when (now.get(Calendar.DAY_OF_WEEK)) {
-                    Calendar.MONDAY -> 0
-                    Calendar.TUESDAY -> 1
-                    Calendar.WEDNESDAY -> 2
-                    Calendar.THURSDAY -> 3
-                    Calendar.FRIDAY -> 4
-                    Calendar.SATURDAY -> 5
-                    Calendar.SUNDAY -> 6
-                    else -> -1
-                }
-            dayIndex == todayIndex
-        }
-
-    val isActive =
-        if (!isToday) {
-            false
-        } else {
-            val startTime = Calendar.getInstance().apply { time = period.startTime.toDate() }
-            val endTime = Calendar.getInstance().apply { time = period.endTime.toDate() }
-            val currentTime = Calendar.getInstance()
-
-            val currentHourMinute = currentTime.get(Calendar.HOUR_OF_DAY) * 60 + currentTime.get(Calendar.MINUTE)
-            val startHourMinute = startTime.get(Calendar.HOUR_OF_DAY) * 60 + startTime.get(Calendar.MINUTE)
-            val endHourMinute = endTime.get(Calendar.HOUR_OF_DAY) * 60 + endTime.get(Calendar.MINUTE)
-
-            currentHourMinute in startHourMinute..endHourMinute
-        }
-
-    Card(
-        modifier =
-            Modifier
-                .fillMaxWidth(),
-        colors =
-            CardDefaults.cardColors(
-                containerColor = Secondary,
-            ),
-        border =
-            if (isActive) {
-                BorderStroke(
-                    1.dp,
-                    Accent,
-                )
-            } else {
-                null
-            },
-        shape = RoundedCornerShape(16.dp),
-        onClick = {
-            onCardClick(period.courseName, period.courseCode)
-        },
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp, vertical = 28.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.Top,
-            ) {
-                Column(
-                    modifier = Modifier.weight(1f),
-                ) {
-                    Text(
-                        text = period.courseName,
-                        style = MaterialTheme.typography.labelLarge,
-                        fontWeight = FontWeight.Bold,
-                        color = TextColor,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(4.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Text(
-                    text = "$startTimeStr - $endTimeStr | ${period.slot}",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Accent,
-                    fontWeight = FontWeight.Medium,
-                )
-
-                if (period.roomNo.isNotEmpty()) {
-                    Box(
-                        modifier =
-                            Modifier
-                                .clip(RoundedCornerShape(9999.dp))
-                                .clickable(
-                                    onClick = { onLocationClick(period.roomNo) },
-                                ).border(
-                                    width = 1.dp,
-                                    color = Accent,
-                                    shape = RoundedCornerShape(9999.dp),
-                                ).padding(horizontal = 8.dp, vertical = 4.dp),
-                    ) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Image(
-                                painter = painterResource(id = R.drawable.ic_compass),
-                                contentDescription = "Compass icon",
-                                modifier = Modifier.size(12.dp),
-                                alignment = Alignment.Center,
-                            )
-                            Spacer(modifier = Modifier.width(4.dp))
-                            Text(
-                                text = period.roomNo,
-                                style =
-                                    MaterialTheme.typography.bodyMedium.copy(
-                                        fontSize = 12.sp,
-                                        lineHeight = 12.sp,
-                                        letterSpacing = (-0.12).sp,
-                                        textAlign = TextAlign.Center,
-                                    ),
-                                color = MaterialTheme.colorScheme.primary,
-                                fontWeight = FontWeight.Medium,
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-private fun processAllDaysData(
-    userResponse: UserResponse,
-    prefs: SharedPreferences,
-): Map<Int, List<PeriodDetails>> {
-    val timetableData = userResponse.timetable?.data ?: return emptyMap()
-    val dayNames = listOf("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday")
-
-    val result = mutableMapOf<Int, List<PeriodDetails>>()
-
-    dayNames.forEachIndexed { index, dayName ->
-        val actualDayName =
-            if (dayName == "saturday") {
-                prefs.getString(UtilFunctions.getSatModeCode(), "saturday") ?: "saturday"
-            } else {
-                dayName
-            }
-
-        val courses =
-            when (actualDayName) {
-                "monday" -> timetableData.Monday
-                "tuesday" -> timetableData.Tuesday
-                "wednesday" -> timetableData.Wednesday
-                "thursday" -> timetableData.Thursday
-                "friday" -> timetableData.Friday
-                "saturday" -> timetableData.Saturday
-                "sunday" -> timetableData.Sunday
-                else -> emptyList()
-            }
-
-        val periods =
-            courses
-                ?.map { course ->
-                    PeriodDetails(
-                        courseCode = course.code,
-                        courseName = course.name,
-                        startTime = parseTimeToTimestamp(course.start_time),
-                        endTime = parseTimeToTimestamp(course.end_time),
-                        slot = course.slot,
-                        roomNo = course.venue,
-                    )
-                }?.sortedBy { it.startTime.toDate() } ?: emptyList()
-
-        result[index] = periods
-    }
-
-    return result
-}
diff --git a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleViewModel.kt b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleViewModel.kt
index 675c23a..00e59ae 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleViewModel.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleViewModel.kt
@@ -1,104 +1,6 @@
 package com.dscvit.vitty.ui.schedule
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitSelfUserListener
-import com.dscvit.vitty.network.api.community.RetrofitTimetableListener
-import com.dscvit.vitty.network.api.community.responses.timetable.TimetableResponse
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
-import retrofit2.Call
-import timber.log.Timber
 
 class ScheduleViewModel : ViewModel() {
-    private val _user = MutableLiveData<UserResponse?>()
-    private val _timetable = MutableLiveData<TimetableResponse?>()
-
-    val user: MutableLiveData<UserResponse?> = _user
-    val timetable: MutableLiveData<TimetableResponse?> = _timetable
-
-    fun getUserWithTimeTable(
-        token: String,
-        username: String,
-    ) {
-        Timber.d("Fetching user with timetable: token: $token, username: $username")
-        APICommunityRestClient.instance.getUserWithTimeTable(
-            token,
-            username,
-            object : RetrofitSelfUserListener {
-                override fun onSuccess(
-                    call: Call<UserResponse>?,
-                    response: UserResponse?,
-                ) {
-                    Timber.d("User with timetable fetched successfully: $response")
-                    _user.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<UserResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.e("Error fetching user with timetable: ${t?.message}")
-                    _user.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun getTimeTable(
-        token: String,
-        username: String,
-    ) {
-        Timber.d("Fetching user with timetable: token: $token, username: $username")
-        APICommunityRestClient.instance.getTimeTable(
-            token,
-            username,
-            object : RetrofitTimetableListener {
-                override fun onSuccess(
-                    call: Call<TimetableResponse>?,
-                    response: TimetableResponse?,
-                ) {
-                    Timber.d("User with timetable fetched successfully: $response")
-                    _timetable.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<TimetableResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.e("Error fetching user with timetable: ${t?.message}")
-                    _timetable.postValue(null)
-                }
-            },
-        )
-    }
-
-    fun getCircleTimeTable(
-        token: String,
-        circleId: String,
-        username: String,
-    ) {
-        APICommunityRestClient.instance.getCircleTimeTable(
-            token,
-            circleId,
-            username,
-            object : RetrofitTimetableListener {
-                override fun onSuccess(
-                    call: Call<TimetableResponse>?,
-                    response: TimetableResponse?,
-                ) {
-                    Timber.d("Circle timetable fetched successfully: $response")
-                    _timetable.postValue(response)
-                }
-
-                override fun onError(
-                    call: Call<TimetableResponse>?,
-                    t: Throwable?,
-                ) {
-                    Timber.e("Error fetching circle timetable: ${t?.message}")
-                    _timetable.postValue(null)
-                }
-            },
-        )
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/ui/settings/SettingsFragment.kt b/app/src/main/java/com/dscvit/vitty/ui/settings/SettingsFragment.kt
index a6024d2..49ea910 100755
--- a/app/src/main/java/com/dscvit/vitty/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/settings/SettingsFragment.kt
@@ -9,7 +9,6 @@ import android.os.PowerManager
 import android.provider.Settings
 import android.view.View
 import android.widget.Toast
-import androidx.core.net.toUri
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -22,18 +21,12 @@ import com.dscvit.vitty.util.UtilFunctions.getSatModeCode
 import com.dscvit.vitty.util.UtilFunctions.reloadWidgets
 
 class SettingsFragment : PreferenceFragmentCompat() {
-    override fun onCreatePreferences(
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-    ) {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
         setupPreferences()
     }
 
-    override fun onViewCreated(
-            view: View,
-            savedInstanceState: Bundle?,
-    ) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val rv = listView
         rv.setPadding(24, 0, 24, 0)
@@ -63,9 +56,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
         individualNotification?.setOnPreferenceClickListener {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val settingsIntent: Intent =
-                        Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                .putExtra(Settings.EXTRA_APP_PACKAGE, context?.packageName)
+                    Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(Settings.EXTRA_APP_PACKAGE, context?.packageName)
                 startActivity(settingsIntent)
             }
             true
@@ -90,24 +83,22 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val pm: PowerManager = context?.getSystemService(Context.POWER_SERVICE) as PowerManager
         if (pm.isIgnoringBatteryOptimizations(context?.packageName)) {
             batteryOptimization?.summary =
-                    "Keep the battery optimizations turned off to receive notifications on time"
+                "Keep the battery optimizations turned off to receive notifications on time"
         }
 
         batteryOptimization?.setOnPreferenceClickListener {
             if (!pm.isIgnoringBatteryOptimizations(context?.packageName)) {
                 Toast.makeText(
-                                context,
-                                "Please turn off the Battery Optimization Settings for VITTY to receive notifications on time.",
-                                Toast.LENGTH_LONG,
-                        )
-                        .show()
+                    context,
+                    "Please turn off the Battery Optimization Settings for VITTY to receive notifications on time.",
+                    Toast.LENGTH_LONG
+                ).show()
             } else {
                 Toast.makeText(
-                                context,
-                                "Please keep the Battery Optimization Settings for VITTY turned off to receive notifications on time.",
-                                Toast.LENGTH_LONG,
-                        )
-                        .show()
+                    context,
+                    "Please keep the Battery Optimization Settings for VITTY turned off to receive notifications on time.",
+                    Toast.LENGTH_LONG
+                ).show()
             }
             val pmIntent = Intent()
             pmIntent.action = Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS
@@ -116,18 +107,15 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
-    private fun openWebsite(
-            key: String,
-            website: String,
-    ) {
+    private fun openWebsite(key: String, website: String) {
         val pref: Preference? = findPreference(key)
         pref?.setOnPreferenceClickListener {
             try {
                 startActivity(
-                        Intent(
-                                Intent.ACTION_VIEW,
-                                Uri.parse(website),
-                        ),
+                    Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse(website)
+                    )
                 )
                 true
             } catch (e: Exception) {
@@ -139,8 +127,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     private fun setupAccountDetails() {
         val prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
-        //        val cat: PreferenceCategory? = findPreference("account_title")
-        //        cat?.title = prefs.getString("sign_in_method", "Google") + " Account Details"
+//        val cat: PreferenceCategory? = findPreference("account_title")
+//        cat?.title = prefs.getString("sign_in_method", "Google") + " Account Details"
         val account: Preference? = findPreference("account")
         account?.setOnPreferenceClickListener {
             LogoutHelper.logout(requireContext(), requireActivity(), prefs)
@@ -154,47 +142,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
         openWebsite(Constants.CHANGE_TIMETABLE, Constants.VITTY_URL)
     }
 
-    private fun setupSupportAndFeedback() {
-
-        val supportEmail: Preference? = findPreference(Constants.SUPPORT_EMAIL)
-        supportEmail?.setOnPreferenceClickListener {
-            try {
-                val emailIntent =
-                        Intent(Intent.ACTION_SENDTO).apply {
-                            data = "mailto:".toUri()
-                            putExtra(Intent.EXTRA_EMAIL, arrayOf(Constants.SUPPORT_EMAIL_ADDRESS))
-                            putExtra(Intent.EXTRA_SUBJECT, "Vitty App Support Request")
-                            putExtra(
-                                    Intent.EXTRA_TEXT,
-                                    "Hi Vitty Support Team,\n\nI need help with:\n\n"
-                            )
-                        }
-                startActivity(Intent.createChooser(emailIntent, "Send Email"))
-                true
-            } catch (e: Exception) {
-
-                val clipboard =
-                        requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as
-                                android.content.ClipboardManager
-                val clip =
-                        android.content.ClipData.newPlainText(
-                                "Support Email",
-                                Constants.SUPPORT_EMAIL_ADDRESS
-                        )
-                clipboard.setPrimaryClip(clip)
-                Toast.makeText(
-                                context,
-                                "Email address copied to clipboard: ${Constants.SUPPORT_EMAIL_ADDRESS}",
-                                Toast.LENGTH_LONG
-                        )
-                        .show()
-                false
-            }
-        }
-
-        openWebsite(Constants.GITHUB_ISSUES, Constants.GITHUB_ISSUES_LINK)
-    }
-
     private fun setupClass() {
         val prefs = requireContext().getSharedPreferences(Constants.USER_INFO, 0)
         val satClass: ListPreference? = findPreference("sat_mode")
@@ -210,7 +157,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val pref: Preference? = findPreference("refresh_widgets")
         pref?.setOnPreferenceClickListener {
             reloadWidgets(requireContext())
-            //            Toast.makeText(context, "Refreshed!", Toast.LENGTH_LONG).show()
+//            Toast.makeText(context, "Refreshed!", Toast.LENGTH_LONG).show()
             pref.isEnabled = false
             pref.isSelectable = false
             pref.summary = "Refreshed!"
@@ -222,10 +169,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
         setupAccountDetails()
         setupClass()
         setupNotifications()
-        //        setupEffects()
+//        setupEffects()
         setupBattery()
         setupRefreshWidgets()
         setupAbout()
-        setupSupportAndFeedback()
     }
 }
diff --git a/app/src/main/java/com/dscvit/vitty/util/APIConstants.kt b/app/src/main/java/com/dscvit/vitty/util/APIConstants.kt
new file mode 100644
index 0000000..ed05084
--- /dev/null
+++ b/app/src/main/java/com/dscvit/vitty/util/APIConstants.kt
@@ -0,0 +1,6 @@
+package com.dscvit.vitty.util
+
+object APIConstants {
+    const val BASE_URL = "https://shielded-beyond-17845.herokuapp.com"
+    const val TIMEOUT = 10
+}
diff --git a/app/src/main/java/com/dscvit/vitty/util/Analytics.kt b/app/src/main/java/com/dscvit/vitty/util/Analytics.kt
index 2556822..095141d 100755
--- a/app/src/main/java/com/dscvit/vitty/util/Analytics.kt
+++ b/app/src/main/java/com/dscvit/vitty/util/Analytics.kt
@@ -8,7 +8,6 @@ import java.util.Calendar
 
 object Analytics {
     private val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics
-
     fun share(packageName: String) {
         firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SHARE) {
             param(FirebaseAnalytics.Param.CONTENT_TYPE, "text")
@@ -32,12 +31,4 @@ object Analytics {
             param("block", block)
         }
     }
-
-    fun appNavigation(screen: String) {
-        firebaseAnalytics.logEvent("app_navigation") {
-            param(FirebaseAnalytics.Param.CONTENT_TYPE, "text")
-            param(FirebaseAnalytics.Param.ITEM_ID, Calendar.getInstance().timeInMillis)
-            param("screen", screen)
-        }
-    }
 }
diff --git a/app/src/main/java/com/dscvit/vitty/util/Constants.kt b/app/src/main/java/com/dscvit/vitty/util/Constants.kt
index e5e2bbd..b320713 100755
--- a/app/src/main/java/com/dscvit/vitty/util/Constants.kt
+++ b/app/src/main/java/com/dscvit/vitty/util/Constants.kt
@@ -1,10 +1,6 @@
 package com.dscvit.vitty.util
 
-import java.net.URLDecoder
-import java.nio.charset.StandardCharsets
-
 object Constants {
-    const val GHOST_MODE = "false"
     const val PERIODS = "periods"
     const val TIME_SLOTS = "time_slots"
     const val UID = "uid"
@@ -29,7 +25,7 @@ object Constants {
     const val GDSCVIT_TAG = "gdscvit_website"
     const val GDSCVIT_WEBSITE = "https://dscvit.com/"
     const val VITTY_APP_URL = "https://dscv.it/app/vitty"
-    const val VITTY_URL = "https://dscv.it/vittyconnect"
+    const val VITTY_URL = "https://dscv.it/vitty"
     const val ALARM_INTENT = 0
     const val TODAY_INTENT = 1
     const val NEXT_CLASS_INTENT = 2
@@ -41,39 +37,4 @@ object Constants {
     const val VIBRATION_MODE = "vib_mode"
     const val SAT_MODE = "sat_mode"
     const val CHANGE_TIMETABLE = "change_timetable"
-
-    // Support & Feedback
-    const val SUPPORT_EMAIL = "support_email"
-    const val SUPPORT_EMAIL_ADDRESS = "dscvit.vitty@gmail.com"
-    const val GITHUB_ISSUES = "github_issues"
-    const val GITHUB_ISSUES_LINK = "https://github.com/GDGVIT/vitty-app/issues"
-
-    const val COMMUNITY_TOKEN = "community_token"
-    const val COMMUNITY_USERNAME = "community_username"
-    const val COMMUNITY_NAME = "community_name"
-    const val COMMUNITY_PICTURE = "community_picture"
-    const val COMMUNITY_REGNO = "community_regno"
-    const val COMMUNITY_CAMPUS = "community_campus"
-    const val COMMUNITY_TIMETABLE_AVAILABLE = "community_timetable_available"
-    const val COMMUNITY_PINNED_FRIEND_1 = "community_pinned_friend_1"
-    const val COMMUNITY_PINNED_FRIEND_2 = "community_pinned_friend_2"
-    const val COMMUNITY_PINNED_FRIEND_3 = "community_pinned_friend_3"
-
-    const val CACHE_COMMUNITY_TIMETABLE = "cache_community_timetable"
-
-    const val REMINDER_CHANNEL_ID = "reminder_channel"
-    const val REMINDER_CHANNEL_NAME = "Reminders"
-    const val REMINDER_CHANNEL_DESC = "Notifications for course reminders"
-
-    const val PREF_LAST_REVIEW_REQUEST = "last_review_request"
-
-    const val ACTIVE_FRIENDS_FETCHED = "active_friends_fetched"
-    const val ACTIVE_FRIENDS_LIST = "active_friends_list"
 }
-
-fun String.urlDecode(): String =
-    try {
-        URLDecoder.decode(this, StandardCharsets.UTF_8.toString())
-    } catch (e: Exception) {
-        this
-    }
diff --git a/app/src/main/java/com/dscvit/vitty/util/LogoutHelper.kt b/app/src/main/java/com/dscvit/vitty/util/LogoutHelper.kt
index 43ecd54..6751be4 100755
--- a/app/src/main/java/com/dscvit/vitty/util/LogoutHelper.kt
+++ b/app/src/main/java/com/dscvit/vitty/util/LogoutHelper.kt
@@ -8,32 +8,27 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
 import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.content.edit
 import com.dscvit.vitty.R
 import com.dscvit.vitty.activity.AuthActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.firebase.auth.FirebaseAuth
 
 object LogoutHelper {
-    fun logout(
-        context: Context,
-        activity: Activity,
-        prefs: SharedPreferences,
-    ) {
-        val v: View =
-            LayoutInflater
-                .from(context)
-                .inflate(R.layout.dialog_logout, null)
 
-        val dialog =
-            MaterialAlertDialogBuilder(context)
-                .setView(v)
-                .setBackground(
-                    AppCompatResources.getDrawable(
-                        context,
-                        R.color.transparent,
-                    ),
-                ).create()
+    fun logout(context: Context, activity: Activity, prefs: SharedPreferences) {
+        val v: View = LayoutInflater
+            .from(context)
+            .inflate(R.layout.dialog_logout, null)
+
+        val dialog = MaterialAlertDialogBuilder(context)
+            .setView(v)
+            .setBackground(
+                AppCompatResources.getDrawable(
+                    context,
+                    R.color.transparent
+                )
+            )
+            .create()
 
         dialog.show()
 
@@ -50,20 +45,8 @@ object LogoutHelper {
                 putInt(Constants.UPDATE, 0)
                 putString(Constants.UID, "")
                 putBoolean(Constants.FIRST_TIME_SETUP, false)
-                putString(Constants.COMMUNITY_USERNAME, null)
-                putString(Constants.COMMUNITY_TOKEN, null)
-                putString(Constants.COMMUNITY_NAME, null)
-                putString(Constants.COMMUNITY_PICTURE, null)
-                putString(Constants.COMMUNITY_REGNO, null)
-                putString(Constants.COMMUNITY_CAMPUS, null)
-                putBoolean(Constants.COMMUNITY_TIMETABLE_AVAILABLE, false)
-                putString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-                putBoolean(Constants.ACTIVE_FRIENDS_FETCHED, false)
-                putString(Constants.ACTIVE_FRIENDS_FETCHED, null)
-
                 apply()
             }
-            prefs.edit { clear() }
             FirebaseAuth.getInstance().signOut()
             val intent = Intent(context, AuthActivity::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
diff --git a/app/src/main/java/com/dscvit/vitty/util/MaintenanceChecker.kt b/app/src/main/java/com/dscvit/vitty/util/MaintenanceChecker.kt
deleted file mode 100644
index e03b6f3..0000000
--- a/app/src/main/java/com/dscvit/vitty/util/MaintenanceChecker.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.dscvit.vitty.util
-
-import android.content.Context
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitServerStatusListener
-import retrofit2.Call
-import timber.log.Timber
-
-object MaintenanceChecker {
-
-    private const val API_OPERATIONAL_MESSAGE = "Welcome to VITTY API!🎉"
-    private var isChecking = false
-
-    fun checkMaintenanceStatusAsync(
-        context: Context,
-        onResult: (isUnderMaintenance: Boolean) -> Unit
-    ) {
-        if (isChecking) return
-
-        isChecking = true
-
-        APICommunityRestClient.instance.checkServerStatus(
-            object : RetrofitServerStatusListener {
-                override fun onSuccess(call: Call<String>, response: String?, isSuccessful: Boolean) {
-                    val result = when {
-                        !isSuccessful -> {
-                            Timber.d("Server returned error")
-                            true // Server error = maintenance
-                        }
-                        response == null -> {
-                            Timber.d("No response body received")
-                            true // No response = maintenance
-                        }
-                        response.contains(API_OPERATIONAL_MESSAGE) -> {
-                            Timber.d("API operational message found")
-                            false // API working
-                        }
-                        else -> {
-                            Timber.d("Different response received: $response")
-                            true // Different response = maintenance
-                        }
-                    }
-
-                    Timber.d("Maintenance check: isUnderMaintenance=$result, response=$response")
-                    isChecking = false
-                    onResult(result)
-                }
-
-                override fun onError(call: Call<String>, t: Throwable) {
-                    Timber.e(t, "Maintenance check failed")
-                    isChecking = false
-                    onResult(false) // Network error = don't assume maintenance
-                }
-            }
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dscvit/vitty/util/NotificationPermissionHelper.kt b/app/src/main/java/com/dscvit/vitty/util/NotificationPermissionHelper.kt
deleted file mode 100644
index e5abcf0..0000000
--- a/app/src/main/java/com/dscvit/vitty/util/NotificationPermissionHelper.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dscvit.vitty.util
-
-import android.Manifest
-import android.app.AlarmManager
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.provider.Settings
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-
-object NotificationPermissionHelper {
-    fun hasNotificationPermission(context: Context): Boolean =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.POST_NOTIFICATIONS,
-            ) == PackageManager.PERMISSION_GRANTED
-        } else {
-            areNotificationsEnabled(context)
-        }
-
-    private fun areNotificationsEnabled(context: Context): Boolean = NotificationManagerCompat.from(context).areNotificationsEnabled()
-
-    fun canScheduleExactAlarms(context: Context): Boolean =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-            alarmManager.canScheduleExactAlarms()
-        } else {
-            true
-        }
-
-    fun requestExactAlarmPermission(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val intent =
-                Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM).apply {
-                    data = "package:${context.packageName}".toUri()
-                }
-            context.startActivity(intent)
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/util/QRCodeGenerator.kt b/app/src/main/java/com/dscvit/vitty/util/QRCodeGenerator.kt
deleted file mode 100644
index be80d08..0000000
--- a/app/src/main/java/com/dscvit/vitty/util/QRCodeGenerator.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.dscvit.vitty.util
-
-import android.graphics.Bitmap
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.core.graphics.set
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.qrcode.QRCodeWriter
-import androidx.core.graphics.createBitmap
-
-object QRCodeGenerator {
-    fun generateQRCode(
-        content: String,
-        size: Int = 512,
-    ): Bitmap? =
-        try {
-            val writer = QRCodeWriter()
-            val bitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, size, size)
-            val width = bitMatrix.width
-            val height = bitMatrix.height
-            val bitmap = createBitmap(width, height, Bitmap.Config.RGB_565)
-
-            for (x in 0 until width) {
-                for (y in 0 until height) {
-                    bitmap[x, y] =
-                        if (bitMatrix[x, y]) Color.Black.toArgb() else Color.White.toArgb()
-                }
-            }
-            bitmap
-        } catch (e: Exception) {
-            null
-        }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/util/SemesterUtils.kt b/app/src/main/java/com/dscvit/vitty/util/SemesterUtils.kt
deleted file mode 100644
index 52dbd26..0000000
--- a/app/src/main/java/com/dscvit/vitty/util/SemesterUtils.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.dscvit.vitty.util
-
-import java.text.SimpleDateFormat
-import java.util.*
-
-object SemesterUtils {
-    
-    fun determineSemester(date: Date = Date()): String {
-        val calendar = Calendar.getInstance()
-        calendar.time = date
-        val month = calendar.get(Calendar.MONTH) + 1
-        
-        return when (month) {
-            12, 1, 2 -> "Winter ${academicYear(date)}"
-            in 3..6 -> "Summer ${academicYear(date)}"
-            in 7..11 -> "Fall ${academicYear(date)}"
-            else -> "Unknown"
-        }
-    }
-    
-    private fun academicYear(date: Date): String {
-        val calendar = Calendar.getInstance()
-        calendar.time = date
-        val year = calendar.get(Calendar.YEAR)
-        val month = calendar.get(Calendar.MONTH) + 1
-        
-        return if (month < 3) {
-            "${year - 1}-${String.format("%02d", year % 100)}"
-        } else {
-            "$year-${String.format("%02d", (year + 1) % 100)}"
-        }
-    }
-}
diff --git a/app/src/main/java/com/dscvit/vitty/util/UtilFunctions.kt b/app/src/main/java/com/dscvit/vitty/util/UtilFunctions.kt
index 94fbd41..c67653f 100755
--- a/app/src/main/java/com/dscvit/vitty/util/UtilFunctions.kt
+++ b/app/src/main/java/com/dscvit/vitty/util/UtilFunctions.kt
@@ -9,8 +9,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
 import android.net.Uri
 import android.provider.MediaStore
 import android.view.View
@@ -23,37 +21,28 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import java.util.TimeZone
 
 object UtilFunctions {
-    fun openLink(
-        context: Context,
-        url: String,
-    ) {
+
+    fun openLink(context: Context, url: String) {
         try {
             context.startActivity(
                 Intent(
                     Intent.ACTION_VIEW,
-                    Uri.parse(url),
-                ),
+                    Uri.parse(url)
+                )
             )
         } catch (e: Exception) {
             Toast.makeText(context, "Browser not found!", Toast.LENGTH_LONG).show()
         }
     }
 
-    fun copyItem(
-        context: Context,
-        item: String,
-        label: String,
-        url: String,
-    ) {
-        Toast
-            .makeText(
-                context,
-                "$item Copied",
-                Toast.LENGTH_LONG,
-            ).show()
+    fun copyItem(context: Context, item: String, label: String, url: String) {
+        Toast.makeText(
+            context,
+            "$item Copied",
+            Toast.LENGTH_LONG
+        ).show()
         val clipboard: ClipboardManager? =
             context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
         val clip = ClipData.newPlainText(label, url)
@@ -65,10 +54,7 @@ object UtilFunctions {
         reloadWidget(context, TodayWidget::class.java)
     }
 
-    private fun reloadWidget(
-        context: Context,
-        cls: Class<*>,
-    ) {
+    private fun reloadWidget(context: Context, cls: Class<*>) {
         val intent = Intent(context, cls)
         intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
         val ids = AppWidgetManager.getInstance(context).getAppWidgetIds(ComponentName(context, cls))
@@ -81,33 +67,21 @@ object UtilFunctions {
         return now.get(Calendar.WEEK_OF_YEAR).toString() + now.get(Calendar.YEAR).toString()
     }
 
-    fun getSatModeCode(): String = SAT_MODE + getWeekYear()
+    fun getSatModeCode(): String {
+        return SAT_MODE + getWeekYear()
+    }
 
-    fun isUpdated(
-        document: DocumentSnapshot,
-        preferences: SharedPreferences,
-    ): Boolean =
-        try {
+    fun isUpdated(document: DocumentSnapshot, preferences: SharedPreferences): Boolean {
+        return try {
             val oldTimetableVersion = preferences.getLong("TIMETABLE_VERSION", 0)
             val timetableVersion = document.getLong("timetableVersion")
-            if (timetableVersion!! > 0) {
+            if (timetableVersion!! > 0)
                 oldTimetableVersion < timetableVersion
-            } else {
+            else
                 document.getBoolean("isUpdated") == true
-            }
         } catch (e: Exception) {
             document.getBoolean("isUpdated") == true
         }
-
-    fun isNetworkAvailable(context: Context): Boolean {
-        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val network = connectivityManager.activeNetwork
-        val capabilities = connectivityManager.getNetworkCapabilities(network)
-        return capabilities != null &&
-            (
-                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
-                    capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
-            )
     }
 
     fun getBitmapFromView(view: View): Bitmap {
@@ -118,25 +92,19 @@ object UtilFunctions {
         return bitmap
     }
 
-    fun takeScreenshotAndShare(
-        context: Context,
-        bitmap: Bitmap,
-    ) {
-        val dateFormatter =
-            SimpleDateFormat(
-                "yyyy-MM-dd 'at' HH-mm-ss z",
-                Locale.getDefault(),
-            )
+    fun takeScreenshotAndShare(context: Context, bitmap: Bitmap) {
+        val dateFormatter = SimpleDateFormat(
+            "yyyy-MM-dd 'at' HH-mm-ss z", Locale.getDefault()
+        )
         val bitmapPath: String =
             MediaStore.Images.Media.insertImage(
-                context.contentResolver,
-                bitmap,
+                context.contentResolver, bitmap,
                 "VITTY Schedule taken on ${
-                    dateFormatter.format(
-                        Date(),
-                    )
+                dateFormatter.format(
+                    Date()
+                )
                 }",
-                null,
+                null
             )
         val bitmapUri = Uri.parse(bitmapPath)
 
@@ -145,32 +113,4 @@ object UtilFunctions {
         intent.putExtra(Intent.EXTRA_STREAM, bitmapUri)
         context.startActivity(Intent.createChooser(intent, "Share"))
     }
-
-    fun parseBackendTimeString(timeString: String): Date? {
-        try {
-            val timeRegex = """T(\d{2}):(\d{2}):(\d{2})""".toRegex()
-            val match = timeRegex.find(timeString)
-
-            if (match != null) {
-                val hours = match.groupValues[1].toInt()
-                val minutes = match.groupValues[2].toInt()
-                val seconds = match.groupValues[3].toInt()
-
-                val calendar = Calendar.getInstance()
-                calendar.set(Calendar.HOUR_OF_DAY, hours)
-                calendar.set(Calendar.MINUTE, minutes)
-                calendar.set(Calendar.SECOND, seconds)
-                calendar.set(Calendar.MILLISECOND, 0)
-
-                return calendar.time
-            } else {
-                val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.Builder().setLanguage("en").setRegion("IN").build())
-                sdf.timeZone = TimeZone.getTimeZone("Asia/Kolkata")
-                return sdf.parse(timeString)
-            }
-        } catch (e: Exception) {
-            val calendar = Calendar.getInstance(TimeZone.getTimeZone("Asia/Kolkata"))
-            return calendar.time
-        }
-    }
 }
diff --git a/app/src/main/java/com/dscvit/vitty/util/VITMap.kt b/app/src/main/java/com/dscvit/vitty/util/VITMap.kt
index c487406..7d5cd2d 100755
--- a/app/src/main/java/com/dscvit/vitty/util/VITMap.kt
+++ b/app/src/main/java/com/dscvit/vitty/util/VITMap.kt
@@ -7,7 +7,7 @@ import android.widget.Toast
 
 object VITMap {
     private const val VIT = "Vellore+Institute+of+Technology,+Vellore+India" // done
-    private val blocks: HashMap<String, String> = HashMap()
+    val blocks: HashMap<String, String> = HashMap()
 
     init {
         blocks["CDMM"] = "Centre+For+Disaster+Mitigation+And+Management,+$VIT"
@@ -38,7 +38,7 @@ object VITMap {
                 mapIntent.setPackage("com.google.android.apps.maps")
                 try {
                     Analytics.navigation(classBlock)
-                } catch (_: Exception) {
+                } catch (e: Exception) {
                 }
                 mapIntent.resolveActivity(context.packageManager)?.let {
                     context.startActivity(mapIntent)
diff --git a/app/src/main/java/com/dscvit/vitty/util/WebConstants.kt b/app/src/main/java/com/dscvit/vitty/util/WebConstants.kt
deleted file mode 100644
index 6897fae..0000000
--- a/app/src/main/java/com/dscvit/vitty/util/WebConstants.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.dscvit.vitty.util
-
-object WebConstants {
-    const val COMMUNITY_BASE_URL = "https://api-vitty.dscvit.com"
-    const val TIMEOUT = 10
-}
diff --git a/app/src/main/java/com/dscvit/vitty/widget/NextClassWidget.kt b/app/src/main/java/com/dscvit/vitty/widget/NextClassWidget.kt
index 06c42d8..60df5c5 100755
--- a/app/src/main/java/com/dscvit/vitty/widget/NextClassWidget.kt
+++ b/app/src/main/java/com/dscvit/vitty/widget/NextClassWidget.kt
@@ -11,9 +11,6 @@ import com.dscvit.vitty.R
 import com.dscvit.vitty.activity.AuthActivity
 import com.dscvit.vitty.activity.NavigationActivity
 import com.dscvit.vitty.model.PeriodDetails
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitSelfUserListener
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
 import com.dscvit.vitty.util.Constants
 import com.dscvit.vitty.util.Constants.NEXT_CLASS_INTENT
 import com.dscvit.vitty.util.Constants.NEXT_CLASS_NAV_INTENT
@@ -21,10 +18,9 @@ import com.dscvit.vitty.util.Quote
 import com.dscvit.vitty.util.RemoteConfigUtils
 import com.dscvit.vitty.util.UtilFunctions
 import com.google.firebase.firestore.FirebaseFirestore
-import com.google.gson.Gson
+import com.google.firebase.firestore.Source
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.runBlocking
-import retrofit2.Call
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -75,15 +71,6 @@ internal fun updateNextClassWidget(
     )
     views.setOnClickPendingIntent(R.id.next_class_widget, pendingIntent)
 
-
-    // Add the following lines to update the text with the current date and time
-    val currentDate = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(Date())
-    val currentTime = SimpleDateFormat("hh:mm a", Locale.getDefault()).format(Date())
-    val currentDateTime = "$currentDate $currentTime"
-
-    // Assuming "refresh_text" is the ID of the TextView you want to update
-//    views.setTextViewText(R.id.refresh_widget, currentDateTime)
-
     val sharedPref = context.getSharedPreferences("login_info", Context.MODE_PRIVATE)!!
     if (sharedPref.getBoolean(Constants.EXAM_MODE, false)) {
         views.setTextViewText(
@@ -208,212 +195,61 @@ suspend fun fetchData(
             .toString() else oldDay
         val uid = sharedPref.getString("uid", "")
         var pd = PeriodDetails()
-        val sharedPreferences =
-            context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-        val token = sharedPreferences?.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-        val username = sharedPreferences?.getString(Constants.COMMUNITY_USERNAME, null) ?: ""
-        val cachedData = sharedPref.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-        if (cachedData != null) {
-            // If cached data is available, load from cache
-            Timber.d("Loading from cache")
-            Timber.d("$cachedData")
-            val response = Gson().fromJson(cachedData, UserResponse::class.java)
-
-            val user = response
-            if (user?.timetable?.data == null) {
-                pd.courseName = ""
-                updateNextClassWidget(context, appWidgetManager, appWidgetId, pd)
-                return@coroutineScope
-            }
-            var today = user.timetable?.data?.Monday
-
-            when (day) {
-                "monday" -> {
-                    today = user.timetable?.data?.Monday
-                }
-
-                "tuesday" -> {
-                    today = user.timetable?.data?.Tuesday
-                }
-
-                "wednesday" -> {
-                    today = user.timetable?.data?.Wednesday
-                }
-
-                "thursday" -> {
-                    today = user.timetable?.data?.Thursday
-                }
-
-                "friday" -> {
-                    today = user.timetable?.data?.Friday
-                }
-
-                "saturday" -> {
-                    today = user.timetable?.data?.Saturday
-                }
-
-                "sunday" -> {
-                    today = user.timetable?.data?.Sunday
-                }
-            }
-            today = today?.sortedBy { it.start_time }
-            if (today != null) {
-                for (period in today) {
-
-                    try {
-                        val start = Calendar.getInstance()
-                        val s = Calendar.getInstance()
-                        s.time = parseTimeToTimestamp(period.start_time).toDate()
-                        start[Calendar.HOUR_OF_DAY] = s[Calendar.HOUR_OF_DAY]
-                        start[Calendar.MINUTE] = s[Calendar.MINUTE]
-                        Timber.d("$calendar")
-                        Timber.d("$start")
-                        if (start.time > calendar.time) {
-                            val end = Calendar.getInstance()
-                            val e = Calendar.getInstance()
-                            e.time = parseTimeToTimestamp(period.end_time).toDate()
-                            end[Calendar.HOUR_OF_DAY] = e[Calendar.HOUR_OF_DAY]
-                            end[Calendar.MINUTE] = e[Calendar.MINUTE]
-                            Timber.d("$end")
-                            if (end.time > calendar.time) {
-                                pd = PeriodDetails(
-                                    period.code,
-                                    period.name,
-                                    parseTimeToTimestamp(period.start_time),
-                                    parseTimeToTimestamp(period.end_time),
-                                    period.slot,
-                                    period.venue
-                                )
-                                break
+        if (uid != null && uid != "") {
+            db.collection("users")
+                .document(uid)
+                .collection("timetable")
+                .document(day)
+                .collection("periods")
+                .get(Source.CACHE)
+                .addOnSuccessListener { result ->
+                    for (document in result) {
+                        try {
+                            val start = Calendar.getInstance()
+                            val s = Calendar.getInstance()
+                            s.time = document.getTimestamp("startTime")!!.toDate()
+                            start[Calendar.HOUR_OF_DAY] = s[Calendar.HOUR_OF_DAY]
+                            start[Calendar.MINUTE] = s[Calendar.MINUTE]
+                            Timber.d("$calendar")
+                            Timber.d("$start")
+                            if (start.time > calendar.time) {
+                                val end = Calendar.getInstance()
+                                val e = Calendar.getInstance()
+                                e.time = document.getTimestamp("endTime")!!.toDate()
+                                end[Calendar.HOUR_OF_DAY] = e[Calendar.HOUR_OF_DAY]
+                                end[Calendar.MINUTE] = e[Calendar.MINUTE]
+                                Timber.d("$end")
+                                if (end.time > calendar.time) {
+                                    pd = PeriodDetails(
+                                        document.getString("courseCode")!!,
+                                        document.getString("courseName")!!,
+                                        document.getTimestamp("startTime")!!,
+                                        document.getTimestamp("endTime")!!,
+                                        document.getString("slot")!!,
+                                        document.getString("location")!!
+                                    )
+                                    break
+                                }
+                            } else {
+                                pd.courseName = ""
+                                val simpleDateFormat =
+                                    SimpleDateFormat("h:mm a", Locale.getDefault())
+                                val sTime: String =
+                                    simpleDateFormat.format(calendar.time).uppercase(Locale.ROOT)
+                                Timber.d("LOL: $sTime")
                             }
-                        } else {
+                        } catch (e: Exception) {
                             pd.courseName = ""
-                            val simpleDateFormat =
-                                SimpleDateFormat("h:mm a", Locale.getDefault())
-                            val sTime: String =
-                                simpleDateFormat.format(calendar.time).uppercase(Locale.ROOT)
-                            Timber.d("LOL: $sTime")
+                            Timber.d("F: $e")
                         }
-                    } catch (e: Exception) {
-                        pd.courseName = ""
-                        Timber.d("F: $e")
                     }
-
-
+                    updateNextClassWidget(context, appWidgetManager, appWidgetId, pd)
                 }
-            }
+                .addOnFailureListener { e ->
+                    Timber.d("Error: $e")
+                }
+        } else {
+            pd.courseName = ""
             updateNextClassWidget(context, appWidgetManager, appWidgetId, pd)
-
         }
-
-
-
-        if (cachedData == null) {
-            APICommunityRestClient.instance.getUserWithTimeTable(token, username,
-
-                object : RetrofitSelfUserListener {
-                    override fun onSuccess(call: Call<UserResponse>?, response: UserResponse?) {
-                        val user = response
-                        //cache response for widget
-                        val jsonResponse = Gson().toJson(response)
-                        val editor = sharedPref.edit()
-                        editor.putString(Constants.CACHE_COMMUNITY_TIMETABLE, jsonResponse)
-                        editor.apply()
-
-                        if (user?.timetable?.data == null) {
-                            pd.courseName = ""
-                            updateNextClassWidget(context, appWidgetManager, appWidgetId, pd)
-                            return
-                        }
-                        var today = user.timetable?.data?.Monday
-
-                        when (day) {
-                            "monday" -> {
-                                today = user.timetable?.data?.Monday
-                            }
-
-                            "tuesday" -> {
-                                today = user.timetable?.data?.Tuesday
-                            }
-
-                            "wednesday" -> {
-                                today = user.timetable?.data?.Wednesday
-                            }
-
-                            "thursday" -> {
-                                today = user.timetable?.data?.Thursday
-                            }
-
-                            "friday" -> {
-                                today = user?.timetable?.data?.Friday
-                            }
-
-                            "saturday" -> {
-                                today = user?.timetable?.data?.Saturday
-                            }
-
-                            "sunday" -> {
-                                today = user?.timetable?.data?.Sunday
-                            }
-                        }
-                        today = today?.sortedBy { it.start_time }
-
-                        val todayTimetable = today
-                        if(todayTimetable != null){
-                            for (period in todayTimetable) {
-                                try {
-                                    val start = Calendar.getInstance()
-                                    val s = Calendar.getInstance()
-                                    s.time = parseTimeToTimestamp(period.start_time).toDate()
-                                    start[Calendar.HOUR_OF_DAY] = s[Calendar.HOUR_OF_DAY]
-                                    start[Calendar.MINUTE] = s[Calendar.MINUTE]
-                                    Timber.d("$calendar")
-                                    Timber.d("$start")
-                                    if (start.time > calendar.time) {
-                                        val end = Calendar.getInstance()
-                                        val e = Calendar.getInstance()
-                                        e.time = parseTimeToTimestamp(period.end_time).toDate()
-                                        end[Calendar.HOUR_OF_DAY] = e[Calendar.HOUR_OF_DAY]
-                                        end[Calendar.MINUTE] = e[Calendar.MINUTE]
-                                        Timber.d("$end")
-                                        if (end.time > calendar.time) {
-                                            pd = PeriodDetails(
-                                                period.code,
-                                                period.name,
-                                                parseTimeToTimestamp(period.start_time),
-                                                parseTimeToTimestamp(period.end_time),
-                                                period.slot,
-                                                period.venue
-                                            )
-                                            break
-                                        }
-                                    } else {
-                                        pd.courseName = ""
-                                        val simpleDateFormat =
-                                            SimpleDateFormat("h:mm a", Locale.getDefault())
-                                        val sTime: String =
-                                            simpleDateFormat.format(calendar.time)
-                                                .uppercase(Locale.ROOT)
-                                        Timber.d("LOL: $sTime")
-                                    }
-                                } catch (e: Exception) {
-                                    pd.courseName = ""
-                                    Timber.d("F: $e")
-                                }
-
-
-                            }
-                        }
-                        updateNextClassWidget(context, appWidgetManager, appWidgetId, pd)
-
-                    }
-
-                    override fun onError(call: Call<UserResponse>?, t: Throwable?) {
-                        pd.courseName = ""
-                        updateNextClassWidget(context, appWidgetManager, appWidgetId, pd)
-                    }
-                })
-        }
-
-
     }
diff --git a/app/src/main/java/com/dscvit/vitty/widget/TodayWidget.kt b/app/src/main/java/com/dscvit/vitty/widget/TodayWidget.kt
index 844214d..78c8bbc 100755
--- a/app/src/main/java/com/dscvit/vitty/widget/TodayWidget.kt
+++ b/app/src/main/java/com/dscvit/vitty/widget/TodayWidget.kt
@@ -9,22 +9,16 @@ import android.os.Bundle
 import android.widget.RemoteViews
 import com.dscvit.vitty.R
 import com.dscvit.vitty.activity.AuthActivity
-import com.dscvit.vitty.network.api.community.APICommunityRestClient
-import com.dscvit.vitty.network.api.community.RetrofitSelfUserListener
-import com.dscvit.vitty.network.api.community.responses.user.UserResponse
 import com.dscvit.vitty.service.TodayWidgetService
 import com.dscvit.vitty.util.ArraySaverLoader.saveArray
-import com.dscvit.vitty.util.Constants
 import com.dscvit.vitty.util.Constants.PERIODS
 import com.dscvit.vitty.util.Constants.TIME_SLOTS
 import com.dscvit.vitty.util.Constants.TODAY_INTENT
 import com.dscvit.vitty.util.UtilFunctions
-import com.google.firebase.Timestamp
 import com.google.firebase.firestore.FirebaseFirestore
-import com.google.gson.Gson
+import com.google.firebase.firestore.Source
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.runBlocking
-import retrofit2.Call
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -38,7 +32,7 @@ class TodayWidget : AppWidgetProvider() {
     override fun onUpdate(
         context: Context,
         appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray,
+        appWidgetIds: IntArray
     ) {
         // There may be multiple widgets active, so update all of them
         for (appWidgetId in appWidgetIds) {
@@ -61,42 +55,30 @@ internal fun updateTodayWidget(
     appWidgetId: Int,
     courseList: ArrayList<String>?,
     timeList: ArrayList<String>?,
-    roomList: ArrayList<String>?,
+    roomList: ArrayList<String>?
 ) {
     // Construct the RemoteViews object
     val views = RemoteViews(context.packageName, R.layout.today_widget)
-
     val intent = Intent(context, AuthActivity::class.java)
-    val pendingIntent =
-        PendingIntent.getActivity(
-            context,
-            TODAY_INTENT,
-            intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
-        )
+    val pendingIntent = PendingIntent.getActivity(
+        context,
+        TODAY_INTENT,
+        intent,
+        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
     views.setOnClickPendingIntent(R.id.today_widget, pendingIntent)
-
-    // Add the following lines to update the text with the current date and time
-    val currentDate = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(Date())
-    val currentTime = SimpleDateFormat("hh:mm a", Locale.getDefault()).format(Date())
-    val currentDateTime = "$currentDate $currentTime"
-
-    // Assuming "refesr_text" is the ID of the TextView you want to update
-//    views.setTextViewText(R.id.refresh_widget, currentDateTime)
-
     val days = listOf("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday")
     val calendar: Calendar = Calendar.getInstance()
-    val d =
-        when (calendar.get(Calendar.DAY_OF_WEEK)) {
-            Calendar.MONDAY -> 0
-            Calendar.TUESDAY -> 1
-            Calendar.WEDNESDAY -> 2
-            Calendar.THURSDAY -> 3
-            Calendar.FRIDAY -> 4
-            Calendar.SATURDAY -> 5
-            Calendar.SUNDAY -> 6
-            else -> 0
-        }
+    val d = when (calendar.get(Calendar.DAY_OF_WEEK)) {
+        Calendar.MONDAY -> 0
+        Calendar.TUESDAY -> 1
+        Calendar.WEDNESDAY -> 2
+        Calendar.THURSDAY -> 3
+        Calendar.FRIDAY -> 4
+        Calendar.SATURDAY -> 5
+        Calendar.SUNDAY -> 6
+        else -> 0
+    }
 
     if (courseList == null) {
         fetchTodayFirestore(context, days[d], appWidgetManager, appWidgetId)
@@ -109,12 +91,12 @@ internal fun updateTodayWidget(
         val bundle1 = Bundle()
         bundle1.putStringArrayList(
             PERIODS,
-            courseList,
+            courseList
         )
         val bundle2 = Bundle()
         bundle2.putStringArrayList(
             TIME_SLOTS,
-            timeList,
+            timeList
         )
         views.setRemoteAdapter(R.id.periods, serviceIntent)
         appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.periods)
@@ -129,234 +111,60 @@ fun fetchTodayFirestore(
     day: String,
     appWidgetManager: AppWidgetManager,
     appWidgetId: Int,
-) = runBlocking {
-    fetchTodayData(context, day, appWidgetManager, appWidgetId)
-}
+) =
+    runBlocking {
+        fetchTodayData(context, day, appWidgetManager, appWidgetId)
+    }
 
 suspend fun fetchTodayData(
     context: Context,
     oldDay: String,
     appWidgetManager: AppWidgetManager,
     appWidgetId: Int,
-) = coroutineScope {
-    val db = FirebaseFirestore.getInstance()
-    val sharedPref = context.getSharedPreferences("login_info", Context.MODE_PRIVATE)!!
-    val day =
-        if (oldDay == "saturday") {
-            sharedPref
-                .getString(
-                    UtilFunctions.getSatModeCode(),
-                    "saturday",
-                ).toString()
-        } else {
-            oldDay
-        }
-    val uid = sharedPref.getString("uid", "")
-    val courseList: ArrayList<String> = ArrayList()
-    val timeList: ArrayList<String> = ArrayList()
-    val roomList: ArrayList<String> = ArrayList()
-    val sharedPreferences =
-        context.getSharedPreferences(Constants.USER_INFO, Context.MODE_PRIVATE)
-    val token = sharedPreferences?.getString(Constants.COMMUNITY_TOKEN, "") ?: ""
-    val username = sharedPreferences?.getString(Constants.COMMUNITY_USERNAME, null) ?: ""
-    val cachedData = sharedPref.getString(Constants.CACHE_COMMUNITY_TIMETABLE, null)
-    if (cachedData != null) {
-        // If cached data is available, load from cache
-        Timber.d("Loading from cache")
-        Timber.d("$cachedData")
-        val response = Gson().fromJson(cachedData, UserResponse::class.java)
-
-        val user = response
-        if (user?.timetable?.data == null) {
-            updateTodayWidget(
-                context,
-                appWidgetManager,
-                appWidgetId,
-                courseList,
-                timeList,
-                roomList,
-            )
-            return@coroutineScope
-        }
-        var today = user.timetable?.data?.Monday
-
-        when (day) {
-            "monday" -> {
-                today = user.timetable?.data?.Monday
-            }
-
-            "tuesday" -> {
-                today = user.timetable?.data?.Tuesday
-            }
-
-            "wednesday" -> {
-                today = user.timetable?.data?.Wednesday
-            }
-
-            "thursday" -> {
-                today = user.timetable?.data?.Thursday
-            }
-
-            "friday" -> {
-                today = user.timetable?.data?.Friday
-            }
-
-            "saturday" -> {
-                today = user.timetable?.data?.Saturday
-            }
-
-            "sunday" -> {
-                today = user.timetable?.data?.Sunday
-            }
-        }
-        Timber.d("Today: ${user.timetable}")
-        today = today?.sortedBy { it.start_time }
-        if (today != null) {
-            for (period in today) {
-                var startTime = parseTimeToTimestamp(period.start_time).toDate()
-                var endTime = parseTimeToTimestamp(period.end_time).toDate()
-
-                val simpleDateFormat = SimpleDateFormat("h:mm a", Locale.getDefault())
-                val sTime: String = simpleDateFormat.format(startTime).uppercase(Locale.ROOT)
-                val eTime: String = simpleDateFormat.format(endTime).uppercase(Locale.ROOT)
-                courseList.add(period.name)
-                timeList.add("$sTime - $eTime")
-                roomList.add(period.venue)
-            }
-        }
-
-        updateTodayWidget(
-            context,
-            appWidgetManager,
-            appWidgetId,
-            courseList,
-            timeList,
-            roomList,
-        )
-    }
-
-    APICommunityRestClient.instance.getUserWithTimeTable(
-        token,
-        username,
-        object : RetrofitSelfUserListener {
-            override fun onSuccess(
-                call: Call<UserResponse>?,
-                response: UserResponse?,
-            ) {
-                // clear the lists
-                courseList.clear()
-                timeList.clear()
-                roomList.clear()
-
-                val user = response
-
-                // cache response for widget
-                val jsonResponse = Gson().toJson(response)
-                val editor = sharedPref.edit()
-                editor.putString(Constants.CACHE_COMMUNITY_TIMETABLE, jsonResponse)
-                editor.apply()
-
-                if (user?.timetable?.data == null) {
-                    updateTodayWidget(
-                        context,
-                        appWidgetManager,
-                        appWidgetId,
-                        courseList,
-                        timeList,
-                        roomList,
-                    )
-                    return
-                }
-                var today = user.timetable?.data?.Monday
-
-                when (day) {
-                    "monday" -> {
-                        today = user.timetable?.data?.Monday
-                    }
-
-                    "tuesday" -> {
-                        today = user.timetable?.data?.Tuesday
-                    }
-
-                    "wednesday" -> {
-                        today = user.timetable?.data?.Wednesday
-                    }
-
-                    "thursday" -> {
-                        today = user.timetable?.data?.Thursday
-                    }
-
-                    "friday" -> {
-                        today = user.timetable?.data?.Friday
-                    }
-
-                    "saturday" -> {
-                        today = user.timetable?.data?.Saturday
-                    }
-
-                    "sunday" -> {
-                        today = user.timetable?.data?.Sunday
+) =
+    coroutineScope {
+        val db = FirebaseFirestore.getInstance()
+        val sharedPref = context.getSharedPreferences("login_info", Context.MODE_PRIVATE)!!
+        val day = if (oldDay == "saturday") sharedPref.getString(
+            UtilFunctions.getSatModeCode(),
+            "saturday"
+        ).toString() else oldDay
+        val uid = sharedPref.getString("uid", "")
+        val courseList: ArrayList<String> = ArrayList()
+        val timeList: ArrayList<String> = ArrayList()
+        val roomList: ArrayList<String> = ArrayList()
+        if (uid != null && uid != "") {
+            db.collection("users")
+                .document(uid)
+                .collection("timetable")
+                .document(day)
+                .collection("periods")
+                .get(Source.CACHE)
+                .addOnSuccessListener { result ->
+                    for (document in result) {
+                        try {
+                            val startTime: Date = document.getTimestamp("startTime")!!.toDate()
+                            val simpleDateFormat = SimpleDateFormat("h:mm a", Locale.getDefault())
+                            val sTime: String =
+                                simpleDateFormat.format(startTime).uppercase()
+
+                            val endTime: Date = document.getTimestamp("endTime")!!.toDate()
+                            val eTime: String =
+                                simpleDateFormat.format(endTime).uppercase()
+
+                            courseList.add(document.getString("courseName")!!)
+                            timeList.add("$sTime - $eTime")
+                            roomList.add(document.getString("location")!!)
+                        } catch (e: Exception) {
+                            Timber.d("Error: $e")
+                        }
                     }
+                    updateTodayWidget(context, appWidgetManager, appWidgetId, courseList, timeList, roomList)
                 }
-                today = today?.sortedBy { it.start_time }
-                val todayTimeTable = today
-                if (todayTimeTable != null) {
-                    for (period in todayTimeTable) {
-                        var startTime = parseTimeToTimestamp(period.start_time).toDate()
-                        var endTime = parseTimeToTimestamp(period.end_time).toDate()
-
-                        val simpleDateFormat =
-                            SimpleDateFormat("h:mm a", Locale("en", "IN"))
-                        val sTime: String =
-                            simpleDateFormat.format(startTime).uppercase(Locale.ROOT)
-                        val eTime: String =
-                            simpleDateFormat.format(endTime).uppercase(Locale.ROOT)
-                        courseList.add(period.name)
-                        timeList.add("$sTime - $eTime")
-                        roomList.add(period.venue)
-                    }
+                .addOnFailureListener { e ->
+                    Timber.d("Error YO: $e")
                 }
-
-                updateTodayWidget(
-                    context,
-                    appWidgetManager,
-                    appWidgetId,
-                    courseList,
-                    timeList,
-                    roomList,
-                )
-            }
-
-            override fun onError(
-                call: Call<UserResponse>?,
-                t: Throwable?,
-            ) {
-                Timber.d("Error YO: $t")
-                updateTodayWidget(
-                    context,
-                    appWidgetManager,
-                    appWidgetId,
-                    courseList,
-                    timeList,
-                    roomList,
-                )
-            }
-        },
-    )
-}
-
-fun parseTimeToTimestamp(timeString: String): Timestamp =
-    try {
-        val date = UtilFunctions.parseBackendTimeString(timeString)
-        if (date != null) {
-            Timestamp(date)
         } else {
-            Timber.d("Date parsing error: Unable to parse time: $timeString")
-            Timestamp.now()
+            updateTodayWidget(context, appWidgetManager, appWidgetId, courseList, timeList, roomList)
         }
-    } catch (e: Exception) {
-        Timber.d("Date parsing error: Unparseable date: \"$timeString\"")
-        Timestamp.now()
     }
-
-
diff --git a/app/src/main/res/anim/bounce_in.xml b/app/src/main/res/anim/bounce_in.xml
deleted file mode 100644
index acd7106..0000000
--- a/app/src/main/res/anim/bounce_in.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale
-        android:duration="400"
-        android:fromXScale="0.8"
-        android:fromYScale="0.8"
-        android:toXScale="1.0"
-        android:toYScale="1.0"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:interpolator="@android:anim/overshoot_interpolator" />
-    <alpha
-        android:duration="300"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/crossfade_in.xml b/app/src/main/res/anim/crossfade_in.xml
deleted file mode 100644
index 4461ff2..0000000
--- a/app/src/main/res/anim/crossfade_in.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="200"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:interpolator="@android:anim/decelerate_interpolator" />
diff --git a/app/src/main/res/anim/crossfade_out.xml b/app/src/main/res/anim/crossfade_out.xml
deleted file mode 100644
index 9734b10..0000000
--- a/app/src/main/res/anim/crossfade_out.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="150"
-    android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    android:interpolator="@android:anim/accelerate_interpolator" />
diff --git a/app/src/main/res/anim/nav_slide_down.xml b/app/src/main/res/anim/nav_slide_down.xml
deleted file mode 100644
index 8070176..0000000
--- a/app/src/main/res/anim/nav_slide_down.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="300"
-        android:fromYDelta="0%"
-        android:toYDelta="100%"
-        android:interpolator="@android:anim/accelerate_interpolator" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/nav_slide_up.xml b/app/src/main/res/anim/nav_slide_up.xml
deleted file mode 100644
index 2135ffa..0000000
--- a/app/src/main/res/anim/nav_slide_up.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="500"
-        android:fromYDelta="100%"
-        android:toYDelta="0%"
-        android:interpolator="@android:anim/overshoot_interpolator" />
-    <alpha
-        android:duration="300"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml
deleted file mode 100644
index 47a9132..0000000
--- a/app/src/main/res/anim/slide_in_left.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="350"
-        android:fromXDelta="-100%"
-        android:toXDelta="0%"
-        android:interpolator="@android:anim/decelerate_interpolator" />
-    <alpha
-        android:duration="250"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:startOffset="50" />
-</set>
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
deleted file mode 100644
index 42dc4bc..0000000
--- a/app/src/main/res/anim/slide_in_right.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="350"
-        android:fromXDelta="100%"
-        android:toXDelta="0%"
-        android:interpolator="@android:anim/decelerate_interpolator" />
-    <alpha
-        android:duration="250"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:startOffset="50" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
deleted file mode 100644
index cdaf3e2..0000000
--- a/app/src/main/res/anim/slide_out_left.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="250"
-        android:fromXDelta="0%"
-        android:toXDelta="-100%"
-        android:interpolator="@android:anim/accelerate_interpolator" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
deleted file mode 100644
index 532dbb6..0000000
--- a/app/src/main/res/anim/slide_out_right.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="250"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="100%"
-        android:toYDelta="0%"
-        android:interpolator="@android:anim/accelerate_interpolator" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
diff --git a/app/src/main/res/drawable/bg_nav_bar.xml b/app/src/main/res/drawable/bg_nav_bar.xml
deleted file mode 100644
index 67910c6..0000000
--- a/app/src/main/res/drawable/bg_nav_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/background" />
-    <corners android:radius="120dp" />
-    <stroke android:width="1dp" android:color="@color/tab_back" />
-</shape>
diff --git a/app/src/main/res/drawable/bg_nav_item_selected.xml b/app/src/main/res/drawable/bg_nav_item_selected.xml
deleted file mode 100644
index 6d3ca57..0000000
--- a/app/src/main/res/drawable/bg_nav_item_selected.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/tab_back" />
-    <corners android:radius="120dp" />
-</shape>
diff --git a/app/src/main/res/drawable/bubble_bg.xml b/app/src/main/res/drawable/bubble_bg.xml
deleted file mode 100644
index dd5211b..0000000
--- a/app/src/main/res/drawable/bubble_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/red" />
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_background.xml b/app/src/main/res/drawable/circular_background.xml
deleted file mode 100644
index 9df57cd..0000000
--- a/app/src/main/res/drawable/circular_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <corners android:radius="10dp" />
-    <solid android:color="#FF0000" /> <!-- Adjust the background color as needed -->
-</shape>
diff --git a/app/src/main/res/drawable/cursor_white.xml b/app/src/main/res/drawable/cursor_white.xml
deleted file mode 100644
index e40fb0d..0000000
--- a/app/src/main/res/drawable/cursor_white.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <size android:width="2dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/et_style.xml b/app/src/main/res/drawable/et_style.xml
deleted file mode 100644
index 5152385..0000000
--- a/app/src/main/res/drawable/et_style.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="2dp"
-        android:color="@color/mtrl_textinput_default_box_stroke_color" />
-    <solid android:color="@color/mtrl_textinput_bg_color" />
-    <corners android:radius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c1aeff6..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <group>
-    <clip-path
-        android:pathData="M0,0h16v16h-16z"/>
-    <path
-        android:pathData="M8,0.15C12.335,0.15 15.85,3.665 15.85,8C15.85,12.335 12.335,15.85 8,15.85C3.665,15.85 0.15,12.335 0.15,8C0.15,3.665 3.665,0.15 8,0.15ZM8,1.45C4.388,1.45 1.45,4.388 1.45,8C1.45,11.612 4.388,14.55 8,14.55C11.612,14.55 14.55,11.612 14.55,8C14.55,4.388 11.612,1.45 8,1.45ZM8.651,7.35V11.85H7.352V7.35H8.651ZM8.008,3.95C8.496,3.95 8.851,4.303 8.852,4.8C8.852,5.297 8.496,5.65 8.008,5.65C7.747,5.65 7.535,5.558 7.389,5.41C7.242,5.262 7.151,5.049 7.151,4.789C7.151,4.306 7.506,3.95 8.008,3.95Z"
-        android:strokeWidth="0.3"
-        android:fillColor="#ffffff"
-        android:strokeColor="#071F33"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_academics_outline.xml b/app/src/main/res/drawable/ic_academics_outline.xml
deleted file mode 100644
index 83a039d..0000000
--- a/app/src/main/res/drawable/ic_academics_outline.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="29dp"
-    android:height="30dp"
-    android:viewportWidth="29"
-    android:viewportHeight="30">
-  <group>
-    <clip-path
-        android:pathData="M0.203,0.4h28.8v28.8h-28.8z"/>
-    <path
-        android:pathData="M7.403,26.8C6.743,26.8 6.178,26.565 5.708,26.095C5.238,25.625 5.003,25.06 5.003,24.4V5.2C5.003,4.54 5.238,3.975 5.708,3.505C6.178,3.035 6.743,2.8 7.403,2.8H21.803C22.463,2.8 23.028,3.035 23.498,3.505C23.968,3.975 24.203,4.54 24.203,5.2V24.4C24.203,25.06 23.968,25.625 23.498,26.095C23.028,26.565 22.463,26.8 21.803,26.8H7.403ZM7.403,24.4H21.803V5.2H19.403V13.6L16.403,11.8L13.403,13.6V5.2H7.403V24.4Z"
-        android:fillColor="#F4F4FC"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_academics_selector.xml b/app/src/main/res/drawable/ic_academics_selector.xml
deleted file mode 100644
index 340931b..0000000
--- a/app/src/main/res/drawable/ic_academics_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_academics_outline" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_academics_outline" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_a_photo.xml b/app/src/main/res/drawable/ic_add_a_photo.xml
deleted file mode 100644
index 39079aa..0000000
--- a/app/src/main/res/drawable/ic_add_a_photo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
-  <group>
-    <clip-path
-        android:pathData="M0.5,0.5h24v24h-24z"/>
-    <path
-        android:pathData="M3.5,21.5C2.95,21.5 2.479,21.304 2.088,20.913C1.696,20.521 1.5,20.05 1.5,19.5V7.5C1.5,6.95 1.696,6.479 2.088,6.088C2.479,5.696 2.95,5.5 3.5,5.5H6.65L8.5,3.5H14.5V5.5H9.375L7.55,7.5H3.5V19.5H19.5V10.5H21.5V19.5C21.5,20.05 21.304,20.521 20.913,20.913C20.521,21.304 20.05,21.5 19.5,21.5H3.5ZM19.5,7.5V5.5H17.5V3.5H19.5V1.5H21.5V3.5H23.5V5.5H21.5V7.5H19.5ZM11.5,18C12.75,18 13.813,17.563 14.688,16.688C15.563,15.813 16,14.75 16,13.5C16,12.25 15.563,11.188 14.688,10.313C13.813,9.438 12.75,9 11.5,9C10.25,9 9.188,9.438 8.313,10.313C7.438,11.188 7,12.25 7,13.5C7,14.75 7.438,15.813 8.313,16.688C9.188,17.563 10.25,18 11.5,18ZM11.5,16C10.8,16 10.208,15.758 9.725,15.275C9.242,14.792 9,14.2 9,13.5C9,12.8 9.242,12.208 9.725,11.725C10.208,11.242 10.8,11 11.5,11C12.2,11 12.792,11.242 13.275,11.725C13.758,12.208 14,12.8 14,13.5C14,14.2 13.758,14.792 13.275,15.275C12.792,15.758 12.2,16 11.5,16Z"
-        android:fillColor="#041727"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_friend.xml b/app/src/main/res/drawable/ic_add_friend.xml
deleted file mode 100644
index c3c4447..0000000
--- a/app/src/main/res/drawable/ic_add_friend.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <group>
-    <clip-path
-        android:pathData="M20,0l-20,0l-0,20l20,0z"/>
-    <path
-        android:pathData="M5.312,5.625C5.466,7.69 7.031,9.375 8.75,9.375C10.469,9.375 12.037,7.691 12.188,5.625C12.344,3.477 10.82,1.875 8.75,1.875C6.68,1.875 5.156,3.516 5.312,5.625Z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#F4F4FC"
-        android:strokeLineCap="round"/>
-    <path
-        android:pathData="M8.75,11.875C12.149,11.875 15.598,13.75 16.236,17.289C16.314,17.716 16.072,18.125 15.625,18.125H1.875C1.428,18.125 1.187,17.716 1.264,17.289C1.902,13.75 5.352,11.875 8.75,11.875Z"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#F4F4FC"/>
-    <path
-        android:pathData="M16.563,6.875V11.25M14.375,9.063H18.75"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#F4F4FC"
-        android:strokeLineCap="round"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index bef9ffa..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_busy.png b/app/src/main/res/drawable/ic_busy.png
deleted file mode 100644
index f7b30fc2ae7261f23e8f14e93e96dcc1e8978e2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1080
zcmV-81jqY{P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1I<Z9K~#7FZB$)o
z990zl=I-qL&(6$lH)^w)CP>6k3YH|sV4?m*N*@FTqx8j}2Ne|47g0nci51ZYK@bFg
zD4_-MMST!OkZ3|%qBSM4m~1pZ7;KVl+D)>_y4juCnd_O&CbZJK?C!a9?)mOH-}%l6
zxOoYja|nXKqfPemkB72Tlcy4i)U+wbKIrOsCQp8$cCdbCFEILvoV4mD7oI(F<k92D
zkG=QL;$oX$sX&(FXmp!>MPlE4^zoTDhR@F~M2GwP``O^&U|0j%-HeZa62E$dz2KFu
z4aS(53Igy<<_?}pr<vz@$gSjfu~-yzO-9+{V-0TWEA8#aF4b?3i6>7!ZK~n)hvkC)
zR2*ySf!2fEJ>Z6MS!7X_Ro@3=44EcZ5a@q%qY&nnm%H=JbK_s1eP_N<EWS(CoECo{
z`%3M+?~(f#7iLr{fmb|F7{7QyNLUUE8*4~dHi}zYP<0&@DpQOJOp+B8*4KIZwv6j0
z8(Q`_I&=E1qiNe5k!7vwIJT(D47qEY@G9GAX>P*mY97UZ%SbvVOkKrNF3)|xjB>eh
z{jn2oHblINb)rYl|NP~|LiW<(p`kA@Ht{!J?|TA)Uq#=m@1y7FJ$Ud)7e4#^EGDx{
zc<trKDS<euqV?Qv2ia~LZCiV>tGgS+qkmv_ZW)5;K-QC(na$ysi}QH6=K=gQI)%CU
z6$FBX*1OvNda3X2?|OTCV^O@gtAo}%oA+N`$>H{W29{Pgkxn}BeXmw~(|#MGVvtY6
z#@05KXhBg`tzJ!V6Og2(xMP=zR2hu+3EM=Zp-5i3sY0Uc6ly)A`z_0W<=E^-LGA$|
zCP6iIXsS^Q)^rUa36YU4D<(wIfU0P;XE00yx~AdQK#>`8n5IQaRuGGclo^L2%g{7~
z`~hWV(_V!bm+=2}15kx@Ql{E<*rtOZAmx+16J$%0LU)uX3muM~L>Pvs_`YyUpqa^Y
z*Q20nz+o5(tmg~F2W4THD3v^TrF8;}5txZJ@@cA6jyhf^oU>?7BA|?W_(>;~M5ZwX
zgUD>Z_YfM=M6e>FqoWO?WWja!!L$u@b{?e6t)}5`hZ^^WJ~B4*e?C8T`NF4OHLQw^
zi6QY3y)7!`XwEp|@i?}M+eCIe5+8jT-zpZNs%GijuU8TS0|T6L^Ewu?Bfo7F);VLb
zow{jS{c5$Qp(rp2BjBBZA_WsiG|lu00uOG>-6M?$x*ig;li&X^Jv{+gQi)$W&BGlm
y1U1DIuVhEhBUeC)vYj(Rt&suUp3vg@ss8}!l#Xd)Ldxg>0000<MNUMnLSTZHZv5H+

diff --git a/app/src/main/res/drawable/ic_circle_join.xml b/app/src/main/res/drawable/ic_circle_join.xml
deleted file mode 100644
index ab0a48a..0000000
--- a/app/src/main/res/drawable/ic_circle_join.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M0,0h24v24h-24z"/>
-    <path
-        android:pathData="M16.283,16.863C17.666,16.863 18.845,16.376 19.82,15.401C20.795,14.426 21.283,13.247 21.283,11.863C21.283,10.48 20.795,9.301 19.82,8.326C18.845,7.351 17.666,6.863 16.283,6.863C15.833,6.863 15.395,6.922 14.97,7.038C14.545,7.155 14.149,7.322 13.783,7.538C14.266,8.138 14.637,8.805 14.895,9.538C15.153,10.272 15.283,11.047 15.283,11.863C15.283,12.68 15.153,13.455 14.895,14.188C14.637,14.922 14.266,15.588 13.783,16.188C14.149,16.405 14.545,16.572 14.97,16.688C15.395,16.805 15.833,16.863 16.283,16.863ZM12.283,14.863C12.599,14.447 12.845,13.984 13.02,13.476C13.195,12.967 13.283,12.43 13.283,11.863C13.283,11.297 13.195,10.759 13.02,10.251C12.845,9.742 12.599,9.28 12.283,8.863C11.966,9.28 11.72,9.742 11.545,10.251C11.37,10.759 11.283,11.297 11.283,11.863C11.283,12.43 11.37,12.967 11.545,13.476C11.72,13.984 11.966,14.447 12.283,14.863ZM8.283,16.863C8.733,16.863 9.17,16.805 9.595,16.688C10.02,16.572 10.416,16.405 10.783,16.188C10.299,15.588 9.929,14.922 9.67,14.188C9.412,13.455 9.283,12.68 9.283,11.863C9.283,11.047 9.412,10.272 9.67,9.538C9.929,8.805 10.299,8.138 10.783,7.538C10.416,7.322 10.02,7.155 9.595,7.038C9.17,6.922 8.733,6.863 8.283,6.863C6.899,6.863 5.72,7.351 4.745,8.326C3.77,9.301 3.283,10.48 3.283,11.863C3.283,13.247 3.77,14.426 4.745,15.401C5.72,16.376 6.899,16.863 8.283,16.863ZM8.283,18.863C6.333,18.863 4.679,18.184 3.32,16.826C1.962,15.467 1.283,13.813 1.283,11.863C1.283,9.913 1.962,8.259 3.32,6.901C4.679,5.542 6.333,4.863 8.283,4.863C9.033,4.863 9.745,4.972 10.42,5.188C11.095,5.405 11.716,5.713 12.283,6.113C12.849,5.713 13.47,5.405 14.145,5.188C14.82,4.972 15.533,4.863 16.283,4.863C18.233,4.863 19.887,5.542 21.245,6.901C22.604,8.259 23.283,9.913 23.283,11.863C23.283,13.813 22.604,15.467 21.245,16.826C19.887,18.184 18.233,18.863 16.283,18.863C15.533,18.863 14.82,18.755 14.145,18.538C13.47,18.322 12.849,18.013 12.283,17.613C11.716,18.013 11.095,18.322 10.42,18.538C9.745,18.755 9.033,18.863 8.283,18.863Z"
-        android:fillColor="#041726"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_clock.xml b/app/src/main/res/drawable/ic_clock.xml
deleted file mode 100644
index 95c14f2..0000000
--- a/app/src/main/res/drawable/ic_clock.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M0,0h24v24h-24z"/>
-    <path
-        android:pathData="M12,22C10.75,22 9.579,21.763 8.488,21.288C7.396,20.813 6.446,20.171 5.638,19.362C4.829,18.554 4.188,17.604 3.713,16.513C3.238,15.421 3,14.25 3,13C3,11.75 3.238,10.579 3.713,9.487C4.188,8.396 4.829,7.446 5.638,6.637C6.446,5.829 7.396,5.187 8.488,4.712C9.579,4.237 10.75,4 12,4C13.25,4 14.421,4.237 15.513,4.712C16.604,5.187 17.554,5.829 18.363,6.637C19.171,7.446 19.813,8.396 20.288,9.487C20.763,10.579 21,11.75 21,13C21,14.25 20.763,15.421 20.288,16.513C19.813,17.604 19.171,18.554 18.363,19.362C17.554,20.171 16.604,20.813 15.513,21.288C14.421,21.763 13.25,22 12,22ZM14.8,17.2L16.2,15.8L13,12.6V8H11V13.4L14.8,17.2ZM5.6,2.35L7,3.75L2.75,8L1.35,6.6L5.6,2.35ZM18.4,2.35L22.65,6.6L21.25,8L17,3.75L18.4,2.35ZM12,20C13.95,20 15.604,19.321 16.963,17.962C18.321,16.604 19,14.95 19,13C19,11.05 18.321,9.396 16.963,8.037C15.604,6.679 13.95,6 12,6C10.05,6 8.396,6.679 7.038,8.037C5.679,9.396 5,11.05 5,13C5,14.95 5.679,16.604 7.038,17.962C8.396,19.321 10.05,20 12,20Z"
-        android:fillColor="#071F33"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_community_selector.xml b/app/src/main/res/drawable/ic_community_selector.xml
index de737d8..c6164e3 100644
--- a/app/src/main/res/drawable/ic_community_selector.xml
+++ b/app/src/main/res/drawable/ic_community_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_community_outline" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_community_filled" android:state_checked="true" />
     <item android:drawable="@drawable/ic_community_outline" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_compass.png b/app/src/main/res/drawable/ic_compass.png
deleted file mode 100644
index e182becd9b4df20b74453b9c7f3e5bcba2ffca4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41146
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

diff --git a/app/src/main/res/drawable/ic_edit_document.xml b/app/src/main/res/drawable/ic_edit_document.xml
deleted file mode 100644
index 5891de1..0000000
--- a/app/src/main/res/drawable/ic_edit_document.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M10.5,20V16.925L16.025,11.425C16.175,11.275 16.342,11.167 16.525,11.1C16.708,11.033 16.892,11 17.075,11C17.275,11 17.467,11.038 17.65,11.113C17.833,11.188 18,11.3 18.15,11.45L19.075,12.375C19.208,12.525 19.313,12.692 19.388,12.875C19.462,13.058 19.5,13.242 19.5,13.425C19.5,13.608 19.467,13.796 19.4,13.988C19.333,14.179 19.225,14.35 19.075,14.5L13.575,20H10.5ZM12,18.5H12.95L15.975,15.45L15.525,14.975L15.05,14.525L12,17.55V18.5ZM2.5,20C1.95,20 1.479,19.804 1.087,19.413C0.696,19.021 0.5,18.55 0.5,18V2C0.5,1.45 0.696,0.979 1.087,0.587C1.479,0.196 1.95,0 2.5,0H10.5L16.5,6V9H14.5V7H9.5V2H2.5V18H8.5V20H2.5ZM15.525,14.975L15.05,14.525L15.975,15.45L15.525,14.975Z"
-      android:fillColor="#071F33"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_empty_classroom.xml b/app/src/main/res/drawable/ic_empty_classroom.xml
deleted file mode 100644
index f74a6ba..0000000
--- a/app/src/main/res/drawable/ic_empty_classroom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M6.333,11.667H4.556C2.592,11.667 1,13.259 1,15.222C1,16.204 1.796,17 2.778,17H8.111M11.667,4.556C11.667,6.519 10.075,8.111 8.111,8.111C6.147,8.111 4.556,6.519 4.556,4.556C4.556,2.592 6.147,1 8.111,1C10.075,1 11.667,2.592 11.667,4.556ZM13.444,17C13.089,17 9.889,15.272 9.889,12.852C9.889,11.642 10.956,10.778 12.022,10.778C12.546,10.778 13.089,10.951 13.444,11.469C13.8,10.951 14.333,10.771 14.867,10.778C15.933,10.793 17,11.642 17,12.852C17,15.272 13.8,17 13.444,17Z"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:strokeColor="#F4F4FC"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_format_bold.xml b/app/src/main/res/drawable/ic_format_bold.xml
deleted file mode 100644
index 9f7cc1b..0000000
--- a/app/src/main/res/drawable/ic_format_bold.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.034,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M9.078,25.27V6.65H16.426C17.867,6.65 19.197,7.093 20.416,7.98C21.635,8.867 22.245,10.097 22.245,11.671C22.245,12.801 21.99,13.671 21.48,14.281C20.971,14.891 20.494,15.328 20.051,15.594C20.605,15.838 21.22,16.292 21.896,16.958C22.572,17.622 22.91,18.62 22.91,19.95C22.91,21.923 22.19,23.303 20.749,24.09C19.308,24.877 17.956,25.27 16.692,25.27H9.078ZM13.101,21.546H16.559C17.623,21.546 18.272,21.274 18.504,20.731C18.737,20.188 18.854,19.795 18.854,19.551C18.854,19.307 18.737,18.914 18.504,18.371C18.272,17.828 17.59,17.556 16.46,17.556H13.101V21.546ZM13.101,13.965H16.194C16.925,13.965 17.457,13.777 17.79,13.4C18.122,13.023 18.288,12.602 18.288,12.136C18.288,11.604 18.1,11.172 17.723,10.84C17.346,10.507 16.859,10.341 16.26,10.341H13.101V13.965Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_format_italic.xml b/app/src/main/res/drawable/ic_format_italic.xml
deleted file mode 100644
index 42916f9..0000000
--- a/app/src/main/res/drawable/ic_format_italic.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.046,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M6.696,25.27V21.945H12.016L16.006,9.975H10.686V6.65H23.986V9.975H19.331L15.341,21.945H19.996V25.27H6.696Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_format_list_bulleted.xml b/app/src/main/res/drawable/ic_format_list_bulleted.xml
deleted file mode 100644
index 6961f88..0000000
--- a/app/src/main/res/drawable/ic_format_list_bulleted.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.011,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M11.981,25.27V22.61H27.941V25.27H11.981ZM11.981,17.29V14.63H27.941V17.29H11.981ZM11.981,9.31V6.65H27.941V9.31H11.981ZM6.661,26.6C5.93,26.6 5.304,26.34 4.783,25.819C4.262,25.298 4.001,24.671 4.001,23.94C4.001,23.208 4.262,22.582 4.783,22.061C5.304,21.54 5.93,21.28 6.661,21.28C7.393,21.28 8.019,21.54 8.54,22.061C9.061,22.582 9.321,23.208 9.321,23.94C9.321,24.671 9.061,25.298 8.54,25.819C8.019,26.34 7.393,26.6 6.661,26.6ZM6.661,18.62C5.93,18.62 5.304,18.36 4.783,17.839C4.262,17.318 4.001,16.691 4.001,15.96C4.001,15.228 4.262,14.602 4.783,14.081C5.304,13.56 5.93,13.3 6.661,13.3C7.393,13.3 8.019,13.56 8.54,14.081C9.061,14.602 9.321,15.228 9.321,15.96C9.321,16.691 9.061,17.318 8.54,17.839C8.019,18.36 7.393,18.62 6.661,18.62ZM6.661,10.64C5.93,10.64 5.304,10.38 4.783,9.859C4.262,9.338 4.001,8.711 4.001,7.98C4.001,7.248 4.262,6.622 4.783,6.101C5.304,5.58 5.93,5.32 6.661,5.32C7.393,5.32 8.019,5.58 8.54,6.101C9.061,6.622 9.321,7.248 9.321,7.98C9.321,8.711 9.061,9.338 8.54,9.859C8.019,10.38 7.393,10.64 6.661,10.64Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_format_underlined.xml b/app/src/main/res/drawable/ic_format_underlined.xml
deleted file mode 100644
index 08c2f9c..0000000
--- a/app/src/main/res/drawable/ic_format_underlined.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.057,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M6.707,27.93V25.27H25.327V27.93H6.707ZM16.017,22.61C13.778,22.61 12.038,21.912 10.797,20.515C9.555,19.119 8.935,17.268 8.935,14.962V3.99H12.359V15.162C12.359,16.403 12.67,17.412 13.29,18.188C13.911,18.964 14.82,19.351 16.017,19.351C17.214,19.351 18.123,18.964 18.743,18.188C19.364,17.412 19.674,16.403 19.674,15.162V3.99H23.099V14.962C23.099,17.268 22.479,19.119 21.237,20.515C19.996,21.912 18.256,22.61 16.017,22.61Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_free.png b/app/src/main/res/drawable/ic_free.png
deleted file mode 100644
index a55cce7f5f9c180e1ff6502d4ca71f2c484c19bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1CL2WK~#7Fol;#)
zTV)u2&rc6M{X0FhrG>R)w6yCAflVNQi%R0Ai!AC`3hITr7-x2)Cc8nCrRky<=!H?U
zC7Ura6S<%!GycS2a6g$cVK8J1&<$8&g|@6e($aD`|L#;trU_fZbMby}zW4o}@BMi&
z_!s^Cek>H4k`=#i^td_eh*j!no!Zi5eSY^7Ra{!b2-|APYT94#f*Tjc@=9LdVjF(>
z+`Odth+>YOX;7VgYmC2@JLCQM+xJ7!7`yY{B7$2j6@tm8S8+TmrQ>UCE?XcyJ1K$C
z%D3cY^9$!r49zJ8basYBq%F{fUkY9lJ{#Kq^6<o!KB-`l)A?0#ZW!<*CtYB+SRs*I
zfz*5w;?V@qI*;sdp-7(LKoi|l6+G5EuM~qSByXPFTXTNkx4v8!7cA8nqSNbf!U&VD
zUFv0nRu)~gIG`j8&HJ>HX~!axEeKFTXdz>p9xcvA1_V{k!O`2_M}}mfw%Le#8w{|<
z@XB>%WC}Fvc>>EU@*<!q-~<(_F{)C_OX-1dI0MNjVS45rU-SI|$*8-7a;~rPvrUgX
z9Ta6{MVX9hwJL#jkiRnmJ{U``C$D{)z)ZI7k+r;f5fRHvDN1{R=kb@q<4aKK^t2RP
zbDArd_{EiHx7Dk^NZi3oVhg<8YAgF{=%e@ngj88(CNq}Hr{>|i<Jcj}W}p{la|q9A
zdI+`j6H4l@Tpx=VibMlvr{j%pRP4Dv_*Z)>#Xxcfmn<~VtpvwofA%<B^xIk-Sbiq+
ziL_v>Q>$$<Q$S~OOR`>-EgZyvJ*{lNIHT73!&4fadR#0R5+sH-1rJ=!1p58N5ACTR
zKX~$&UT>WlwU?LJ-`oG|9l)4fz@qLdFKrtBW;QqSbvRwDNHI6lH$@P|$0jDGKm7c)
ztK)(Dk_dK&I3?ELbfPjrN;-^pSC?-0o$465jS^gUc#a5f=&-oA4YYPu`@2scqy2tA
z1`nXM)lR;$*O7a-qgFm#Zt`wCR)h%uM<C!QHuUhoFGcu#KH|vJp45r1I(c7<w*xjo
zv9)0EpEeXd{HIJsOx#_{=b@;UMhB=6GW}4ZhX9dy37@*lVw{LTeHl`^RU%nyt2lJ9
z(S(dlrXaGiYTqgmh%!sxSYW_yLtyZl_{WxsN=W0;SD*7hIFg2^+IHXDEDw7W(TmMH
o)~noQc>(mjJzt*xd9%E~0TX&}59>!+_y7O^07*qoM6N<$g2a8?mH+?%

diff --git a/app/src/main/res/drawable/ic_group_add.xml b/app/src/main/res/drawable/ic_group_add.xml
deleted file mode 100644
index d114446..0000000
--- a/app/src/main/res/drawable/ic_group_add.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="29dp"
-    android:height="28dp"
-    android:viewportWidth="29"
-    android:viewportHeight="28">
-  <group>
-    <clip-path
-        android:pathData="M0.408,0h28v28h-28z"/>
-    <path
-        android:pathData="M14.991,13.942C15.555,13.319 15.988,12.61 16.289,11.813C16.591,11.015 16.742,10.189 16.742,9.333C16.742,8.478 16.591,7.651 16.289,6.854C15.988,6.057 15.555,5.347 14.991,4.725C16.158,4.881 17.13,5.396 17.908,6.271C18.686,7.146 19.075,8.167 19.075,9.333C19.075,10.5 18.686,11.521 17.908,12.396C17.13,13.271 16.158,13.786 14.991,13.942ZM21.408,23.333V19.833C21.408,19.133 21.253,18.467 20.941,17.835C20.63,17.204 20.222,16.644 19.716,16.158C20.708,16.508 21.627,16.96 22.473,17.515C23.319,18.069 23.742,18.842 23.742,19.833V23.333H21.408ZM23.742,15.167V12.833H21.408V10.5H23.742V8.167H26.075V10.5H28.408V12.833H26.075V15.167H23.742ZM9.742,14C8.458,14 7.36,13.543 6.446,12.629C5.532,11.715 5.075,10.617 5.075,9.333C5.075,8.05 5.532,6.951 6.446,6.037C7.36,5.124 8.458,4.667 9.742,4.667C11.025,4.667 12.123,5.124 13.037,6.037C13.951,6.951 14.408,8.05 14.408,9.333C14.408,10.617 13.951,11.715 13.037,12.629C12.123,13.543 11.025,14 9.742,14ZM0.408,23.333V20.067C0.408,19.406 0.578,18.798 0.919,18.244C1.259,17.69 1.711,17.267 2.275,16.975C3.48,16.372 4.705,15.92 5.95,15.619C7.194,15.317 8.458,15.167 9.742,15.167C11.025,15.167 12.289,15.317 13.533,15.619C14.778,15.92 16.003,16.372 17.208,16.975C17.772,17.267 18.224,17.69 18.565,18.244C18.905,18.798 19.075,19.406 19.075,20.067V23.333H0.408ZM9.742,11.667C10.383,11.667 10.932,11.438 11.389,10.981C11.846,10.524 12.075,9.975 12.075,9.333C12.075,8.692 11.846,8.142 11.389,7.685C10.932,7.228 10.383,7 9.742,7C9.1,7 8.551,7.228 8.094,7.685C7.637,8.142 7.408,8.692 7.408,9.333C7.408,9.975 7.637,10.524 8.094,10.981C8.551,11.438 9.1,11.667 9.742,11.667ZM2.742,21H16.742V20.067C16.742,19.853 16.688,19.658 16.581,19.483C16.474,19.308 16.333,19.172 16.158,19.075C15.108,18.55 14.049,18.156 12.979,17.894C11.91,17.631 10.83,17.5 9.742,17.5C8.653,17.5 7.573,17.631 6.504,17.894C5.435,18.156 4.375,18.55 3.325,19.075C3.15,19.172 3.009,19.308 2.902,19.483C2.795,19.658 2.742,19.853 2.742,20.067V21Z"
-        android:fillColor="#F4F4FC"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_library_add_check.xml b/app/src/main/res/drawable/ic_library_add_check.xml
deleted file mode 100644
index e094c88..0000000
--- a/app/src/main/res/drawable/ic_library_add_check.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.023,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M16.914,18.687L24.428,11.172L22.566,9.244L16.914,14.896L14.054,12.103L12.192,13.965L16.914,18.687ZM10.663,23.94C9.931,23.94 9.305,23.68 8.784,23.159C8.263,22.638 8.003,22.011 8.003,21.28V5.32C8.003,4.589 8.263,3.962 8.784,3.441C9.305,2.92 9.931,2.66 10.663,2.66H26.623C27.354,2.66 27.981,2.92 28.501,3.441C29.022,3.962 29.283,4.589 29.283,5.32V21.28C29.283,22.011 29.022,22.638 28.501,23.159C27.981,23.68 27.354,23.94 26.623,23.94H10.663ZM10.663,21.28H26.623V5.32H10.663V21.28ZM5.343,29.26C4.611,29.26 3.985,29 3.464,28.479C2.943,27.958 2.683,27.331 2.683,26.6V7.98H5.343V26.6H23.963V29.26H5.343Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_logout_2.xml b/app/src/main/res/drawable/ic_logout_2.xml
deleted file mode 100644
index 2f79008..0000000
--- a/app/src/main/res/drawable/ic_logout_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M16.188,7C17.176,7.74 18.067,8.599 18.843,9.556C18.948,9.686 19,9.843 19,10M16.188,13C17.176,12.26 18.067,11.401 18.843,10.444C18.948,10.314 19,10.157 19,10M19,10H6M11,2.528C9.938,1.578 8.537,1 7,1C3.686,1 1,3.686 1,7V13C1,16.314 3.686,19 7,19C8.537,19 9.938,18.422 11,17.472"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#FF0000"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_maintenance.xml b/app/src/main/res/drawable/ic_maintenance.xml
deleted file mode 100644
index 8554ac4..0000000
--- a/app/src/main/res/drawable/ic_maintenance.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorOnSurface">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml
deleted file mode 100644
index a4b9a11..0000000
--- a/app/src/main/res/drawable/ic_pin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
deleted file mode 100644
index 04d77b4..0000000
--- a/app/src/main/res/drawable/ic_qr.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="20dp" android:viewportHeight="24" android:viewportWidth="24" android:width="20dp">
-      
-    <path android:fillColor="#00000000" android:pathData="M6.5,6.5H6.51M17.5,6.5H17.51M6.5,17.5H6.51M13,13H13.01M17.5,17.5H17.51M17,21H21V17M14,16.5V21M21,14H16.5M15.6,10H19.4C19.96,10 20.24,10 20.454,9.891C20.642,9.795 20.795,9.642 20.891,9.454C21,9.24 21,8.96 21,8.4V4.6C21,4.04 21,3.76 20.891,3.546C20.795,3.358 20.642,3.205 20.454,3.109C20.24,3 19.96,3 19.4,3H15.6C15.04,3 14.76,3 14.546,3.109C14.358,3.205 14.205,3.358 14.109,3.546C14,3.76 14,4.04 14,4.6V8.4C14,8.96 14,9.24 14.109,9.454C14.205,9.642 14.358,9.795 14.546,9.891C14.76,10 15.04,10 15.6,10ZM4.6,10H8.4C8.96,10 9.24,10 9.454,9.891C9.642,9.795 9.795,9.642 9.891,9.454C10,9.24 10,8.96 10,8.4V4.6C10,4.04 10,3.76 9.891,3.546C9.795,3.358 9.642,3.205 9.454,3.109C9.24,3 8.96,3 8.4,3H4.6C4.04,3 3.76,3 3.546,3.109C3.358,3.205 3.205,3.358 3.109,3.546C3,3.76 3,4.04 3,4.6V8.4C3,8.96 3,9.24 3.109,9.454C3.205,9.642 3.358,9.795 3.546,9.891C3.76,10 4.04,10 4.6,10ZM4.6,21H8.4C8.96,21 9.24,21 9.454,20.891C9.642,20.795 9.795,20.642 9.891,20.454C10,20.24 10,19.96 10,19.4V15.6C10,15.04 10,14.76 9.891,14.546C9.795,14.358 9.642,14.205 9.454,14.109C9.24,14 8.96,14 8.4,14H4.6C4.04,14 3.76,14 3.546,14.109C3.358,14.205 3.205,14.358 3.109,14.546C3,14.76 3,15.04 3,15.6V19.4C3,19.96 3,20.24 3.109,20.454C3.205,20.642 3.358,20.795 3.546,20.891C3.76,21 4.04,21 4.6,21Z" android:strokeColor="#000000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2"/>
-    
-</vector>
diff --git a/app/src/main/res/drawable/ic_redo.xml b/app/src/main/res/drawable/ic_redo.xml
deleted file mode 100644
index 4d24cfb..0000000
--- a/app/src/main/res/drawable/ic_redo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.08,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M13.247,25.27C11.097,25.27 9.252,24.572 7.711,23.175C6.17,21.779 5.4,20.039 5.4,17.955C5.4,15.871 6.17,14.131 7.711,12.735C9.252,11.338 11.097,10.64 13.247,10.64H21.626L18.168,7.182L20.03,5.32L26.68,11.97L20.03,18.62L18.168,16.758L21.626,13.3H13.247C11.851,13.3 10.637,13.743 9.606,14.63C8.576,15.517 8.06,16.625 8.06,17.955C8.06,19.285 8.576,20.393 9.606,21.28C10.637,22.167 11.851,22.61 13.247,22.61H22.69V25.27H13.247Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_request_pending.xml b/app/src/main/res/drawable/ic_request_pending.xml
deleted file mode 100644
index 9c63e5b..0000000
--- a/app/src/main/res/drawable/ic_request_pending.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M13.3,14.7L14.7,13.3L11,9.6V5H9V10.4L13.3,14.7ZM10,20C8.617,20 7.317,19.737 6.1,19.212C4.883,18.688 3.825,17.975 2.925,17.075C2.025,16.175 1.313,15.117 0.788,13.9C0.262,12.683 0,11.383 0,10C0,8.617 0.262,7.317 0.788,6.1C1.313,4.883 2.025,3.825 2.925,2.925C3.825,2.025 4.883,1.313 6.1,0.788C7.317,0.262 8.617,0 10,0C11.383,0 12.683,0.262 13.9,0.788C15.117,1.313 16.175,2.025 17.075,2.925C17.975,3.825 18.688,4.883 19.212,6.1C19.737,7.317 20,8.617 20,10C20,11.383 19.737,12.683 19.212,13.9C18.688,15.117 17.975,16.175 17.075,17.075C16.175,17.975 15.117,18.688 13.9,19.212C12.683,19.737 11.383,20 10,20ZM10,18C12.217,18 14.104,17.221 15.663,15.663C17.221,14.104 18,12.217 18,10C18,7.783 17.221,5.896 15.663,4.338C14.104,2.779 12.217,2 10,2C7.783,2 5.896,2.779 4.338,4.338C2.779,5.896 2,7.783 2,10C2,12.217 2.779,14.104 4.338,15.663C5.896,17.221 7.783,18 10,18Z"
-      android:fillColor="#BBE7FF"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_requests.xml b/app/src/main/res/drawable/ic_requests.xml
index 33fa9bd..89c57d7 100644
--- a/app/src/main/res/drawable/ic_requests.xml
+++ b/app/src/main/res/drawable/ic_requests.xml
@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M13,8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8s1.79,4 4,4S13,10.21 13,8zM15,10v2h3v3h2v-3h3v-2h-3V7h-2v3H15zM1,18v2h16v-2c0,-2.66 -5.33,-4 -8,-4S1,15.34 1,18z" />
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M13,8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8s1.79,4 4,4S13,10.21 13,8zM15,10v2h3v3h2v-3h3v-2h-3V7h-2v3H15zM1,18v2h16v-2c0,-2.66 -5.33,-4 -8,-4S1,15.34 1,18z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_round_chevron_left.xml b/app/src/main/res/drawable/ic_round_chevron_left.xml
deleted file mode 100644
index a2ad3a5..0000000
--- a/app/src/main/res/drawable/ic_round_chevron_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="42dp"
-    android:height="42dp"
-    android:viewportWidth="42"
-    android:viewportHeight="42">
-  <path
-      android:pathData="M25.742,11.743C25.58,11.58 25.388,11.452 25.176,11.364C24.965,11.276 24.738,11.231 24.508,11.231C24.279,11.231 24.052,11.276 23.841,11.364C23.629,11.452 23.437,11.58 23.275,11.743L15.242,19.775C15.08,19.937 14.951,20.129 14.863,20.341C14.776,20.553 14.731,20.779 14.731,21.009C14.731,21.238 14.776,21.465 14.863,21.677C14.951,21.888 15.08,22.081 15.242,22.243L23.275,30.275C23.437,30.437 23.629,30.566 23.841,30.653C24.052,30.741 24.279,30.786 24.508,30.786C24.738,30.786 24.965,30.741 25.176,30.653C25.388,30.566 25.58,30.437 25.742,30.275C25.904,30.113 26.033,29.921 26.121,29.709C26.208,29.497 26.253,29.27 26.253,29.041C26.253,28.812 26.208,28.585 26.121,28.374C26.033,28.162 25.904,27.969 25.742,27.808L18.952,21L25.742,14.21C26.425,13.528 26.407,12.408 25.742,11.743Z"
-      android:fillColor="#F4F4FC"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_screwdriver.xml b/app/src/main/res/drawable/ic_screwdriver.xml
deleted file mode 100644
index 8554ac4..0000000
--- a/app/src/main/res/drawable/ic_screwdriver.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorOnSurface">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index 5023dc8..0000000
--- a/app/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
deleted file mode 100644
index 53a0c32..0000000
--- a/app/src/main/res/drawable/ic_settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M8.856,11.5C10.237,11.5 11.356,10.381 11.356,9C11.356,7.619 10.237,6.5 8.856,6.5C7.476,6.5 6.356,7.619 6.356,9C6.356,10.381 7.476,11.5 8.856,11.5Z"
-      android:strokeWidth="0.7"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-  <path
-      android:pathData="M10.327,0.793C10.021,0.667 9.633,0.667 8.856,0.667C8.08,0.667 7.691,0.667 7.385,0.793C7.183,0.877 6.999,1 6.844,1.155C6.69,1.31 6.567,1.494 6.483,1.696C6.406,1.882 6.376,2.099 6.364,2.415C6.358,2.643 6.295,2.867 6.18,3.064C6.065,3.261 5.902,3.426 5.706,3.543C5.506,3.654 5.282,3.713 5.053,3.714C4.825,3.715 4.6,3.659 4.4,3.549C4.12,3.401 3.917,3.319 3.716,3.293C3.278,3.235 2.835,3.354 2.485,3.623C2.223,3.825 2.028,4.161 1.64,4.833C1.251,5.506 1.056,5.842 1.014,6.171C0.985,6.388 1,6.609 1.056,6.82C1.113,7.031 1.211,7.23 1.344,7.403C1.467,7.563 1.64,7.698 1.907,7.866C2.301,8.113 2.555,8.535 2.555,9C2.555,9.465 2.301,9.887 1.907,10.133C1.64,10.303 1.466,10.437 1.344,10.597C1.211,10.77 1.113,10.969 1.056,11.18C1,11.392 0.985,11.612 1.014,11.829C1.057,12.158 1.251,12.494 1.639,13.167C2.028,13.839 2.222,14.175 2.485,14.378C2.658,14.511 2.857,14.609 3.068,14.665C3.28,14.722 3.5,14.736 3.717,14.708C3.917,14.681 4.12,14.599 4.4,14.451C4.6,14.342 4.825,14.285 5.053,14.286C5.282,14.287 5.506,14.346 5.706,14.458C6.108,14.691 6.347,15.12 6.364,15.585C6.376,15.902 6.405,16.118 6.483,16.304C6.567,16.507 6.69,16.691 6.844,16.845C6.999,17 7.183,17.123 7.385,17.207C7.691,17.333 8.08,17.333 8.856,17.333C9.633,17.333 10.021,17.333 10.327,17.207C10.53,17.123 10.713,17 10.868,16.845C11.023,16.691 11.146,16.507 11.23,16.304C11.306,16.118 11.337,15.902 11.349,15.585C11.366,15.12 11.605,14.69 12.007,14.458C12.207,14.346 12.431,14.287 12.659,14.286C12.888,14.285 13.113,14.342 13.313,14.451C13.593,14.599 13.795,14.681 13.995,14.708C14.212,14.736 14.433,14.722 14.645,14.665C14.856,14.609 15.054,14.511 15.228,14.378C15.491,14.176 15.685,13.839 16.073,13.167C16.461,12.494 16.656,12.158 16.699,11.829C16.728,11.612 16.713,11.392 16.656,11.18C16.6,10.969 16.502,10.77 16.369,10.597C16.246,10.437 16.073,10.303 15.806,10.134C15.61,10.015 15.449,9.849 15.335,9.651C15.222,9.452 15.161,9.228 15.158,9C15.158,8.535 15.411,8.113 15.806,7.867C16.073,7.698 16.246,7.563 16.369,7.403C16.502,7.23 16.6,7.031 16.656,6.82C16.713,6.609 16.728,6.388 16.699,6.171C16.656,5.843 16.461,5.506 16.074,4.833C15.685,4.161 15.491,3.825 15.228,3.623C15.054,3.489 14.856,3.392 14.645,3.335C14.433,3.278 14.212,3.264 13.995,3.293C13.795,3.319 13.593,3.401 13.312,3.549C13.112,3.659 12.887,3.715 12.659,3.714C12.431,3.713 12.206,3.654 12.007,3.543C11.811,3.426 11.648,3.261 11.533,3.064C11.417,2.867 11.354,2.643 11.349,2.415C11.337,2.098 11.307,1.882 11.23,1.696C11.146,1.494 11.023,1.31 10.868,1.155C10.713,1 10.53,0.877 10.327,0.793Z"
-      android:strokeWidth="0.7"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 7a7594e..1ab06d8 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,11 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="17dp"
-    android:height="16dp"
-    android:viewportWidth="17"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M2.679,1.672H5.893C6.008,1.672 6.119,1.717 6.201,1.799C6.283,1.881 6.328,1.992 6.328,2.107C6.328,2.223 6.283,2.333 6.201,2.415C6.119,2.497 6.008,2.543 5.893,2.543H2.679C2.226,2.543 1.792,2.723 1.472,3.043C1.152,3.363 0.972,3.797 0.972,4.25V12.821C0.972,13.274 1.152,13.708 1.472,14.028C1.792,14.349 2.226,14.528 2.679,14.528H11.25C11.703,14.528 12.137,14.349 12.457,14.028C12.777,13.708 12.957,13.274 12.957,12.821V11.75C12.957,11.634 13.003,11.523 13.085,11.441C13.167,11.36 13.277,11.314 13.393,11.314C13.508,11.314 13.62,11.36 13.701,11.441C13.783,11.523 13.828,11.634 13.828,11.75V12.821C13.828,13.505 13.557,14.161 13.073,14.644C12.59,15.128 11.934,15.4 11.25,15.4H2.679C1.995,15.4 1.339,15.128 0.855,14.644C0.372,14.161 0.1,13.505 0.1,12.821V4.25C0.1,3.566 0.372,2.91 0.855,2.427C1.339,1.943 1.995,1.672 2.679,1.672ZM10.148,1.119C10.148,0.685 10.624,0.459 10.941,0.696L11.003,0.75L15.815,5.48V5.481C15.905,5.572 15.959,5.691 15.969,5.817C15.978,5.944 15.942,6.07 15.866,6.172L15.811,6.235L10.998,10.97C10.7,11.263 10.209,11.08 10.152,10.673L10.148,10.589V8.24L10.039,8.25L9.763,8.274H9.761C9.626,8.289 9.492,8.307 9.357,8.328L8.956,8.401C7.291,8.746 5.691,9.607 4.147,10.985C3.803,11.292 3.261,11.008 3.319,10.53C3.584,8.353 4.271,6.675 5.355,5.506C6.438,4.338 7.926,3.667 9.814,3.518L9.813,3.517L10.055,3.501L10.148,3.495V1.119ZM11.019,4.31L9.878,4.386H9.877C8.171,4.522 6.903,5.117 5.994,6.098C5.263,6.886 4.711,7.982 4.389,9.43L4.33,9.694L4.546,9.532C6.157,8.325 7.86,7.602 9.661,7.407H9.666L9.676,7.406L11.019,7.285V9.726L11.189,9.559L14.882,5.926L14.954,5.854L14.882,5.783L11.189,2.153L11.019,1.986V4.31Z"
-      android:strokeWidth="0.2"
-      android:fillColor="#ffffff"
-      android:strokeColor="#071F33"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
deleted file mode 100644
index 7fa3592..0000000
--- a/app/src/main/res/drawable/ic_star.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13dp"
-    android:height="13dp"
-    android:viewportWidth="13"
-    android:viewportHeight="13">
-  <path
-      android:pathData="M5.015,1.455C5.389,0.303 7.019,0.303 7.393,1.455L7.99,3.292C8.157,3.807 8.637,4.156 9.179,4.156H11.111C12.321,4.156 12.825,5.705 11.845,6.417L10.282,7.553C9.844,7.871 9.661,8.435 9.828,8.95L10.425,10.788C10.8,11.939 9.481,12.897 8.502,12.185L6.939,11.05C6.501,10.731 5.907,10.731 5.469,11.05L3.906,12.185C2.927,12.897 1.609,11.939 1.983,10.788L2.58,8.95C2.747,8.435 2.564,7.871 2.126,7.553L0.563,6.417C-0.417,5.705 0.087,4.156 1.298,4.156H3.229C3.771,4.156 4.251,3.807 4.418,3.292L5.015,1.455Z"
-      android:fillColor="#BBE7FF"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_support.xml b/app/src/main/res/drawable/ic_support.xml
deleted file mode 100644
index cb0dcac..0000000
--- a/app/src/main/res/drawable/ic_support.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-    <path
-      android:pathData="M8.285,1.2C10.673,1.2 12.241,2.223 13.25,3.569C14.265,4.924 14.72,6.614 14.849,7.935L14.861,8.059L14.977,8.103C15.819,8.422 16.374,9.23 16.37,10.13V11.316C16.382,12.262 15.777,13.106 14.877,13.398L14.78,13.429L14.748,13.525C14.576,14.047 14.214,14.754 13.46,15.382C12.706,16.009 11.548,16.567 9.767,16.771L9.659,16.783L9.61,16.881C9.487,17.128 9.299,17.336 9.064,17.482C8.83,17.628 8.56,17.705 8.284,17.707C7.572,17.707 6.96,17.204 6.822,16.505C6.685,15.806 7.06,15.107 7.72,14.837C8.379,14.567 9.137,14.802 9.529,15.398L9.598,15.501L9.721,15.485C11.996,15.209 12.965,14.274 13.356,13.538L13.454,13.354L13.267,13.264C12.899,13.087 12.589,12.81 12.371,12.465C12.154,12.12 12.037,11.721 12.035,11.314V10.131C12.036,9.251 12.568,8.459 13.382,8.126L13.521,8.068L13.506,7.919C13.42,7.129 13.167,5.78 12.412,4.623C11.649,3.455 10.376,2.491 8.285,2.491C6.194,2.491 4.918,3.455 4.153,4.623C3.396,5.78 3.142,7.129 3.056,7.919L3.04,8.069L3.18,8.126C3.995,8.458 4.53,9.25 4.534,10.131V11.314C4.534,12.51 3.564,13.481 2.367,13.481C1.17,13.481 0.2,12.51 0.2,11.314V10.13L0.206,9.962C0.267,9.13 0.804,8.402 1.593,8.103L1.709,8.059L1.721,7.935C1.849,6.614 2.304,4.924 3.319,3.569C4.328,2.223 5.897,1.2 8.285,1.2ZM2.367,9.249C2.252,9.249 2.137,9.272 2.03,9.316C1.924,9.361 1.827,9.426 1.745,9.508C1.664,9.59 1.599,9.687 1.556,9.794C1.523,9.874 1.502,9.959 1.494,10.045L1.491,10.13V11.314C1.491,11.797 1.883,12.19 2.367,12.19C2.851,12.19 3.243,11.797 3.243,11.314V10.13C3.244,10.015 3.222,9.9 3.179,9.794C3.135,9.687 3.071,9.59 2.989,9.508C2.908,9.426 2.811,9.361 2.704,9.316C2.597,9.272 2.483,9.249 2.367,9.249ZM14.203,9.254C13.719,9.254 13.326,9.646 13.326,10.13V11.314C13.326,11.797 13.719,12.19 14.203,12.19C14.687,12.19 15.079,11.797 15.079,11.314V10.13C15.079,9.646 14.687,9.254 14.203,9.254Z"
-      android:strokeWidth="0.4"
-      android:fillColor="#ffffff"
-      android:strokeColor="#071F33"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_timetable_selector.xml b/app/src/main/res/drawable/ic_timetable_selector.xml
index a40ff74..e67e0e7 100644
--- a/app/src/main/res/drawable/ic_timetable_selector.xml
+++ b/app/src/main/res/drawable/ic_timetable_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_timetable_outline" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_timetable_filled" android:state_checked="true" />
     <item android:drawable="@drawable/ic_timetable_outline" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_undo.xml b/app/src/main/res/drawable/ic_undo.xml
deleted file mode 100644
index 89fba9d..0000000
--- a/app/src/main/res/drawable/ic_undo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <group>
-    <clip-path
-        android:pathData="M0.069,0h31.92v31.92h-31.92z"/>
-    <path
-        android:pathData="M9.379,25.27V22.61H18.822C20.218,22.61 21.432,22.167 22.462,21.28C23.493,20.393 24.009,19.285 24.009,17.955C24.009,16.625 23.493,15.517 22.462,14.63C21.432,13.743 20.218,13.3 18.822,13.3H10.443L13.901,16.758L12.039,18.62L5.389,11.97L12.039,5.32L13.901,7.182L10.443,10.64H18.822C20.972,10.64 22.817,11.338 24.358,12.735C25.898,14.131 26.669,15.871 26.669,17.955C26.669,20.039 25.898,21.779 24.358,23.175C22.817,24.572 20.972,25.27 18.822,25.27H9.379Z"
-        android:fillColor="#BBE7FF"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_upload.xml b/app/src/main/res/drawable/ic_upload.xml
deleted file mode 100644
index 9eb44e7..0000000
--- a/app/src/main/res/drawable/ic_upload.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M0.5,0h24v24h-24z"/>
-    <path
-        android:pathData="M11.5,16V7.85L8.9,10.45L7.5,9L12.5,4L17.5,9L16.1,10.45L13.5,7.85V16H11.5ZM6.5,20C5.95,20 5.479,19.804 5.088,19.413C4.696,19.021 4.5,18.55 4.5,18V15H6.5V18H18.5V15H20.5V18C20.5,18.55 20.304,19.021 19.913,19.413C19.521,19.804 19.05,20 18.5,20H6.5Z"
-        android:fillColor="#071F33"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_visibility_outlined.xml b/app/src/main/res/drawable/ic_visibility_outlined.xml
deleted file mode 100644
index 86bd6f9..0000000
--- a/app/src/main/res/drawable/ic_visibility_outlined.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="1024dp"
-    android:height="1024dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M952.5,496.4c-6,-9.1 -151.2,-221.8 -442.1,-221.8 -290.8,0 -436,212.7 -442.1,221.8a27.9,27.9 0,0 0,0 31c6.1,9 151.3,221.8 442.1,221.8 290.9,0 436.1,-212.7 442.1,-221.8a27.8,27.8 0,0 0,0 -31zM510.4,693.3c-216.5,0 -345.8,-135.1 -383.8,-181.5 37.9,-46.5 166.5,-181.4 383.8,-181.4 216.5,0 345.8,135.1 383.8,181.5 -37.9,46.5 -166.5,181.4 -383.8,181.4z"
-      android:fillColor="#040000"/>
-  <path
-      android:pathData="M510.4,386.3c-69.3,0 -125.7,56.3 -125.7,125.6 0,69.3 56.4,125.6 125.7,125.6 69.3,0 125.7,-56.3 125.7,-125.6 0,-69.3 -56.4,-125.6 -125.7,-125.6zM510.4,581.6c-38.5,0 -69.8,-31.3 -69.8,-69.8 0,-38.5 31.3,-69.8 69.8,-69.8 38.5,0 69.8,31.3 69.8,69.8 0,38.5 -31.3,69.8 -69.8,69.8z"
-      android:fillColor="#040000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_vitevents.xml b/app/src/main/res/drawable/ic_vitevents.xml
index 9600232..d2067ba 100644
--- a/app/src/main/res/drawable/ic_vitevents.xml
+++ b/app/src/main/res/drawable/ic_vitevents.xml
@@ -1,23 +1,23 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="32dp"
     android:height="32dp"
-    android:tint="@color/white"
     android:viewportWidth="500"
+    android:tint="@color/white"
     android:viewportHeight="500">
-    <path
-        android:fillColor="#1DBC9C"
-        android:fillType="evenOdd"
-        android:pathData="M102.914,206.696C102.641,207.585 102.124,210.485 101.76,213.141C101.397,215.798 100.819,219.834 100.474,222.111C100.131,224.388 99.634,227.881 99.372,229.874L98.896,233.496L103.217,233.496C120.923,233.496 155.931,245.038 178.077,258.177C179.215,258.853 181.699,260.318 183.597,261.436C194.899,268.084 209.855,278.512 216.369,284.283C217.699,285.463 221.35,288.663 224.483,291.397C236.356,301.759 248.014,316.16 254.134,328.026C257.154,333.879 258.036,336.109 259.519,341.654C259.747,342.507 260.268,343.206 260.677,343.206C261.262,343.206 267.929,337.998 269.502,336.311C269.692,336.108 271.553,334.548 273.64,332.847C275.726,331.145 278.086,329.13 278.884,328.371C279.683,327.612 281.12,326.37 282.079,325.611C284.546,323.658 290.716,318.44 293.8,315.697C295.237,314.421 296.41,313.024 296.409,312.592C296.402,311.104 279.852,294.901 267.422,284.211C263.449,280.796 259.575,277.437 258.812,276.749C258.051,276.06 255.719,274.199 253.632,272.614C251.545,271.03 249.371,269.248 248.802,268.658C247.139,266.932 232.361,256.119 226.722,252.504C223.876,250.679 219.455,247.829 216.898,246.17C214.34,244.512 212.06,243.156 211.83,243.156C211.599,243.156 210.533,242.532 209.46,241.767C202.579,236.867 177.27,225.154 165.312,221.335C163.604,220.79 161.667,220.041 161.008,219.674C160.349,219.306 159.247,219.006 158.559,219.006C157.87,219.006 157.013,218.749 156.652,218.437C156.292,218.123 154.6,217.471 152.892,216.989C151.184,216.506 149.247,215.832 148.588,215.489C147.929,215.145 146.629,214.866 145.697,214.866C144.766,214.866 143.832,214.59 143.624,214.252C143.415,213.916 142.078,213.439 140.651,213.198C134.393,212.132 133.539,211.92 133.18,211.34C132.972,211.002 131.906,210.726 130.812,210.726C129.718,210.726 128.652,210.45 128.444,210.112C128.235,209.776 127.053,209.322 125.816,209.106C123.6,208.72 119.805,207.978 112.7,206.545C104.604,204.913 103.452,204.93 102.914,206.696M93.247,272.999C92.993,274.232 92.489,277.415 92.125,280.071C91.763,282.728 91.185,286.919 90.842,289.386C90.497,291.853 89.881,296.355 89.472,299.391C89.062,302.427 88.286,307.825 87.747,311.387C86.735,318.083 86.859,319.746 88.377,319.746C93.242,319.746 117.925,330.339 129.777,337.515C132.813,339.352 136.073,341.307 137.022,341.859C137.971,342.409 138.902,343.016 139.092,343.206C139.282,343.396 140.213,343.977 141.162,344.498C156.332,352.828 180.692,377.891 186.857,391.506C189.284,396.866 190.152,399.343 190.152,400.906C190.152,401.808 190.34,402.546 190.571,402.546C190.939,402.546 205.525,390.54 207.978,388.218C208.487,387.739 210.031,386.497 211.411,385.458C212.791,384.42 215.014,382.534 216.353,381.268C217.692,380 220.55,377.566 222.704,375.857C228.195,371.505 228.166,370.839 221.954,358.155C205.625,324.819 171.948,293.095 139.437,280.425C137.16,279.536 134.986,278.593 134.607,278.325C134.227,278.06 133.141,277.673 132.192,277.47C131.243,277.264 128.294,276.433 125.637,275.619C120.578,274.07 117.442,273.43 106.722,271.765C95.983,270.097 93.804,270.295 93.247,272.999M82.707,348.962C82.433,349.402 81.977,351.624 81.694,353.901C81.061,358.976 80.052,366.114 79.057,372.531C78.645,375.188 77.993,379.69 77.606,382.536C77.221,385.382 76.611,389.729 76.252,392.196C74.263,405.856 74.377,407.376 77.396,407.376C77.942,407.376 78.929,407.659 79.588,408.004C80.247,408.351 85.6,410.962 91.482,413.809C100.216,418.035 108.572,422.88 117.874,429.111C121.607,431.611 127.764,435.976 128.052,436.328C128.242,436.56 129.287,437.432 130.376,438.267C131.464,439.104 133.896,441.191 135.782,442.908L139.209,446.026L141.048,444.681C142.059,443.941 143.819,442.511 144.957,441.503C146.096,440.496 148.233,438.692 149.706,437.496C151.179,436.299 153.042,434.7 153.848,433.941C154.653,433.182 157.018,431.164 159.104,429.456C165.838,423.943 165.457,424.521 164.372,421.447C161.593,413.569 153.422,399.582 147.089,391.861C145.537,389.971 143.646,387.651 142.887,386.707C132.258,373.494 112.96,359.352 96.657,352.826C87.828,349.294 83.285,348.034 82.707,348.962M71.003,444.118C71.415,454.669 71.701,456.011 74.977,462.816C77.875,468.834 83.859,472.084 90.594,471.296C97.563,470.48 100.129,470.004 100.763,469.405C101.123,469.065 102.136,468.786 103.014,468.786C103.892,468.786 105.227,468.476 105.981,468.096C106.734,467.717 107.97,467.095 108.723,466.716C109.477,466.336 110.529,466.026 111.064,466.026C118.252,466.026 90.463,443.906 75.693,437.874C73.649,437.039 71.689,436.356 71.337,436.356C70.965,436.356 70.825,439.59 71.003,444.118"
-        android:strokeWidth="1.725"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
-    <path
-        android:fillColor="#5BCEB6"
-        android:fillType="evenOdd"
-        android:pathData="M162.55,33.054C162.173,34.052 161.862,35.915 161.862,37.198C161.862,38.48 161.405,44.591 160.848,50.781C157.217,91.075 156.735,97.297 156.97,100.928C157.208,104.592 158.962,99.445 159.35,93.944C159.795,87.651 160.606,77.946 161.876,63.756C162.233,59.771 162.823,52.94 163.189,48.576C163.554,44.212 164.067,38.744 164.327,36.423C164.845,31.795 163.791,29.794 162.55,33.054M324.923,53.616C322.958,56.347 320.76,59.211 320.038,59.978C319.317,60.748 318.173,62.222 317.495,63.256C315.856,65.757 315.711,65.729 302.277,60.308C299.538,59.202 293.274,56.941 291.81,56.53C290.385,56.128 290.347,56.232 291.006,58.724C292.067,62.73 292.758,65.512 294.739,73.739L296.56,81.308L294.934,82.572C294.038,83.267 290.24,85.802 286.492,88.204L279.678,92.57L282.007,93.286C283.288,93.681 286.045,94.387 288.132,94.858C290.219,95.329 294.173,96.286 296.917,96.985C299.662,97.683 302.529,98.256 303.29,98.256C304.989,98.256 306.517,100.568 312.848,112.727C319.187,124.902 318.042,125.228 323.65,109.641C326.71,101.13 326.855,100.861 328.906,99.862C330.638,99.02 345.721,94.834 349.025,94.278C351.71,93.826 351.362,92.75 347.632,89.976C345.847,88.648 343.605,86.895 342.651,86.081C341.697,85.268 338.899,83.067 336.432,81.192C331.254,77.254 331.592,78.4 330.239,60.306C329.272,47.348 329.358,47.458 324.923,53.616M255.804,169.359C226.282,213.531 222.842,219.006 224.604,219.006C225.463,219.006 288.822,124.015 288.822,122.727C288.822,120.21 285.805,124.471 255.804,169.359M153.891,134.195C153.629,134.619 153.128,138.428 152.778,142.659C152.43,146.889 151.845,153.611 151.483,157.596C151.119,161.581 150.53,168.746 150.173,173.521C149.818,178.294 149.333,182.976 149.095,183.921C148.812,185.048 149.023,185.941 149.702,186.505C151.02,187.599 151.16,186.802 152.533,170.361C153.104,163.53 153.872,154.836 154.238,151.041C155.837,134.479 155.768,131.159 153.891,134.195M439.587,193.943C438.449,194.549 435.219,196.431 432.411,198.125C427.583,201.038 426.344,201.758 420.095,205.287C418.671,206.091 416.731,207.288 415.782,207.949C414.833,208.609 413.74,209.272 413.351,209.42C412.962,209.569 407.994,212.46 402.311,215.842C396.628,219.225 389.183,223.627 385.767,225.625C377.67,230.36 376.807,231.017 377.411,231.992C377.98,232.913 379.077,232.356 391.896,224.635C396.405,221.918 400.186,219.696 400.297,219.696C400.409,219.696 403.031,218.144 406.122,216.246C409.213,214.349 411.906,212.796 412.104,212.796C412.303,212.796 413.288,212.211 414.295,211.497C415.302,210.783 417.214,209.582 418.542,208.83C419.87,208.078 424.528,205.351 428.892,202.769C433.256,200.188 437.99,197.428 439.409,196.638C440.853,195.834 441.993,194.668 441.997,193.994C442.004,192.563 442.173,192.567 439.587,193.943M101.899,205.999C101.484,207.195 101.142,209.189 101.142,210.431C101.142,211.675 100.849,214.19 100.49,216.02C100.131,217.852 99.508,221.835 99.107,224.871C98.703,227.907 97.109,239.396 95.563,250.401C91.805,277.151 91.918,276.133 92.796,274.896C93.2,274.327 93.536,273.162 93.542,272.309C93.555,270.373 96.876,270.235 106.722,271.765C117.442,273.43 120.578,274.07 125.637,275.619C128.294,276.433 131.243,277.264 132.192,277.47C133.141,277.673 134.227,278.06 134.607,278.325C134.986,278.593 137.16,279.536 139.437,280.425C171.948,293.095 205.625,324.819 221.954,358.155C228.166,370.839 228.195,371.505 222.704,375.857C220.55,377.566 217.692,380 216.353,381.268C215.014,382.534 212.791,384.42 211.411,385.458C210.031,386.497 208.487,387.739 207.978,388.218C205.525,390.54 190.939,402.546 190.571,402.546C190.34,402.546 190.152,401.808 190.152,400.906C190.152,399.343 189.284,396.866 186.857,391.506C180.692,377.891 156.332,352.828 141.162,344.498C140.213,343.977 139.282,343.396 139.092,343.206C138.902,343.016 137.971,342.409 137.022,341.859C136.073,341.307 132.813,339.352 129.777,337.515C117.925,330.339 93.242,319.746 88.377,319.746C86.619,319.746 87.57,306.331 90.124,295.068C90.492,293.45 90.792,290.935 90.792,289.479C90.792,288.023 91.121,285.888 91.523,284.735C91.925,283.581 92.158,281.13 92.041,279.284C91.796,275.445 90.852,281.379 86.376,314.916C85.793,319.28 84.984,325.335 84.577,328.371C84.171,331.407 83.559,335.599 83.218,337.686C82.583,341.574 81.524,348.495 80.39,356.143C80.04,358.515 79.457,362.397 79.097,364.768C78.738,367.14 78.094,371.72 77.668,374.946C77.244,378.172 76.626,382.519 76.297,384.606C75.201,391.558 74.299,397.999 73.545,404.271C73.135,407.686 72.51,412.344 72.159,414.621C67.38,445.449 69.43,462.01 78.922,469.252C88.582,476.621 112.163,469.95 130.32,454.713C134.892,450.879 140.208,446.53 142.138,445.05C144.069,443.57 145.802,442.173 145.992,441.945C146.387,441.471 153.789,435.188 156.292,433.201C157.213,432.47 159.387,430.612 161.122,429.071C162.857,427.533 165.388,425.359 166.745,424.241C177.19,415.651 180.435,412.674 180.042,412.037C179.788,411.625 179.912,411.504 180.326,411.759C180.97,412.156 183.6,410.386 186.585,407.547C187.09,407.067 191.127,403.657 195.555,399.969C199.983,396.281 203.762,393.09 203.952,392.877C204.142,392.665 210.197,387.549 217.407,381.508C224.618,375.465 230.672,370.354 230.862,370.147C231.052,369.94 233.225,368.072 235.692,365.993C238.159,363.916 240.332,362.052 240.522,361.848C240.712,361.646 244.593,358.393 249.147,354.62C253.701,350.849 257.582,347.581 257.772,347.358C257.962,347.136 258.954,346.313 259.977,345.528C260.999,344.745 263.483,342.69 265.497,340.965C271.724,335.63 284.125,325.185 291.102,319.401C294.763,316.365 297.768,313.379 297.776,312.767C297.795,311.4 281.342,295.101 269.157,284.416C251.352,268.802 234.738,256.078 221.719,248.086C219.158,246.513 215.002,243.955 212.486,242.402C203.26,236.711 192.458,231.202 180.837,226.26C179.699,225.777 177.525,224.823 176.007,224.143C173.178,222.875 155.573,216.608 151.857,215.546C128.385,208.834 113.55,205.206 109.576,205.206C107.431,205.206 109.526,206.16 112.882,206.71C114.775,207.022 117.952,207.599 119.944,207.995C121.937,208.39 124.58,208.891 125.816,209.106C127.053,209.322 128.235,209.776 128.444,210.112C128.652,210.45 129.718,210.726 130.812,210.726C131.906,210.726 132.972,211.002 133.18,211.34C133.389,211.676 134.648,212.142 135.98,212.375C137.312,212.606 139.492,212.986 140.824,213.217C142.156,213.45 143.415,213.916 143.624,214.252C143.832,214.59 144.766,214.866 145.697,214.866C146.629,214.866 147.929,215.145 148.588,215.489C149.247,215.832 151.184,216.506 152.892,216.989C154.6,217.471 156.292,218.123 156.652,218.437C157.013,218.749 157.87,219.006 158.559,219.006C159.247,219.006 160.349,219.306 161.008,219.674C161.667,220.041 163.604,220.79 165.312,221.335C177.27,225.154 202.579,236.867 209.46,241.767C210.533,242.532 211.599,243.156 211.83,243.156C212.06,243.156 214.34,244.512 216.898,246.17C219.455,247.829 223.876,250.679 226.722,252.504C232.361,256.119 247.139,266.932 248.802,268.658C249.371,269.248 251.545,271.03 253.632,272.614C255.719,274.199 258.051,276.06 258.812,276.749C259.575,277.437 263.449,280.796 267.422,284.211C279.852,294.901 296.402,311.104 296.409,312.592C296.41,313.024 295.237,314.421 293.8,315.697C290.716,318.44 284.546,323.658 282.079,325.611C281.12,326.37 279.683,327.612 278.884,328.371C278.086,329.13 275.726,331.145 273.64,332.847C271.553,334.548 269.692,336.108 269.502,336.311C267.929,337.998 261.262,343.206 260.677,343.206C260.268,343.206 259.747,342.507 259.519,341.654C258.036,336.109 257.154,333.879 254.134,328.026C248.014,316.16 236.356,301.759 224.483,291.397C221.35,288.663 217.699,285.463 216.369,284.283C209.855,278.512 194.899,268.084 183.597,261.436C181.7,260.318 179.215,258.854 178.077,258.177C155.931,245.038 120.923,233.496 103.217,233.496L98.896,233.496L99.372,229.874C99.634,227.881 100.131,224.388 100.474,222.111C100.819,219.834 101.397,215.798 101.76,213.141C102.789,205.61 102.991,205.216 105.881,205.137C108.147,205.075 108.221,205.016 106.662,204.516C103.497,203.502 102.681,203.757 101.899,205.999M337.933,253.687C330.978,258.331 324.785,262.441 324.169,262.821C323.555,263.201 322.725,263.749 322.325,264.041C321.045,264.974 315.547,268.638 310.04,272.231C305.289,275.329 303.31,277.656 305.427,277.656C306.81,277.656 351.612,247.113 351.612,246.168C351.612,244.615 351.074,244.912 337.933,253.687M96.657,352.826C112.96,359.352 132.258,373.494 142.887,386.707C143.646,387.651 145.537,389.971 147.089,391.861C153.422,399.582 161.593,413.569 164.372,421.447C165.457,424.521 165.838,423.943 159.104,429.456C157.018,431.164 154.653,433.182 153.848,433.941C153.042,434.7 151.179,436.299 149.706,437.496C148.233,438.692 146.096,440.496 144.957,441.503C143.819,442.511 142.059,443.941 141.048,444.681L139.209,446.026L135.782,442.908C133.896,441.191 131.464,439.104 130.376,438.267C129.287,437.432 128.242,436.56 128.052,436.328C127.764,435.977 121.607,431.611 117.875,429.111C108.572,422.88 100.216,418.035 91.482,413.809C85.6,410.962 80.247,408.351 79.588,408.004C78.929,407.659 77.942,407.376 77.396,407.376C74.377,407.376 74.263,405.856 76.252,392.196C76.611,389.729 77.221,385.382 77.606,382.536C77.993,379.69 78.645,375.188 79.057,372.531C80.052,366.114 81.061,358.976 81.694,353.901C82.519,347.274 82.743,347.258 96.657,352.826M75.693,437.874C90.463,443.906 118.252,466.026 111.064,466.026C110.529,466.026 109.477,466.336 108.723,466.716C107.97,467.095 106.734,467.717 105.981,468.096C105.227,468.476 103.892,468.786 103.014,468.786C102.136,468.786 101.123,469.065 100.763,469.405C100.129,470.004 97.563,470.48 90.594,471.296C82.264,472.271 76.923,468.305 72.812,458.091C71.303,454.344 70.083,436.356 71.337,436.356C71.689,436.356 73.649,437.039 75.693,437.874"
-        android:strokeWidth="1.725"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
+  <path
+      android:pathData="M102.914,206.696C102.641,207.585 102.124,210.485 101.76,213.141C101.397,215.798 100.819,219.834 100.474,222.111C100.131,224.388 99.634,227.881 99.372,229.874L98.896,233.496L103.217,233.496C120.923,233.496 155.931,245.038 178.077,258.177C179.215,258.853 181.699,260.318 183.597,261.436C194.899,268.084 209.855,278.512 216.369,284.283C217.699,285.463 221.35,288.663 224.483,291.397C236.356,301.759 248.014,316.16 254.134,328.026C257.154,333.879 258.036,336.109 259.519,341.654C259.747,342.507 260.268,343.206 260.677,343.206C261.262,343.206 267.929,337.998 269.502,336.311C269.692,336.108 271.553,334.548 273.64,332.847C275.726,331.145 278.086,329.13 278.884,328.371C279.683,327.612 281.12,326.37 282.079,325.611C284.546,323.658 290.716,318.44 293.8,315.697C295.237,314.421 296.41,313.024 296.409,312.592C296.402,311.104 279.852,294.901 267.422,284.211C263.449,280.796 259.575,277.437 258.812,276.749C258.051,276.06 255.719,274.199 253.632,272.614C251.545,271.03 249.371,269.248 248.802,268.658C247.139,266.932 232.361,256.119 226.722,252.504C223.876,250.679 219.455,247.829 216.898,246.17C214.34,244.512 212.06,243.156 211.83,243.156C211.599,243.156 210.533,242.532 209.46,241.767C202.579,236.867 177.27,225.154 165.312,221.335C163.604,220.79 161.667,220.041 161.008,219.674C160.349,219.306 159.247,219.006 158.559,219.006C157.87,219.006 157.013,218.749 156.652,218.437C156.292,218.123 154.6,217.471 152.892,216.989C151.184,216.506 149.247,215.832 148.588,215.489C147.929,215.145 146.629,214.866 145.697,214.866C144.766,214.866 143.832,214.59 143.624,214.252C143.415,213.916 142.078,213.439 140.651,213.198C134.393,212.132 133.539,211.92 133.18,211.34C132.972,211.002 131.906,210.726 130.812,210.726C129.718,210.726 128.652,210.45 128.444,210.112C128.235,209.776 127.053,209.322 125.816,209.106C123.6,208.72 119.805,207.978 112.7,206.545C104.604,204.913 103.452,204.93 102.914,206.696M93.247,272.999C92.993,274.232 92.489,277.415 92.125,280.071C91.763,282.728 91.185,286.919 90.842,289.386C90.497,291.853 89.881,296.355 89.472,299.391C89.062,302.427 88.286,307.825 87.747,311.387C86.735,318.083 86.859,319.746 88.377,319.746C93.242,319.746 117.925,330.339 129.777,337.515C132.813,339.352 136.073,341.307 137.022,341.859C137.971,342.409 138.902,343.016 139.092,343.206C139.282,343.396 140.213,343.977 141.162,344.498C156.332,352.828 180.692,377.891 186.857,391.506C189.284,396.866 190.152,399.343 190.152,400.906C190.152,401.808 190.34,402.546 190.571,402.546C190.939,402.546 205.525,390.54 207.978,388.218C208.487,387.739 210.031,386.497 211.411,385.458C212.791,384.42 215.014,382.534 216.353,381.268C217.692,380 220.55,377.566 222.704,375.857C228.195,371.505 228.166,370.839 221.954,358.155C205.625,324.819 171.948,293.095 139.437,280.425C137.16,279.536 134.986,278.593 134.607,278.325C134.227,278.06 133.141,277.673 132.192,277.47C131.243,277.264 128.294,276.433 125.637,275.619C120.578,274.07 117.442,273.43 106.722,271.765C95.983,270.097 93.804,270.295 93.247,272.999M82.707,348.962C82.433,349.402 81.977,351.624 81.694,353.901C81.061,358.976 80.052,366.114 79.057,372.531C78.645,375.188 77.993,379.69 77.606,382.536C77.221,385.382 76.611,389.729 76.252,392.196C74.263,405.856 74.377,407.376 77.396,407.376C77.942,407.376 78.929,407.659 79.588,408.004C80.247,408.351 85.6,410.962 91.482,413.809C100.216,418.035 108.572,422.88 117.874,429.111C121.607,431.611 127.764,435.976 128.052,436.328C128.242,436.56 129.287,437.432 130.376,438.267C131.464,439.104 133.896,441.191 135.782,442.908L139.209,446.026L141.048,444.681C142.059,443.941 143.819,442.511 144.957,441.503C146.096,440.496 148.233,438.692 149.706,437.496C151.179,436.299 153.042,434.7 153.848,433.941C154.653,433.182 157.018,431.164 159.104,429.456C165.838,423.943 165.457,424.521 164.372,421.447C161.593,413.569 153.422,399.582 147.089,391.861C145.537,389.971 143.646,387.651 142.887,386.707C132.258,373.494 112.96,359.352 96.657,352.826C87.828,349.294 83.285,348.034 82.707,348.962M71.003,444.118C71.415,454.669 71.701,456.011 74.977,462.816C77.875,468.834 83.859,472.084 90.594,471.296C97.563,470.48 100.129,470.004 100.763,469.405C101.123,469.065 102.136,468.786 103.014,468.786C103.892,468.786 105.227,468.476 105.981,468.096C106.734,467.717 107.97,467.095 108.723,466.716C109.477,466.336 110.529,466.026 111.064,466.026C118.252,466.026 90.463,443.906 75.693,437.874C73.649,437.039 71.689,436.356 71.337,436.356C70.965,436.356 70.825,439.59 71.003,444.118"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.725"
+      android:fillColor="#1DBC9C"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M162.55,33.054C162.173,34.052 161.862,35.915 161.862,37.198C161.862,38.48 161.405,44.591 160.848,50.781C157.217,91.075 156.735,97.297 156.97,100.928C157.208,104.592 158.962,99.445 159.35,93.944C159.795,87.651 160.606,77.946 161.876,63.756C162.233,59.771 162.823,52.94 163.189,48.576C163.554,44.212 164.067,38.744 164.327,36.423C164.845,31.795 163.791,29.794 162.55,33.054M324.923,53.616C322.958,56.347 320.76,59.211 320.038,59.978C319.317,60.748 318.173,62.222 317.495,63.256C315.856,65.757 315.711,65.729 302.277,60.308C299.538,59.202 293.274,56.941 291.81,56.53C290.385,56.128 290.347,56.232 291.006,58.724C292.067,62.73 292.758,65.512 294.739,73.739L296.56,81.308L294.934,82.572C294.038,83.267 290.24,85.802 286.492,88.204L279.678,92.57L282.007,93.286C283.288,93.681 286.045,94.387 288.132,94.858C290.219,95.329 294.173,96.286 296.917,96.985C299.662,97.683 302.529,98.256 303.29,98.256C304.989,98.256 306.517,100.568 312.848,112.727C319.187,124.902 318.042,125.228 323.65,109.641C326.71,101.13 326.855,100.861 328.906,99.862C330.638,99.02 345.721,94.834 349.025,94.278C351.71,93.826 351.362,92.75 347.632,89.976C345.847,88.648 343.605,86.895 342.651,86.081C341.697,85.268 338.899,83.067 336.432,81.192C331.254,77.254 331.592,78.4 330.239,60.306C329.272,47.348 329.358,47.458 324.923,53.616M255.804,169.359C226.282,213.531 222.842,219.006 224.604,219.006C225.463,219.006 288.822,124.015 288.822,122.727C288.822,120.21 285.805,124.471 255.804,169.359M153.891,134.195C153.629,134.619 153.128,138.428 152.778,142.659C152.43,146.889 151.845,153.611 151.483,157.596C151.119,161.581 150.53,168.746 150.173,173.521C149.818,178.294 149.333,182.976 149.095,183.921C148.812,185.048 149.023,185.941 149.702,186.505C151.02,187.599 151.16,186.802 152.533,170.361C153.104,163.53 153.872,154.836 154.238,151.041C155.837,134.479 155.768,131.159 153.891,134.195M439.587,193.943C438.449,194.549 435.219,196.431 432.411,198.125C427.583,201.038 426.344,201.758 420.095,205.287C418.671,206.091 416.731,207.288 415.782,207.949C414.833,208.609 413.74,209.272 413.351,209.42C412.962,209.569 407.994,212.46 402.311,215.842C396.628,219.225 389.183,223.627 385.767,225.625C377.67,230.36 376.807,231.017 377.411,231.992C377.98,232.913 379.077,232.356 391.896,224.635C396.405,221.918 400.186,219.696 400.297,219.696C400.409,219.696 403.031,218.144 406.122,216.246C409.213,214.349 411.906,212.796 412.104,212.796C412.303,212.796 413.288,212.211 414.295,211.497C415.302,210.783 417.214,209.582 418.542,208.83C419.87,208.078 424.528,205.351 428.892,202.769C433.256,200.188 437.99,197.428 439.409,196.638C440.853,195.834 441.993,194.668 441.997,193.994C442.004,192.563 442.173,192.567 439.587,193.943M101.899,205.999C101.484,207.195 101.142,209.189 101.142,210.431C101.142,211.675 100.849,214.19 100.49,216.02C100.131,217.852 99.508,221.835 99.107,224.871C98.703,227.907 97.109,239.396 95.563,250.401C91.805,277.151 91.918,276.133 92.796,274.896C93.2,274.327 93.536,273.162 93.542,272.309C93.555,270.373 96.876,270.235 106.722,271.765C117.442,273.43 120.578,274.07 125.637,275.619C128.294,276.433 131.243,277.264 132.192,277.47C133.141,277.673 134.227,278.06 134.607,278.325C134.986,278.593 137.16,279.536 139.437,280.425C171.948,293.095 205.625,324.819 221.954,358.155C228.166,370.839 228.195,371.505 222.704,375.857C220.55,377.566 217.692,380 216.353,381.268C215.014,382.534 212.791,384.42 211.411,385.458C210.031,386.497 208.487,387.739 207.978,388.218C205.525,390.54 190.939,402.546 190.571,402.546C190.34,402.546 190.152,401.808 190.152,400.906C190.152,399.343 189.284,396.866 186.857,391.506C180.692,377.891 156.332,352.828 141.162,344.498C140.213,343.977 139.282,343.396 139.092,343.206C138.902,343.016 137.971,342.409 137.022,341.859C136.073,341.307 132.813,339.352 129.777,337.515C117.925,330.339 93.242,319.746 88.377,319.746C86.619,319.746 87.57,306.331 90.124,295.068C90.492,293.45 90.792,290.935 90.792,289.479C90.792,288.023 91.121,285.888 91.523,284.735C91.925,283.581 92.158,281.13 92.041,279.284C91.796,275.445 90.852,281.379 86.376,314.916C85.793,319.28 84.984,325.335 84.577,328.371C84.171,331.407 83.559,335.599 83.218,337.686C82.583,341.574 81.524,348.495 80.39,356.143C80.04,358.515 79.457,362.397 79.097,364.768C78.738,367.14 78.094,371.72 77.668,374.946C77.244,378.172 76.626,382.519 76.297,384.606C75.201,391.558 74.299,397.999 73.545,404.271C73.135,407.686 72.51,412.344 72.159,414.621C67.38,445.449 69.43,462.01 78.922,469.252C88.582,476.621 112.163,469.95 130.32,454.713C134.892,450.879 140.208,446.53 142.138,445.05C144.069,443.57 145.802,442.173 145.992,441.945C146.387,441.471 153.789,435.188 156.292,433.201C157.213,432.47 159.387,430.612 161.122,429.071C162.857,427.533 165.388,425.359 166.745,424.241C177.19,415.651 180.435,412.674 180.042,412.037C179.788,411.625 179.912,411.504 180.326,411.759C180.97,412.156 183.6,410.386 186.585,407.547C187.09,407.067 191.127,403.657 195.555,399.969C199.983,396.281 203.762,393.09 203.952,392.877C204.142,392.665 210.197,387.549 217.407,381.508C224.618,375.465 230.672,370.354 230.862,370.147C231.052,369.94 233.225,368.072 235.692,365.993C238.159,363.916 240.332,362.052 240.522,361.848C240.712,361.646 244.593,358.393 249.147,354.62C253.701,350.849 257.582,347.581 257.772,347.358C257.962,347.136 258.954,346.313 259.977,345.528C260.999,344.745 263.483,342.69 265.497,340.965C271.724,335.63 284.125,325.185 291.102,319.401C294.763,316.365 297.768,313.379 297.776,312.767C297.795,311.4 281.342,295.101 269.157,284.416C251.352,268.802 234.738,256.078 221.719,248.086C219.158,246.513 215.002,243.955 212.486,242.402C203.26,236.711 192.458,231.202 180.837,226.26C179.699,225.777 177.525,224.823 176.007,224.143C173.178,222.875 155.573,216.608 151.857,215.546C128.385,208.834 113.55,205.206 109.576,205.206C107.431,205.206 109.526,206.16 112.882,206.71C114.775,207.022 117.952,207.599 119.944,207.995C121.937,208.39 124.58,208.891 125.816,209.106C127.053,209.322 128.235,209.776 128.444,210.112C128.652,210.45 129.718,210.726 130.812,210.726C131.906,210.726 132.972,211.002 133.18,211.34C133.389,211.676 134.648,212.142 135.98,212.375C137.312,212.606 139.492,212.986 140.824,213.217C142.156,213.45 143.415,213.916 143.624,214.252C143.832,214.59 144.766,214.866 145.697,214.866C146.629,214.866 147.929,215.145 148.588,215.489C149.247,215.832 151.184,216.506 152.892,216.989C154.6,217.471 156.292,218.123 156.652,218.437C157.013,218.749 157.87,219.006 158.559,219.006C159.247,219.006 160.349,219.306 161.008,219.674C161.667,220.041 163.604,220.79 165.312,221.335C177.27,225.154 202.579,236.867 209.46,241.767C210.533,242.532 211.599,243.156 211.83,243.156C212.06,243.156 214.34,244.512 216.898,246.17C219.455,247.829 223.876,250.679 226.722,252.504C232.361,256.119 247.139,266.932 248.802,268.658C249.371,269.248 251.545,271.03 253.632,272.614C255.719,274.199 258.051,276.06 258.812,276.749C259.575,277.437 263.449,280.796 267.422,284.211C279.852,294.901 296.402,311.104 296.409,312.592C296.41,313.024 295.237,314.421 293.8,315.697C290.716,318.44 284.546,323.658 282.079,325.611C281.12,326.37 279.683,327.612 278.884,328.371C278.086,329.13 275.726,331.145 273.64,332.847C271.553,334.548 269.692,336.108 269.502,336.311C267.929,337.998 261.262,343.206 260.677,343.206C260.268,343.206 259.747,342.507 259.519,341.654C258.036,336.109 257.154,333.879 254.134,328.026C248.014,316.16 236.356,301.759 224.483,291.397C221.35,288.663 217.699,285.463 216.369,284.283C209.855,278.512 194.899,268.084 183.597,261.436C181.7,260.318 179.215,258.854 178.077,258.177C155.931,245.038 120.923,233.496 103.217,233.496L98.896,233.496L99.372,229.874C99.634,227.881 100.131,224.388 100.474,222.111C100.819,219.834 101.397,215.798 101.76,213.141C102.789,205.61 102.991,205.216 105.881,205.137C108.147,205.075 108.221,205.016 106.662,204.516C103.497,203.502 102.681,203.757 101.899,205.999M337.933,253.687C330.978,258.331 324.785,262.441 324.169,262.821C323.555,263.201 322.725,263.749 322.325,264.041C321.045,264.974 315.547,268.638 310.04,272.231C305.289,275.329 303.31,277.656 305.427,277.656C306.81,277.656 351.612,247.113 351.612,246.168C351.612,244.615 351.074,244.912 337.933,253.687M96.657,352.826C112.96,359.352 132.258,373.494 142.887,386.707C143.646,387.651 145.537,389.971 147.089,391.861C153.422,399.582 161.593,413.569 164.372,421.447C165.457,424.521 165.838,423.943 159.104,429.456C157.018,431.164 154.653,433.182 153.848,433.941C153.042,434.7 151.179,436.299 149.706,437.496C148.233,438.692 146.096,440.496 144.957,441.503C143.819,442.511 142.059,443.941 141.048,444.681L139.209,446.026L135.782,442.908C133.896,441.191 131.464,439.104 130.376,438.267C129.287,437.432 128.242,436.56 128.052,436.328C127.764,435.977 121.607,431.611 117.875,429.111C108.572,422.88 100.216,418.035 91.482,413.809C85.6,410.962 80.247,408.351 79.588,408.004C78.929,407.659 77.942,407.376 77.396,407.376C74.377,407.376 74.263,405.856 76.252,392.196C76.611,389.729 77.221,385.382 77.606,382.536C77.993,379.69 78.645,375.188 79.057,372.531C80.052,366.114 81.061,358.976 81.694,353.901C82.519,347.274 82.743,347.258 96.657,352.826M75.693,437.874C90.463,443.906 118.252,466.026 111.064,466.026C110.529,466.026 109.477,466.336 108.723,466.716C107.97,467.095 106.734,467.717 105.981,468.096C105.227,468.476 103.892,468.786 103.014,468.786C102.136,468.786 101.123,469.065 100.763,469.405C100.129,470.004 97.563,470.48 90.594,471.296C82.264,472.271 76.923,468.305 72.812,458.091C71.303,454.344 70.083,436.356 71.337,436.356C71.689,436.356 73.649,437.039 75.693,437.874"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.725"
+      android:fillColor="#5BCEB6"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_color.xml b/app/src/main/res/drawable/nav_color.xml
index 242d194..6d52bcc 100644
--- a/app/src/main/res/drawable/nav_color.xml
+++ b/app/src/main/res/drawable/nav_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" android:state_checked="true" />
-    <item android:color="@color/translucent_head" android:state_enabled="true" android:state_pressed="true" />
+    <item android:state_checked="true" android:color="@android:color/white" />
+    <item android:state_pressed="true" android:state_enabled="true" android:color="@color/translucent_head" />
     <item android:color="@color/translucent_imp" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/nav_item_background.xml b/app/src/main/res/drawable/nav_item_background.xml
deleted file mode 100644
index 21bcfa5..0000000
--- a/app/src/main/res/drawable/nav_item_background.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_back"/>
-            <corners android:radius="120dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent"/>
-        </shape>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/nav_item_color.xml b/app/src/main/res/drawable/nav_item_color.xml
deleted file mode 100644
index c5ed8d5..0000000
--- a/app/src/main/res/drawable/nav_item_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_checked="true"/>
-    <item android:color="@color/white" />
-</selector>
diff --git a/app/src/main/res/drawable/slot_chip_background.xml b/app/src/main/res/drawable/slot_chip_background.xml
deleted file mode 100644
index e98cdf8..0000000
--- a/app/src/main/res/drawable/slot_chip_background.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="40dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/translucent" />
-
-
-    <solid android:color="@color/transparent" />
-
-</shape>
diff --git a/app/src/main/res/drawable/tab_selected_background.xml b/app/src/main/res/drawable/tab_selected_background.xml
index a0dabd6..63ee405 100755
--- a/app/src/main/res/drawable/tab_selected_background.xml
+++ b/app/src/main/res/drawable/tab_selected_background.xml
@@ -2,6 +2,12 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <size android:height="2.6dp" />
-    <solid android:color="@color/text" />
+    <corners android:radius="12dp" />
+
+    <gradient
+        android:angle="45"
+        android:endColor="@color/tab_selected_2"
+        android:startColor="@color/tab_selected"
+        android:type="linear" />
+
 </shape>
diff --git a/app/src/main/res/layout/activity_add_info.xml b/app/src/main/res/layout/activity_add_info.xml
deleted file mode 100644
index 14f84f2..0000000
--- a/app/src/main/res/layout/activity_add_info.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".activity.AddInfoActivity">
-
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/addInfoTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/background"
-            app:elevation="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/addInfo_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="20dp"
-                android:paddingTop="20dp"
-                android:paddingEnd="10dp"
-                android:paddingBottom="6dp"
-                app:menu="@menu/settings_menu"
-                app:title="Let's Sign You In"
-                app:titleTextAppearance="@style/TitleTextAppearance"
-                app:titleTextColor="@color/white" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-
-        <TextView
-            android:id="@+id/addInfoDesc"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:lineSpacingExtra="3dp"
-            android:paddingStart="20dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="10dp"
-            android:paddingBottom="10dp"
-            android:text="@string/add_info_desc"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/addInfoTitle" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="10dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/addInfoDesc">
-
-            <EditText
-                android:id="@+id/et_username"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:background="@drawable/et_style"
-                android:hint="Username"
-                android:inputType="text"
-                android:maxLines="1"
-                android:paddingStart="12dp"
-                android:textColorHint="@color/translucent"
-                android:textCursorDrawable="@drawable/cursor_white"
-                android:textSize="16dp" />
-
-            <TextView
-                android:id="@+id/username_validity"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginTop="5dp"
-                android:text="Username is valid"
-                android:textColor="@color/white"
-                android:visibility="gone" />
-
-            <EditText
-                android:id="@+id/et_regno"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="15dp"
-                android:background="@drawable/et_style"
-                android:hint="Registration Number"
-                android:inputType="text"
-                android:maxLines="1"
-                android:paddingStart="12dp"
-                android:textColorHint="@color/translucent"
-                android:textCursorDrawable="@drawable/cursor_white"
-                android:textSize="16dp" />
-
-            <Spinner
-                android:id="@+id/spinner_campus"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="15dp"
-                android:background="@drawable/et_style"
-                android:paddingStart="12dp"
-                android:popupBackground="@color/tab_back"
-                android:textSize="16dp" />
-
-        </LinearLayout>
-
-        <RelativeLayout
-            android:id="@+id/loading_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.5"
-                android:background="@color/background" />
-
-            <com.github.ybq.android.spinkit.SpinKitView
-                android:id="@+id/loading_sign"
-                style="@style/SpinKitView.Large.ThreeBounce"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center"
-                app:SpinKit_Color="@color/white" />
-
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/continue_button"
-            android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:layout_marginStart="40dp"
-            android:layout_marginTop="30dp"
-            android:layout_marginEnd="40dp"
-            android:layout_marginBottom="30dp"
-            android:backgroundTint="@color/tab_selected"
-            android:fontFamily="@font/poppins_600"
-            android:letterSpacing="0"
-            android:src="@drawable/ic_login_google"
-            android:text="@string/continue_text"
-            android:textAllCaps="false"
-            android:textSize="19sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 6af0666..3c59d3d 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -7,163 +7,32 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/nav_view"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:background="@color/tab_back"
+            app:itemIconTint="@drawable/nav_color"
+            app:itemTextColor="@drawable/nav_color"
+            app:itemRippleColor="@color/translucent_ripple"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:menu="@menu/bottom_nav_menu" />
+
         <fragment
             android:id="@+id/nav_host_fragment_activity_main"
             android:name="androidx.navigation.fragment.NavHostFragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-
+            android:layout_height="0dp"
             app:defaultNavHost="true"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/nav_view"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:navGraph="@navigation/mobile_navigation" />
 
-        <!-- Uncomment the below code to use BottomNavigationView -->
-<!--        <com.google.android.material.bottomnavigation.BottomNavigationView-->
-<!--            android:id="@+id/nav_view"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_gravity="center"-->
-<!--            android:layout_marginBottom="40dp"-->
-<!--            android:background="@drawable/bg_nav_bar"-->
-<!--            android:elevation="8dp"-->
-<!--            android:padding="8dp"-->
-<!--            app:elevation="8dp"-->
-<!--            app:itemBackground="@drawable/nav_item_background"-->
-<!--            app:itemIconSize="24dp"-->
-<!--            app:itemIconTint="@color/text"-->
-<!--            app:itemTextColor="@color/text"-->
-<!--            app:labelVisibilityMode="selected"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintLeft_toLeftOf="parent"-->
-<!--            app:layout_constraintRight_toRightOf="parent"-->
-<!--            app:menu="@menu/bottom_nav_menu" />-->
-
-        <HorizontalScrollView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="40dp"
-            android:scrollbars="none"
-            android:fillViewport="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent">
-
-            <LinearLayout
-                android:id="@+id/custom_bottom_nav"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:background="@drawable/bg_nav_bar"
-                android:paddingVertical="12dp"
-                android:paddingHorizontal="16dp"
-                android:elevation="0dp">
-
-                <LinearLayout
-                    android:id="@+id/nav_academics"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center"
-                    android:background="@color/transparent"
-                    android:paddingHorizontal="16dp"
-                    android:paddingVertical="12dp"
-                    android:layout_marginEnd="8dp"
-                    android:minWidth="48dp">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_academics_outline"
-                        app:tint="@color/text"
-                        android:contentDescription="@string/title_academics"/>
-
-                    <TextView
-                        android:id="@+id/text_academics"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/title_academics"
-                        android:textColor="@color/text"
-                        android:fontFamily="@font/poppins_400"
-                        android:textSize="16sp"
-                        android:layout_marginStart="6dp"
-                        android:visibility="gone"
-                        android:singleLine="true"
-                        android:ellipsize="none"
-                        android:maxWidth="100dp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/nav_timetable"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center"
-                    android:paddingHorizontal="16dp"
-                    android:paddingVertical="12dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@android:color/transparent"
-                    android:minWidth="48dp">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_timetable_outline"
-                        app:tint="@color/text"
-                        android:contentDescription="@string/title_schedule"/>
-
-                    <TextView
-                        android:id="@+id/text_timetable"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/title_schedule"
-                        android:textColor="@color/text"
-                        android:fontFamily="@font/poppins_400"
-                        android:textSize="16sp"
-                        android:layout_marginStart="6dp"
-                        android:visibility="gone"
-                        android:singleLine="true"
-                        android:ellipsize="none"
-                        android:maxWidth="100dp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/nav_community"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center"
-                    android:paddingHorizontal="16dp"
-                    android:paddingVertical="12dp"
-                    android:background="@android:color/transparent"
-                    android:minWidth="48dp">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_community_outline"
-                        app:tint="@color/text"
-                        android:contentDescription="@string/title_connect"/>
-
-                    <TextView
-                        android:id="@+id/text_community"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/title_connect"
-                        android:textColor="@color/text"
-                        android:fontFamily="@font/poppins_400"
-                        android:textSize="16sp"
-                        android:layout_marginStart="6dp"
-                        android:visibility="gone"
-                        android:singleLine="true"
-                        android:ellipsize="none"
-                        android:maxWidth="80dp" />
-                </LinearLayout>
-            </LinearLayout>
-        </HorizontalScrollView>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home_compose.xml b/app/src/main/res/layout/activity_home_compose.xml
deleted file mode 100644
index 37d66a5..0000000
--- a/app/src/main/res/layout/activity_home_compose.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/composeView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</layout>
diff --git a/app/src/main/res/layout/activity_maintenance.xml b/app/src/main/res/layout/activity_maintenance.xml
deleted file mode 100644
index 3475e7a..0000000
--- a/app/src/main/res/layout/activity_maintenance.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/background"
-        tools:context=".activity.MaintenanceActivity">
-
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/compose_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/card_friend.xml b/app/src/main/res/layout/card_friend.xml
deleted file mode 100644
index 19ead91..0000000
--- a/app/src/main/res/layout/card_friend.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-
-            name="friendDetails"
-            type="com.dscvit.vitty.network.api.community.responses.user.UserResponse">
-
-        </variable>
-
-    </data>
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="18dp"
-        android:layout_marginVertical="10dp"
-        app:cardBackgroundColor="@color/tab_back"
-        app:cardCornerRadius="12dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingHorizontal="16dp"
-            android:paddingVertical="10dp">
-
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/icon"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center"
-                android:layout_marginVertical="16dp"
-                android:adjustViewBounds="true"
-                app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
-                tools:src="@tools:sample/avatars" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingHorizontal="16dp"
-                android:paddingVertical="10dp">
-
-                <TextView
-                    android:id="@+id/friend_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:fontFamily="@font/poppins_500"
-                    android:text="@={friendDetails.name}"
-                    android:textColor="@color/white"
-                    android:textSize="18sp"
-                    tools:text="Krish Chatterjeeeeeeeeeee" />
-
-                <TextView
-                    android:id="@+id/friend_class"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:text="No more classes for today"
-                    android:textSize="16sp" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingHorizontal="16dp"
-                android:paddingVertical="10dp">
-
-                <ImageView
-                    android:id="@+id/pin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:rotation="45"
-                    android:src="@drawable/ic_pin"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1"
-                    android:text="NOW"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/friend_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:fontFamily="@font/poppins_500"
-                    android:text="Free"
-                    android:textColor="@color/white"
-                    android:textSize="24sp" />
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_period.xml b/app/src/main/res/layout/card_period.xml
index fef3f2a..f989648 100755
--- a/app/src/main/res/layout/card_period.xml
+++ b/app/src/main/res/layout/card_period.xml
@@ -15,7 +15,6 @@
     </data>
 
     <com.google.android.material.card.MaterialCardView
-        android:id="@+id/period_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -26,9 +25,7 @@
         app:cardBackgroundColor="@color/tab_back"
         app:cardCornerRadius="14dp"
         app:cardElevation="0dp"
-        app:rippleColor="@android:color/transparent"
-        app:strokeWidth="0dp"
-        app:strokeColor="@android:color/transparent">
+        app:rippleColor="@android:color/transparent">
 
         <ImageView
             android:id="@+id/expanded_background"
@@ -44,7 +41,7 @@
             android:layout_height="match_parent"
             android:alpha="0.6"
             android:contentDescription="@string/active_background"
-            android:src="@color/transparent"
+            android:src="@drawable/next_class_background"
             android:visibility="invisible" />
 
         <LinearLayout
@@ -59,11 +56,13 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="5dp"
                 android:orientation="horizontal">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:orientation="vertical">
 
                     <TextView
@@ -76,73 +75,109 @@
                         android:textSize="16sp"
                         tools:text="@string/sample_course" />
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/course_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        android:alpha="0.9"
+                        android:text='@={periodDetails.courseCode}'
+                        android:textSize="11sp"
+                        android:visibility="gone"
+                        tools:text="@string/sample_course" />
+
+                    <TextView
+                        android:id="@+id/period_time"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/period_time"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text=""
-                            android:textSize="15sp"
-                            tools:text="@string/sample_time" />
-
-                        <LinearLayout
-                            android:id="@+id/class_nav"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="0dp"
-                            android:layout_marginEnd="0dp"
-                            android:alpha="0.8"
-                            android:background="@drawable/slot_chip_background"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingStart="8dp"
-                            android:paddingTop="4dp"
-                            android:paddingEnd="8dp"
-                            android:paddingBottom="4dp">
-
-                            <ImageView
-                                android:layout_width="14dp"
-                                android:layout_height="14dp"
-                                android:layout_marginEnd="2dp"
-                                android:contentDescription="@string/directions"
-                                android:src="@drawable/ic_nav"
-                                android:visibility="gone"
-                                app:tint="@color/background" />
-
-                            <TextView
-                                android:id="@+id/textView"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:paddingRight="4dp"
-                                android:text="@string/compass" />
-
-                            <TextView
-                                android:id="@+id/class_id"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@={periodDetails.roomNo}"
-                                android:textColor="@color/translucent"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-                    </LinearLayout>
+                        android:layout_marginTop="5dp"
+                        android:text=""
+                        android:textSize="15sp"
+                        tools:text="@string/sample_time" />
                 </LinearLayout>
 
+                <ImageView
+                    android:id="@+id/arrow_more_info"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="15dp"
+                    android:contentDescription="@string/down_arrow"
+                    android:src="@drawable/ic_down_arrow"
+                    app:tint="?android:text" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/more_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <!--                    <TextView-->
+                    <!--                        android:id="@+id/course_code"-->
+                    <!--                        android:layout_width="wrap_content"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:text='@{"Code: "+periodDetails.courseCode}'-->
+                    <!--                        android:textSize="11sp"-->
+                    <!--                        tools:text="@string/sample_course" />-->
+
+                    <TextView
+                        android:id="@+id/slot_id"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text='@={periodDetails.slot}'
+                        tools:text="@string/sample_slot" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/class_nav"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="3dp"
+                    android:alpha="0.8"
+                    android:background="@drawable/nav_button_background"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingStart="8dp"
+                    android:paddingTop="1.5dp"
+                    android:paddingEnd="2dp"
+                    android:paddingBottom="1.5dp">
+
+                    <TextView
+                        android:id="@+id/class_id"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="4dp"
+                        android:text="@={periodDetails.roomNo}" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:contentDescription="@string/directions"
+                        android:src="@drawable/ic_nav"
+                        app:tint="@color/background" />
+
+                </LinearLayout>
+
+
                 <TextView
                     android:id="@+id/class_id_online"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
                     android:layout_marginEnd="4dp"
                     android:text="@={periodDetails.roomNo}"
-                    android:textColor="@color/translucent"
                     android:visibility="gone" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/card_request.xml b/app/src/main/res/layout/card_request.xml
deleted file mode 100644
index 1200dd8..0000000
--- a/app/src/main/res/layout/card_request.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-
-            name="personDetails"
-            type="com.dscvit.vitty.network.api.community.responses.user.UserResponse">
-
-        </variable>
-
-    </data>
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="15dp"
-        android:layout_marginTop="10dp"
-        app:cardBackgroundColor="@color/tab_back"
-        app:cardCornerRadius="12dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingHorizontal="18dp"
-            android:paddingVertical="10dp">
-
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/icon"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center"
-                android:layout_marginVertical="16dp"
-                android:adjustViewBounds="true"
-                app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
-                tools:src="@tools:sample/avatars" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingHorizontal="16dp"
-                android:paddingVertical="10dp">
-
-                <TextView
-                    android:id="@+id/name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:fontFamily="@font/poppins_500"
-                    android:text="@={personDetails.name}"
-                    android:textColor="@color/white"
-                    android:textSize="18sp"
-                    tools:text="Krish Chatterjeeeeeeeeeee" />
-
-                <TextView
-                    android:id="@+id/username"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_weight="1"
-                    android:text="@={personDetails.username}"
-                    android:textSize="16sp"
-                    tools:text="sampleusername" />
-            </LinearLayout>
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/action_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center">
-
-                <LinearLayout
-                    android:id="@+id/acceptRejectLayout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/accept"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class"
-                        android:letterSpacing="0"
-                        android:text="Accept"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white" />
-
-                    <ImageView
-                        android:id="@+id/reject"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class"
-                        android:letterSpacing="0"
-                        android:paddingStart="5dp"
-                        android:src="@drawable/ic_close"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/sendRequestLayout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/sendRequest"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class"
-                        android:letterSpacing="0"
-                        android:text="Send Request"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/sentLayout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/sent"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class_2"
-                        android:letterSpacing="0"
-                        android:text="Sent"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white" />
-
-
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_academics.xml b/app/src/main/res/layout/fragment_academics.xml
deleted file mode 100644
index 73ac4ef..0000000
--- a/app/src/main/res/layout/fragment_academics.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/compose_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_all_request.xml b/app/src/main/res/layout/fragment_all_request.xml
deleted file mode 100644
index b398adc..0000000
--- a/app/src/main/res/layout/fragment_all_request.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.community.AllRequestFragment">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateLayoutChanges="true">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/schedule_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/background">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/req_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="20dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="10dp"
-                android:paddingBottom="10dp"
-                app:title="All Requests"
-                app:titleTextAppearance="@style/TitleTextAppearance"
-                app:titleTextColor="@color/white" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/request_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/schedule_appbar"
-            android:clipToPadding="false"
-            android:layoutAnimation="@anim/layout_animation"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:visibility="visible"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:listitem="@layout/card_friend" />
-
-
-        <RelativeLayout
-            android:id="@+id/no_requests"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/schedule_appbar"
-            android:orientation="vertical"
-            android:visibility="visible"
-            tools:visibility="visible">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/todo"
-                android:scaleType="centerCrop"
-                android:src="@drawable/no_period_background" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/search_text_heading"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_700"
-                    android:text="No Requests"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="24sp" />
-
-                <TextView
-                    android:id="@+id/search_text_subtext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_300"
-                    android:text="All requests will be shown here"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="20sp" />
-            </LinearLayout>
-        </RelativeLayout>
-
-
-    </RelativeLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml
index fc64aa9..e28c17b 100644
--- a/app/src/main/res/layout/fragment_community.xml
+++ b/app/src/main/res/layout/fragment_community.xml
@@ -24,129 +24,250 @@
                 android:paddingEnd="10dp"
                 android:paddingBottom="10dp"
                 app:menu="@menu/community_menu"
-                app:title="@string/title_connect"
+                app:title="@string/title_community"
                 app:titleTextAppearance="@style/TitleTextAppearance"
-                app:titleTextColor="@color/white">
-
-                <TextView
-                    android:id="@+id/friend_requests_notification"
-                    android:layout_width="wrap_content"
-                    android:layout_height="24dp"
-                    android:layout_gravity="end|top"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@drawable/bubble_bg"
-                    android:gravity="center"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
-                    android:text="2 Req"
-                    android:textColor="@android:color/white"
-                    android:visibility="invisible" />
-
-            </com.google.android.material.appbar.MaterialToolbar>
+                app:titleTextColor="@color/white" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/friends_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_below="@id/community_appbar"
-            android:clipToPadding="false"
-            android:layoutAnimation="@anim/layout_animation"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:visibility="visible"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:listitem="@layout/card_friend" />
-
-
-        <TextView
-            android:id="@+id/tip_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/friends_list"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:fontFamily="@font/poppins_300"
-            android:text="Tip: Long press on a friend to pin them."
-            android:textAlignment="center"
-            android:textSize="10sp" />
-
-
-        <RelativeLayout
-            android:id="@+id/no_friends"
+            android:id="@+id/friends_list_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:visibility="gone" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/krish"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_below="@id/community_appbar"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:visibility="visible">
+            android:layout_marginHorizontal="18dp"
+            android:layout_marginVertical="10dp"
+            app:cardBackgroundColor="@color/tab_back"
+            app:cardCornerRadius="12dp">
 
-            <ImageView
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/todo"
-                android:scaleType="centerCrop"
-                android:src="@drawable/no_period_background" />
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_500"
+                        android:text="Krish Chatterjie"
+                        android:textColor="@color/white"
+                        android:textSize="18sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:text="No more classes for today"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1"
+                        android:text="NOW"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_500"
+                        android:text="Free"
+                        android:textColor="@color/white"
+                        android:textSize="24sp" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/jeevan"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/krish"
+            android:layout_marginHorizontal="18dp"
+            android:layout_marginVertical="10dp"
+            app:cardBackgroundColor="@color/tab_back"
+            app:cardCornerRadius="12dp">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
                 android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="horizontal"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="10dp">
 
-                <TextView
-                    android:id="@+id/no_friends_found"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_700"
-                    android:text="@string/no_friends_found"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="24sp" />
-
-                <TextView
-                    android:id="@+id/quote_line"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_500"
+                        android:text="Jeevan Yohan Varghese"
+                        android:textColor="@color/white"
+                        android:textSize="18sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:text="No more classes for today"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_300"
-                    android:text="@string/no_friends_found_subtext"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="20sp" />
+
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1"
+                        android:text="NOW"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_500"
+                        android:text="Free"
+                        android:textColor="@color/white"
+                        android:textSize="24sp" />
+                </LinearLayout>
+
+
             </LinearLayout>
-        </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/loading_view"
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone">
+            android:layout_height="wrap_content"
+            android:layout_below="@id/jeevan"
+            android:layout_marginHorizontal="18dp"
+            android:layout_marginVertical="10dp"
+            app:cardBackgroundColor="@color/tab_back"
+            app:cardCornerRadius="12dp">
 
-            <View
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.5"
-                android:background="@color/background" />
-
-            <com.github.ybq.android.spinkit.SpinKitView
-                android:id="@+id/loading_sign"
-                style="@style/SpinKitView.Large.ThreeBounce"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center"
-                app:SpinKit_Color="@color/white" />
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_500"
+                        android:text="Dilith Dinesh"
+                        android:textColor="@color/white"
+                        android:textSize="18sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_weight="1"
+                        android:text="Class at 6pm in SJT711"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1"
+                        android:text="NOW"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_500"
+                        android:text="Free"
+                        android:textColor="@color/white"
+                        android:textSize="24sp" />
+                </LinearLayout>
+
+
+            </LinearLayout>
 
-        </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
 
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_connect.xml b/app/src/main/res/layout/fragment_connect.xml
deleted file mode 100644
index 4130b11..0000000
--- a/app/src/main/res/layout/fragment_connect.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/composeView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_course_page.xml b/app/src/main/res/layout/fragment_course_page.xml
deleted file mode 100644
index 779a4d3..0000000
--- a/app/src/main/res/layout/fragment_course_page.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/compose_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</layout>
diff --git a/app/src/main/res/layout/fragment_day.xml b/app/src/main/res/layout/fragment_day.xml
index 514cf40..d08c993 100755
--- a/app/src/main/res/layout/fragment_day.xml
+++ b/app/src/main/res/layout/fragment_day.xml
@@ -7,7 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/day_list"
             android:layout_width="match_parent"
@@ -15,9 +14,9 @@
             android:clipToPadding="false"
             android:layoutAnimation="@anim/layout_animation"
             android:paddingTop="10dp"
+            tools:listitem="@layout/card_period"
             android:paddingBottom="180dp"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:listitem="@layout/card_period" />
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <RelativeLayout
             android:id="@+id/no_period"
@@ -66,29 +65,5 @@
                     android:textSize="20sp" />
             </LinearLayout>
         </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/loading_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.5"
-                android:background="@color/background" />
-
-            <com.github.ybq.android.spinkit.SpinKitView
-                android:id="@+id/loading_sign"
-                style="@style/SpinKitView.Large.ThreeBounce"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center"
-                app:SpinKit_Color="@color/white" />
-
-        </RelativeLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_friend.xml b/app/src/main/res/layout/fragment_friend.xml
deleted file mode 100644
index bb9f5a9..0000000
--- a/app/src/main/res/layout/fragment_friend.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.community.FriendFragment">
-
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/schedule_appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/background"
-        android:visibility="gone">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/friend_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="20dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="10dp"
-            android:paddingBottom="10dp"
-            app:title="Username"
-            app:titleTextAppearance="@style/TitleTextAppearance"
-            app:titleTextColor="@color/white" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:animateLayoutChanges="true">
-
-
-        <LinearLayout
-            android:id="@+id/schedule_profile_layout"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:orientation="vertical">
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:orientation="horizontal">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/profile_image"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="20dp"
-                    android:adjustViewBounds="true"
-                    app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
-                    tools:src="@tools:sample/avatars" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical"
-                    android:padding="20dp">
-
-                    <TextView
-                        android:id="@+id/friend_timetable_name"
-                        style="@style/TitleTextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:text="Your Name"
-                        android:textColor="@color/white"
-                        android:textSize="18dp" />
-
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/acceptRejectLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/accept"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:backgroundTint="@color/next_class"
-                            android:letterSpacing="0"
-                            android:text="Accept"
-                            android:textAllCaps="false"
-                            android:textColor="@color/white"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@+id/reject"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintVertical_bias="0.0"
-                            app:layout_constraintWidth_percent="0.48" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/reject"
-                            style="?attr/materialButtonOutlinedStyle"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:letterSpacing="0"
-                            android:text="Reject"
-                            android:textAllCaps="false"
-                            android:textColor="@color/white"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintWidth_percent="0.48"
-                            app:rippleColor="@color/translucent"
-                            app:strokeColor="@color/next_class" />
-
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/sendRequest"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class"
-                        android:letterSpacing="0"
-                        android:text="Send Request"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white"
-                        android:visibility="gone" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/requestSent"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class_2"
-                        android:letterSpacing="0"
-                        android:text="Request Sent"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white"
-                        android:visibility="gone" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/unfriend"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:backgroundTint="@color/next_class_2"
-                        android:letterSpacing="0"
-                        android:text="Friends"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white"
-                        android:visibility="gone" />
-
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/tabs_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/schedule_profile_layout"
-            android:background="@color/tab_back">
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/tab_back"
-                app:tabIndicator="@drawable/tab_selected_background"
-                app:tabIndicatorColor="@color/tab_selected"
-                app:tabIndicatorGravity="stretch"
-                app:tabMode="scrollable"
-                app:tabRippleColor="@null"
-                app:tabSelectedTextColor="@color/white"
-                app:tabTextAppearance="@style/TabTextAppearance"
-                app:tabTextColor="@color/translucent" />
-        </FrameLayout>
-
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/tabs_layout" />
-
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/not_friend"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/placeholder_tab"
-
-        android:orientation="vertical"
-        tools:visibility="visible">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/todo"
-            android:scaleType="centerCrop"
-            android:src="@drawable/no_period_background" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/no_classes_today"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="20dp"
-                android:fontFamily="@font/poppins_700"
-                android:text="Not friends with this user"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="24sp" />
-
-            <TextView
-                android:id="@+id/quote_line"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="20dp"
-                android:fontFamily="@font/poppins_300"
-                android:text="Connect with your friends to see their timetable"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="20sp" />
-        </LinearLayout>
-    </RelativeLayout>
-
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
deleted file mode 100644
index 611ef5f..0000000
--- a/app/src/main/res/layout/fragment_note.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.compose.ui.platform.ComposeView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/compose_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/fragment_requests.xml b/app/src/main/res/layout/fragment_requests.xml
index 6f61fad..e173b2f 100644
--- a/app/src/main/res/layout/fragment_requests.xml
+++ b/app/src/main/res/layout/fragment_requests.xml
@@ -15,7 +15,6 @@
             android:layout_height="wrap_content"
             android:background="@color/background">
 
-
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/schedule_toolbar"
                 android:layout_width="match_parent"
@@ -24,6 +23,7 @@
                 android:paddingTop="12dp"
                 android:paddingEnd="10dp"
                 android:paddingBottom="10dp"
+                app:menu="@menu/requests_menu"
                 app:title="Add Friends"
                 app:titleTextAppearance="@style/TitleTextAppearance"
                 app:titleTextColor="@color/white" />
@@ -72,174 +72,52 @@
             android:layout_marginStart="20dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="20dp"
-            android:text="Pending Requests"
-            android:visibility="gone" />
-
-        <RelativeLayout
-            android:id="@+id/request_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/pending_requests_text_view"
-            android:layout_marginStart="20dp"
-            android:visibility="gone">
-
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/icon"
-                android:layout_width="54dp"
-                android:layout_height="54dp"
-                android:layout_gravity="center"
-                android:layout_marginVertical="16dp"
-                android:adjustViewBounds="true"
-                app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
-                tools:src="@tools:sample/avatars" />
-
-            <TextView
-                android:id="@+id/superscriptTextView"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_marginStart="-22dp"
-                android:layout_marginTop="12dp"
-                android:layout_toEndOf="@id/icon"
-                android:background="@drawable/circular_background"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:padding="3dp"
-                android:text="2"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/requestsHeading"
-                style="@style/TitleTextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginTop="18dp"
-                android:layout_toEndOf="@id/icon"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="Follow Requests"
-                android:textColor="@color/white"
-                android:textSize="14dp" />
-
-            <TextView
-                android:id="@+id/requestsSubtext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginTop="40dp"
-                android:layout_toEndOf="@id/icon"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="Accept or reject requests"
-                android:textSize="14dp" />
-
-        </RelativeLayout>
-
-
-        <TextView
-            android:id="@+id/suggested_friends_text_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/request_layout"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="20dp"
             android:layout_marginBottom="20dp"
-            android:text="Suggested Friends"
-            android:visibility="gone" />
+            android:text="Pending Requests" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/suggested_list"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/req_krish"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/suggested_friends_text_view"
-            android:clipToPadding="false"
-            android:layoutAnimation="@anim/layout_animation"
-            android:paddingBottom="10dp"
-            android:visibility="gone"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:listitem="@layout/card_friend" />
-
-
-        <RelativeLayout
-            android:id="@+id/no_requests"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/search_friends"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:visibility="visible">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/todo"
-                android:scaleType="centerCrop"
-                android:src="@drawable/no_period_background" />
+            android:layout_below="@id/pending_requests_text_view"
+            android:layout_marginHorizontal="18dp"
+            app:cardBackgroundColor="@color/tab_back"
+            app:cardCornerRadius="12dp">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="horizontal"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="10dp">
 
                 <TextView
-                    android:id="@+id/no_friends_found"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_700"
-                    android:text="@string/no_requests"
-                    android:textAlignment="center"
+                    android:layout_marginTop="2dp"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_500"
+                    android:text="Krish Chatterjie"
                     android:textColor="@color/white"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
-                <TextView
-                    android:id="@+id/quote_line"
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/logout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_300"
-                    android:text="@string/no_requests_subtext"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="20sp" />
-            </LinearLayout>
-        </RelativeLayout>
+                    android:layout_marginStart="5dp"
+                    android:backgroundTint="@color/next_class"
+                    android:letterSpacing="0"
+                    android:text="Accept"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white" />
 
-        <RelativeLayout
-            android:id="@+id/loading_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.5"
-                android:background="@color/background" />
-
-            <com.github.ybq.android.spinkit.SpinKitView
-                android:id="@+id/loading_sign"
-                style="@style/SpinKitView.Large.ThreeBounce"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center"
-                app:SpinKit_Color="@color/white" />
+            </LinearLayout>
 
-        </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
 
 
     </RelativeLayout>
-
-
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml
index 9be6f3a..0df7428 100644
--- a/app/src/main/res/layout/fragment_schedule.xml
+++ b/app/src/main/res/layout/fragment_schedule.xml
@@ -9,73 +9,53 @@
         android:layout_height="match_parent"
         android:animateLayoutChanges="true">
 
-
-        <LinearLayout
-            android:id="@+id/schedule_toolbar"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/schedule_appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:background="@color/background">
 
-            <TextView
-                style="@style/TitleTextAppearance"
-                android:layout_width="wrap_content"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/schedule_toolbar"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:paddingStart="20dp"
                 android:paddingTop="12dp"
                 android:paddingEnd="10dp"
                 android:paddingBottom="10dp"
-                android:text="Schedule"
-                android:textColor="@color/white" />
-
-            <!-- Spacer View -->
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/profile_image"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="center"
-                android:layout_marginEnd="20dp"
-                android:adjustViewBounds="true"
-                app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
-                tools:src="@tools:sample/avatars" />
-
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/tabs_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/schedule_toolbar"
-            android:layout_marginTop="16dp"
-            android:background="@color/tab_back">
+                app:menu="@menu/schedule_menu"
+                app:title="Schedule"
+                app:titleTextAppearance="@style/TitleTextAppearance"
+                app:titleTextColor="@color/white" />
 
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabs"
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/tab_back"
-                app:tabIndicator="@drawable/tab_selected_background"
-                app:tabIndicatorColor="@color/transparent"
-                app:tabIndicatorGravity="bottom"
-                app:tabMode="scrollable"
-                app:tabRippleColor="@null"
-                app:tabSelectedTextColor="@color/text"
-                app:tabTextAppearance="@style/TabTextAppearance"
-                app:tabTextColor="@color/translucent" />
-        </FrameLayout>
+                android:background="@color/tab_back">
+
+                <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/tab_back"
+                    app:tabIndicator="@drawable/tab_selected_background"
+                    app:tabIndicatorColor="@color/tab_selected"
+                    app:tabIndicatorGravity="stretch"
+                    app:tabMode="scrollable"
+                    app:tabRippleColor="@null"
+                    app:tabSelectedTextColor="@color/white"
+                    app:tabTextAppearance="@style/TabTextAppearance"
+                    app:tabTextColor="@color/translucent" />
+            </FrameLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/tabs_layout" />
+            android:layout_below="@+id/schedule_appbar" />
 
         <LinearLayout
             android:id="@+id/exam_mode_alert"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
deleted file mode 100644
index 0473ff6..0000000
--- a/app/src/main/res/layout/fragment_search.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.community.SearchFragment">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateLayoutChanges="true">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/schedule_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/background">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/search_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="20dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="10dp"
-                android:paddingBottom="10dp"
-                app:title="Search Friends"
-                app:titleTextAppearance="@style/TitleTextAppearance"
-                app:titleTextColor="@color/white" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <TextView
-            android:id="@+id/search_friends_text_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/schedule_appbar"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginBottom="10dp"
-            android:text="Search Friends" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/search_friends"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/search_friends_text_view"
-            android:layout_marginHorizontal="20dp"
-            android:hint="Username"
-            android:maxLength="20"
-            android:shadowColor="@color/translucent"
-            android:textColorHint="@color/translucent"
-            app:boxStrokeColor="@color/translucent"
-            app:counterTextColor="@color/translucent"
-            app:hintTextColor="@color/translucent"
-            app:placeholderTextColor="@color/translucent">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/search_friends_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="text"
-                android:maxLines="1"
-                android:textColor="@color/white"
-                android:textCursorDrawable="@drawable/cursor_white" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/search_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/search_friends"
-            android:clipToPadding="false"
-            android:layoutAnimation="@anim/layout_animation"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:visibility="visible"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:listitem="@layout/card_friend" />
-
-
-        <RelativeLayout
-            android:id="@+id/no_search_results"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/search_friends"
-            android:orientation="vertical"
-            android:visibility="visible"
-            tools:visibility="visible">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/todo"
-                android:scaleType="centerCrop"
-                android:src="@drawable/no_period_background" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/search_text_heading"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_700"
-                    android:text="@string/search_text_heading"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="24sp" />
-
-                <TextView
-                    android:id="@+id/search_text_subtext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginEnd="20dp"
-                    android:fontFamily="@font/poppins_300"
-                    android:text="@string/search_text_subheading"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="20sp" />
-            </LinearLayout>
-        </RelativeLayout>
-
-
-    </RelativeLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_period.xml b/app/src/main/res/layout/item_period.xml
index 10d8146..b87e707 100755
--- a/app/src/main/res/layout/item_period.xml
+++ b/app/src/main/res/layout/item_period.xml
@@ -32,9 +32,9 @@
             android:id="@+id/period_time"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="12dp"
-            android:layout_weight="1"
             android:paddingStart="20dp"
             android:paddingEnd="5dp"
             android:text="@string/sample_time"
diff --git a/app/src/main/res/layout/next_class_widget.xml b/app/src/main/res/layout/next_class_widget.xml
index 360a7cf..09d7440 100755
--- a/app/src/main/res/layout/next_class_widget.xml
+++ b/app/src/main/res/layout/next_class_widget.xml
@@ -22,7 +22,6 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/refresh_widget"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/today_widget.xml b/app/src/main/res/layout/today_widget.xml
index 23f7998..816f485 100755
--- a/app/src/main/res/layout/today_widget.xml
+++ b/app/src/main/res/layout/today_widget.xml
@@ -61,6 +61,5 @@
         android:divider="@null"
         tools:listitem="@layout/item_period" />
 
-
 </RelativeLayout>
 
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 997712e..d238490 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/navigation_academics"
-        android:icon="@drawable/ic_academics_selector"
-        android:title="@string/title_academics" />
 
     <item
         android:id="@+id/navigation_schedule"
@@ -13,6 +9,6 @@
     <item
         android:id="@+id/navigation_community"
         android:icon="@drawable/ic_community_selector"
-        android:title="@string/title_connect" />
+        android:title="@string/title_community" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 646bbe2..3ec965c 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -5,133 +5,23 @@
     android:id="@+id/mobile_navigation"
     app:startDestination="@id/navigation_schedule">
 
-    <fragment
-        android:id="@+id/navigation_academics"
-        android:name="com.dscvit.vitty.ui.academics.AcademicsFragment"
-        android:label="@string/title_academics"
-        tools:layout="@layout/fragment_academics">
-        <action
-            android:id="@+id/action_navigation_academics_to_coursePageFragment"
-            app:destination="@id/coursePageFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-
     <fragment
         android:id="@+id/navigation_schedule"
         android:name="com.dscvit.vitty.ui.schedule.ScheduleFragment"
         android:label="@string/title_schedule"
         tools:layout="@layout/fragment_schedule" />
-    <fragment
-        android:id="@+id/navigation_connect"
-        android:name="com.dscvit.vitty.ui.connect.ConnectFragment"
-        android:label="@string/title_connect"
-        tools:layout="@layout/fragment_connect">
-    </fragment>
     <fragment
         android:id="@+id/navigation_community"
         android:name="com.dscvit.vitty.ui.community.CommunityFragment"
         android:label="@string/title_community"
-        tools:layout="@layout/fragment_community">
+        tools:layout="@layout/fragment_community" >
         <action
             android:id="@+id/action_navigation_community_to_navigation_requests"
-            app:destination="@id/navigation_requests"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />
-        <action
-            android:id="@+id/action_navigation_community_to_friendFragment"
-            app:destination="@id/friendFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />
+            app:destination="@id/navigation_requests" />
     </fragment>
     <fragment
         android:id="@+id/navigation_requests"
         android:name="com.dscvit.vitty.ui.community.RequestsFragment"
         android:label="Requests"
-        tools:layout="@layout/fragment_requests">
-        <action
-            android:id="@+id/action_navigation_requests_to_searchFragment"
-            app:destination="@id/searchFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />
-        <action
-            android:id="@+id/action_navigation_requests_to_friendFragment"
-            app:destination="@id/friendFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />
-        <action
-            android:id="@+id/action_navigation_requests_to_allRequestFragment"
-            app:destination="@id/allRequestFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-    <fragment
-        android:id="@+id/searchFragment"
-        android:name="com.dscvit.vitty.ui.community.SearchFragment"
-        android:label="fragment_search"
-        tools:layout="@layout/fragment_search">
-        <action
-            android:id="@+id/action_searchFragment_to_friendFragment"
-            app:destination="@id/friendFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-    <fragment
-        android:id="@+id/friendFragment"
-        android:name="com.dscvit.vitty.ui.community.FriendFragment"
-        android:label="fragment_friend"
-        tools:layout="@layout/fragment_friend" />
-    <fragment
-        android:id="@+id/allRequestFragment"
-        android:name="com.dscvit.vitty.ui.community.AllRequestFragment"
-        android:label="fragment_all_request"
-        tools:layout="@layout/fragment_all_request">
-        <action
-            android:id="@+id/action_allRequestFragment_to_friendFragment"
-            app:destination="@id/friendFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:popExitAnim="@anim/slide_out_right" />    </fragment>
-      <fragment
-        android:id="@+id/coursePageFragment"
-        android:name="com.dscvit.vitty.ui.coursepage.CoursePageFragment"
-        android:label="Course Page"
-        tools:layout="@layout/fragment_course_page">
-        <argument
-            android:name="courseTitle"
-            app:argType="string" />
-        <argument
-            android:name="courseSlot"
-            app:argType="string" />
-        <argument
-            android:name="courseCode"
-            app:argType="string" />
-        <argument
-            android:name="courseSemester"
-            app:argType="string" />
-        <action
-            android:id="@+id/action_coursePageFragment_to_noteFragment"
-            app:destination="@id/noteFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-    
-    <fragment
-        android:id="@+id/noteFragment"
-        android:name="com.dscvit.vitty.ui.notes.NoteFragment"
-        android:label="Note"
-        tools:layout="@layout/fragment_note">
-        <argument
-            android:name="courseCode"
-            app:argType="string"
-            app:defaultValue="" />
-        <argument
-            android:name="noteId"
-            app:argType="string"
-            app:defaultValue=""
-            app:nullable="true" />
-    </fragment>
+        tools:layout="@layout/fragment_requests" />
 </navigation>
\ 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 16237c8..462794f 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <color name="tab_selected_2">#1A126AFC</color>
     <color name="fab_color">#082F63</color>
     <color name="background">#041727</color>
-    <color name="translucent">#BBE7FF</color>
+    <color name="translucent">#688FBC</color>
     <color name="translucent_ripple">#25688FBC</color>
     <color name="translucent_imp">#9DBADC</color>
     <color name="translucent_head">#C3D4E8</color>
@@ -18,9 +18,5 @@
     <color name="next_class">#99126AFC</color>
     <color name="next_class_2">#1A126AFC</color>
     <color name="transparent">#00000000</color>
-    <color name="red">#F61F1F</color>
-    <color name="text">#F4F4FC</color>
-    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">@color/translucent
-    </color>
-    <color name="mtrl_textinput_bg_color" tools:override="true">#0E2336</color>
+    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">@color/translucent</color>
 </resources>
\ 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 882d931..6eb7d2a 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,17 +9,10 @@
     <string name="sample_class_id">SJT 304</string>
     <string name="next">Next</string>
     <string name="greeting">Hello,</string>
-    <string name="continue_text">Continue</string>
     <string name="done">Done</string>
     <string name="no_classes_today">No classes today!</string>
     <string name="no_more_classes_today">No More Classes Today</string>
     <string name="no_classes_today_subtext">Catch up on some sleep</string>
-    <string name="no_friends_found">No Friends? </string>
-    <string name="no_friends_found_subtext">Add your friends and see their timetable!</string>
-    <string name="no_requests">Request and Suggestions</string>
-    <string name="no_requests_subtext">Your friend requests and suggested friends will be shown here.</string>
-    <string name="search_text_heading"> Search For Your Friends </string>
-    <string name="search_text_subheading"> Enter their Username </string>
     <string name="intro1_title">Never miss a class</string>
     <string name="intro1_subtitle">Notifications to remind you about your upcoming classes</string>
     <string name="intro2_title">Get a sneak peek</string>
@@ -31,9 +24,9 @@
     <string name="your_next_class">Your Next Class</string>
     <string name="today_schedule">Today\'s Schedule</string>
     <string name="share">Share</string>
-    <string name="share_text">Are you having trouble staying on top of your hectic college schedule? Don\'t know where your classes are? VITTY has got you covered, with VITTY you can have easy access to your timetable no matter where you are!\n\nSimply upload your VIT timetable as text or image and never miss another class again!\n\nGet VITTY Now!\n\nWebsite: https://dscv.it/vittyconnect\n\nChrome Extension: https://dscv.it/vitty-extension\n\nAndroid App: https://dscv.it/vitty-app\n\niOS App: https://dscv.it/vitty-ios</string>
+    <string name="share_text">Are you having trouble staying on top of your hectic college schedule? Don\'t know where your classes are? VITTY has got you covered, with VITTY you can have easy access to your timetable no matter where you are!\n\nSimply upload your VIT timetable as text or image and never miss another class again!\n\nGet VITTY Now!\n\nWebsite: https://dscv.it/vitty\n\nChrome Extension: https://dscv.it/vitty-extension\n\nAndroid App: https://dscv.it/vitty-app\n\niOS App: https://dscv.it/vitty-ios</string>
     <string name="instructions_1">1. Upload the timetable on:</string>
-    <string name="instructions_1_link"><u>https://dscv.it/vittyconnect</u></string>
+    <string name="instructions_1_link"><u>https://dscv.it/vitty</u></string>
     <string name="instructions_2">2. Log in with the same account as shown above.</string>
     <string name="instructions_3">3. Follow the instructions and upload your timetable.</string>
     <string name="instructions_3_a">\u25CB Ensure that the screenshot is taken directly from VTOP. It should fit in one single image.</string>
@@ -44,7 +37,6 @@
     <string name="instructions_5">5. When done, click on Confirm.</string>
     <string name="instructions_6">BRAVO! That\'s it. You did it!</string>
     <string name="instructions_7">In addition to this, you can have a sneak peek at your upcoming classes via the Widget.</string>
-    <string name="add_info_desc">Enter username and your registration number below. Your username will help your friends find you!</string>
     <string name="logout">Logout</string>
     <string name="logout_msg">Are you sure?</string>
     <string name="cancel">Cancel</string>
@@ -64,7 +56,7 @@
     <string name="about_notifications">Get control of the notifications by tapping on ⋮ > Settings > Notifications.\n\nThere you can:\n1. Turn on No CLasses Mode to pause your class notifications.\n2. Individually turn on/off notifications for your classes (Android 8+ only).</string>
     <string name="about_battery">To get notifications on time, keep the battery optimisations for the app turned off.\n\nTo change this setting, tap on ⋮ > Settings > Battery.</string>
     <string name="about_nav">Don\'t know which class is where? Don\'t worry, we\'ve got you covered!\n\nNow you can hit the directions button on the Next Class widget or tap on a room number in the app to start navigation to your class!</string>
-    <string name="about_new_updates">1. Add friends and see their timetable. \n Set Friend Requests Now!</string>
+    <string name="about_new_updates">1. Exam/Holiday Mode is now called No Classes Mode.</string>
     <string name="final_heading">Let\'s go!</string>
     <string name="about_final">You\'re all set to start using the app.</string>
     <string name="congratulations">Congratulations!</string>
@@ -88,18 +80,12 @@
     <string name="default_notification_channel_id">con.dscvit.vitty-Updates</string>
     <string name="directions">Directions</string>
     <string name="facing_issues_title">Facing any issues? Contact us!</string>
-    <string name="facing_issues_description">Reach out support in case of any issues!</string>
-    <string name="telegram_link"><u>https://vitty.dscvit.com</u></string>
+    <string name="facing_issues_description">We are available on Telegram throughout the day ready to fix your problems!</string>
+    <string name="telegram_link"><u>https://dscv.it/telegram</u></string>
     <string name="support">Support</string>
     <string name="sample_room">SJT101</string>
-    <string name="title_academics">Academics</string>
-    <string name="title_schedule">Schedule</string>
+    <string name="title_schedule">Timetable</string>
     <string name="title_community">Community</string>
-    <string name="title_connect">Connect</string>
-    <string name="fill_all_fields">Fill All Fields!</string>
-    <string name="invalid_regno">Invalid Registration Number!</string>
-    <string name="something_went_wrong">Something Went Wrong!</string>
-    <string name="compass">🧭</string>
     <string-array name="no_classes_today_subtext_list">
         <item>Don\'t you have a quiz coming up?</item>
         <item>Finish your DAs!</item>
@@ -130,14 +116,4 @@
         <item>thursday</item>
         <item>friday</item>
     </string-array>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    
-    <string name="maintenance_title">Server Under Maintenance</string>
-    <string name="maintenance_message">We\'re currently performing server maintenance to improve your experience.</string>
-    <string name="maintenance_description">Please check back in a few minutes. We\'ll be back online soon!</string>
-    <string name="retry_connection">Try Again</string>
-    <string name="exit_app">Exit App</string>
-    <string name="maintenance_footer">Thank you for your patience</string>
-    <string name="maintenance_icon_desc">Maintenance Icon</string>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 81c7f8b..03a41fa 100755
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -53,7 +53,7 @@
     </style>
 
     <style name="TabTextAppearance" parent="">
-        <item name="android:textSize">20sp</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 33d2823..4d1e20f 100755
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -94,23 +94,5 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="Support &amp; Feedback">
-
-        <Preference
-            app:icon="@android:drawable/ic_dialog_email"
-            app:key="support_email"
-            app:summary="dscvit.vitty@gmail.com"
-            app:title="Contact Support" />
-
-        <Preference
-            app:icon="@drawable/ic_github"
-            app:key="github_issues"
-            app:summary="Report bugs and request features"
-            app:title="Report Issue" />
-
-    </PreferenceCategory>
-
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 32c055b..aa4d177 100755
--- a/build.gradle
+++ b/build.gradle
@@ -2,16 +2,16 @@
 buildscript {
     repositories {
         google()
-        mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://jitpack.io" }
+        jcenter()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.12.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21'
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.9.2'
-        classpath 'com.google.gms:google-services:4.4.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.4'
+        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -21,11 +21,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
+        jcenter()
     }
 }
 
-tasks.register('clean', Delete) {
-    delete rootProject.getLayout().getBuildDirectory()
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index dbc9506..98bed16 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
+android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eff8d92..ba3018c 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/markdowntext/.gitignore b/markdowntext/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/markdowntext/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/markdowntext/build.gradle b/markdowntext/build.gradle
deleted file mode 100644
index d48c6df..0000000
--- a/markdowntext/build.gradle
+++ /dev/null
@@ -1,80 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'maven-publish'
-    id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0'
-}
-
-android {
-    compileSdk 36
-    namespace 'dev.jeziellago.compose.markdown'
-
-    defaultConfig {
-        minSdk 26
-        targetSdk 36
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    buildFeatures {
-        compose true
-    }
-    kotlin {
-        jvmToolchain(21)
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
-    }
-    publishing {
-        singleVariant("release") {}
-    }
-}
-
-dependencies {
-    // Compose BOM (Bill of Materials) - matches your app
-    implementation platform("androidx.compose:compose-bom:2025.07.00")
-    
-    implementation 'androidx.core:core-ktx:1.16.0'
-    implementation 'androidx.appcompat:appcompat:1.7.1'
-
-    final def markwon_version = '4.6.2'
-
-    implementation "io.noties.markwon:core:$markwon_version"
-    implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
-    implementation "io.noties.markwon:ext-tables:$markwon_version"
-    implementation "io.noties.markwon:html:$markwon_version"
-    implementation "io.noties.markwon:linkify:$markwon_version"
-    implementation "io.noties.markwon:ext-tasklist:$markwon_version"
-
-    // TODO: Change it after migrating markwon project
-    implementation "com.github.jeziellago:Markwon:58aa5aba6a"
-
-    api("io.coil-kt:coil:2.7.0")
-    api("io.coil-kt:coil-gif:2.7.0")
-
-    // Jetpack Compose - versions from BOM
-    implementation "androidx.compose.ui:ui"
-    implementation "androidx.compose.material3:material3"
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.release
-
-                groupId = 'dev.jeziellago'
-                artifactId = 'compose-markdown'
-                version = '1.0.0-local'
-            }
-        }
-    }
-}
diff --git a/markdowntext/consumer-rules.pro b/markdowntext/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/markdowntext/proguard-rules.pro b/markdowntext/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/markdowntext/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/markdowntext/src/main/AndroidManifest.xml b/markdowntext/src/main/AndroidManifest.xml
deleted file mode 100644
index 10728cc..0000000
--- a/markdowntext/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
\ No newline at end of file
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/AutoSizeConfig.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/AutoSizeConfig.kt
deleted file mode 100644
index e1b7e03..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/AutoSizeConfig.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.jeziellago.compose.markdowntext
-
-import android.util.TypedValue
-
-/**
- * Requires API Level 26 to apply auto size
- * */
-data class AutoSizeConfig(
-    val autoSizeMinTextSize: Int,
-    val autoSizeMaxTextSize: Int,
-    val autoSizeStepGranularity: Int,
-    val unit: Int = TypedValue.COMPLEX_UNIT_SP,
-)
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTaskListPlugin.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTaskListPlugin.kt
deleted file mode 100644
index b50b330..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTaskListPlugin.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package dev.jeziellago.compose.markdowntext
-
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import io.noties.markwon.ext.tasklist.TaskListPlugin
-
-object CustomTaskListPlugin {
-    fun create(
-        checkboxColor: Color,
-        checkedCheckboxColor: Color,
-        checkmarkColor: Color = Color.White
-    ): TaskListPlugin {
-        return TaskListPlugin.create(
-            checkedCheckboxColor.toArgb(),
-            checkboxColor.toArgb(),
-            checkmarkColor.toArgb()
-        )
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTextView.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTextView.kt
deleted file mode 100644
index 0110af7..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/CustomTextView.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package dev.jeziellago.compose.markdowntext
-
-import android.content.Context
-import android.text.Spannable
-import android.text.style.ClickableSpan
-import android.view.MotionEvent
-import androidx.appcompat.widget.AppCompatTextView
-
-class CustomTextView(context: Context) : AppCompatTextView(context) {
-
-    private var isTextSelectable: Boolean = false
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        performClick()
-        if (isTextSelectable) {
-            return super.onTouchEvent(event)
-        } else {
-            if (event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_DOWN) {
-                val link = getClickableSpans(event)
-
-                if (link.isNotEmpty()) {
-                    if (event.action == MotionEvent.ACTION_UP) {
-                        link[0].onClick(this)
-                    }
-                    return true
-                }
-            }
-            return false
-        }
-    }
-
-    private fun getClickableSpans(event: MotionEvent): Array<ClickableSpan> {
-        var x = event.x.toInt()
-        var y = event.y.toInt()
-
-        x -= totalPaddingLeft
-        y -= totalPaddingTop
-
-        x += scrollX
-        y += scrollY
-
-        val layout = layout
-        val line = layout.getLineForVertical(y)
-        val off = layout.getOffsetForHorizontal(line, x.toFloat())
-
-        val spannable = text as Spannable
-        return spannable.getSpans(off, off, ClickableSpan::class.java)
-    }
-
-    override fun performClick(): Boolean {
-        return super.performClick()
-    }
-
-    override fun setTextIsSelectable(selectable: Boolean) {
-        super.setTextIsSelectable(selectable)
-        isTextSelectable = selectable
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownRender.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownRender.kt
deleted file mode 100644
index d664b17..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownRender.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package dev.jeziellago.compose.markdowntext
-
-import android.content.Context
-import android.os.Build.VERSION.SDK_INT
-import android.text.Spanned
-import android.widget.TextView
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.text.TextStyle
-import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import dev.jeziellago.compose.markdowntext.plugins.core.MardownCorePlugin
-import dev.jeziellago.compose.markdowntext.plugins.image.ImagesPlugin
-import dev.jeziellago.compose.markdowntext.plugins.syntaxhighlight.SyntaxHighlightPlugin
-import dev.jeziellago.compose.markdowntext.CustomTaskListPlugin
-import io.noties.markwon.AbstractMarkwonPlugin
-import io.noties.markwon.Markwon
-import io.noties.markwon.MarkwonConfiguration
-import io.noties.markwon.SoftBreakAddsNewLinePlugin
-import io.noties.markwon.core.MarkwonTheme
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin
-import io.noties.markwon.ext.tables.TablePlugin
-import io.noties.markwon.ext.tasklist.TaskListPlugin
-import io.noties.markwon.html.HtmlPlugin
-import io.noties.markwon.linkify.LinkifyPlugin
-
-internal object MarkdownRender {
-
-    fun create(
-        context: Context,
-        imageLoader: ImageLoader?,
-        linkifyMask: Int,
-        enableSoftBreakAddsNewLine: Boolean,
-        syntaxHighlightColor: Color,
-        syntaxHighlightTextColor: Color,
-        headingBreakColor: Color,
-        checkboxColor: Color,
-        checkedCheckboxColor: Color,
-        checkmarkColor: Color,
-        enableUnderlineForLink: Boolean,
-        beforeSetMarkdown: ((TextView, Spanned) -> Unit)? = null,
-        afterSetMarkdown: ((TextView) -> Unit)? = null,
-        onLinkClicked: ((String) -> Unit)? = null,
-        style: TextStyle
-    ): Markwon {
-        val coilImageLoader = imageLoader ?: ImageLoader.Builder(context)
-            .components {
-                if (SDK_INT >= 28) {
-                    add(ImageDecoderDecoder.Factory())
-                } else {
-                    add(GifDecoder.Factory())
-                }
-            }
-            .build()
-
-        return Markwon.builderNoCore(context)
-            .usePlugin(
-                MardownCorePlugin(
-                    syntaxHighlightColor.toArgb(),
-                    syntaxHighlightTextColor.toArgb(),
-                    enableUnderlineForLink,
-                )
-            )
-            .usePlugin(HtmlPlugin.create())
-            .usePlugin(ImagesPlugin.create(context, coilImageLoader))
-            .usePlugin(StrikethroughPlugin.create())
-            .usePlugin(TablePlugin.create(context))
-            .usePlugin(LinkifyPlugin.create(linkifyMask))
-            .usePlugin(CustomTaskListPlugin.create(checkboxColor, checkedCheckboxColor, checkmarkColor))
-            .apply {
-                if (enableSoftBreakAddsNewLine) {
-                    usePlugin(SoftBreakAddsNewLinePlugin.create())
-                }
-            }
-            .usePlugin(SyntaxHighlightPlugin())
-            .usePlugin(object : AbstractMarkwonPlugin() {
-
-                override fun beforeSetText(textView: TextView, markdown: Spanned) {
-                    beforeSetMarkdown?.invoke(textView, markdown)
-                }
-
-                override fun afterSetText(textView: TextView) {
-                    afterSetMarkdown?.invoke(textView)
-                }
-
-                override fun configureTheme(builder: MarkwonTheme.Builder) {
-                    if (headingBreakColor == Color.Transparent) {
-                        builder.headingBreakColor(1)
-                    } else {
-                        builder.headingBreakColor(headingBreakColor.toArgb())
-                    }
-                    builder.bulletWidth(style.fontSize.value.toInt())
-                }
-
-                override fun configureConfiguration(builder: MarkwonConfiguration.Builder) {
-                    // Setting [MarkwonConfiguration.Builder.linkResolver] overrides
-                    // Markwon's default behaviour - see Markwon's [LinkResolverDef]
-                    // and how it's used in [MarkwonConfiguration.Builder].
-                    // Only use it if the client explicitly wants to handle link clicks.
-                    onLinkClicked ?: return
-                    builder.linkResolver { _, link ->
-                        // handle individual clicks on Textview link
-                        onLinkClicked.invoke(link)
-                    }
-                }
-            })
-            .build()
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownText.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownText.kt
deleted file mode 100644
index 42ba83c..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/MarkdownText.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package dev.jeziellago.compose.markdowntext
-
-import android.content.Context
-import android.os.Build
-import android.text.Spanned
-import android.text.method.LinkMovementMethod
-import android.text.util.Linkify
-import android.view.View
-import android.widget.TextView
-import androidx.annotation.FontRes
-import androidx.annotation.IdRes
-import androidx.compose.foundation.clickable
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.widget.TextViewCompat
-import coil.ImageLoader
-import io.noties.markwon.Markwon
-
-@Composable
-fun MarkdownText(
-    markdown: String,
-    modifier: Modifier = Modifier,
-    linkColor: Color = Color.Unspecified,
-    truncateOnTextOverflow: Boolean = false,
-    maxLines: Int = Int.MAX_VALUE,
-    isTextSelectable: Boolean = false,
-    autoSizeConfig: AutoSizeConfig? = null,
-    @FontRes fontResource: Int? = null,
-    style: TextStyle = LocalTextStyle.current,
-    @IdRes viewId: Int? = null,
-    onClick: (() -> Unit)? = null,
-    // this option will disable all clicks on links, inside the markdown text
-    // it also enable the parent view to receive the click event
-    disableLinkMovementMethod: Boolean = false,
-    imageLoader: ImageLoader? = null,
-    linkifyMask: Int = Linkify.EMAIL_ADDRESSES or Linkify.PHONE_NUMBERS or Linkify.WEB_URLS,
-    enableSoftBreakAddsNewLine: Boolean = true,
-    syntaxHighlightColor: Color = Color.LightGray,
-    syntaxHighlightTextColor: Color = Color.Unspecified,
-    headingBreakColor: Color = Color.Transparent,
-    checkboxColor: Color = Color.Unspecified,
-    checkedCheckboxColor: Color = Color.Unspecified,
-    checkmarkColor: Color = Color.White,
-    enableUnderlineForLink: Boolean = true,
-    importForAccessibility: Int = View.IMPORTANT_FOR_ACCESSIBILITY_AUTO,
-    beforeSetMarkdown: ((TextView, Spanned) -> Unit)? = null,
-    afterSetMarkdown: ((TextView) -> Unit)? = null,
-    onLinkClicked: ((String) -> Unit)? = null,
-    onTextLayout: ((numLines: Int) -> Unit)? = null
-) {
-    val defaultColor: Color = LocalContentColor.current
-    val context: Context = LocalContext.current
-    val markdownRender: Markwon =
-        remember {
-            MarkdownRender.create(
-                context,
-                imageLoader,
-                linkifyMask,
-                enableSoftBreakAddsNewLine,
-                syntaxHighlightColor,
-                syntaxHighlightTextColor,
-                headingBreakColor,
-                checkboxColor,
-                checkedCheckboxColor,
-                checkmarkColor,
-                enableUnderlineForLink,
-                beforeSetMarkdown,
-                afterSetMarkdown,
-                onLinkClicked,
-                style
-            )
-        }
-
-    val androidViewModifier = if (onClick != null) {
-        Modifier
-            .clickable { onClick() }
-            .then(modifier)
-    } else {
-        modifier
-    }
-    AndroidView(
-        modifier = androidViewModifier,
-        factory = { factoryContext ->
-
-            val linkTextColor = linkColor.takeOrElse { style.color.takeOrElse { defaultColor } }
-
-            CustomTextView(factoryContext).apply {
-                viewId?.let { id = viewId }
-                fontResource?.let { font -> applyFontResource(font) }
-                importantForAccessibility = importForAccessibility
-
-                setMaxLines(maxLines)
-                setLinkTextColor(linkTextColor.toArgb())
-
-                setTextIsSelectable(isTextSelectable)
-
-                movementMethod = LinkMovementMethod.getInstance()
-
-                if (truncateOnTextOverflow) enableTextOverflow()
-
-                autoSizeConfig?.let { config ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
-                            this,
-                            config.autoSizeMinTextSize,
-                            config.autoSizeMaxTextSize,
-                            config.autoSizeStepGranularity,
-                            config.unit
-                        )
-                    }
-                }
-            }
-        },
-        update = { textView ->
-            with(textView) {
-                applyTextColor(style.color.takeOrElse { defaultColor }.toArgb())
-                applyFontSize(style)
-                applyLineHeight(style)
-                applyTextDecoration(style)
-
-                with(style) {
-                    applyTextAlign(textAlign)
-                    fontFamily?.let { applyFontFamily(this) }
-                    fontStyle?.let { applyFontStyle(it) }
-                    fontWeight?.let { applyFontWeight(it) }
-                }
-            }
-            markdownRender.setMarkdown(textView, markdown)
-            if (disableLinkMovementMethod) {
-                textView.movementMethod = null
-            }
-            if (onTextLayout != null) {
-                textView.post {
-                    onTextLayout(textView.lineCount)
-                }
-            }
-            textView.maxLines = maxLines
-        }
-    )
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/TextAppearanceExt.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/TextAppearanceExt.kt
deleted file mode 100644
index cbcc08f..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/TextAppearanceExt.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-package dev.jeziellago.compose.markdowntext
-
-import android.graphics.Paint
-import android.graphics.Typeface
-import android.graphics.text.LineBreaker
-import android.os.Build
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.util.TypedValue
-import android.view.Gravity
-import android.widget.TextView
-import androidx.annotation.FontRes
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontSynthesis
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.font.FontWeight.Companion.Bold
-import androidx.compose.ui.text.font.FontWeight.Companion.ExtraBold
-import androidx.compose.ui.text.font.FontWeight.Companion.SemiBold
-import androidx.compose.ui.text.font.createFontFamilyResolver
-import androidx.compose.ui.text.font.resolveAsTypeface
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.view.doOnNextLayout
-import androidx.core.widget.TextViewCompat
-
-fun TextView.applyFontWeight(fontWeight: FontWeight) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-        typeface = Typeface.create(typeface, fontWeight.weight, false)
-    } else {
-        val weight = when (fontWeight) {
-            ExtraBold, Bold, SemiBold -> Typeface.BOLD
-            else -> Typeface.NORMAL
-        }
-        setTypeface(typeface, weight)
-    }
-}
-
-fun TextView.applyFontStyle(fontStyle: FontStyle) {
-    val type = when (fontStyle) {
-        FontStyle.Italic -> Typeface.ITALIC
-        FontStyle.Normal -> Typeface.NORMAL
-        else -> Typeface.NORMAL
-    }
-    setTypeface(typeface, type)
-}
-
-fun TextView.applyFontFamily(textStyle: TextStyle) {
-    typeface = createFontFamilyResolver(context).resolveAsTypeface(
-        fontFamily = textStyle.fontFamily,
-        fontWeight = textStyle.fontWeight ?: FontWeight.Normal,
-        fontStyle = textStyle.fontStyle ?: FontStyle.Normal,
-        fontSynthesis = textStyle.fontSynthesis ?: FontSynthesis.All,
-    ).value
-}
-
-fun TextView.applyFontResource(@FontRes font: Int) {
-    typeface = ResourcesCompat.getFont(context, font)
-}
-
-fun TextView.applyTextColor(argbColor: Int) {
-    setTextColor(argbColor)
-}
-
-fun TextView.applyFontSize(textStyle: TextStyle) {
-    setTextSize(TypedValue.COMPLEX_UNIT_SP, textStyle.fontSize.value)
-}
-
-fun TextView.applyTextDecoration(textStyle: TextStyle) {
-    if (textStyle.textDecoration == TextDecoration.LineThrough) {
-        paintFlags = Paint.STRIKE_THRU_TEXT_FLAG
-    }
-}
-
-fun TextView.applyLineHeight(textStyle: TextStyle) {
-    if (textStyle.lineHeight.isSp) {
-        TextViewCompat.setLineHeight(
-            this,
-            TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_SP,
-                textStyle.lineHeight.value,
-                context.resources.displayMetrics
-            ).toInt()
-        )
-    }
-}
-
-fun TextView.applyTextAlign(align: TextAlign) {
-    gravity = when (align) {
-        TextAlign.Left, TextAlign.Start -> Gravity.START
-        TextAlign.Right, TextAlign.End -> Gravity.END
-        TextAlign.Center -> Gravity.CENTER_HORIZONTAL
-        else -> Gravity.START
-    }
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && align == TextAlign.Justify) {
-        justificationMode = LineBreaker.JUSTIFICATION_MODE_INTER_WORD
-    }
-}
-
-fun TextView.enableTextOverflow() {
-    doOnNextLayout {
-        if (maxLines != -1 && lineCount > maxLines) {
-            val endOfLastLine = layout.getLineEnd(maxLines - 1)
-            val startIndex = maxOf(0, endOfLastLine - 3)
-            val spannedDropLast3Chars = text.subSequence(0, startIndex) as? Spanned
-            if (spannedDropLast3Chars != null) {
-                val spannableBuilder = SpannableStringBuilder()
-                    .append(spannedDropLast3Chars)
-                    .append("…")
-
-                text = spannableBuilder
-            }
-        }
-    }
-}
-
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/core/MardownCorePlugin.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/core/MardownCorePlugin.kt
deleted file mode 100644
index 65cba4d..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/core/MardownCorePlugin.kt
+++ /dev/null
@@ -1,396 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.core
-
-import androidx.annotation.VisibleForTesting
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import io.noties.markwon.MarkwonSpansFactory
-import io.noties.markwon.MarkwonVisitor
-import io.noties.markwon.core.CorePlugin
-import io.noties.markwon.core.CoreProps
-import io.noties.markwon.core.MarkwonTheme
-import io.noties.markwon.core.SimpleBlockNodeVisitor
-import io.noties.markwon.core.factory.BlockQuoteSpanFactory
-import io.noties.markwon.core.factory.CodeBlockSpanFactory
-import io.noties.markwon.core.factory.CodeSpanFactory
-import io.noties.markwon.core.factory.EmphasisSpanFactory
-import io.noties.markwon.core.factory.HeadingSpanFactory
-import io.noties.markwon.core.factory.LinkSpanFactory
-import io.noties.markwon.core.factory.ListItemSpanFactory
-import io.noties.markwon.core.factory.StrongEmphasisSpanFactory
-import io.noties.markwon.core.factory.ThematicBreakSpanFactory
-import io.noties.markwon.image.ImageProps
-import org.commonmark.node.BlockQuote
-import org.commonmark.node.BulletList
-import org.commonmark.node.Code
-import org.commonmark.node.Emphasis
-import org.commonmark.node.FencedCodeBlock
-import org.commonmark.node.HardLineBreak
-import org.commonmark.node.Heading
-import org.commonmark.node.Image
-import org.commonmark.node.IndentedCodeBlock
-import org.commonmark.node.Link
-import org.commonmark.node.ListBlock
-import org.commonmark.node.ListItem
-import org.commonmark.node.Node
-import org.commonmark.node.OrderedList
-import org.commonmark.node.Paragraph
-import org.commonmark.node.SoftLineBreak
-import org.commonmark.node.StrongEmphasis
-import org.commonmark.node.Text
-import org.commonmark.node.ThematicBreak
-
-class MardownCorePlugin(
-    private val syntaxHighlightColor: Int,
-    private val syntaxHighlightTextColor: Int,
-    private val enableUnderlineForLink: Boolean,
-    private val onTextAddedListeners: MutableList<OnTextAddedListener> = ArrayList(0)
-) : CorePlugin() {
-
-    override fun configureVisitor(builder: MarkwonVisitor.Builder) {
-        text(builder)
-        strongEmphasis(builder)
-        emphasis(builder)
-        blockQuote(builder)
-        code(builder)
-        fencedCodeBlock(builder)
-        indentedCodeBlock(builder)
-        image(builder)
-        bulletList(builder)
-        orderedList(builder)
-        listItem(builder)
-        thematicBreak(builder)
-        heading(builder)
-        softLineBreak(builder)
-        hardLineBreak(builder)
-        paragraph(builder)
-        link(builder)
-    }
-
-    override fun configureTheme(builder: MarkwonTheme.Builder) {
-        builder.codeBackgroundColor(syntaxHighlightColor)
-        builder.isLinkUnderlined(enableUnderlineForLink)
-        if (syntaxHighlightTextColor != Color.Unspecified.toArgb()) {
-            builder.codeTextColor(syntaxHighlightTextColor)
-        }
-        super.configureTheme(builder)
-    }
-
-    override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
-        // reuse this one for both code-blocks (indent & fenced)
-        val codeBlockSpanFactory = CodeBlockSpanFactory()
-
-        builder
-            .setFactory(StrongEmphasis::class.java, StrongEmphasisSpanFactory())
-            .setFactory(Emphasis::class.java, EmphasisSpanFactory())
-            .setFactory(BlockQuote::class.java, BlockQuoteSpanFactory())
-            .setFactory(Code::class.java, CodeSpanFactory())
-            .setFactory(FencedCodeBlock::class.java, codeBlockSpanFactory)
-            .setFactory(IndentedCodeBlock::class.java, codeBlockSpanFactory)
-            .setFactory(ListItem::class.java, ListItemSpanFactory())
-            .setFactory(Heading::class.java, HeadingSpanFactory())
-            .setFactory(Link::class.java, LinkSpanFactory())
-            .setFactory(ThematicBreak::class.java, ThematicBreakSpanFactory())
-    }
-
-    override fun addOnTextAddedListener(onTextAddedListener: OnTextAddedListener): CorePlugin {
-        onTextAddedListeners.add(onTextAddedListener)
-        return this
-    }
-
-    private fun text(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Text::class.java
-        ) { visitor, text ->
-            val literal = text.literal
-            visitor.builder().append(literal)
-
-            if (onTextAddedListeners.isNotEmpty()) {
-                // calculate the start position
-                val length = visitor.length() - literal.length
-                for (onTextAddedListener in onTextAddedListeners) {
-                    onTextAddedListener.onTextAdded(visitor, literal, length)
-                }
-            }
-        }
-    }
-
-    private fun strongEmphasis(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            StrongEmphasis::class.java
-        ) { visitor, strongEmphasis ->
-            val length = visitor.length()
-            visitor.visitChildren(strongEmphasis)
-            visitor.setSpansForNodeOptional(strongEmphasis, length)
-        }
-    }
-
-    private fun emphasis(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Emphasis::class.java
-        ) { visitor, emphasis ->
-            val length = visitor.length()
-            visitor.visitChildren(emphasis)
-            visitor.setSpansForNodeOptional(emphasis, length)
-        }
-    }
-
-    private fun blockQuote(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            BlockQuote::class.java
-        ) { visitor, blockQuote ->
-            visitor.blockStart(blockQuote)
-            val length = visitor.length()
-
-            visitor.visitChildren(blockQuote)
-            visitor.setSpansForNodeOptional(blockQuote, length)
-            visitor.blockEnd(blockQuote)
-        }
-    }
-
-    private fun code(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Code::class.java
-        ) { visitor, code ->
-            val length = visitor.length()
-            visitor.builder()
-                .append('\u00a0')
-                .append(code.literal)
-                .append('\u00a0')
-            visitor.setSpansForNodeOptional(code, length)
-        }
-    }
-
-    private fun fencedCodeBlock(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            FencedCodeBlock::class.java
-        ) { visitor, fencedCodeBlock ->
-            visitCodeBlock(
-                visitor,
-                fencedCodeBlock.info,
-                fencedCodeBlock.literal,
-                fencedCodeBlock
-            )
-        }
-    }
-
-    private fun indentedCodeBlock(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            IndentedCodeBlock::class.java
-        ) { visitor, indentedCodeBlock ->
-            visitCodeBlock(
-                visitor,
-                null,
-                indentedCodeBlock.literal,
-                indentedCodeBlock
-            )
-        }
-    }
-
-    private fun image(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Image::class.java,
-            MarkwonVisitor.NodeVisitor { visitor, image -> // if there is no image spanFactory, ignore
-                val spanFactory = visitor.configuration().spansFactory().get(
-                    Image::class.java
-                )
-                if (spanFactory == null) {
-                    visitor.visitChildren(image)
-                    return@NodeVisitor
-                }
-
-                val length = visitor.length()
-
-                visitor.visitChildren(image)
-
-                // we must check if anything _was_ added, as we need at least one char to render
-                if (length == visitor.length()) {
-                    visitor.builder().append('\uFFFC')
-                }
-
-                val configuration = visitor.configuration()
-
-                val parent = image.parent
-                val link = parent is Link
-
-                val destination = configuration
-                    .imageDestinationProcessor()
-                    .process(image.destination)
-
-                val props = visitor.renderProps()
-
-                // apply image properties
-                // Please note that we explicitly set IMAGE_SIZE to null as we do not clear
-                // properties after we applied span (we could though)
-                ImageProps.DESTINATION[props] = destination
-                ImageProps.REPLACEMENT_TEXT_IS_LINK[props] = link
-                ImageProps.IMAGE_SIZE[props] = null
-                visitor.setSpans(length, spanFactory.getSpans(configuration, props))
-            })
-    }
-
-    @VisibleForTesting
-    fun visitCodeBlock(
-        visitor: MarkwonVisitor,
-        info: String?,
-        code: String,
-        node: Node
-    ) {
-        visitor.blockStart(node)
-
-        val length = visitor.length()
-
-        visitor.builder()
-            .append('\u00a0').append('\n')
-            .append(visitor.configuration().syntaxHighlight().highlight(info, code))
-
-        visitor.ensureNewLine()
-
-        visitor.builder().append('\u00a0')
-
-        CoreProps.CODE_BLOCK_INFO[visitor.renderProps()] = info
-
-        visitor.setSpansForNodeOptional(node, length)
-
-        visitor.blockEnd(node)
-    }
-
-    private fun bulletList(builder: MarkwonVisitor.Builder) {
-        builder.on(BulletList::class.java, SimpleBlockNodeVisitor())
-    }
-
-    private fun orderedList(builder: MarkwonVisitor.Builder) {
-        builder.on(OrderedList::class.java, SimpleBlockNodeVisitor())
-    }
-
-    private fun listItem(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            ListItem::class.java
-        ) { visitor, listItem ->
-            val length = visitor.length()
-            // it's important to visit children before applying render props (
-            // we can have nested children, who are list items also, thus they will
-            // override out props (if we set them before visiting children)
-            visitor.visitChildren(listItem)
-
-            val parent: Node = listItem.parent
-            if (parent is OrderedList) {
-                val start = parent.startNumber
-
-                CoreProps.LIST_ITEM_TYPE[visitor.renderProps()] = CoreProps.ListItemType.ORDERED
-                CoreProps.ORDERED_LIST_ITEM_NUMBER[visitor.renderProps()] = start
-
-                // after we have visited the children increment start number
-                val orderedList = parent
-                orderedList.startNumber += 1
-            } else {
-                CoreProps.LIST_ITEM_TYPE[visitor.renderProps()] = CoreProps.ListItemType.BULLET
-                CoreProps.BULLET_LIST_ITEM_LEVEL[visitor.renderProps()] = listLevel(listItem)
-            }
-
-            visitor.setSpansForNodeOptional(listItem, length)
-            if (visitor.hasNext(listItem)) {
-                visitor.ensureNewLine()
-            }
-        }
-    }
-
-    private fun listLevel(node: Node): Int {
-        var level = 0
-        var parent = node.parent
-        while (parent != null) {
-            if (parent is ListItem) {
-                level += 1
-            }
-            parent = parent.parent
-        }
-        return level
-    }
-
-    private fun thematicBreak(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            ThematicBreak::class.java
-        ) { visitor, thematicBreak ->
-            visitor.blockStart(thematicBreak)
-            val length = visitor.length()
-
-            // without space it won't render
-            visitor.builder().append('\u00a0')
-
-            visitor.setSpansForNodeOptional(thematicBreak, length)
-            visitor.blockEnd(thematicBreak)
-        }
-    }
-
-    private fun heading(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Heading::class.java
-        ) { visitor, heading ->
-            visitor.blockStart(heading)
-            val length = visitor.length()
-            visitor.visitChildren(heading)
-
-            CoreProps.HEADING_LEVEL[visitor.renderProps()] = heading.level
-
-            visitor.setSpansForNodeOptional(heading, length)
-            visitor.blockEnd(heading)
-        }
-    }
-
-    private fun softLineBreak(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            SoftLineBreak::class.java
-        ) { visitor, _ -> visitor.builder().append(' ') }
-    }
-
-    private fun hardLineBreak(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            HardLineBreak::class.java
-        ) { visitor, _ -> visitor.ensureNewLine() }
-    }
-
-    private fun paragraph(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Paragraph::class.java
-        ) { visitor, paragraph ->
-            val inTightList = isInTightList(paragraph)
-            if (!inTightList) {
-                visitor.blockStart(paragraph)
-            }
-
-            val length = visitor.length()
-            visitor.visitChildren(paragraph)
-
-            CoreProps.PARAGRAPH_IS_IN_TIGHT_LIST[visitor.renderProps()] = inTightList
-
-            visitor.setSpansForNodeOptional(paragraph, length)
-            if (!inTightList) {
-                visitor.blockEnd(paragraph)
-            }
-        }
-    }
-
-    private fun isInTightList(paragraph: Paragraph): Boolean {
-        val parent: Node? = paragraph.parent
-        if (parent != null) {
-            val gramps = parent.parent
-            if (gramps is ListBlock) {
-                return gramps.isTight
-            }
-        }
-        return false
-    }
-
-    private fun link(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            Link::class.java
-        ) { visitor, link ->
-            val length = visitor.length()
-            visitor.visitChildren(link)
-
-            val destination = link.destination
-
-            CoreProps.LINK_DESTINATION[visitor.renderProps()] = destination
-            visitor.setSpansForNodeOptional(link, length)
-        }
-    }
-}
\ No newline at end of file
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/image/ImagesPlugin.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/image/ImagesPlugin.kt
deleted file mode 100644
index 51433d6..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/image/ImagesPlugin.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.image
-
-import android.content.Context
-import android.graphics.drawable.Animatable
-import android.graphics.drawable.Drawable
-import android.text.Spanned
-import android.widget.TextView
-import coil.ImageLoader
-import coil.request.Disposable
-import coil.request.ImageRequest
-import coil.target.Target
-import io.noties.markwon.AbstractMarkwonPlugin
-import io.noties.markwon.MarkwonConfiguration
-import io.noties.markwon.MarkwonSpansFactory
-import io.noties.markwon.image.AsyncDrawable
-import io.noties.markwon.image.AsyncDrawableLoader
-import io.noties.markwon.image.AsyncDrawableScheduler
-import io.noties.markwon.image.DrawableUtils
-import io.noties.markwon.image.ImageSpanFactory
-import java.util.concurrent.atomic.AtomicBoolean
-
-class ImagesPlugin private constructor(
-    private val imageLoader: ImageLoader,
-    private val coilStore: CoilStore,
-    private val imageDrawableLoader: AnimatedImageDrawableLoader = AnimatedImageDrawableLoader(
-        coilStore,
-        imageLoader
-    )
-) : AbstractMarkwonPlugin() {
-
-    override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
-        builder.setFactory(org.commonmark.node.Image::class.java, ImageSpanFactory())
-    }
-
-    override fun configureConfiguration(builder: MarkwonConfiguration.Builder) {
-        builder.asyncDrawableLoader(imageDrawableLoader)
-    }
-
-    override fun beforeSetText(textView: TextView, markdown: Spanned) {
-        AsyncDrawableScheduler.unschedule(textView)
-    }
-
-    override fun afterSetText(textView: TextView) {
-        AsyncDrawableScheduler.schedule(textView)
-    }
-
-    companion object {
-        private val cache: HashMap<AsyncDrawable, Disposable> = HashMap(2)
-
-        fun create(context: Context, imageLoader: ImageLoader): ImagesPlugin {
-            val coilStore = object : CoilStore {
-                override fun load(drawable: AsyncDrawable): ImageRequest {
-                    return ImageRequest.Builder(context)
-                        .data(drawable.destination)
-                        .build()
-                }
-
-                override fun cancel(disposable: Disposable) {
-                    disposable.dispose()
-                }
-            }
-            return ImagesPlugin(imageLoader, coilStore)
-        }
-
-        class AnimatedImageDrawableLoader(
-            private val coilStore: CoilStore,
-            private val imageLoader: ImageLoader,
-        ) : AsyncDrawableLoader() {
-
-            override fun load(drawable: AsyncDrawable) {
-                val loaded = AtomicBoolean(false)
-                val target: Target = AnimatedDrawableTarget(drawable, loaded)
-                val request = coilStore.load(drawable).newBuilder()
-                    .target(target)
-                    .build()
-
-                val disposable = imageLoader.enqueue(request)
-                if (!loaded.get()) {
-                    loaded.set(true)
-                    cache[drawable] = disposable
-                }
-            }
-
-            override fun cancel(drawable: AsyncDrawable) {
-                val disposable = cache.remove(drawable)
-                if (disposable != null) {
-                    coilStore.cancel(disposable)
-                }
-            }
-
-            override fun placeholder(drawable: AsyncDrawable): Drawable? = null
-
-            class AnimatedDrawableTarget(
-                private val drawable: AsyncDrawable,
-                private val loaded: AtomicBoolean
-            ) : Target {
-                override fun onSuccess(result: Drawable) {
-                    if (cache.remove(drawable) != null || !loaded.get()) {
-                        loaded.set(true)
-                        if (drawable.isAttached) {
-                            DrawableUtils.applyIntrinsicBoundsIfEmpty(result)
-                            drawable.result = result
-
-                            if (result is Animatable) {
-                                (result as Animatable).start()
-                            }
-                        }
-                    }
-                }
-
-                override fun onStart(placeholder: Drawable?) {
-                    if (placeholder != null && drawable.isAttached) {
-                        DrawableUtils.applyIntrinsicBoundsIfEmpty(placeholder)
-                        drawable.result = placeholder
-                    }
-                }
-
-                override fun onError(error: Drawable?) {
-                    if (cache.remove(drawable) != null) {
-                        if (error != null && drawable.isAttached) {
-                            DrawableUtils.applyIntrinsicBoundsIfEmpty(error)
-                            drawable.result = error
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    interface CoilStore {
-        fun load(drawable: AsyncDrawable): ImageRequest
-        fun cancel(disposable: Disposable)
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/StrikethroughNodeRenderer.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/StrikethroughNodeRenderer.kt
deleted file mode 100644
index b41e0c9..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/StrikethroughNodeRenderer.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.syntaxhighlight;
-
-import org.commonmark.node.Node
-import org.commonmark.renderer.NodeRenderer
-import org.commonmark.renderer.text.TextContentNodeRendererContext
-import org.commonmark.renderer.text.TextContentWriter
-import java.util.Collections
-
-abstract class SyntaxHighlightRenderer : NodeRenderer {
-    override fun getNodeTypes(): MutableSet<Class<out Node>> {
-        return Collections.singleton(SyntaxHighlight::class.java)
-    }
-}
-
-class SyntaxHighlightNodeRenderer(private val context: TextContentNodeRendererContext) :
-    SyntaxHighlightRenderer() {
-    private val textContent: TextContentWriter = context.writer
-
-    override fun render(node: Node) {
-        textContent.write('/')
-        renderChildren(node)
-        textContent.write('/')
-    }
-
-    private fun renderChildren(parent: Node) {
-        var node = parent.firstChild
-        while (node != null) {
-            val next = node.next
-            context.render(node)
-            node = next
-        }
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlight.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlight.kt
deleted file mode 100644
index 011ea3b..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlight.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.syntaxhighlight
-
-import org.commonmark.node.CustomNode
-import org.commonmark.node.Delimited
-
-class SyntaxHighlight(val textLiteral: String) : CustomNode(), Delimited {
-    override fun getOpeningDelimiter(): String {
-        return DELIMITER
-    }
-
-    override fun getClosingDelimiter(): String {
-        return DELIMITER
-    }
-
-    companion object {
-        private const val DELIMITER = "=="
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightDelimiterProcessor.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightDelimiterProcessor.kt
deleted file mode 100644
index 582411d..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightDelimiterProcessor.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.syntaxhighlight
-
-import org.commonmark.node.Node
-import org.commonmark.node.Text
-import org.commonmark.parser.delimiter.DelimiterProcessor
-import org.commonmark.parser.delimiter.DelimiterRun
-
-class SyntaxHighlightDelimiterProcessor(
-    private val openingCharacter: Char,
-    private val closingCharacter: Char,
-    private val minLength: Int,
-) : DelimiterProcessor {
-
-    override fun getOpeningCharacter(): Char = openingCharacter
-
-    override fun getClosingCharacter(): Char = closingCharacter
-
-    override fun getMinLength(): Int = minLength
-
-    override fun getDelimiterUse(opener: DelimiterRun, closer: DelimiterRun): Int {
-        return if (opener.length() >= minLength && closer.length() >= minLength) {
-            // Use exactly two delimiters even if we have more, and don't care about internal openers/closers.
-            minLength
-        } else {
-            0
-        }
-    }
-
-    override fun process(opener: Text, closer: Text, delimiterCount: Int) {
-        // Wrap nodes between delimiters in SyntaxHighlight.
-        val syntaxHighlight: Node = SyntaxHighlight(opener.literal)
-
-        var tmp = opener.next
-        while (tmp != null && tmp !== closer) {
-            val next = tmp.next
-            syntaxHighlight.appendChild(tmp)
-            tmp = next
-        }
-
-        opener.insertAfter(syntaxHighlight)
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightExtension.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightExtension.kt
deleted file mode 100644
index 1dacb18..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightExtension.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.syntaxhighlight
-
-import org.commonmark.Extension
-import org.commonmark.parser.Parser
-import org.commonmark.parser.Parser.ParserExtension
-import org.commonmark.renderer.text.TextContentRenderer
-import org.commonmark.renderer.text.TextContentRenderer.TextContentRendererExtension
-
-class SyntaxHighlightExtension private constructor() : ParserExtension,
-    TextContentRendererExtension {
-    override fun extend(parserBuilder: Parser.Builder) {
-        parserBuilder.customDelimiterProcessor(
-            SyntaxHighlightDelimiterProcessor(
-                openingCharacter = '=',
-                closingCharacter = '=',
-                minLength = 2,
-            ),
-        )
-    }
-
-    override fun extend(rendererBuilder: TextContentRenderer.Builder) {
-        rendererBuilder.nodeRendererFactory { context ->
-            SyntaxHighlightNodeRenderer(
-                context
-            )
-        }
-    }
-
-    companion object {
-        fun create(): Extension {
-            return SyntaxHighlightExtension()
-        }
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightPlugin.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightPlugin.kt
deleted file mode 100644
index 3abbce5..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/syntaxhighlight/SyntaxHighlightPlugin.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.syntaxhighlight
-
-import io.noties.markwon.AbstractMarkwonPlugin
-import io.noties.markwon.MarkwonSpansFactory
-import io.noties.markwon.MarkwonVisitor
-import io.noties.markwon.core.factory.CodeSpanFactory
-import org.commonmark.parser.Parser
-
-class SyntaxHighlightPlugin : AbstractMarkwonPlugin() {
-
-    override fun configureParser(builder: Parser.Builder) {
-        builder.extensions(setOf(SyntaxHighlightExtension.create()))
-    }
-
-    override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
-        builder.setFactory(
-            SyntaxHighlight::class.java,
-            CodeSpanFactory()
-        )
-    }
-
-    override fun configureVisitor(builder: MarkwonVisitor.Builder) {
-        builder.on(
-            SyntaxHighlight::class.java
-        ) { visitor, syntaxHighlight ->
-            val length = visitor.length()
-            visitor.builder().append('\u00a0')
-            visitor.visitChildren(syntaxHighlight)
-            visitor.builder().append('\u00a0')
-            visitor.setSpansForNodeOptional(syntaxHighlight, length)
-        }
-    }
-}
diff --git a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/tasklist/CustomTaskListPlugin.kt b/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/tasklist/CustomTaskListPlugin.kt
deleted file mode 100644
index 1fe57d2..0000000
--- a/markdowntext/src/main/java/dev/jeziellago/compose/markdowntext/plugins/tasklist/CustomTaskListPlugin.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package dev.jeziellago.compose.markdowntext.plugins.tasklist
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Path
-import android.graphics.RectF
-import android.text.Spanned
-import android.text.style.ReplacementSpan
-import androidx.annotation.NonNull
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import io.noties.markwon.MarkwonPlugin
-import io.noties.markwon.MarkwonSpansFactory
-import io.noties.markwon.SpanFactory
-import io.noties.markwon.ext.tasklist.TaskListPlugin
-import io.noties.markwon.ext.tasklist.TaskListProps
-import org.commonmark.node.Node
-
-object CustomTaskListPlugin {
-    fun create(
-        context: Context,
-        checkboxColor: Color,
-        checkedCheckboxColor: Color
-    ): MarkwonPlugin {
-        // Use the TaskListPlugin.create overload that accepts custom colors
-        return TaskListPlugin.create(
-            checkedCheckboxColor.toArgb(), // checkedFillColor - fill color for checked checkboxes
-            checkboxColor.toArgb(),         // normalOutlineColor - outline color for unchecked checkboxes  
-            android.graphics.Color.WHITE    // checkMarkColor - color of the checkmark itself
-        )
-    }
-}
-
-class CustomTaskListSpansFactory(
-    private val uncheckedColor: Int,
-    private val checkedColor: Int
-) : MarkwonSpansFactory {
-
-object CustomTaskListPlugin {
-    fun create(
-        context: Context,
-        checkboxColor: Color,
-        checkedCheckboxColor: Color
-    ): MarkwonPlugin {
-        // Use the TaskListPlugin.create overload that accepts custom colors
-        return TaskListPlugin.create(
-            checkedCheckboxColor.toArgb(),
-            checkboxColor.toArgb(),
-            android.graphics.Color.WHITE 
-        )
-    }
-}
-
-    override fun <N : Node?> get(node: Class<N>): SpanFactory? {
-        TODO("Not yet implemented")
-    }
-
-    override fun <N : Node?> require(node: Class<N>): SpanFactory {
-        TODO("Not yet implemented")
-    }
-}
-
-class CustomTaskListSpan(
-    private val uncheckedColor: Int,
-    private val checkedColor: Int,
-    private val isDone: Boolean
-) : ReplacementSpan() {
-    
-    private val checkboxSize = 48f // Size in pixels
-    private val margin = 24f // Margin between checkbox and text
-    
-    override fun getSize(
-        paint: Paint,
-        text: CharSequence?,
-        start: Int,
-        end: Int,
-        fm: Paint.FontMetricsInt?
-    ): Int {
-        return (checkboxSize + margin).toInt()
-    }
-    
-    override fun draw(
-        @NonNull canvas: Canvas,
-        text: CharSequence?,
-        start: Int,
-        end: Int,
-        x: Float,
-        top: Int,
-        y: Int,
-        bottom: Int,
-        @NonNull paint: Paint
-    ) {
-        val centerY = (top + bottom) / 2f
-        val checkboxTop = centerY - checkboxSize / 2f
-        val checkboxBottom = centerY + checkboxSize / 2f
-        val checkboxRect = RectF(x, checkboxTop, x + checkboxSize, checkboxBottom)
-        
-        // Save original paint settings
-        val originalColor = paint.color
-        val originalStyle = paint.style
-        val originalStrokeWidth = paint.strokeWidth
-        
-        // Draw checkbox border
-        paint.color = if (isDone) checkedColor else uncheckedColor
-        paint.style = Paint.Style.STROKE
-        paint.strokeWidth = 4f
-        canvas.drawRoundRect(checkboxRect, 6f, 6f, paint)
-        
-        if (isDone) {
-            // Fill the checkbox if checked
-            paint.style = Paint.Style.FILL
-            paint.color = checkedColor
-            canvas.drawRoundRect(checkboxRect, 6f, 6f, paint)
-            
-            // Draw checkmark
-            paint.color = android.graphics.Color.WHITE
-            paint.style = Paint.Style.STROKE
-            paint.strokeWidth = 6f
-            paint.strokeCap = Paint.Cap.ROUND
-            paint.strokeJoin = Paint.Join.ROUND
-            
-            val path = Path()
-            val checkStartX = x + checkboxSize * 0.25f
-            val checkMidX = x + checkboxSize * 0.45f
-            val checkEndX = x + checkboxSize * 0.75f
-            val checkStartY = centerY
-            val checkMidY = centerY + checkboxSize * 0.15f
-            val checkEndY = centerY - checkboxSize * 0.15f
-            
-            path.moveTo(checkStartX, checkStartY)
-            path.lineTo(checkMidX, checkMidY)
-            path.lineTo(checkEndX, checkEndY)
-            
-            canvas.drawPath(path, paint)
-        }
-        
-        // Restore original paint settings
-        paint.color = originalColor
-        paint.style = originalStyle
-        paint.strokeWidth = originalStrokeWidth
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 34962fc..007e81e 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,2 @@
 include ':app'
-include ':markdowntext'
 rootProject.name = "VITTY"
\ No newline at end of file