From 9915150c33c59e657530ef4e92b3a4617b6759b1 Mon Sep 17 00:00:00 2001 From: Adam Kasprzycki <66315787+santoni0@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:08:17 +0100 Subject: [PATCH] =?UTF-8?q?wielki=20powr=C3=B3t=20pr=20m3=20do=20szkolnego?= =?UTF-8?q?=20(nie=20czytajcie=20tego=20kodu)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 42 +- app/git-info.gradle | 2 +- .../97.json | 15 + app/src/main/AndroidManifest.xml | 14 +- .../main/ic_launcher_monochrome-playstore.png | Bin 0 -> 41956 bytes .../szczodrzynski/edziennik/MainActivity.kt | 108 ++--- .../edziennik/librus/LibrusRecaptchaHelper.kt | 1 + .../api/edziennik/vulcan/data/VulcanHebe.kt | 2 + .../edziennik/ext/MiscExtensions.kt | 4 +- .../ui/agenda/event/AgendaEventRenderer.kt | 8 +- .../lessonchanges/LessonChangesAdapter.kt | 51 +-- .../LessonChangesEventRenderer.kt | 16 +- .../TeacherAbsenceEventRenderer.kt | 15 +- .../edziennik/ui/attendance/AttendanceBar.kt | 2 +- .../ui/behaviour/BehaviourFragment.java | 186 -------- .../ui/behaviour/BehaviourFragment.kt | 152 +++++++ .../edziennik/ui/behaviour/NoticesAdapter.kt | 25 +- .../edziennik/ui/event/EventDetailsDialog.kt | 3 +- .../edziennik/ui/event/EventManualDialog.kt | 3 +- .../edziennik/ui/event/EventViewHolder.kt | 3 +- .../edziennik/ui/grades/GradeDetailsDialog.kt | 2 +- .../edziennik/ui/grades/GradeView.kt | 3 +- .../ui/home/cards/HomeLuckyNumberCard.kt | 6 +- .../ui/home/cards/HomeTimetableCard.kt | 22 +- .../edziennik/ui/login/LoginActivity.kt | 3 +- .../ui/messages/list/MessageViewHolder.kt | 14 +- .../ui/messages/single/MessageFragment.kt | 36 +- .../edziennik/ui/notes/NotesExtensions.kt | 9 +- .../ui/notifications/NotificationsAdapter.kt | 4 +- .../edziennik/ui/settings/SettingsUtil.kt | 2 + .../ui/settings/cards/SettingsAboutCard.kt | 4 +- .../timetable/GenerateBlockTimetableDialog.kt | 4 +- .../ui/timetable/LessonDetailsDialog.kt | 7 +- .../ui/timetable/TimetableDayFragment.kt | 17 +- .../ui/timetable/TimetableFragment.kt | 8 +- .../edziennik/utils/managers/GradesManager.kt | 5 +- .../utils/managers/TimetableManager.kt | 38 +- app/src/main/res/color/card_background.xml | 5 + app/src/main/res/color/drawer_background.xml | 6 + app/src/main/res/color/ediary_background.xml | 5 + app/src/main/res/drawable/bg_circle.xml | 2 +- .../main/res/drawable/bg_circle_outline.xml | 6 + app/src/main/res/drawable/divider.xml | 2 +- app/src/main/res/drawable/emoji_glasses.xml | 32 +- app/src/main/res/drawable/emoji_no_face.xml | 23 +- app/src/main/res/drawable/emoji_sad.xml | 26 +- app/src/main/res/drawable/ic_archive.xml | 23 +- app/src/main/res/drawable/ic_delete.xml | 10 + app/src/main/res/drawable/ic_event_note.xml | 11 + app/src/main/res/drawable/ic_forward.xml | 11 + app/src/main/res/drawable/ic_grade.xml | 14 +- .../ic_launcher_monochrome_background.xml | 74 ++++ app/src/main/res/drawable/ic_no_timetable.xml | 16 +- app/src/main/res/drawable/ic_note.xml | 21 +- app/src/main/res/drawable/ic_reply.xml | 11 + app/src/main/res/drawable/ic_rip.xml | 49 +-- .../ic_shortcut_agenda_foreground.xml | 2 +- .../ic_shortcut_homework_foreground.xml | 2 +- .../ic_shortcut_messages_foreground.xml | 2 +- .../ic_shortcut_timetable_foreground.xml | 2 +- app/src/main/res/drawable/ic_sync.xml | 13 +- app/src/main/res/drawable/ic_timetable.xml | 36 +- .../drawable/timetable_lesson_annotation.xml | 2 +- .../drawable/timetable_marker_triangle.xml | 2 +- .../main/res/drawable/unread_red_circle.xml | 2 +- app/src/main/res/layout/activity_crash.xml | 2 +- .../main/res/layout/attendance_fragment.xml | 10 +- app/src/main/res/layout/card_home.xml | 6 +- app/src/main/res/layout/card_home_archive.xml | 40 +- .../res/layout/card_home_availability.xml | 49 +-- app/src/main/res/layout/card_home_events.xml | 59 ++- app/src/main/res/layout/card_home_grades.xml | 58 ++- .../res/layout/card_home_lucky_number.xml | 59 +-- app/src/main/res/layout/card_home_notes.xml | 56 ++- .../main/res/layout/card_home_timetable.xml | 274 ++++++------ .../main/res/layout/contributors_activity.xml | 2 +- .../main/res/layout/dialog_event_details.xml | 155 +++---- .../main/res/layout/dialog_grade_details.xml | 67 ++- .../main/res/layout/dialog_lesson_details.xml | 88 ++-- app/src/main/res/layout/event_list_item.xml | 158 +++---- .../res/layout/fragment_agenda_calendar.xml | 2 +- .../res/layout/fragment_agenda_default.xml | 4 +- .../res/layout/fragment_announcements.xml | 3 +- .../main/res/layout/fragment_behaviour.xml | 93 ++-- app/src/main/res/layout/fragment_home.xml | 11 +- .../main/res/layout/fragment_timetable_v2.xml | 29 +- app/src/main/res/layout/grades_item_empty.xml | 6 +- app/src/main/res/layout/grades_item_grade.xml | 54 ++- .../main/res/layout/grades_item_semester.xml | 9 +- app/src/main/res/layout/grades_item_stats.xml | 402 ++++++++++-------- .../main/res/layout/grades_item_subject.xml | 11 +- .../main/res/layout/grades_list_fragment.xml | 3 +- app/src/main/res/layout/homework_fragment.xml | 4 +- .../res/layout/homework_list_fragment.xml | 3 +- .../res/layout/login_chooser_fragment.xml | 9 +- .../main/res/layout/login_chooser_item.xml | 3 +- .../main/res/layout/login_finish_fragment.xml | 4 +- .../main/res/layout/login_form_fragment.xml | 12 +- .../main/res/layout/login_platform_item.xml | 2 + .../layout/login_platform_list_fragment.xml | 6 +- .../res/layout/login_progress_fragment.xml | 4 +- .../res/layout/login_summary_fragment.xml | 6 +- .../res/layout/login_sync_error_fragment.xml | 4 +- .../main/res/layout/login_sync_fragment.xml | 4 +- .../mal_material_about_profile_item.xml | 7 +- .../res/layout/material_drawer_header.xml | 35 +- .../layout/material_drawer_item_profile.xml | 9 +- .../layout/material_drawer_recycler_view.xml | 17 + app/src/main/res/layout/message_fragment.xml | 293 +++++++------ .../res/layout/messages_compose_fragment.xml | 5 +- app/src/main/res/layout/messages_fragment.xml | 14 +- .../res/layout/messages_list_fragment.xml | 6 +- .../main/res/layout/messages_list_item.xml | 100 +++-- app/src/main/res/layout/note_list_item.xml | 72 ++-- .../layout/notifications_list_fragment.xml | 3 +- .../res/layout/notifications_list_item.xml | 44 +- .../res/layout/row_announcements_item.xml | 12 +- app/src/main/res/layout/row_notices_item.xml | 76 ++-- app/src/main/res/layout/search_item.xml | 3 +- .../main/res/layout/styled_text_buttons.xml | 3 +- app/src/main/res/layout/teacher_item.xml | 8 +- .../res/layout/teachers_list_fragment.xml | 3 +- app/src/main/res/layout/template_fragment.xml | 2 +- .../res/layout/timetable_day_fragment.xml | 2 +- app/src/main/res/layout/timetable_lesson.xml | 276 ++++++------ .../main/res/layout/timetable_no_lessons.xml | 3 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 1 + .../ic_launcher_monochrome.xml | 5 + .../mipmap-anydpi-v26/ic_shortcut_agenda.xml | 2 +- .../mipmap-anydpi-v26/ic_shortcut_grades.xml | 2 +- .../ic_shortcut_homework.xml | 2 +- .../ic_shortcut_messages.xml | 2 +- .../ic_shortcut_timetable.xml | 2 +- .../ic_launcher_monochrome_foreground.png | Bin 0 -> 2957 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 1822 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 3864 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 6926 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 9230 bytes app/src/main/res/values-de/strings.xml | 5 +- app/src/main/res/values-en/strings.xml | 7 +- .../res/{values => values-v16}/styles.xml | 21 +- app/src/main/res/values-v31/styles.xml | 25 ++ app/src/main/res/values/colors.xml | 111 +++-- .../ic_launcher_monochrome_background.xml | 4 + app/src/main/res/values/strings.xml | 9 +- .../edziennik/sync/UpdateDownloaderService.kt | 1 + build.gradle | 12 +- gradle.properties | 22 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 149 files changed, 2214 insertions(+), 2031 deletions(-) create mode 100644 app/src/main/ic_launcher_monochrome-playstore.png delete mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.java create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt create mode 100644 app/src/main/res/color/card_background.xml create mode 100644 app/src/main/res/color/drawer_background.xml create mode 100644 app/src/main/res/color/ediary_background.xml create mode 100644 app/src/main/res/drawable/bg_circle_outline.xml create mode 100644 app/src/main/res/drawable/ic_delete.xml create mode 100644 app/src/main/res/drawable/ic_event_note.xml create mode 100644 app/src/main/res/drawable/ic_forward.xml create mode 100644 app/src/main/res/drawable/ic_launcher_monochrome_background.xml create mode 100644 app/src/main/res/drawable/ic_reply.xml create mode 100644 app/src/main/res/layout/material_drawer_recycler_view.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_foreground.png rename app/src/main/res/{values => values-v16}/styles.xml (95%) create mode 100644 app/src/main/res/values-v31/styles.xml create mode 100644 app/src/main/res/values/ic_launcher_monochrome_background.xml diff --git a/app/build.gradle b/app/build.gradle index 57334e8f..ce7b2dd1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,6 +36,8 @@ android { arguments { arg("room.schemaLocation", "$projectDir/schemas") } + correctErrorTypes true + } } @@ -110,6 +112,8 @@ android { lint { checkReleaseBuilds false } + namespace 'pl.szczodrzynski.edziennik' + } tasks.whenTaskAdded { task -> @@ -140,11 +144,12 @@ tasks.whenTaskAdded { task -> } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - + debugImplementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') // Language cores implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "androidx.multidex:multidex:2.0.1" + implementation files('libs/navlib-debug.aar') + implementation files('libs/navlib-font-debug.aar') coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" // Android Jetpack @@ -160,7 +165,7 @@ dependencies { kapt "androidx.room:room-compiler:2.4.3" // Google design libs - implementation "com.google.android.material:material:1.6.1" + implementation "com.google.android.material:material:1.11.0-beta01" implementation "com.google.android.flexbox:flexbox:3.0.0" // Play Services/Firebase @@ -181,16 +186,16 @@ dependencies { // Szkolny.eu libraries/forks implementation "eu.szkolny:android-snowfall:1ca9ea2da3" - implementation "eu.szkolny:agendacalendarview:1.0.4" + // implementation "eu.szkolny:agendacalendarview:1.0.4" implementation "eu.szkolny:cafebar:5bf0c618de" implementation "eu.szkolny.fslogin:lib:2.0.0" - implementation "eu.szkolny:material-about-library:1d5ebaf47c" + // implementation "eu.szkolny:material-about-library:1d5ebaf47c" implementation "eu.szkolny:mhttp:af4b62e6e9" implementation "eu.szkolny:nachos:0e5dfcaceb" implementation "eu.szkolny.selective-dao:annotation:27f8f3f194" officialImplementation "eu.szkolny:ssl-provider:1.0.0" unofficialImplementation "eu.szkolny:ssl-provider:1.0.0" - implementation "pl.szczodrzynski:navlib:0.8.0" + // implementation "pl.szczodrzynski:navlib:0.8.0" implementation "pl.szczodrzynski:numberslidingpicker:2921225f76" implementation "pl.szczodrzynski:recyclertablayout:700f980584" implementation "pl.szczodrzynski:tachyon:551943a6b5" @@ -200,6 +205,7 @@ dependencies { implementation "com.mikepenz:iconics-core:5.3.2" implementation "com.mikepenz:iconics-views:5.3.2" implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar" + implementation 'com.mikepenz:google-material-typeface:4.0.0.2-kotlin@aar' implementation "eu.szkolny:szkolny-font:77e33acc2a" // Other dependencies @@ -227,4 +233,28 @@ dependencies { // Debug-only dependencies debugImplementation "com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6" + + // NavLib required dependencies + debugImplementation "com.mikepenz:iconics-views:5.3.2" + debugImplementation "com.mikepenz:iconics-typeface-api:5.3.2" + debugImplementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar" + debugImplementation "com.balysv:material-ripple:1.0.2" + debugApi "com.mikepenz:materialize:1.2.1" + debugApi "com.mikepenz:materialdrawer:9.0.1" + debugApi "com.mikepenz:iconics-core:5.3.2" + debugApi "com.mikepenz:itemanimators:1.1.0" + + // agencacalendarview required dependencies + + debugApi 'eu.szkolny:StickyListHeaders:2.7.1' + debugImplementation 'io.reactivex:rxjava:1.1.1' + + // material-about-library required dependencies + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0-alpha04', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + + debugImplementation 'net.yslibrary.licenseadapter:licenseadapter:3.0.0' + + testImplementation 'junit:junit:4.13' } diff --git a/app/git-info.gradle b/app/git-info.gradle index 3577f668..07ca7ae2 100644 --- a/app/git-info.gradle +++ b/app/git-info.gradle @@ -5,7 +5,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath "org.eclipse.jgit:org.eclipse.jgit:5.5.+" diff --git a/app/schemas/pl.szczodrzynski.edziennik.data.db.AppDb/97.json b/app/schemas/pl.szczodrzynski.edziennik.data.db.AppDb/97.json index 37b6d0f4..b09d9ed9 100644 --- a/app/schemas/pl.szczodrzynski.edziennik.data.db.AppDb/97.json +++ b/app/schemas/pl.szczodrzynski.edziennik.data.db.AppDb/97.json @@ -137,6 +137,7 @@ "columnNames": [ "profileId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_grades_profileId` ON `${TABLE_NAME}` (`profileId`)" } ], @@ -290,6 +291,7 @@ "columnNames": [ "profileId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_teacherAbsence_profileId` ON `${TABLE_NAME}` (`profileId`)" } ], @@ -452,6 +454,7 @@ "columnNames": [ "profileId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_notices_profileId` ON `${TABLE_NAME}` (`profileId`)" } ], @@ -629,6 +632,7 @@ "columnNames": [ "profileId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_attendances_profileId` ON `${TABLE_NAME}` (`profileId`)" } ], @@ -781,6 +785,7 @@ "eventDate", "eventTime" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_events_profileId_eventDate_eventTime` ON `${TABLE_NAME}` (`profileId`, `eventDate`, `eventTime`)" }, { @@ -790,6 +795,7 @@ "profileId", "eventType" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_events_profileId_eventType` ON `${TABLE_NAME}` (`profileId`, `eventType`)" } ], @@ -1166,6 +1172,7 @@ "columnNames": [ "profileId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_announcements_profileId` ON `${TABLE_NAME}` (`profileId`)" } ], @@ -1407,6 +1414,7 @@ "profileId", "messageType" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_messages_profileId_messageType` ON `${TABLE_NAME}` (`profileId`, `messageType`)" } ], @@ -1918,6 +1926,7 @@ "type", "date" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_timetable_profileId_type_date` ON `${TABLE_NAME}` (`profileId`, `type`, `date`)" }, { @@ -1928,6 +1937,7 @@ "type", "oldDate" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_timetable_profileId_type_oldDate` ON `${TABLE_NAME}` (`profileId`, `type`, `oldDate`)" } ], @@ -2015,6 +2025,7 @@ "columnNames": [ "profileId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_librusLessons_profileId` ON `${TABLE_NAME}` (`profileId`)" } ], @@ -2117,6 +2128,7 @@ "profileId", "date" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_timetableManual_profileId_date` ON `${TABLE_NAME}` (`profileId`, `date`)" }, { @@ -2126,6 +2138,7 @@ "profileId", "weekDay" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_timetableManual_profileId_weekDay` ON `${TABLE_NAME}` (`profileId`, `weekDay`)" } ], @@ -2217,6 +2230,7 @@ "noteOwnerType", "noteOwnerId" ], + "orders": [], "createSql": "CREATE INDEX IF NOT EXISTS `index_notes_profileId_noteOwnerType_noteOwnerId` ON `${TABLE_NAME}` (`profileId`, `noteOwnerType`, `noteOwnerId`)" } ], @@ -2278,6 +2292,7 @@ "thingType", "thingId" ], + "orders": [], "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_metadata_profileId_thingType_thingId` ON `${TABLE_NAME}` (`profileId`, `thingType`, `thingId`)" } ], diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9e7499e7..7c66eb3a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -12,6 +11,7 @@ + @@ -84,7 +84,7 @@ android:resource="@xml/widget_timetable_info" /> + android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync"/> + android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync"/> - + + android:exported="false" android:foregroundServiceType="dataSync"> - + - + android:width="64dp" + android:height="64dp" + android:viewportWidth="48" + android:viewportHeight="48" + android:tint="?colorOnSurfaceVariant"> - - - - - + android:fillColor="?colorOnSurfaceVariant" + android:pathData="M24,34.85Q27.45,34.85 30.25,32.95Q33.05,31.05 34.2,27.9H13.8Q15,31.05 17.775,32.95Q20.55,34.85 24,34.85ZM15,21.75 L17.4,19.4 19.7,21.75 21.9,19.6 17.35,15.15 12.9,19.6ZM28.35,21.75 L30.65,19.4 33.05,21.75 35.2,19.6 30.7,15.15 26.2,19.6ZM24,45.05Q19.7,45.05 15.825,43.425Q11.95,41.8 9.075,38.925Q6.2,36.05 4.575,32.2Q2.95,28.35 2.95,24Q2.95,19.7 4.575,15.825Q6.2,11.95 9.075,9.075Q11.95,6.2 15.8,4.55Q19.65,2.9 24,2.9Q28.3,2.9 32.175,4.55Q36.05,6.2 38.925,9.075Q41.8,11.95 43.45,15.8Q45.1,19.65 45.1,24Q45.1,28.35 43.45,32.2Q41.8,36.05 38.925,38.925Q36.05,41.8 32.2,43.425Q28.35,45.05 24,45.05ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24ZM24,40.5Q30.9,40.5 35.7,35.7Q40.5,30.9 40.5,24Q40.5,17.1 35.7,12.3Q30.9,7.5 24,7.5Q17.1,7.5 12.3,12.3Q7.5,17.1 7.5,24Q7.5,30.9 12.3,35.7Q17.1,40.5 24,40.5Z"/> diff --git a/app/src/main/res/drawable/emoji_no_face.xml b/app/src/main/res/drawable/emoji_no_face.xml index 46a67e51..d4c320a0 100644 --- a/app/src/main/res/drawable/emoji_no_face.xml +++ b/app/src/main/res/drawable/emoji_no_face.xml @@ -1,19 +1,10 @@ - - + android:width="64dp" + android:height="64dp" + android:viewportWidth="48" + android:viewportHeight="48" + android:tint="?colorOnSurfaceVariant"> - - + android:fillColor="?colorOnSurfaceVariant" + android:pathData="M17.9,28.95Q16.75,28.95 15.925,28.1Q15.1,27.25 15.1,26.15Q15.1,25 15.95,24.175Q16.8,23.35 17.9,23.35Q19.05,23.35 19.875,24.2Q20.7,25.05 20.7,26.15Q20.7,27.3 19.85,28.125Q19,28.95 17.9,28.95ZM30.15,28.95Q29,28.95 28.175,28.1Q27.35,27.25 27.35,26.15Q27.35,25 28.2,24.175Q29.05,23.35 30.15,23.35Q31.3,23.35 32.15,24.2Q33,25.05 33,26.15Q33,27.3 32.125,28.125Q31.25,28.95 30.15,28.95ZM24.05,40.5Q30.9,40.5 35.725,35.7Q40.55,30.9 40.55,24.05Q40.55,22.75 40.35,21.55Q40.15,20.35 39.85,19.35Q38.85,19.65 37.75,19.725Q36.65,19.8 35.4,19.8Q30.6,19.8 26.425,17.875Q22.25,15.95 19.25,12.3Q17.6,16.2 14.55,19.15Q11.5,22.1 7.55,23.7Q7.55,23.75 7.55,23.9Q7.55,24.05 7.55,24.05Q7.55,30.9 12.375,35.7Q17.2,40.5 24.05,40.5ZM24.05,45.05Q19.75,45.05 15.875,43.4Q12,41.75 9.125,38.9Q6.25,36.05 4.6,32.175Q2.95,28.3 2.95,24Q2.95,19.7 4.6,15.825Q6.25,11.95 9.125,9.1Q12,6.25 15.875,4.575Q19.75,2.9 24.05,2.9Q28.35,2.9 32.2,4.575Q36.05,6.25 38.925,9.1Q41.8,11.95 43.45,15.825Q45.1,19.7 45.1,24Q45.1,28.3 43.45,32.175Q41.8,36.05 38.95,38.9Q36.1,41.75 32.2,43.4Q28.3,45.05 24.05,45.05ZM19.3,7.7Q23.7,12.9 27.425,14.825Q31.15,16.75 35.7,16.75Q36.9,16.75 37.65,16.7Q38.4,16.65 39.25,16.4Q37.05,12.25 33.125,9.65Q29.2,7.05 24,7.05Q22.6,7.05 21.35,7.275Q20.1,7.5 19.3,7.7ZM7.4,20.35Q9.9,19.4 13.05,16.125Q16.2,12.85 17.5,8.2Q13.05,10.25 10.775,13.35Q8.5,16.45 7.4,20.35ZM19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7Q19.3,7.7 19.3,7.7ZM17.5,8.2Q17.5,8.2 17.5,8.2Q17.5,8.2 17.5,8.2Q17.5,8.2 17.5,8.2Q17.5,8.2 17.5,8.2Z"/> diff --git a/app/src/main/res/drawable/emoji_sad.xml b/app/src/main/res/drawable/emoji_sad.xml index d4f0cea0..9a21ca3a 100644 --- a/app/src/main/res/drawable/emoji_sad.xml +++ b/app/src/main/res/drawable/emoji_sad.xml @@ -1,22 +1,10 @@ - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="48" + android:viewportHeight="48" + android:tint="?colorOnPrimary"> - - - + android:fillColor="?colorOnPrimary" + android:pathData="M30.95,21.6Q32.15,21.6 33.025,20.725Q33.9,19.85 33.9,18.65Q33.9,17.45 33.025,16.575Q32.15,15.7 30.95,15.7Q29.75,15.7 28.9,16.55Q28.05,17.4 28.05,18.65Q28.05,19.85 28.9,20.725Q29.75,21.6 30.95,21.6ZM17.05,21.6Q18.3,21.6 19.125,20.75Q19.95,19.9 19.95,18.7Q19.95,17.45 19.1,16.575Q18.25,15.7 17.05,15.7Q15.9,15.7 15,16.575Q14.1,17.45 14.1,18.65Q14.1,19.85 14.975,20.725Q15.85,21.6 17.05,21.6ZM24,27.15Q20.7,27.15 18,29Q15.3,30.85 14,33.9H17.25Q18.25,32.1 20.125,31.075Q22,30.05 24.05,30.05Q26.1,30.05 27.95,31.1Q29.8,32.15 30.85,33.9H34Q32.75,30.8 30.05,28.975Q27.35,27.15 24,27.15ZM24,45.05Q19.7,45.05 15.825,43.425Q11.95,41.8 9.075,38.925Q6.2,36.05 4.575,32.2Q2.95,28.35 2.95,24Q2.95,19.7 4.575,15.825Q6.2,11.95 9.075,9.075Q11.95,6.2 15.8,4.55Q19.65,2.9 24,2.9Q28.3,2.9 32.175,4.55Q36.05,6.2 38.925,9.075Q41.8,11.95 43.45,15.8Q45.1,19.65 45.1,24Q45.1,28.35 43.45,32.2Q41.8,36.05 38.925,38.925Q36.05,41.8 32.2,43.425Q28.35,45.05 24,45.05ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24ZM24,40.5Q30.9,40.5 35.7,35.7Q40.5,30.9 40.5,24Q40.5,17.1 35.7,12.3Q30.9,7.5 24,7.5Q17.1,7.5 12.3,12.3Q7.5,17.1 7.5,24Q7.5,30.9 12.3,35.7Q17.1,40.5 24,40.5Z"/> diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml index a61f71cc..1ccaa4c8 100644 --- a/app/src/main/res/drawable/ic_archive.xml +++ b/app/src/main/res/drawable/ic_archive.xml @@ -1,19 +1,10 @@ - - + android:width="64dp" + android:height="64dp" + android:viewportWidth="48" + android:viewportHeight="48" + android:tint="?colorOnSecondaryContainer"> - - + android:fillColor="?colorOnSecondaryContainer" + android:pathData="M4.95,40.5V16.5Q4.2,16.25 3.575,15.325Q2.95,14.4 2.95,12.75V7.55Q2.95,5.7 4.3,4.325Q5.65,2.95 7.5,2.95H40.5Q42.35,2.95 43.725,4.325Q45.1,5.7 45.1,7.55V12.75Q45.1,14.4 44.45,15.325Q43.8,16.25 43.1,16.5V40.5Q43.1,42.35 41.725,43.75Q40.35,45.15 38.5,45.15H9.5Q7.65,45.15 6.3,43.75Q4.95,42.35 4.95,40.5ZM9.5,17.35V40.6Q9.5,40.6 9.5,40.6Q9.5,40.6 9.5,40.6H38.5Q38.5,40.6 38.5,40.6Q38.5,40.6 38.5,40.6V17.35ZM40.5,12.75Q40.5,12.75 40.5,12.75Q40.5,12.75 40.5,12.75V7.55Q40.5,7.55 40.5,7.55Q40.5,7.55 40.5,7.55H7.5Q7.5,7.55 7.5,7.55Q7.5,7.55 7.5,7.55V12.75Q7.5,12.75 7.5,12.75Q7.5,12.75 7.5,12.75ZM17.4,27.15H30.65V23.75H17.4ZM9.5,40.6Q9.5,40.6 9.5,40.6Q9.5,40.6 9.5,40.6V17.35V40.6Q9.5,40.6 9.5,40.6Q9.5,40.6 9.5,40.6Z"/> diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 00000000..9d96c812 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_event_note.xml b/app/src/main/res/drawable/ic_event_note.xml new file mode 100644 index 00000000..cc35247a --- /dev/null +++ b/app/src/main/res/drawable/ic_event_note.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml new file mode 100644 index 00000000..8e0f3a54 --- /dev/null +++ b/app/src/main/res/drawable/ic_forward.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_grade.xml b/app/src/main/res/drawable/ic_grade.xml index ed0551d5..c2901173 100644 --- a/app/src/main/res/drawable/ic_grade.xml +++ b/app/src/main/res/drawable/ic_grade.xml @@ -1,12 +1,10 @@ + android:viewportHeight="48" + android:tint="?attr/colorControlNormal"> - + android:fillColor="@android:color/white" + android:pathData="M17.9,34.55H26.45Q27.9,34.55 29,33.45Q30.1,32.35 30.1,30.9V25.75Q30.1,24.3 29,23.2Q27.9,22.1 26.45,22.1H21.55V17.1H30.1V13.45H17.9V25.75H26.45Q26.45,25.75 26.45,25.75Q26.45,25.75 26.45,25.75V30.9Q26.45,30.9 26.45,30.9Q26.45,30.9 26.45,30.9H17.9ZM9,42.65Q7.55,42.65 6.45,41.55Q5.35,40.45 5.35,39V9Q5.35,7.55 6.45,6.45Q7.55,5.35 9,5.35H39Q40.45,5.35 41.55,6.45Q42.65,7.55 42.65,9V39Q42.65,40.45 41.55,41.55Q40.45,42.65 39,42.65ZM9,39H39Q39,39 39,39Q39,39 39,39V9Q39,9 39,9Q39,9 39,9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39ZM9,9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/> diff --git a/app/src/main/res/drawable/ic_launcher_monochrome_background.xml b/app/src/main/res/drawable/ic_launcher_monochrome_background.xml new file mode 100644 index 00000000..ca3826a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_monochrome_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_no_timetable.xml b/app/src/main/res/drawable/ic_no_timetable.xml index d3a52741..abc66c8f 100644 --- a/app/src/main/res/drawable/ic_no_timetable.xml +++ b/app/src/main/res/drawable/ic_no_timetable.xml @@ -1,12 +1,10 @@ + android:width="64dp" + android:height="64dp" + android:viewportWidth="48" + android:viewportHeight="48" + android:tint="?colorOnSurfaceVariant"> - + android:fillColor="?colorOnSurfaceVariant" + android:pathData="M22.4,26.8V13.6H25.85V26.8ZM24.05,34.25Q23.25,34.25 22.7,33.7Q22.15,33.15 22.15,32.35Q22.15,31.6 22.7,31.05Q23.25,30.5 24.05,30.5Q24.8,30.5 25.35,31.05Q25.9,31.6 25.9,32.35Q25.9,33.15 25.35,33.7Q24.8,34.25 24.05,34.25ZM29.95,7.4H41.65V10.8H36.65L37,11.2Q40.25,14.15 41.575,17.45Q42.9,20.75 42.9,23.8Q42.9,29.8 39.225,34.4Q35.55,39 29.85,40.55V35.85Q33.7,34.65 36,31.325Q38.3,28 38.3,23.8Q38.3,21.25 37.45,19.1Q36.6,16.95 34.65,15.2L33.4,14.1V19.1H29.95ZM18,40.6H6.3V37.2H11.3L10.95,36.8Q7.9,33.65 6.5,30.475Q5.1,27.3 5.1,24.2Q5.1,18.25 8.725,13.65Q12.35,9.05 18.1,7.5V12.15Q14.25,13.4 11.975,16.725Q9.7,20.05 9.7,24.2Q9.7,26.7 10.45,28.8Q11.2,30.9 13.3,32.8L14.55,33.9V28.9H18Z"/> diff --git a/app/src/main/res/drawable/ic_note.xml b/app/src/main/res/drawable/ic_note.xml index a00cf012..068ea1d6 100644 --- a/app/src/main/res/drawable/ic_note.xml +++ b/app/src/main/res/drawable/ic_note.xml @@ -1,18 +1,11 @@ + android:viewportHeight="48" + android:tint="?colorOnBackground" + android:autoMirrored="true"> - - - + android:fillColor="?colorOnBackground" + android:pathData="M15,34.2Q15.75,34.2 16.3,33.675Q16.85,33.15 16.85,32.4Q16.85,31.65 16.3,31.1Q15.75,30.55 15,30.55Q14.25,30.55 13.725,31.1Q13.2,31.65 13.2,32.4Q13.2,33.15 13.725,33.675Q14.25,34.2 15,34.2ZM15,25.8Q15.75,25.8 16.3,25.275Q16.85,24.75 16.85,24Q16.85,23.25 16.3,22.7Q15.75,22.15 15,22.15Q14.25,22.15 13.725,22.7Q13.2,23.25 13.2,24Q13.2,24.75 13.725,25.275Q14.25,25.8 15,25.8ZM15,17.35Q15.75,17.35 16.3,16.825Q16.85,16.3 16.85,15.55Q16.85,14.8 16.3,14.25Q15.75,13.7 15,13.7Q14.25,13.7 13.725,14.25Q13.2,14.8 13.2,15.55Q13.2,16.3 13.725,16.825Q14.25,17.35 15,17.35ZM21.45,34.25H34.15V30.6H21.45ZM21.45,25.8H34.15V22.15H21.45ZM21.45,17.4H34.15V13.75H21.45ZM9,42.65Q7.55,42.65 6.45,41.55Q5.35,40.45 5.35,39V9Q5.35,7.55 6.45,6.45Q7.55,5.35 9,5.35H39Q40.45,5.35 41.55,6.45Q42.65,7.55 42.65,9V39Q42.65,40.45 41.55,41.55Q40.45,42.65 39,42.65ZM9,39H39Q39,39 39,39Q39,39 39,39V9Q39,9 39,9Q39,9 39,9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39ZM9,9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/> diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml new file mode 100644 index 00000000..58cd7340 --- /dev/null +++ b/app/src/main/res/drawable/ic_reply.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_rip.xml b/app/src/main/res/drawable/ic_rip.xml index 350384c9..6d6c6242 100644 --- a/app/src/main/res/drawable/ic_rip.xml +++ b/app/src/main/res/drawable/ic_rip.xml @@ -2,50 +2,9 @@ android:width="48dp" android:height="48dp" android:viewportWidth="48" - android:viewportHeight="48"> + android:viewportHeight="48" + android:tint="?colorOnBackground"> - - - - - - - - + android:fillColor="?colorOnBackground" + android:pathData="M23.4,45.75Q16.5,38.9 12.35,34.55Q8.2,30.2 5.925,27.1Q3.65,24 2.925,21.725Q2.2,19.45 2.2,16.7Q2.2,11.65 5.575,8.15Q8.95,4.65 13.95,4.65Q16.6,4.65 19,5.725Q21.4,6.8 23.3,8.55L20.8,19.9H25.9L23.55,40L29.2,18.25H23.8L27.25,6.1Q28.8,5.35 30.525,5Q32.25,4.65 34.1,4.65Q39,4.65 42.45,8.15Q45.9,11.65 45.9,16.7Q45.9,19.4 45.125,21.675Q44.35,23.95 41.95,27Q39.55,30.05 35.1,34.475Q30.65,38.9 23.4,45.75ZM19.65,35.45 L21.05,23.7H15.4L18.3,10.55Q17.3,10.05 16.175,9.65Q15.05,9.25 13.9,9.25Q10.85,9.25 8.8,11.4Q6.75,13.55 6.75,16.7Q6.75,18.35 7.35,20.1Q7.95,21.85 9.425,23.925Q10.9,26 13.375,28.825Q15.85,31.65 19.65,35.45ZM29.6,33.65Q35.65,28 38.475,23.85Q41.3,19.7 41.3,16.65Q41.3,13.55 39.225,11.4Q37.15,9.25 34.1,9.25Q33.3,9.25 32.55,9.3Q31.8,9.35 31,9.65L29.55,14.45H34.7ZM34.7,14.45Q34.7,14.45 34.7,14.45Q34.7,14.45 34.7,14.45Q34.7,14.45 34.7,14.45Q34.7,14.45 34.7,14.45Q34.7,14.45 34.7,14.45Q34.7,14.45 34.7,14.45ZM15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Q15.4,23.7 15.4,23.7Z"/> diff --git a/app/src/main/res/drawable/ic_shortcut_agenda_foreground.xml b/app/src/main/res/drawable/ic_shortcut_agenda_foreground.xml index a5486da1..22be1d63 100644 --- a/app/src/main/res/drawable/ic_shortcut_agenda_foreground.xml +++ b/app/src/main/res/drawable/ic_shortcut_agenda_foreground.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/drawable/ic_shortcut_homework_foreground.xml b/app/src/main/res/drawable/ic_shortcut_homework_foreground.xml index d82c6c79..645f4ab4 100644 --- a/app/src/main/res/drawable/ic_shortcut_homework_foreground.xml +++ b/app/src/main/res/drawable/ic_shortcut_homework_foreground.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/drawable/ic_shortcut_messages_foreground.xml b/app/src/main/res/drawable/ic_shortcut_messages_foreground.xml index 47655e1b..d68afd4a 100644 --- a/app/src/main/res/drawable/ic_shortcut_messages_foreground.xml +++ b/app/src/main/res/drawable/ic_shortcut_messages_foreground.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/drawable/ic_shortcut_timetable_foreground.xml b/app/src/main/res/drawable/ic_shortcut_timetable_foreground.xml index 02179281..32dad9e1 100644 --- a/app/src/main/res/drawable/ic_shortcut_timetable_foreground.xml +++ b/app/src/main/res/drawable/ic_shortcut_timetable_foreground.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml index bbed3d7f..58e55ea2 100644 --- a/app/src/main/res/drawable/ic_sync.xml +++ b/app/src/main/res/drawable/ic_sync.xml @@ -1,5 +1,10 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_timetable.xml b/app/src/main/res/drawable/ic_timetable.xml index b51a0123..da58816f 100644 --- a/app/src/main/res/drawable/ic_timetable.xml +++ b/app/src/main/res/drawable/ic_timetable.xml @@ -1,30 +1,10 @@ - - - - - - - - +android:width="48dp" +android:height="48dp" +android:viewportWidth="48" +android:viewportHeight="48" +android:tint="?attr/colorOnSurfaceVariant"> + diff --git a/app/src/main/res/drawable/timetable_lesson_annotation.xml b/app/src/main/res/drawable/timetable_lesson_annotation.xml index 4c89f473..43809e92 100644 --- a/app/src/main/res/drawable/timetable_lesson_annotation.xml +++ b/app/src/main/res/drawable/timetable_lesson_annotation.xml @@ -7,5 +7,5 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/timetable_marker_triangle.xml b/app/src/main/res/drawable/timetable_marker_triangle.xml index 97d2e71b..72942b02 100644 --- a/app/src/main/res/drawable/timetable_marker_triangle.xml +++ b/app/src/main/res/drawable/timetable_marker_triangle.xml @@ -9,7 +9,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/unread_red_circle.xml b/app/src/main/res/drawable/unread_red_circle.xml index 8679f344..827dc920 100644 --- a/app/src/main/res/drawable/unread_red_circle.xml +++ b/app/src/main/res/drawable/unread_red_circle.xml @@ -5,6 +5,6 @@ - + diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml index 22f70a68..bc99f849 100644 --- a/app/src/main/res/layout/activity_crash.xml +++ b/app/src/main/res/layout/activity_crash.xml @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/crash_details" - android:textColor="@color/colorPrimary" /> + android:textColor="?colorPrimary" /> diff --git a/app/src/main/res/layout/attendance_fragment.xml b/app/src/main/res/layout/attendance_fragment.xml index 48fb1aa5..c723668f 100644 --- a/app/src/main/res/layout/attendance_fragment.xml +++ b/app/src/main/res/layout/attendance_fragment.xml @@ -20,11 +20,17 @@ android:id="@+id/tabLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/colorSurface_6dp" + android:background="?colorSurfaceContainerLow" app:tabIndicatorColor="?colorPrimary" + app:tabMaxWidth="300dp" app:tabMode="auto" + app:tabPaddingBottom="12dp" + app:tabPaddingEnd="16dp" + app:tabPaddingStart="16dp" + app:tabPaddingTop="12dp" app:tabSelectedTextColor="?colorPrimary" - app:tabTextColor="?android:textColorPrimary" /> + app:tabTextAppearance="@style/NavView.TextView.BodyMedium" + app:tabTextColor="?colorOnBackground" /> + style="?attr/materialCardViewFilledStyle" + app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraLarge" /> diff --git a/app/src/main/res/layout/card_home_archive.xml b/app/src/main/res/layout/card_home_archive.xml index d587ae65..c3702940 100644 --- a/app/src/main/res/layout/card_home_archive.xml +++ b/app/src/main/res/layout/card_home_archive.xml @@ -7,50 +7,40 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingTop="8dp"> + + android:textAppearance="@style/NavView.TextView.TitleMedium" /> - - - diff --git a/app/src/main/res/layout/card_home_availability.xml b/app/src/main/res/layout/card_home_availability.xml index 45b5b52c..80cc4c82 100644 --- a/app/src/main/res/layout/card_home_availability.xml +++ b/app/src/main/res/layout/card_home_availability.xml @@ -6,60 +6,51 @@ - - - - + android:paddingLeft="8dp" + android:paddingTop="8dp" + android:orientation="vertical"> + + android:textAppearance="@style/NavView.TextView.TitleMedium" /> - + - - - diff --git a/app/src/main/res/layout/card_home_events.xml b/app/src/main/res/layout/card_home_events.xml index 91ffc6ad..5f7fc3fd 100644 --- a/app/src/main/res/layout/card_home_events.xml +++ b/app/src/main/res/layout/card_home_events.xml @@ -1,41 +1,62 @@ - - + android:orientation="vertical" + android:padding="8dp"> - - - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + + tools:visibility="visible" /> diff --git a/app/src/main/res/layout/card_home_grades.xml b/app/src/main/res/layout/card_home_grades.xml index 38ae61de..b4f8dd33 100644 --- a/app/src/main/res/layout/card_home_grades.xml +++ b/app/src/main/res/layout/card_home_grades.xml @@ -2,36 +2,56 @@ ~ Copyright (c) Kacper Ziubryniewicz 2019-11-29 --> - + + android:orientation="vertical" + android:padding="8dp"> - - - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + - + android:layout_marginTop="16dp" + android:orientation="vertical"/> + diff --git a/app/src/main/res/layout/card_home_lucky_number.xml b/app/src/main/res/layout/card_home_lucky_number.xml index 40069c32..c64bc578 100644 --- a/app/src/main/res/layout/card_home_lucky_number.xml +++ b/app/src/main/res/layout/card_home_lucky_number.xml @@ -1,5 +1,4 @@ - - @@ -10,38 +9,48 @@ + android:padding="8dp"> + android:orientation="horizontal" + android:gravity="center_vertical" + > - - - + android:layout_marginRight="8dp" + app:icon="@drawable/emoji_sad" /> + + + + + + + - - - \ No newline at end of file diff --git a/app/src/main/res/layout/card_home_notes.xml b/app/src/main/res/layout/card_home_notes.xml index 76d2a5cd..f357d8c6 100644 --- a/app/src/main/res/layout/card_home_notes.xml +++ b/app/src/main/res/layout/card_home_notes.xml @@ -1,36 +1,56 @@ - - + android:padding="8dp"> - - - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml index d07e4fc3..e8aca2a5 100644 --- a/app/src/main/res/layout/card_home_timetable.xml +++ b/app/src/main/res/layout/card_home_timetable.xml @@ -1,5 +1,4 @@ - - @@ -19,46 +18,40 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" + android:padding="8dp" android:visibility="gone" tools:visibility="visible"> - + + + android:textAppearance="@style/NavView.TextView.BodyLarge" /> - - + android:textAppearance="@style/NavView.TextView.BodyMedium" /> - - - + + + android:textAppearance="@style/NavView.TextView.BodyLarge" /> + android:textAppearance="@style/NavView.TextView.BodyMedium" /> - - - + + + android:textAppearance="@style/NavView.TextView.BodyLarge" /> - + android:textAppearance="@style/NavView.TextView.BodyMedium" /> - + + android:padding="8dp" + tools:layout_marginTop="290dp"> + + @@ -165,14 +172,14 @@ android:id="@+id/dayInfo" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="@style/NavView.TextView.Title" + android:textAppearance="@style/NavView.TextView.BodyLarge" tools:text="Jutro" /> @@ -182,90 +189,99 @@ android:layout_height="48dp" android:background="?selectableItemBackgroundBorderless" android:padding="12dp" - android:visibility="gone" - tools:src="@sample/settings" /> - - - - + android:visibility="gone" /> - - + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_marginTop="8dp"> + + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="8dp" + android:orientation="horizontal"> - + android:layout_weight="1" + android:orientation="vertical"> - + - + + + + android:layout_weight="1" + android:orientation="vertical"> + + + + + - - - - + + + + diff --git a/app/src/main/res/layout/contributors_activity.xml b/app/src/main/res/layout/contributors_activity.xml index fa54100d..8ddc5160 100644 --- a/app/src/main/res/layout/contributors_activity.xml +++ b/app/src/main/res/layout/contributors_activity.xml @@ -100,7 +100,7 @@ android:layout_width="match_parent" android:layout_height="?actionBarSize" android:layout_gravity="bottom" - android:background="?android:colorBackground" + android:background="?colorSurfaceContainerLow" android:foreground="@color/colorSurface_2dp" android:minHeight="?actionBarSize" android:visibility="gone" diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml index fb420732..663c920b 100644 --- a/app/src/main/res/layout/dialog_event_details.xml +++ b/app/src/main/res/layout/dialog_event_details.xml @@ -22,7 +22,7 @@ + android:layout_height="wrap_content"> + android:layout_weight="1" + android:orientation="vertical"> @@ -65,42 +65,81 @@ android:id="@+id/lessonDate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textIsSelectable="true" - android:textAppearance="@style/NavView.TextView.Subtitle" android:text="@{details}" + android:textAppearance="?textAppearanceBodyMedium" + android:textIsSelectable="true" android:visibility="@{details == null ? View.GONE : View.VISIBLE}" tools:text="język angielski • 2B3T a2" tools:visibility="visible" /> + + + + + + + + + + android:gravity="right" + android:orientation="vertical"> - - + + @@ -122,7 +161,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textAppearance="@style/NavView.TextView.Helper" + android:textAppearance="@style/NavView.TextView.BodyMedium" + android:textStyle="bold" + android:textColor="?colorPrimary" android:text="@string/dialog_event_details_teacher" android:visibility="@{event.teacherName != null ? View.VISIBLE : View.GONE}"/> + android:textAppearance="@style/NavView.TextView.BodyMedium" + android:textStyle="bold" + android:textColor="?colorPrimary" /> @@ -199,94 +246,56 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/dialog_event_details_attachments" - android:textAppearance="@style/NavView.TextView.Helper" /> + android:textAppearance="@style/NavView.TextView.BodyMedium" /> - - + app:justifyContent="center"> - - - - - - - + android:layout_margin="4dp" + android:textColor="?colorOnBackground" + tools:text="@string/notes_button" /> + - - diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml index 3fc4b8f8..4e6a94b1 100644 --- a/app/src/main/res/layout/dialog_grade_details.xml +++ b/app/src/main/res/layout/dialog_grade_details.xml @@ -53,7 +53,7 @@ android:id="@+id/gradeName" android:layout_width="72dp" android:layout_height="72dp" - android:background="@drawable/bg_rounded_16dp" + android:background="@drawable/bg_circle" android:gravity="center" android:padding="8dp" android:text="@{grade.name}" @@ -85,30 +85,31 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@{@string/dialog_grade_details_semester_format(grade.semester)}" - android:textAppearance="@style/NavView.TextView.Helper" + android:textAppearance="?textAppearanceLabelLarge" + android:textIsSelectable="true" tools:text="semestr 1" /> - - + + @@ -126,7 +127,9 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/dialog_grade_details_teacher" - android:textAppearance="@style/NavView.TextView.Helper" /> + android:textAppearance="@style/NavView.TextView.BodyMedium" + android:textStyle="bold" + android:textColor="?colorPrimary" /> + android:textAppearance="@style/NavView.TextView.BodyMedium" + android:textStyle="bold" + android:textColor="?colorPrimary" /> + android:textAppearance="@style/NavView.TextView.BodyMedium" + android:textStyle="bold" + android:textColor="?colorPrimary" + /> + android:textAppearance="@style/NavView.TextView.BodyMedium" + android:textStyle="bold" + android:textColor="?colorPrimary" /> @@ -309,7 +329,7 @@