wielki powrót pr m3 do szkolnego (nie czytajcie tego kodu)

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'
 }

app/git-info.gradle

@@ -5,7 +5,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "org.eclipse.jgit:org.eclipse.jgit:5.5.+"

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`)"
           }
         ],

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="pl.szczodrzynski.edziennik">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,6 +11,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 -->
     <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core, com.mikepenz:materialdrawer, com.mikepenz.iconics.typeface.library.navlibfont" />
@@ -84,7 +84,7 @@
                 android:resource="@xml/widget_timetable_info" />
         </receiver>
         <service android:name=".ui.widgets.timetable.WidgetTimetableService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
+            android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync"/>
         <activity android:name=".ui.widgets.LessonDialogActivity"
             android:label=""
             android:configChanges="orientation|keyboardHidden"
@@ -105,7 +105,7 @@
                 android:resource="@xml/widget_notifications_info" />
         </receiver>
         <service android:name=".ui.widgets.notifications.WidgetNotificationsService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
+            android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync"/>
         <!-- LUCKY NUMBER -->
         <receiver android:name=".ui.widgets.luckynumber.WidgetLuckyNumberProvider"
             android:label="@string/widget_lucky_number_title"
@@ -194,15 +194,15 @@
               ____) |  __/ |   \ V /| | (_|  __/\__ \
              |_____/ \___|_|    \_/ |_|\___\___||___/
         -->
-        <service android:name=".data.api.ApiService" />
+        <service android:name=".data.api.ApiService" android:foregroundServiceType="dataSync"/>
         <service android:name=".data.firebase.MyFirebaseService"
-            android:exported="false">
+            android:exported="false" android:foregroundServiceType="dataSync">
             <intent-filter android:priority="10000000">
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
-        <service android:name=".sync.UpdateDownloaderService" />
+        <service android:name=".sync.UpdateDownloaderService" android:foregroundServiceType="dataSync"/>
 
         <!--
               _____                _     _

app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import android.os.Bundle
@@ -16,9 +17,12 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.core.view.isVisible
 import androidx.navigation.NavOptions
 import com.danimahardhika.cafebar.CafeBar
+import com.danimahardhika.cafebar.CafeBarTheme
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.jetradarmobile.snowfall.SnowfallView
 import com.mikepenz.iconics.IconicsDrawable
@@ -337,6 +341,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         setContentView(b.root)
 
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 
@@ -352,44 +358,43 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         b.navView.apply {
             drawer.init(this@MainActivity)
 
-            SystemBarsUtil(this@MainActivity).run {
+            /*
-                //paddingByKeyboard = b.navView
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-                appFullscreen = false
+                SystemBarsUtil(this@MainActivity).run {
-                statusBarColor = getColorFromAttr(context, android.R.attr.colorBackground)
+                    //paddingByKeyboard = b.navView
-                statusBarDarker = false
+                    appFullscreen = false
-                statusBarFallbackLight = COLOR_HALF_TRANSPARENT
+                    statusBarColor = getColorFromAttr(context, android.R.attr.colorBackground)
-                statusBarFallbackGradient = COLOR_HALF_TRANSPARENT
+                    statusBarDarker = false
-                navigationBarTransparent = false
+                    statusBarFallbackLight = COLOR_HALF_TRANSPARENT
+                    statusBarFallbackGradient = COLOR_HALF_TRANSPARENT
+                    navigationBarTransparent = false
 
-                b.navView.configSystemBarsUtil(this)
+                    b.navView.configSystemBarsUtil(this)
 
-                // fix for setting status bar color to window color, outside of navlib
+                    // fix for setting status bar color to window color, outside of navlib
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    window.statusBarColor = statusBarColor
+                        window.statusBarColor = statusBarColor
-                }
+                    }
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                         && ColorUtils.calculateLuminance(statusBarColor) > 0.6
-                ) {
+                    ) {
-                    @Suppress("deprecation")
+                        @Suppress("deprecation")
-                    window.decorView.systemUiVisibility =
+                        window.decorView.systemUiVisibility =
-                        window.decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                            window.decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    }
+
+                    // TODO fix navlib navbar detection, orientation change issues, status bar color setting if not fullscreen
+
+                    commit()
                 }
-
-                // TODO fix navlib navbar detection, orientation change issues, status bar color setting if not fullscreen
-
-                commit()
-            }
-
-            toolbar.apply {
-                subtitleFormat = R.string.toolbar_subtitle
-                subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
             }
+            */
 
             bottomBar.apply {
                 fabEnable = false
                 fabExtendable = true
                 fabExtended = false
-                fabGravity = Gravity.CENTER
+                fabGravity = Gravity.RIGHT
             }
 
             bottomSheet.apply {
@@ -544,6 +549,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         if (app.config.appRateSnackbarTime != 0L && app.config.appRateSnackbarTime <= System.currentTimeMillis()) {
             navView.coordinator.postDelayed({
                 CafeBar.builder(this)
+                    .theme(CafeBarTheme.Custom(getColorFromAttr(this, R.attr.colorSurfaceInverse)))
                     .content(R.string.rate_snackbar_text)
                     .icon(IconicsDrawable(this).apply {
                         icon = CommunityMaterial.Icon3.cmd_star_outline
@@ -702,6 +708,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             Type.NO_API_ACCESS -> {
                 Toast.makeText(this, R.string.error_no_api_access, Toast.LENGTH_SHORT).show()
             }
+
+            null -> TODO()
         }
 
         swipeRefreshLayout.isRefreshing = true
@@ -739,13 +747,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) {
         swipeRefreshLayout.isRefreshing = true
-        if (event.profileId == App.profileId) {
-            navView.toolbar.apply {
-                subtitleFormat = null
-                subtitleFormatWithUnread = null
-                subtitle = getString(R.string.toolbar_subtitle_syncing)
-            }
-        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -756,35 +757,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         finish()
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onApiTaskProgressEvent(event: ApiTaskProgressEvent) {
-        if (event.profileId == App.profileId) {
-            navView.toolbar.apply {
-                subtitleFormat = null
-                subtitleFormatWithUnread = null
-                subtitle = if (event.progress < 0f)
-                    event.progressText ?: ""
-                else
-                    getString(
-                        R.string.toolbar_subtitle_syncing_format,
-                        event.progress.roundToInt(),
-                        event.progressText ?: "",
-                    )
-
-            }
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onApiTaskFinishedEvent(event: ApiTaskFinishedEvent) {
         EventBus.getDefault().removeStickyEvent(event)
-        if (event.profileId == App.profileId) {
-            navView.toolbar.apply {
-                subtitleFormat = R.string.toolbar_subtitle
-                subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
-                subtitle = "Gotowe"
-            }
-        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
@@ -801,11 +776,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 return
             ErrorDetailsDialog(this, listOf(event.error)).show()
         }
-        navView.toolbar.apply {
-            subtitleFormat = R.string.toolbar_subtitle
-            subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
-            subtitle = "Gotowe"
-        }
         mainSnackbar.dismiss()
         errorSnackbar.addError(event.error).show()
     }
@@ -1043,6 +1013,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         handleIntent(intent?.extras)
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("deprecation")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
@@ -1310,7 +1281,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 else
                     getString(R.string.app_task_format, getString(target.name)),
                 bm,
-                getColorFromAttr(this, R.attr.colorSurface)
             )
             setTaskDescription(taskDesc)
         }
@@ -1353,9 +1323,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     fun gainAttention() {
         if (app.config.ui.bottomSheetOpened)
             return
-        b.navView.postDelayed({
-            navView.gainAttentionOnBottomBar()
-        }, 2000)
     }
 
     fun gainAttentionFAB() {
@@ -1474,6 +1441,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
     private val targetPopToHomeList = arrayListOf<Int>()
     private var targetHomeId: Int = -1
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         if (!b.navView.onBackPressed()) {
             if (App.config.ui.openDrawerOnBackPressed && ((navTarget.popTo == null && navTarget.popToHome)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt

@@ -39,6 +39,7 @@ class LibrusRecaptchaHelper(
     private var timedOut = false
 
     inner class WebViewClient : android.webkit.WebViewClient() {
+        @Deprecated("Deprecated in Java")
         override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
             timeout?.cancel()
             if (!timedOut) {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt

@@ -406,6 +406,8 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
             HebeFilterType.BY_MESSAGEBOX -> {
                 query["box"] = messageBox ?: data.messageBoxKey ?: ""
             }
+
+            null -> TODO()
         }
 
         if (dateFrom != null)

app/src/main/java/pl/szczodrzynski/edziennik/ext/MiscExtensions.kt

@@ -21,8 +21,8 @@ import java.io.StringWriter
 
 fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
     observe(lifecycleOwner, object : Observer<T> {
-        override fun onChanged(t: T?) {
+        override fun onChanged(value: T) {
-            observer.onChanged(t)
+            observer.onChanged(value)
             removeObserver(this)
         }
     })

app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventRenderer.kt

@@ -10,6 +10,7 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.core.view.isVisible
 import com.github.tibolte.agendacalendarview.render.EventRenderer
+import com.google.android.material.color.MaterialColors
 import com.mikepenz.iconics.view.IconicsTextView
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.AgendaWrappedEventBinding
@@ -46,7 +47,8 @@ class AgendaEventRenderer(
     ) {
         val event = aEvent.event
 
-        val textColor = Colors.legibleTextColor(event.eventColor)
+        val harmonizedColor = MaterialColors.harmonizeWithPrimary(card.context, event.eventColor)
+        val textColor = Colors.legibleTextColor(harmonizedColor)
 
         val timeText = if (event.time == null)
             card.context.getString(R.string.agenda_event_all_day)
@@ -60,8 +62,8 @@ class AgendaEventRenderer(
             event.teamName
         ).join(", ")
 
-        card.foreground.setTintColor(event.eventColor)
+        card.foreground.setTintColor(harmonizedColor)
-        card.background.setTintColor(event.eventColor)
+        card.background.setTintColor(harmonizedColor)
         manager.setEventTopic(title, event, doneIconColor = textColor)
         title.setTextColor(textColor)
         subtitle?.text = eventSubtitle

app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesAdapter.kt

@@ -17,7 +17,6 @@ import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
 import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.managers.NoteManager
-import pl.szczodrzynski.navlib.getColorFromAttr
 
 class LessonChangesAdapter(
         val context: Context,
@@ -64,7 +63,9 @@ class LessonChangesAdapter(
             lesson.teacherName ?: "?"
         else
             mutableListOf<CharSequence>().apply {
-                lesson.oldTeacherName?.let { add(it.asStrikethroughSpannable()) }
+                if (lesson.teacherName == null)
+                    lesson.oldTeacherName?.let { add(it) }
+                else lesson.oldTeacherName?.let { add(it.asStrikethroughSpannable()) }
                 lesson.teacherName?.let { add(it) }
             }.concat(arrowRight)
 
@@ -73,7 +74,9 @@ class LessonChangesAdapter(
             lesson.teamName ?: "?"
         else
             mutableListOf<CharSequence>().apply {
-                lesson.oldTeamName?.let { add(it.asStrikethroughSpannable()) }
+                if (lesson.teamName == null)
+                    lesson.oldTeamName?.let { add(it) }
+                else lesson.oldTeamName?.let { add(it.asStrikethroughSpannable()) }
                 lesson.teamName?.let { add(it) }
             }.concat(arrowRight)
 
@@ -82,7 +85,9 @@ class LessonChangesAdapter(
             lesson.classroom ?: "?"
         else
             mutableListOf<CharSequence>().apply {
-                lesson.oldClassroom?.let { add(it.asStrikethroughSpannable()) }
+                if (lesson.classroom == null)
+                    lesson.oldClassroom?.let { add(it) }
+                else lesson.oldClassroom?.let { add(it.asStrikethroughSpannable()) }
                 lesson.classroom?.let { add(it) }
             }.concat(arrowRight)
 
@@ -109,40 +114,11 @@ class LessonChangesAdapter(
             Lesson.TYPE_CANCELLED -> {
                 b.annotationVisible = true
                 b.annotation.setText(R.string.timetable_lesson_cancelled)
-                b.annotation.background.colorFilter = PorterDuffColorFilter(
-                        getColorFromAttr(context, R.attr.timetable_lesson_cancelled_color),
-                        PorterDuff.Mode.SRC_ATOP
-                )
                 //lb.subjectName.typeface = Typeface.DEFAULT
             }
             Lesson.TYPE_CHANGE -> {
                 b.annotationVisible = true
-                when {
+                b.annotation.setText(R.string.timetable_lesson_change)
-                    lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId
-                            && lesson.oldSubjectName != null && lesson.oldTeacherName != null ->
-                        b.annotation.setText(
-                                R.string.timetable_lesson_change_format,
-                                "${lesson.oldSubjectName ?: "?"}, ${lesson.oldTeacherName ?: "?"}"
-                        )
-
-                    lesson.subjectId != lesson.oldSubjectId && lesson.oldSubjectName != null ->
-                        b.annotation.setText(
-                                R.string.timetable_lesson_change_format,
-                                lesson.oldSubjectName ?: "?"
-                        )
-
-                    lesson.teacherId != lesson.oldTeacherId && lesson.oldTeacherName != null ->
-                        b.annotation.setText(
-                                R.string.timetable_lesson_change_format,
-                                lesson.oldTeacherName ?: "?"
-                        )
-                    else -> b.annotation.setText(R.string.timetable_lesson_change)
-                }
-
-                b.annotation.background.colorFilter = PorterDuffColorFilter(
-                        getColorFromAttr(context, R.attr.timetable_lesson_change_color),
-                        PorterDuff.Mode.SRC_ATOP
-                )
             }
             Lesson.TYPE_SHIFTED_SOURCE -> {
                 b.annotationVisible = true
@@ -162,8 +138,6 @@ class LessonChangesAdapter(
 
                     else -> b.annotation.setText(R.string.timetable_lesson_shifted)
                 }
-
-                b.annotation.background.setTintColor(R.attr.timetable_lesson_shifted_source_color.resolveAttr(context))
             }
             Lesson.TYPE_SHIFTED_TARGET -> {
                 b.annotationVisible = true
@@ -183,11 +157,6 @@ class LessonChangesAdapter(
 
                     else -> b.annotation.setText(R.string.timetable_lesson_shifted_from)
                 }
-
-                b.annotation.background.colorFilter = PorterDuffColorFilter(
-                        getColorFromAttr(context, R.attr.timetable_lesson_shifted_target_color),
-                        PorterDuff.Mode.SRC_ATOP
-                )
             }
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEventRenderer.kt

@@ -7,6 +7,7 @@ package pl.szczodrzynski.edziennik.ui.agenda.lessonchanges
 import android.view.View
 import androidx.core.view.isVisible
 import com.github.tibolte.agendacalendarview.render.EventRenderer
+import com.google.android.material.color.MaterialColors
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.AgendaCounterItemBinding
 import pl.szczodrzynski.edziennik.databinding.AgendaWrappedCounterBinding
@@ -18,10 +19,11 @@ class LessonChangesEventRenderer : EventRenderer<LessonChangesEvent>() {
 
     override fun render(view: View, event: LessonChangesEvent) {
         val b = AgendaWrappedCounterBinding.bind(view).item
-        val textColor = Colors.legibleTextColor(event.color)
+        val harmonizedColor = MaterialColors.harmonizeWithPrimary(view.context, event.color)
+        val textColor = Colors.legibleTextColor(harmonizedColor)
 
-        b.card.foreground.setTintColor(event.color)
+        b.card.foreground.setTintColor(harmonizedColor)
-        b.card.background.setTintColor(event.color)
+        b.card.background.setTintColor(harmonizedColor)
         b.name.setText(R.string.agenda_lesson_changes)
         b.name.setTextColor(textColor)
         b.count.text = event.count.toString()
@@ -35,10 +37,10 @@ class LessonChangesEventRenderer : EventRenderer<LessonChangesEvent>() {
     }
 
     fun render(b: AgendaCounterItemBinding, event: LessonChangesEvent) {
-        val textColor = Colors.legibleTextColor(event.color)
+        val harmonizedColor = MaterialColors.harmonizeWithPrimary(b.root.context, event.color)
-
+        val textColor = Colors.legibleTextColor(harmonizedColor)
-        b.card.foreground.setTintColor(event.color)
+        b.card.foreground.setTintColor(harmonizedColor)
-        b.card.background.setTintColor(event.color)
+        b.card.background.setTintColor(harmonizedColor)
         b.name.setText(R.string.agenda_lesson_changes)
         b.name.setTextColor(textColor)
         b.count.text = event.count.toString()

app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt

@@ -7,6 +7,7 @@ package pl.szczodrzynski.edziennik.ui.agenda.teacherabsence
 import android.view.View
 import androidx.core.view.isVisible
 import com.github.tibolte.agendacalendarview.render.EventRenderer
+import com.google.android.material.color.MaterialColors
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.AgendaCounterItemBinding
 import pl.szczodrzynski.edziennik.databinding.AgendaWrappedCounterBinding
@@ -17,10 +18,11 @@ class TeacherAbsenceEventRenderer : EventRenderer<TeacherAbsenceEvent>() {
 
     override fun render(view: View, event: TeacherAbsenceEvent) {
         val b = AgendaWrappedCounterBinding.bind(view).item
-        val textColor = Colors.legibleTextColor(event.color)
+        val harmonizedColor = MaterialColors.harmonizeWithPrimary(view.context, event.color)
+        val textColor = Colors.legibleTextColor(harmonizedColor)
 
-        b.card.foreground.setTintColor(event.color)
+        b.card.foreground.setTintColor(harmonizedColor)
-        b.card.background.setTintColor(event.color)
+        b.card.background.setTintColor(harmonizedColor)
         b.name.setText(R.string.agenda_teacher_absence)
         b.name.setTextColor(textColor)
         b.count.text = event.count.toString()
@@ -31,10 +33,11 @@ class TeacherAbsenceEventRenderer : EventRenderer<TeacherAbsenceEvent>() {
     }
 
     fun render(b: AgendaCounterItemBinding, event: TeacherAbsenceEvent) {
-        val textColor = Colors.legibleTextColor(event.color)
+        val harmonizedColor = MaterialColors.harmonizeWithPrimary(b.root.context, event.color)
+        val textColor = Colors.legibleTextColor(harmonizedColor)
 
-        b.card.foreground.setTintColor(event.color)
+        b.card.foreground.setTintColor(harmonizedColor)
-        b.card.background.setTintColor(event.color)
+        b.card.background.setTintColor(harmonizedColor)
         b.name.setText(R.string.agenda_teacher_absence)
         b.name.setTextColor(textColor)
         b.count.text = event.count.toString()

app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceBar.kt

@@ -66,7 +66,7 @@ class AttendanceBar : View {
     }
 
     @SuppressLint("DrawAllocation", "CanvasSize")
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         canvas ?: return
 
         val sum = attendancesList.sumOf { it.count }

app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.java

@@ -1,186 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.behaviour;
-
-import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_NOTICE;
-
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.db.entity.Notice;
-import pl.szczodrzynski.edziennik.data.db.full.NoticeFull;
-import pl.szczodrzynski.edziennik.databinding.FragmentBehaviourBinding;
-import pl.szczodrzynski.edziennik.utils.Themes;
-import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
-
-public class BehaviourFragment extends Fragment {
-
-    private App app = null;
-    private MainActivity activity = null;
-    private FragmentBehaviourBinding b = null;
-
-    private int displayMode = MODE_YEAR;
-    private static final int MODE_YEAR = 0;
-    private static final int MODE_SEMESTER_1 = 1;
-    private static final int MODE_SEMESTER_2 = 2;
-
-    private List<NoticeFull> noticeList = null;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        activity = (MainActivity) getActivity();
-        if (getActivity() == null || getContext() == null)
-            return null;
-        app = (App) activity.getApplication();
-        getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        // activity, context and profile is valid
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_behaviour, container, false);
-        b.refreshLayout.setParent(activity.getSwipeRefreshLayout());
-        return b.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || activity == null || b == null || !isAdded())
-            return;
-
-        activity.getBottomSheet().prependItems(
-                new BottomSheetPrimaryItem(true)
-                        .withTitle(R.string.menu_mark_as_read)
-                        .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
-                        .withOnClickListener(v3 -> {
-                            activity.getBottomSheet().close();
-                            AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_NOTICE, true));
-                            Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show();
-                        })
-        );
-
-        /*b.refreshLayout.setOnRefreshListener(() -> {
-            activity.syncCurrentFeature(MainActivity.DRAWER_ITEM_BEHAVIOUR, b.refreshLayout);
-        });*/
-
-        b.noticesSummaryTitle.setOnClickListener((v -> {
-            PopupMenu popupMenu = new PopupMenu(activity, b.noticesSummaryTitle, Gravity.END);
-            popupMenu.getMenu().add(0, 0, 0, R.string.summary_mode_year);
-            popupMenu.getMenu().add(0, 1, 1, R.string.summary_mode_semester_1);
-            popupMenu.getMenu().add(0, 2, 2, R.string.summary_mode_semester_2);
-            popupMenu.setOnMenuItemClickListener((item -> {
-                displayMode = item.getItemId();
-                updateList();
-                return true;
-            }));
-            popupMenu.show();
-        }));
-
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
-
-        b.noticesView.setHasFixedSize(true);
-        b.noticesView.setLayoutManager(linearLayoutManager);
-
-        b.noticesView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                if (recyclerView.canScrollVertically(-1)) {
-                    b.refreshLayout.setEnabled(false);
-                }
-                if (!recyclerView.canScrollVertically(-1) && newState == SCROLL_STATE_IDLE) {
-                    b.refreshLayout.setEnabled(true);
-                }
-            }
-        });
-
-        app.db.noticeDao().getAll(App.Companion.getProfileId()).observe(this, notices -> {
-            if (app == null || activity == null || b == null || !isAdded())
-                return;
-
-            if (notices == null) {
-                b.noticesView.setVisibility(View.GONE);
-                b.noticesNoData.setVisibility(View.VISIBLE);
-                return;
-            }
-
-            noticeList = notices;
-
-            updateList();
-        });
-    }
-
-    private void updateList() {
-        int praisesCount = 0;
-        int warningsCount = 0;
-        int otherCount = 0;
-
-        List<NoticeFull> filteredList = new ArrayList<>();
-        for (NoticeFull notice: noticeList) {
-            if (displayMode != MODE_YEAR && notice.getSemester() != displayMode)
-                continue;
-            filteredList.add(notice);
-            switch (notice.getType()) {
-                case Notice.TYPE_POSITIVE:
-                    praisesCount++;
-                    break;
-                case Notice.TYPE_NEGATIVE:
-                    warningsCount++;
-                    break;
-                case Notice.TYPE_NEUTRAL:
-                    otherCount++;
-                    break;
-            }
-        }
-        if (filteredList.size() > 0) {
-            NoticesAdapter adapter;
-            b.noticesView.setVisibility(View.VISIBLE);
-            b.noticesNoData.setVisibility(View.GONE);
-            if ((adapter = (NoticesAdapter) b.noticesView.getAdapter()) != null) {
-                adapter.setNoticeList(filteredList);
-                adapter.notifyDataSetChanged();
-            }
-            else {
-                adapter = new NoticesAdapter(getContext(), filteredList);
-                b.noticesView.setAdapter(adapter);
-            }
-        }
-        else {
-            b.noticesView.setVisibility(View.GONE);
-            b.noticesNoData.setVisibility(View.VISIBLE);
-        }
-
-        if (displayMode == MODE_YEAR) {
-            b.noticesSummaryTitle.setText(getString(R.string.notices_summary_title_year));
-        }
-        else {
-            b.noticesSummaryTitle.setText(getString(R.string.notices_summary_title_semester_format, displayMode));
-        }
-        b.noticesPraisesCount.setText(String.format(Locale.getDefault(), "%d", praisesCount));
-        b.noticesWarningsCount.setText(String.format(Locale.getDefault(), "%d", warningsCount));
-        b.noticesOtherCount.setText(String.format(Locale.getDefault(), "%d", otherCount));
-        if (warningsCount >= 3) {
-            b.noticesWarningsCount.setTextColor(Color.RED);
-        }
-        else {
-            b.noticesWarningsCount.setTextColor(Themes.INSTANCE.getPrimaryTextColor(activity));
-        }
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt

@@ -0,0 +1,152 @@
+package pl.szczodrzynski.edziennik.ui.behaviour
+
+import android.graphics.Color
+import android.os.AsyncTask
+import android.os.Bundle
+import android.view.*
+import android.widget.Toast
+import androidx.appcompat.widget.PopupMenu
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.App.Companion.profileId
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.full.NoticeFull
+import pl.szczodrzynski.edziennik.databinding.FragmentBehaviourBinding
+import pl.szczodrzynski.edziennik.ui.behaviour.NoticesAdapter
+import pl.szczodrzynski.edziennik.utils.Themes.getPrimaryTextColor
+import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
+import java.util.*
+import kotlin.coroutines.CoroutineContext
+
+class BehaviourFragment : Fragment() {
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: FragmentBehaviourBinding
+    
+    private var displayMode = MODE_YEAR
+    private var noticeList: List<NoticeFull>? = null
+    
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        b = DataBindingUtil.inflate(inflater, R.layout.fragment_behaviour, container, false)
+        b.refreshLayout.setParent(activity.swipeRefreshLayout)
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (app == null || activity == null || b == null || !isAdded) return
+        activity.bottomSheet.prependItems(
+            BottomSheetPrimaryItem(true)
+                .withTitle(R.string.menu_mark_as_read)
+                .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
+                .withOnClickListener { v3: View? ->
+                    activity.bottomSheet.close()
+                    AsyncTask.execute {
+                        App.db.metadataDao().setAllSeen(profileId, Metadata.TYPE_NOTICE, true)
+                    }
+                    Toast.makeText(
+                        activity,
+                        R.string.main_menu_mark_as_read_success,
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+        )
+        b.toggleGroup.check(when (displayMode) {
+            0 -> R.id.allYear
+            1 -> R.id.semester1
+            2 -> R.id.semester2
+            else -> R.id.allYear
+        })
+        b.toggleGroup.addOnButtonCheckedListener { _, checkedId, isChecked ->
+            if (!isChecked)
+                return@addOnButtonCheckedListener
+            displayMode = when (checkedId) {
+                R.id.allYear -> 0
+                R.id.semester1 -> 1
+                R.id.semester2 -> 2
+                else -> 0
+            }
+            updateList()
+        }
+        /*b.refreshLayout.setOnRefreshListener(() -> {
+            activity.syncCurrentFeature(MainActivity.DRAWER_ITEM_BEHAVIOUR, b.refreshLayout);
+        });*/
+        val linearLayoutManager = LinearLayoutManager(context)
+        b.noticesView.setHasFixedSize(true)
+        b.noticesView.layoutManager = linearLayoutManager
+        b.noticesView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                if (recyclerView.canScrollVertically(-1)) {
+                    b.refreshLayout.isEnabled = false
+                }
+                if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    b.refreshLayout.isEnabled = true
+                }
+            }
+        })
+        App.db.noticeDao().getAll(profileId).observe(this) { notices: List<NoticeFull>? ->
+            if (app == null || activity == null || b == null || !isAdded) return@observe
+            if (notices == null) {
+                b.noticesView.visibility = View.GONE
+                b.noticesNoData.visibility = View.VISIBLE
+                return@observe
+            }
+            noticeList = notices
+            updateList()
+        }
+    }
+
+    private fun updateList() {
+        var praisesCount = 0
+        var warningsCount = 0
+        var otherCount = 0
+        val filteredList: MutableList<NoticeFull> = ArrayList()
+        for (notice in noticeList!!) {
+            if (displayMode != MODE_YEAR && notice.semester != displayMode) continue
+            filteredList.add(notice)
+            when (notice.type) {
+                Notice.TYPE_POSITIVE -> praisesCount++
+                Notice.TYPE_NEGATIVE -> warningsCount++
+                Notice.TYPE_NEUTRAL -> otherCount++
+            }
+        }
+        if (filteredList.size > 0) {
+            val adapter = NoticesAdapter(requireContext(), filteredList)
+            b.noticesView.visibility = View.VISIBLE
+            b.noticesNoData.visibility = View.GONE
+            b.noticesView.adapter = adapter
+            adapter.noticeList = filteredList
+            adapter.notifyDataSetChanged()
+        } else {
+            b.noticesView.visibility = View.GONE
+            b.noticesNoData.visibility = View.VISIBLE
+        }
+        b.noticesPraisesCount.text = String.format(Locale.getDefault(), "%d", praisesCount)
+        b.noticesWarningsCount.text = String.format(Locale.getDefault(), "%d", warningsCount)
+        b.noticesOtherCount.text = String.format(Locale.getDefault(), "%d", otherCount)
+        if (warningsCount >= 3) {
+            b.noticesWarningsCount.setTextColor(Color.RED)
+        } else {
+            b.noticesWarningsCount.setTextColor(getPrimaryTextColor(activity))
+        }
+    }
+
+    companion object {
+        private const val MODE_YEAR = 0
+        private const val MODE_SEMESTER_1 = 1
+        private const val MODE_SEMESTER_2 = 2
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/NoticesAdapter.kt

@@ -11,19 +11,24 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.color.MaterialColors
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.colorRes
 import com.mikepenz.iconics.utils.sizeDp
+import com.mikepenz.materialize.color.Material
 import eu.szkolny.font.SzkolnyFont
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
 import pl.szczodrzynski.edziennik.data.db.full.NoticeFull
+import pl.szczodrzynski.edziennik.ext.resolveColor
 import pl.szczodrzynski.edziennik.utils.BetterLink
 import pl.szczodrzynski.edziennik.utils.Utils.bs
 import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.navlib.getColorFromAttr
 
 class NoticesAdapter//getting the context and product list with constructor
 (private val context: Context, var noticeList: List<NoticeFull>) : RecyclerView.Adapter<NoticesAdapter.ViewHolder>() {
@@ -42,9 +47,19 @@ class NoticesAdapter//getting the context and product list with constructor
 
         if (app.profile.loginStoreType == LOGIN_TYPE_MOBIDZIENNIK && false) {
             holder.noticesItemReason.text = bs(null, notice.category, "\n") + notice.text
-            holder.noticesItemTeacherName.text = app.getString(R.string.notices_points_format, notice.teacherName, if (notice.points ?: 0f > 0) "+" + notice.points else notice.points)
+            if (notice.teacherName != null || notice.points != null) {
-        } else {
+                holder.noticesItemTeacherName.visibility = View.VISIBLE
+                holder.noticesItemTeacherName.text = app.getString(
+                    R.string.notices_points_format,
+                    notice.teacherName,
+                    if (notice.points ?: 0f > 0) "+" + notice.points else notice.points
+                )
+            }} else {
             holder.noticesItemReason.text = notice.text
+            if (notice.teacherName != null) {
+                holder.noticesItemTeacherName.visibility = View.VISIBLE
+                holder.noticesItemTeacherName.text = notice.teacherName
+            }
             holder.noticesItemTeacherName.text = notice.teacherName
         }
         holder.noticesItemAddedDate.text = Date.fromMillis(notice.addedDate).formattedString
@@ -52,21 +67,21 @@ class NoticesAdapter//getting the context and product list with constructor
         if (notice.type == Notice.TYPE_POSITIVE) {
             holder.noticesItemType.setImageDrawable(
                 IconicsDrawable(context, CommunityMaterial.Icon3.cmd_plus_circle_outline).apply {
-                    colorRes = R.color.md_green_600
+                    colorInt = MaterialColors.harmonizeWithPrimary(context, R.color.md_green_600.resolveColor(context))
                     sizeDp = 36
                 }
             )
         } else if (notice.type == Notice.TYPE_NEGATIVE) {
             holder.noticesItemType.setImageDrawable(
                 IconicsDrawable(context, CommunityMaterial.Icon.cmd_alert_decagram_outline).apply {
-                    colorRes = R.color.md_red_600
+                    colorInt = MaterialColors.harmonizeWithPrimary(context, R.color.md_red_600.resolveColor(context))
                     sizeDp = 36
                 }
             )
         } else {
             holder.noticesItemType.setImageDrawable(
                 IconicsDrawable(context, SzkolnyFont.Icon.szf_message_processing_outline).apply {
-                    colorRes = R.color.md_blue_500
+                    colorInt = MaterialColors.harmonizeWithPrimary(context, R.color.md_blue_500.resolveColor(context))
                     sizeDp = 36
                 }
             )

app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt

@@ -14,6 +14,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
@@ -110,7 +111,7 @@ class EventDetailsDialog(
 
         manager.setLegendText(b.legend, event, showNotes)
 
-        b.typeColor.background?.setTintColor(event.eventColor)
+        b.typeColor.background?.setTintColor(MaterialColors.harmonizeWithPrimary(b.root.context, event.eventColor))
 
         b.details = mutableListOf(
                 event.subjectLongName,

app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt

@@ -10,6 +10,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE
 import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
@@ -326,7 +327,7 @@ class EventManualDialog(
             selectDefault(defaultType)
 
             onTypeSelected = {
-                b.typeColor.background.setTintColor(it.color)
+                b.typeColor.background.setTintColor(MaterialColors.harmonizeWithPrimary(b.root.context, it.color))
                 customColor = null
             }
         }

app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventViewHolder.kt

@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.color.MaterialColors
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
@@ -112,7 +113,7 @@ class EventViewHolder(
 
         b.attachmentIcon.isVisible = item.hasAttachments
 
-        b.typeColor.background?.setTintColor(item.eventColor)
+        b.typeColor.background?.setTintColor(MaterialColors.harmonizeWithPrimary(b.root.context, item.eventColor))
         b.typeColor.isVisible = adapter.showType && adapter.showColor
 
         b.editButton.isVisible = !adapter.simpleMode

app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt

@@ -39,7 +39,7 @@ class GradeDetailsDialog(
     override suspend fun onShow() {
         val manager = app.gradesManager
 
-        val gradeColor = manager.getGradeColor(grade)
+        val gradeColor = manager.getGradeColor(b.root.context, grade)
         b.grade = grade
         b.weightText = manager.getWeightString(app, grade)
         b.commentVisible = false

app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeView.kt

@@ -15,6 +15,7 @@ import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.graphics.ColorUtils
+import com.google.android.material.color.MaterialColors
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL
@@ -47,7 +48,7 @@ class GradeView : AppCompatTextView {
 
         val gradeName = grade.name
 
-        val gradeColor = manager.getGradeColor(grade)
+        val gradeColor = manager.getGradeColor(context, grade)
 
         text = when {
             periodGradesTextual -> when (grade.type) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeLuckyNumberCard.kt

@@ -63,7 +63,7 @@ class HomeLuckyNumberCard(
             R.string.home_lucky_number_details_click_to_set
         else
             R.string.home_lucky_number_details
-        b.subText.setText(subTextRes, profile.name, profile.studentNumber)
+        b.subText.setText(subTextRes, profile.studentNumber)
 
         app.db.luckyNumberDao().getNearestFuture(profile.id, today).observe(fragment, Observer { luckyNumber ->
             val isYours = luckyNumber?.number == profile.studentNumber
@@ -94,7 +94,7 @@ class HomeLuckyNumberCard(
                 !isYours -> R.drawable.emoji_smiling
                 else -> R.drawable.emoji_no_face
             }
-            b.image.setImageResource(drawableRes)
+            b.image.setIconResource(drawableRes)
         })
 
         holder.root.onClick {
@@ -104,7 +104,7 @@ class HomeLuckyNumberCard(
                     R.string.home_lucky_number_details_click_to_set
                 else
                     R.string.home_lucky_number_details
-                b.subText.setText(newSubTextRes, profile.name, profile.studentNumber)
+                b.subText.setText(newSubTextRes, profile.studentNumber)
             })
         }
     }}

app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt

@@ -95,19 +95,13 @@ class HomeTimetableCard(
             }
         )
 
-        b.bellSync.setImageDrawable(
+        b.bellSync.icon = IconicsDrawable(activity, SzkolnyFont.Icon.szf_alarm_bell_outline).apply {
-            IconicsDrawable(activity, SzkolnyFont.Icon.szf_alarm_bell_outline).apply {
+            sizeDp = 24
-                colorAttr(activity, R.attr.colorOnPrimaryContainer)
+        }
-                sizeDp = 24
-            }
-        )
 
-        b.showCounter.setImageDrawable(
+        b.showCounter.icon = IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_fullscreen).apply {
-            IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_fullscreen).apply {
+            sizeDp = 24
-                colorAttr(activity, R.attr.colorOnPrimaryContainer)
+        }
-                sizeDp = 24
-            }
-        )
 
         b.bellSync.setOnClickListener {
             BellSyncTimeChooseDialog(
@@ -374,7 +368,7 @@ class HomeTimetableCard(
             if (diff >= 60 * MINUTE)
                 b.counter.text = counterStart.stringHM
             else
-                b.counter.text = activity.timeTill(diff.toInt(), "\n", countInSeconds)
+                b.counter.text = activity.timeTill(diff.toInt(), " ", countInSeconds)
         }
         else {
             // the lesson is right now
@@ -383,7 +377,7 @@ class HomeTimetableCard(
             val lessonLength = counterEnd - counterStart
             val timePassed = now - counterStart
             val timeLeft = counterEnd - now
-            b.counter.text = activity.timeLeft(timeLeft.toInt(), "\n", countInSeconds)
+            b.counter.text = activity.timeLeft(timeLeft.toInt(), " ", countInSeconds)
             b.progress.max = lessonLength.toInt()
             b.progress.progress = timePassed.toInt()
         }

app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt

@@ -45,6 +45,7 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
 
     fun getRootView() = b.root
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         val destination = nav.currentDestination ?: run {
             nav.navigateUp()
@@ -85,7 +86,7 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setTheme(R.style.AppTheme_Light)
+        setTheme(R.style.AppTheme_Dark)
 
         navOptions = NavOptions.Builder()
                 .setEnterAnim(R.anim.slide_in_right)

app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessageViewHolder.kt

@@ -4,6 +4,7 @@
 
 package pl.szczodrzynski.edziennik.ui.messages.list
 
+import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
@@ -21,6 +22,7 @@ import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
 import pl.szczodrzynski.edziennik.utils.managers.NoteManager
 import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.navlib.getColorFromAttr
 
 class MessageViewHolder(
     inflater: LayoutInflater,
@@ -44,15 +46,19 @@ class MessageViewHolder(
         b.messageBody.text = item.bodyHtml?.take(200)
 
         val isRead = item.isSent || item.isDraft || item.seen
+
         val typeface = if (isRead) adapter.typefaceNormal else adapter.typefaceBold
-        val style = if (isRead) R.style.NavView_TextView_Small else R.style.NavView_TextView_Normal
+        val textColor = if (isRead) getColorFromAttr(b.root.context, R.attr.colorOnSurfaceVariant) else getColorFromAttr(b.root.context, R.attr.colorOnSurface)
+
         // set text styles
-        b.messageSender.setTextAppearance(activity, style)
         b.messageSender.typeface = typeface
-        b.messageSubject.setTextAppearance(activity, style)
+        b.messageSender.setTextColor(textColor)
+
         b.messageSubject.typeface = typeface
-        b.messageDate.setTextAppearance(activity, style)
+        b.messageSubject.setTextColor(textColor)
+
         b.messageDate.typeface = typeface
+        b.messageDate.setTextColor(textColor)
 
         if (adapter.onStarClick == null) {
             b.messageStar.isVisible = false

app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt

@@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.utils.sizeDp
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
@@ -95,27 +96,6 @@ class MessageFragment : Fragment(), CoroutineScope {
             it.maxLines = if (it.maxLines == 30) 2 else 30
         }
 
-        val replyDrawable = IconicsDrawable(activity, CommunityMaterial.Icon3.cmd_reply_outline).apply {
-            sizeDp = 24
-            colorAttr(activity, android.R.attr.textColorPrimary)
-        }
-        val forwardDrawable = IconicsDrawable(activity, CommunityMaterial.Icon.cmd_arrow_right).apply {
-            sizeDp = 24
-            colorAttr(activity, android.R.attr.textColorPrimary)
-        }
-        val deleteDrawable = IconicsDrawable(activity, CommunityMaterial.Icon.cmd_delete_outline).apply {
-            sizeDp = 24
-            colorAttr(activity, android.R.attr.textColorPrimary)
-        }
-        val downloadDrawable = IconicsDrawable(activity, CommunityMaterial.Icon.cmd_download_outline).apply {
-            sizeDp = 24
-            colorAttr(activity, android.R.attr.textColorPrimary)
-        }
-        b.replyButton.setCompoundDrawables(null, replyDrawable, null, null)
-        b.forwardButton.setCompoundDrawables(null, forwardDrawable, null, null)
-        b.deleteButton.setCompoundDrawables(null, deleteDrawable, null, null)
-        b.downloadButton.setCompoundDrawables(null, downloadDrawable, null, null)
-
         b.messageStar.onClick {
             launch {
                 manager.starMessage(message, !message.isStarred)
@@ -218,20 +198,6 @@ class MessageFragment : Fragment(), CoroutineScope {
 
         b.replyButton.isVisible = message.isReceived || message.isDeleted
         b.deleteButton.isVisible = message.isReceived
-        if (message.isReceived || message.isDeleted) {
-            activity.navView.apply {
-                bottomBar.apply {
-                    fabEnable = true
-                    fabExtendedText = getString(R.string.messages_reply)
-                    fabIcon = CommunityMaterial.Icon3.cmd_reply_outline
-                }
-
-                setFabOnClickListener {
-                    b.replyButton.performClick()
-                }
-            }
-            activity.gainAttentionFAB()
-        }
 
         val messageRecipients = StringBuilder("<ul>")
         message.recipients?.forEach { recipient ->

app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NotesExtensions.kt

@@ -26,15 +26,8 @@ fun MaterialButton.setupNotesButton(
 ) {
     if (!isVisible)
         return
-    icon = IconicsDrawable(activity, CommunityMaterial.Icon3.cmd_playlist_edit)
-    setText(R.string.notes_button)
-    iconPadding = 8.dp
-    iconSize = 24.dp
 
-    updateLayoutParams<LinearLayout.LayoutParams> {
+    setText(R.string.notes_button)
-        gravity = Gravity.CENTER_HORIZONTAL
-    }
-    updatePadding(left = 12.dp)
 
     onClick {
         NoteListDialog(

app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsAdapter.kt

@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.colorRes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -15,6 +16,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.databinding.NotificationsListItemBinding
 import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.navlib.getColorFromAttr
 import kotlin.coroutines.CoroutineContext
 
 class NotificationsAdapter(
@@ -48,7 +50,7 @@ class NotificationsAdapter(
         val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
 
         b.notificationIcon.background = IconicsDrawable(app, item.getLargeIcon()).apply {
-            colorRes = R.color.colorPrimary
+            colorInt = getColorFromAttr(b.root.context, R.attr.colorPrimary)
         }
 
         b.title.text = item.text

app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt

@@ -17,6 +17,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.ext.after
 import pl.szczodrzynski.edziennik.utils.Colors
 import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.utils.Utils
 
 class SettingsUtil(
     val activity: MainActivity,
@@ -43,6 +44,7 @@ class SettingsUtil(
             .title(titleRes ?: 0)
             .cardColor(backgroundColor ?: 0)
             .theme(theme ?: 0)
+            .outline(false)
             .build()
         card.items.addAll(items)
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt

@@ -19,6 +19,7 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.ext.after
+import pl.szczodrzynski.edziennik.ext.resolveAttr
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.dialogs.ChangelogDialog
 import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
@@ -44,8 +45,7 @@ class SettingsAboutCard(util: SettingsUtil) : SettingsCard(util), CoroutineScope
             null,
             items = listOf(),
             itemsMore = listOf(),
-            backgroundColor = 0xff1976d2.toInt(),
+            backgroundColor = R.attr.colorPrimaryContainer.resolveAttr(activity)
-            theme = R.style.AppTheme_Dark
         ).also {
             it.items.addAll(getItems(it))
         }

app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/GenerateBlockTimetableDialog.kt

@@ -391,7 +391,9 @@ class GenerateBlockTimetableDialog(
             try {
                 val uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values) ?: return@withContext null
                 resolver.openOutputStream(uri).use {
-                    bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
+                    if (it != null) {
+                        bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
+                    }
                 }
                 uri
             } catch (e: Exception) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt

@@ -49,6 +49,7 @@ class LessonDetailsDialog(
         DialogLessonDetailsBinding.inflate(layoutInflater)
 
     override fun getPositiveButtonText() = R.string.close
+    override fun getNegativeButtonText() = R.string.notes_button
     override fun getNeutralButtonText() = R.string.add
 
     private lateinit var adapter: EventListAdapter
@@ -67,7 +68,6 @@ class LessonDetailsDialog(
         ).show()
         return NO_DISMISS
     }
-
     override suspend fun onShow() {
         if (App.devMode)
             b.lessonId.visibility = View.VISIBLE
@@ -240,6 +240,7 @@ class LessonDetailsDialog(
 
         lesson.displayTeacherName?.let { name ->
             lesson.displayTeacherId ?: return@let
+            /*
             BetterLink.attach(
                 b.teacherNameView,
                 teachers = mapOf(lesson.displayTeacherId!! to name),
@@ -250,8 +251,9 @@ class LessonDetailsDialog(
                 teachers = mapOf(lesson.displayTeacherId!! to name),
                 onActionSelected = dialog::dismiss
             )
+            */
         }
-
+/*
         b.notesButton.isVisible = showNotes
         b.notesButton.setupNotesButton(
             activity = activity,
@@ -262,5 +264,6 @@ class LessonDetailsDialog(
         b.legend.isVisible = showNotes
         if (showNotes)
             NoteManager.setLegendText(lesson, b.legend)
+*/
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt

@@ -273,34 +273,31 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
                 lesson.teacherName ?: "?"
             else
                 mutableListOf<CharSequence>().apply {
-                    lesson.oldTeacherName?.let { add(it.asStrikethroughSpannable()) }
                     lesson.teacherName?.let { add(it) }
-                }.concat(arrowRight)
+                }.concat()
 
             // team
             val teamInfo = if (lesson.teamId != null && lesson.teamId == lesson.oldTeamId)
                 lesson.teamName ?: "?"
             else
                 mutableListOf<CharSequence>().apply {
-                    lesson.oldTeamName?.let { add(it.asStrikethroughSpannable()) }
                     lesson.teamName?.let { add(it) }
-                }.concat(arrowRight)
+                }.concat()
 
             // classroom
             val classroomInfo = if (lesson.classroom != null && lesson.classroom == lesson.oldClassroom)
                 lesson.classroom ?: "?"
             else
                 mutableListOf<CharSequence>().apply {
-                    lesson.oldClassroom?.let { add(it.asStrikethroughSpannable()) }
                     lesson.classroom?.let { add(it) }
-                }.concat(arrowRight)
+                }.concat()
 
 
             lb.lessonNumber = lesson.displayLessonNumber
             val lessonText =
                 lesson.getNoteSubstituteText(showNotes = true) ?: lesson.displaySubjectName
             lb.subjectName.text = lessonText?.let {
-                if (lesson.type == Lesson.TYPE_CANCELLED || lesson.type == Lesson.TYPE_SHIFTED_SOURCE)
+                if (lesson.type == Lesson.TYPE_SHIFTED_SOURCE)
                     it.asStrikethroughSpannable().asColoredSpannable(colorSecondary)
                 else
                     it
@@ -329,12 +326,6 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
 
             //lb.subjectName.typeface = Typeface.create("sans-serif-light", Typeface.BOLD)
             lb.annotationVisible = manager.getAnnotation(activity, lesson, lb.annotation)
-            val lessonNumberMargin =
-                if (lb.annotationVisible) (-8).dp
-                else 0
-            lb.lessonNumberText.updateLayoutParams<LinearLayout.LayoutParams> {
-                updateMargins(top = lessonNumberMargin, bottom = lessonNumberMargin)
-            }
 
             // The day view needs the event time ranges in the start minute/end minute format,
             // so calculate those here

app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt

@@ -168,8 +168,8 @@ class TimetableFragment : Fragment(), CoroutineScope {
 
         val selectedDate = arguments?.getString("timetableDate", "")?.let { if (it.isBlank()) null else Date.fromY_m_d(it) }
 
-        b.tabLayout.setUpWithViewPager(b.viewPager)
+        b.tabLayout.setupWithViewPager(b.viewPager)
-        b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == selectedDate?.value ?: today }, false)
+        b.viewPager.setCurrentItem(items.indexOfFirst { it.value == selectedDate?.value ?: today }, false)
 
         activity.navView.bottomSheet.prependItems(
                 BottomSheetPrimaryItem(true)
@@ -187,7 +187,7 @@ class TimetableFragment : Fragment(), CoroutineScope {
                                         val dateSelected = Date.fromMillisUtc(millis)
                                         val index = items.indexOfFirst { it == dateSelected }
                                         if (index != -1)
-                                            b.tabLayout.setCurrentItem(index, true)
+                                            b.viewPager.setCurrentItem(index, true)
                                     }
                                 }
                                 .show(activity.supportFragmentManager, TAG)
@@ -223,7 +223,7 @@ class TimetableFragment : Fragment(), CoroutineScope {
         activity.navView.bottomBar.fabExtendedText = getString(R.string.timetable_today)
         activity.navView.bottomBar.fabIcon = SzkolnyFont.Icon.szf_calendar_today_outline
         activity.navView.setFabOnClickListener(View.OnClickListener {
-            b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == today }, true)
+            b.viewPager.setCurrentItem(items.indexOfFirst { it.value == today }, true)
         })
     }}
 

app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/GradesManager.kt

@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.utils.managers
 
 import android.content.Context
+import com.google.android.material.color.MaterialColors
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -125,7 +126,7 @@ class GradesManager(val app: App) : CoroutineScope {
         return grade.weight
     }
 
-    fun getGradeColor(grade: Grade): Int {
+    fun getGradeColor(context: Context, grade: Grade): Int {
         val type = grade.type
         val defColor = colorMode == COLOR_MODE_DEFAULT
         val valueMax = grade.valueMax ?: 0f
@@ -173,7 +174,7 @@ class GradesManager(val app: App) : CoroutineScope {
             }
             else -> grade.color and 0xffffff
         }
-        return color or 0xff000000.toInt()
+        return MaterialColors.harmonizeWithPrimary(context, color or 0xff000000.toInt())
     }
 
     /**

app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/TimetableManager.kt

@@ -43,40 +43,11 @@ class TimetableManager(val app: App) : CoroutineScope {
             Lesson.TYPE_CANCELLED -> {
                 annotationVisible = true
                 annotation.setText(R.string.timetable_lesson_cancelled)
-                annotation.background.colorFilter = PorterDuffColorFilter(
-                        getColorFromAttr(context, R.attr.timetable_lesson_cancelled_color),
-                        PorterDuff.Mode.SRC_ATOP
-                )
                 //lb.subjectName.typeface = Typeface.DEFAULT
             }
             Lesson.TYPE_CHANGE -> {
                 annotationVisible = true
-                when {
+                annotation.setText(R.string.timetable_lesson_change)
-                    lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId
-                            && lesson.oldSubjectName != null && lesson.oldTeacherName != null ->
-                        annotation.setText(
-                                R.string.timetable_lesson_change_format,
-                                "${lesson.oldSubjectName ?: "?"}, ${lesson.oldTeacherName ?: "?"}"
-                        )
-
-                    lesson.subjectId != lesson.oldSubjectId && lesson.oldSubjectName != null ->
-                        annotation.setText(
-                                R.string.timetable_lesson_change_format,
-                                lesson.oldSubjectName ?: "?"
-                        )
-
-                    lesson.teacherId != lesson.oldTeacherId && lesson.oldTeacherName != null ->
-                        annotation.setText(
-                                R.string.timetable_lesson_change_format,
-                                lesson.oldTeacherName ?: "?"
-                        )
-                    else -> annotation.setText(R.string.timetable_lesson_change)
-                }
-
-                annotation.background.colorFilter = PorterDuffColorFilter(
-                        getColorFromAttr(context, R.attr.timetable_lesson_change_color),
-                        PorterDuff.Mode.SRC_ATOP
-                )
             }
             Lesson.TYPE_SHIFTED_SOURCE -> {
                 annotationVisible = true
@@ -96,8 +67,6 @@ class TimetableManager(val app: App) : CoroutineScope {
 
                     else -> annotation.setText(R.string.timetable_lesson_shifted)
                 }
-
-                annotation.background.setTintColor(R.attr.timetable_lesson_shifted_source_color.resolveAttr(context))
             }
             Lesson.TYPE_SHIFTED_TARGET -> {
                 annotationVisible = true
@@ -117,11 +86,6 @@ class TimetableManager(val app: App) : CoroutineScope {
 
                     else -> annotation.setText(R.string.timetable_lesson_shifted_from)
                 }
-
-                annotation.background.colorFilter = PorterDuffColorFilter(
-                        getColorFromAttr(context, R.attr.timetable_lesson_shifted_target_color),
-                        PorterDuff.Mode.SRC_ATOP
-                )
             }
         }
         return annotationVisible

app/src/main/res/color/card_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="?colorSurfaceContainerHigh"/>
+</selector>

app/src/main/res/color/drawer_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="?colorPrimary"
+        android:alpha="0.01" />
+</selector>

app/src/main/res/color/ediary_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="?colorOnBackground"/>
+</selector>

app/src/main/res/drawable/bg_circle.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="#ffffff" />
 </shape>

app/src/main/res/drawable/bg_circle_outline.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <stroke android:color="#000000" android:width="4dp" />
+    <solid android:color="#ffffff" />
+</shape>

app/src/main/res/drawable/divider.xml

@@ -10,6 +10,6 @@
         android:width="1dp"
         android:height="1dp" />
 
-    <solid android:color="@color/dividerColor" />
+    <solid android:color="?colorOutlineVariant" />
 
 </shape>

app/src/main/res/drawable/emoji_glasses.xml

@@ -1,28 +1,10 @@
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
+    android:width="64dp"
-    android:height="128dp"
+    android:height="64dp"
-    android:viewportWidth="128"
+    android:viewportWidth="48"
-    android:viewportHeight="128">
+    android:viewportHeight="48"
+    android:tint="?colorOnSurfaceVariant">
   <path
-      android:pathData="M63.79,8.64C1.48,8.64 0,78.5 0,92.33c0,13.83 28.56,25.03 63.79,25.03c35.24,0 63.79,-11.21 63.79,-25.03C127.58,78.5 126.11,8.64 63.79,8.64z"
+      android:fillColor="?colorOnSurfaceVariant"
-      android:fillColor="#FCC21B"/>
+      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"/>
-  <path
-      android:pathData="M63.91,104.82c-3.43,0 -6.87,-0.43 -10.25,-1.31c-1.6,-0.42 -2.56,-2.06 -2.15,-3.66c0.42,-1.6 2.06,-2.56 3.66,-2.14c11.65,3.04 24.21,-0.21 32.78,-8.48c1.19,-1.15 3.09,-1.12 4.24,0.08c1.15,1.19 1.12,3.09 -0.08,4.24C84.54,100.85 74.32,104.82 63.91,104.82z"
-      android:fillColor="#2F2F2F"/>
-  <path
-      android:pathData="M55.53,67.26c-0.01,0.01 -0.02,0.02 -0.02,0.02C55.51,67.27 55.52,67.26 55.53,67.26z"
-      android:fillColor="#2F2F2F"/>
-  <path
-      android:pathData="M98.21,41.34c-13.36,0 -15.15,2.03 -21.4,3.36C70.56,46.02 64,46.02 64,46.02s-6.56,0 -12.81,-1.33c-6.25,-1.33 -8.05,-3.36 -21.4,-3.36c-13.36,0 -29.37,2.89 -29.37,2.89v8.51c0,0 3.59,0.47 3.91,3.75c0.16,1.33 -3.12,28.35 23.51,28.35c18.9,0 26.87,-11.33 29.45,-20.54c1.17,-4.37 2.19,-9.37 6.72,-9.37c4.53,0 5.55,5 6.72,9.37c2.58,9.22 10.54,20.54 29.45,20.54c26.63,0 23.35,-27.03 23.51,-28.35c0.31,-3.28 3.91,-3.75 3.91,-3.75v-8.51C127.58,44.23 111.57,41.34 98.21,41.34z"
-      android:fillColor="#2F2F2F"/>
-  <path
-      android:pathData="M95.94,45.05c-6.62,0.23 -11.65,1.31 -11.65,1.31c-9.84,2.06 -10.55,8.14 -9.93,12.97c0.8,6.07 3.29,13.75 10.04,18.49c0.53,0.38 1.76,0.79 2.35,-0.77c0,0 -0.02,0.11 0,0c2.22,-10.48 5.52,-20.14 10.78,-29.89l0,0C98.14,45.37 96.71,45.02 95.94,45.05z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M31.06,45.02c-4.27,-0.09 -9.11,0.19 -13.65,1.34c-5.1,1.28 -7.07,3.85 -7.6,9.39c-0.53,5.43 -1.13,19.27 8.73,24.46c0.57,0.3 1.83,0.5 2.44,-0.91l0,0C24,66.21 25.61,60.13 32.54,47.22l0,0C33.11,45.49 31.83,45.03 31.06,45.02z"
-      android:fillColor="#FFFFFF"/>
 </vector>

app/src/main/res/drawable/emoji_no_face.xml

@@ -1,19 +1,10 @@
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
+    android:width="64dp"
-    android:height="128dp"
+    android:height="64dp"
-    android:viewportWidth="128"
+    android:viewportWidth="48"
-    android:viewportHeight="128">
+    android:viewportHeight="48"
+    android:tint="?colorOnSurfaceVariant">
   <path
-      android:pathData="M64,9.56c-62.41,0 -63.88,69.96 -63.88,83.8c0,13.86 28.59,25.08 63.88,25.08c35.28,0 63.88,-11.22 63.88,-25.08C127.88,79.52 126.4,9.56 64,9.56z"
+      android:fillColor="?colorOnSurfaceVariant"
-      android:fillColor="#FCC21B"/>
+      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"/>
-  <path
-      android:pathData="M42.21,65.3c-4.49,0.04 -8.17,-4.27 -8.22,-9.62c-0.05,-5.37 3.55,-9.75 8.04,-9.79c4.48,-0.04 8.17,4.27 8.22,9.64C50.3,60.88 46.7,65.25 42.21,65.3z"
-      android:fillColor="#2F2F2F"/>
-  <path
-      android:pathData="M86.32,65.3c4.48,-0.01 8.11,-4.36 8.1,-9.71c-0.01,-5.37 -3.66,-9.7 -8.14,-9.69c-4.49,0.01 -8.13,4.36 -8.12,9.73C78.18,60.98 81.83,65.31 86.32,65.3z"
-      android:fillColor="#2F2F2F"/>
 </vector>

app/src/main/res/drawable/emoji_sad.xml

@@ -1,22 +1,10 @@
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
+    android:width="24dp"
-    android:height="128dp"
+    android:height="24dp"
-    android:viewportWidth="128"
+    android:viewportWidth="48"
-    android:viewportHeight="128">
+    android:viewportHeight="48"
+    android:tint="?colorOnPrimary">
   <path
-      android:pathData="M64,9.62c-62.41,0 -63.88,69.96 -63.88,83.8c0,13.86 28.59,25.08 63.88,25.08c35.28,0 63.88,-11.22 63.88,-25.08C127.88,79.58 126.4,9.62 64,9.62z"
+      android:fillColor="?colorOnPrimary"
-      android:fillColor="#FCC21B"/>
+      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"/>
-  <path
-      android:pathData="M41.99,65.5c-4.49,0.04 -8.17,-4.27 -8.22,-9.62c-0.05,-5.37 3.55,-9.75 8.04,-9.79c4.48,-0.04 8.17,4.27 8.22,9.64C50.08,61.09 46.47,65.46 41.99,65.5z"
-      android:fillColor="#2F2F2F"/>
-  <path
-      android:pathData="M86.1,65.5c4.48,-0.01 8.11,-4.36 8.1,-9.71c-0.01,-5.37 -3.66,-9.7 -8.14,-9.69c-4.49,0.01 -8.13,4.36 -8.12,9.73C77.95,61.18 81.61,65.51 86.1,65.5z"
-      android:fillColor="#2F2F2F"/>
-  <path
-      android:pathData="M43.08,97.67c1.99,1.34 4.5,0.46 6.71,0c6.18,-1.28 11.6,-1.33 14.2,-1.33s8.03,0.05 14.2,1.33c2.21,0.46 4.72,1.34 6.71,0c2.52,-1.71 0.66,-7.83 -3.31,-11.97c-2.4,-2.5 -8.13,-7.35 -17.61,-7.35c-9.48,0 -15.2,4.85 -17.61,7.35C42.42,89.85 40.56,95.97 43.08,97.67z"
-      android:fillColor="#ED6C30"/>
 </vector>

app/src/main/res/drawable/ic_archive.xml

@@ -1,19 +1,10 @@
-<!--
-  ~ Copyright (c) Kuba Szczodrzyński 2020-8-25.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
+    android:width="64dp"
-    android:height="128dp"
+    android:height="64dp"
-    android:viewportWidth="64"
+    android:viewportWidth="48"
-    android:viewportHeight="64">
+    android:viewportHeight="48"
+    android:tint="?colorOnSecondaryContainer">
   <path
-      android:pathData="M54,19H10v33c0,2.209 1.791,4 4,4h36c2.209,0 4,-1.791 4,-4V19z"
+      android:fillColor="?colorOnSecondaryContainer"
-      android:fillColor="#ffb86b"/>
+      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"/>
-  <path
-      android:pathData="m54,22h-44c-1.657,0 -3,-1.343 -3,-3v-5c0,-1.657 1.343,-3 3,-3h44c1.657,0 3,1.343 3,3v5c0,1.657 -1.343,3 -3,3z"
-      android:fillColor="#ffa54a"/>
-  <path
-      android:pathData="m37,32h-10c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h10c1.65,0 3,1.35 3,3s-1.35,3 -3,3z"
-      android:fillColor="#69707e"/>
 </vector>

app/src/main/res/drawable/ic_delete.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?colorOnBackground">
+  <path
+      android:fillColor="?colorOnBackground"
+      android:pathData="M7.2,21.3Q6.15,21.3 5.45,20.6Q4.75,19.9 4.75,18.85V5.9H3.75V3.75H8.95V2.675H15.1V3.75H20.3V5.9H19.3V18.85Q19.3,19.875 18.587,20.587Q17.875,21.3 16.85,21.3ZM17.15,5.9H6.9V18.85Q6.9,18.975 6.988,19.062Q7.075,19.15 7.2,19.15H16.85Q16.95,19.15 17.05,19.05Q17.15,18.95 17.15,18.85ZM8.875,17.125H11.025V7.925H8.875ZM13.025,17.125H15.175V7.925H13.025ZM6.9,5.9V18.85Q6.9,18.975 6.9,19.062Q6.9,19.15 6.9,19.15Q6.9,19.15 6.9,19.062Q6.9,18.975 6.9,18.85Z"/>
+</vector>

app/src/main/res/drawable/ic_event_note.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?colorOnPrimary"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="?colorOnPrimary"
+      android:pathData="M15.85,27.3Q15,27.3 14.55,26.8Q14.1,26.3 14.1,25.6Q14.1,24.8 14.55,24.325Q15,23.85 15.85,23.85H32.2Q33,23.85 33.45,24.325Q33.9,24.8 33.9,25.55Q33.9,26.3 33.45,26.8Q33,27.3 32.2,27.3ZM15.85,36.1Q15,36.1 14.55,35.65Q14.1,35.2 14.1,34.4Q14.1,33.65 14.55,33.175Q15,32.7 15.85,32.7H26.15Q26.95,32.7 27.4,33.2Q27.85,33.7 27.85,34.4Q27.85,35.2 27.4,35.65Q26.95,36.1 26.15,36.1ZM9.5,45.1Q7.65,45.1 6.3,43.725Q4.95,42.35 4.95,40.55V10.5Q4.95,8.6 6.3,7.25Q7.65,5.9 9.5,5.9H12.45V4.8Q12.45,4.1 13.075,3.475Q13.7,2.85 14.5,2.85Q15.35,2.85 15.875,3.475Q16.4,4.1 16.4,4.8V5.9H31.6V4.8Q31.6,4.1 32.2,3.475Q32.8,2.85 33.6,2.85Q34.45,2.85 35,3.475Q35.55,4.1 35.55,4.8V5.9H38.5Q40.4,5.9 41.75,7.25Q43.1,8.6 43.1,10.5V40.55Q43.1,42.35 41.75,43.725Q40.4,45.1 38.5,45.1ZM9.5,40.55H38.5Q38.5,40.55 38.5,40.55Q38.5,40.55 38.5,40.55V19.6H9.5V40.55Q9.5,40.55 9.5,40.55Q9.5,40.55 9.5,40.55ZM9.5,16.75H38.5V10.5Q38.5,10.5 38.5,10.5Q38.5,10.5 38.5,10.5H9.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5ZM9.5,16.75V10.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5V16.75Z"/>
+</vector>

app/src/main/res/drawable/ic_forward.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?colorOnBackground"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="?colorOnBackground"
+      android:pathData="M2.75,19.2V15.05Q2.75,12.9 4.25,11.4Q5.75,9.9 7.9,9.9H17.15L13.55,6.3L15.05,4.8L21.25,11L15.05,17.2L13.55,15.7L17.15,12.05H7.9Q6.65,12.05 5.775,12.925Q4.9,13.8 4.9,15.05V19.2Z"/>
+</vector>

app/src/main/res/drawable/ic_grade.xml

@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
+    android:width="24dp"
-    android:height="64dp"
+    android:height="24dp"
     android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:viewportHeight="48"
+    android:tint="?attr/colorControlNormal">
   <path
-      android:pathData="M44,24c0,11.045 -8.955,20 -20,20S4,35.045 4,24S12.955,4 24,4S44,12.955 44,24z"
+      android:fillColor="@android:color/white"
-      android:fillColor="#F44336"/>
+      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"/>
-  <path
-      android:pathData="M24,11l3.898,7.898l8.703,1.301l-6.301,6.102l1.5,8.699L24,30.898L16.199,35l1.5,-8.699l-6.301,-6.102l8.703,-1.301L24,11z"
-      android:fillColor="#FFCA28"/>
 </vector>

app/src/main/res/drawable/ic_launcher_monochrome_background.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

app/src/main/res/drawable/ic_no_timetable.xml

@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
+    android:width="64dp"
-    android:height="128dp"
+    android:height="64dp"
-    android:viewportWidth="128"
+    android:viewportWidth="48"
-    android:viewportHeight="128">
+    android:viewportHeight="48"
+    android:tint="?colorOnSurfaceVariant">
   <path
-      android:pathData="m103.24,15.168 l-7.883,7.871c-8.746,-7.063 -19.719,-11.039 -31.355,-11.039 -27.57,0 -50,22.43 -50,50s22.43,50 50,50c17.758,0 34.348,-9.367 43.301,-24.449 1.41,-2.375 0.625,-5.441 -1.75,-6.852 -2.367,-1.41 -5.438,-0.629 -6.852,1.746 -7.156,12.062 -20.453,19.555 -34.699,19.555 -22.055,0 -40,-17.945 -40,-40s17.945,-40 40,-40c8.934,0 17.371,2.938 24.223,8.16l-9.063,9.047c-2.48,2.5 -0.719,6.762 2.801,6.762h24.039c2.199,0 4,-1.801 4,-4v-24c0,-3.52 -4.262,-5.301 -6.762,-2.801z"
+      android:fillColor="?colorOnSurfaceVariant"
-      android:fillColor="#ffcf48"/>
+      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"/>
-  <path
-      android:pathData="m68,85c0,2.762 -2.238,5 -5,5s-5,-2.238 -5,-5 2.238,-5 5,-5 5,2.238 5,5zM70,41c0,-3.867 -3.133,-7 -7,-7s-7,3.133 -7,7c0,0.047 0.016,0.094 0.016,0.141h-0.016l2.438,28.59c0.203,2.414 2.188,4.269 4.563,4.269s4.359,-1.855 4.563,-4.269l2.438,-28.59h-0.016c0,-0.047 0.016,-0.094 0.016,-0.141z"
-      android:fillColor="#fd657a"/>
 </vector>

app/src/main/res/drawable/ic_note.xml

@@ -1,18 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
+    android:width="24dp"
-    android:height="64dp"
+    android:height="24dp"
     android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:viewportHeight="48"
+    android:tint="?colorOnBackground"
+    android:autoMirrored="true">
   <path
-      android:pathData="M8,39.001v-30c0,-2.2 1.8,-4 4,-4h24c2.2,0 4,1.8 4,4v30c0,2.2 -1.8,4 -4,4H12C9.8,43.001 8,41.201 8,39.001z"
+      android:fillColor="?colorOnBackground"
-      android:fillColor="#42a5f5"/>
+      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"/>
-  <path
-      android:pathData="M14,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S14,9.105 14,8.001zM22,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S22,9.105 22,8.001zM30,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S30,9.105 30,8.001zM38,8.001c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2s0.895,2 2,2S38,9.105 38,8.001z"
-      android:fillColor="#1e88e5"/>
-  <path
-      android:pathData="M11,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C11.4,9.001 11,8.601 11,8.001zM19,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C19.4,9.001 19,8.601 19,8.001zM27,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C27.4,9.001 27,8.601 27,8.001zM35,8.001v-4c0,-0.6 0.4,-1 1,-1l0,0c0.6,0 1,0.4 1,1v4c0,0.6 -0.4,1 -1,1l0,0C35.4,9.001 35,8.601 35,8.001z"
-      android:fillColor="#cfd8dc"/>
-  <path
-      android:pathData="M14,19.001h19.993v2H14V19.001zM14.007,15.001H34v2H14.007V15.001zM14,30.001h17v2H14V30.001zM27,34.001h6.993v2H27V34.001zM14,34.001h11v2H14V34.001zM21,23.001h-7v2h7V23.001z"
-      android:fillColor="#1565c0"/>
 </vector>

app/src/main/res/drawable/ic_reply.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?colorOnBackground"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="?colorOnBackground"
+      android:pathData="M19.1,19.2V15.05Q19.1,13.8 18.225,12.925Q17.35,12.05 16.1,12.05H6.85L10.45,15.7L8.95,17.2L2.75,11L8.95,4.8L10.45,6.3L6.85,9.9H16.1Q18.25,9.9 19.75,11.4Q21.25,12.9 21.25,15.05V19.2Z"/>
+</vector>

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">
   <path
-      android:pathData="M33,5L15,5L10,14L12,40L36,40L38,14Z"
+      android:fillColor="?colorOnBackground"
-      android:strokeWidth="1"
+      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"/>
-      android:fillColor="#546e7a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M41,43L7,43C9,38 16,36 24,36C32,36 39,38 41,43Z"
-      android:strokeWidth="1"
-      android:fillColor="#8bc34a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M34.5,38.9727L34.6094,38.1836C34.6602,37.8945 34.7031,37.5977 34.7617,37.3203C34.875,36.7656 35.0039,36.2148 35.1719,35.6719C35.4922,34.5938 35.9375,33.5508 36.4844,32.582C37.0352,31.6133 37.6914,30.7188 38.4492,29.9375C39.2109,29.1641 40.0547,28.4766 41,28C40.1992,28.6836 39.5664,29.5195 39.0469,30.3945C38.5234,31.2773 38.1406,32.2148 37.8633,33.168C37.5938,34.1289 37.4336,35.1055 37.3867,36.082C37.3516,36.5703 37.3594,37.0586 37.375,37.5469C37.3828,37.7891 37.4063,38.0156 37.4219,38.2461L37.5,39.0273Z"
-      android:strokeWidth="1"
-      android:fillColor="#8bc34a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M35.5195,40.7461C35.8125,39.8789 36.1523,39.1719 36.5508,38.4336C36.9531,37.7148 37.4063,37.0234 37.9414,36.3906C38.4688,35.7617 39.0859,35.1953 39.7734,34.7617C40.4648,34.332 41.2383,34.0625 42,34C41.2969,34.3086 40.7148,34.7773 40.2617,35.332C39.8125,35.8906 39.4766,36.5156 39.2227,37.1758C38.9648,37.832 38.7891,38.5195 38.6641,39.2109C38.5469,39.8906 38.4648,40.6367 38.4766,41.2539Z"
-      android:strokeWidth="1"
-      android:fillColor="#8bc34a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M32.5195,37.7617C32.7305,37.1953 32.9063,36.4961 33.0352,35.8398C33.1641,35.1719 33.2461,34.4961 33.2617,33.8164C33.2813,32.4805 33.0664,31.0391 32,30C32.668,30.3008 33.2695,30.8281 33.7109,31.4688C34.1641,32.1055 34.4883,32.832 34.7422,33.5742C34.9883,34.3164 35.1641,35.082 35.2852,35.8555C35.4023,36.6367 35.4805,37.3828 35.4805,38.2422Z"
-      android:strokeWidth="1"
-      android:fillColor="#8bc34a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M31.2617,33.7852C31.2773,32.6367 31.1875,30.375 29,28C30.8789,27.375 32.6328,28.0703 33.8438,28.9063L34.9414,14.668L31.2344,8L16.7656,8L13.0586,14.668L14.6328,35.0977C17.3008,34.3789 20.4336,34 24,34C26.6406,34 29.0391,34.2109 31.1914,34.6094C31.2344,34.1875 31.2617,33.8633 31.2617,33.7852Z"
-      android:strokeWidth="1"
-      android:fillColor="#78909c"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M17.9727,19.1719L16.9297,19.1719L16.9297,22L15,22L15,14L18.1484,14C19.0977,14 19.8398,14.2109 20.3711,14.6328C20.9063,15.0547 21.1758,15.6484 21.1758,16.4141C21.1758,16.9727 21.0625,17.4336 20.8359,17.8008C20.6133,18.1641 20.2578,18.4609 19.7773,18.6875L21.4492,21.918L21.4492,22L19.3828,22ZM16.9297,17.6875L18.1484,17.6875C18.5156,17.6875 18.7891,17.5898 18.9766,17.3984C19.1602,17.207 19.2539,16.9375 19.2539,16.5898C19.2539,16.2461 19.1602,15.9766 18.9727,15.7773C18.7852,15.582 18.5117,15.4844 18.1484,15.4844L16.9297,15.4844Z"
-      android:strokeWidth="1"
-      android:fillColor="#37474f"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M25,22L23,22L23,14L25,14Z"
-      android:strokeWidth="1"
-      android:fillColor="#37474f"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M28.9297,19.2852L28.9297,22L27,22L27,14L30.1914,14C30.8047,14 31.3438,14.1133 31.8125,14.3398C32.2852,14.5625 32.6484,14.8828 32.9063,15.3008C33.168,15.7148 33.2969,16.1875 33.2969,16.7148C33.2969,17.4922 33.0156,18.1172 32.457,18.5859C31.8984,19.0547 31.1328,19.2852 30.1563,19.2852ZM28.9297,17.7969L30.1914,17.7969C30.5664,17.7969 30.8516,17.7031 31.0469,17.5156C31.2422,17.3281 31.3438,17.0664 31.3438,16.7266C31.3438,16.3516 31.2422,16.0547 31.0391,15.8281C30.8359,15.6094 30.5625,15.4922 30.2148,15.4922L28.9297,15.4922Z"
-      android:strokeWidth="1"
-      android:fillColor="#37474f"
-      android:strokeColor="#00000000"/>
 </vector>

app/src/main/res/drawable/ic_shortcut_agenda_foreground.xml

@@ -6,7 +6,7 @@
   <group android:translateX="11.076923"
       android:translateY="11.076923">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="?colorOnPrimary"
         android:pathData="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.89 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V5C21,3.89 20.1,3 19,3H18V1M17,12H12V17H17V12Z"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_shortcut_homework_foreground.xml

@@ -6,7 +6,7 @@
   <group android:translateX="11.076923"
       android:translateY="11.076923">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="?colorOnPrimary"
         android:pathData="M6,2C4.89,2 4,2.89 4,4V20A2,2 0,0 0,6 22H10V20.09L12.09,18H6V16H14.09L16.09,14H6V12H18.09L20,10.09V8L14,2H6M13,3.5L18.5,9H13V3.5M20.15,13C20,13 19.86,13.05 19.75,13.16L18.73,14.18L20.82,16.26L21.84,15.25C22.05,15.03 22.05,14.67 21.84,14.46L20.54,13.16C20.43,13.05 20.29,13 20.15,13M18.14,14.77L12,20.92V23H14.08L20.23,16.85L18.14,14.77Z"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_shortcut_messages_foreground.xml

@@ -6,7 +6,7 @@
   <group android:translateX="11.076923"
       android:translateY="11.076923">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="?colorOnPrimary"
         android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0,0 0,4 20H20A2,2 0,0 0,22 18V6C22,4.89 21.1,4 20,4Z"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_shortcut_timetable_foreground.xml

@@ -6,7 +6,7 @@
   <group android:translateX="11.076923"
       android:translateY="11.076923">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="?colorOnPrimary"
         android:pathData="M14,12H15.5V14.82L17.94,16.23L17.19,17.53L14,15.69V12M4,2H18A2,2 0,0 1,20 4V10.1C21.24,11.36 22,13.09 22,15A7,7 0,0 1,15 22C13.09,22 11.36,21.24 10.1,20H4A2,2 0,0 1,2 18V4A2,2 0,0 1,4 2M4,15V18H8.67C8.24,17.09 8,16.07 8,15H4M4,8H10V5H4V8M18,8V5H12V8H18M4,13H8.29C8.63,11.85 9.26,10.82 10.1,10H4V13M15,10.15A4.85,4.85 0,0 0,10.15 15C10.15,17.68 12.32,19.85 15,19.85A4.85,4.85 0,0 0,19.85 15C19.85,12.32 17.68,10.15 15,10.15Z"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_sync.xml

@@ -1,5 +1,10 @@
-<vector android:height="128dp" android:viewportHeight="64"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="64" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="64dp"
-    <path android:fillColor="#fd646f" android:pathData="m51.483,15.326 l3.937,-3.93c1.24,-1.25 0.36,-3.38 -1.4,-3.38h-12.02c-1.1,0 -2,0.9 -2,2v12c0,1.76 2.13,2.65 3.38,1.4l4.537,-4.529c2.615,3.426 4.083,7.646 4.083,12.113 0,11.215 -8.565,20 -19.5,20 -1.381,0 -2.5,1.119 -2.5,2.5s1.119,2.5 2.5,2.5c13.738,0 24.5,-10.981 24.5,-25 0,-5.817 -1.988,-11.301 -5.517,-15.674z"/>
+    android:height="64dp"
-    <path android:fillColor="#fd646f" android:pathData="m20.604,38.58 l-4.523,4.53c-2.613,-3.427 -4.081,-7.647 -4.081,-12.11 0,-11.215 8.565,-20 19.5,-20 1.381,0 2.5,-1.119 2.5,-2.5s-1.119,-2.5 -2.5,-2.5c-13.738,0 -24.5,10.981 -24.5,25 0,5.815 1.989,11.303 5.52,15.677l-3.936,3.943c-1.25,1.25 -0.36,3.38 1.4,3.38h12c1.1,0 2,-0.9 2,-2v-12.02c0,-1.76 -2.13,-2.64 -3.38,-1.4z"/>
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?colorOnSurfaceVariant">
+    <path
+        android:fillColor="?colorOnSurfaceVariant"
+        android:pathData="M8.6,40.6V37.2H13.85L13.55,36.9Q10.25,34.1 8.725,31.05Q7.2,28 7.2,24.15Q7.2,18.3 10.825,13.775Q14.45,9.25 20.25,7.8V12.45Q16.4,13.65 14.1,16.875Q11.8,20.1 11.8,24.15Q11.8,27.15 12.875,29.325Q13.95,31.5 15.95,33.1L17.2,33.9V28.55H20.6V40.6ZM27.8,40.25V35.55Q31.7,34.4 33.975,31.15Q36.25,27.9 36.25,23.8Q36.25,21.6 35.1,19.275Q33.95,16.95 32.2,15.15L31,14.1V19.45H27.55V7.4H39.6V10.8H34.25L34.6,11.2Q37.75,14.05 39.3,17.4Q40.85,20.75 40.85,23.8Q40.85,29.7 37.225,34.225Q33.6,38.75 27.8,40.25Z"/>
 </vector>

app/src/main/res/drawable/ic_timetable.xml

@@ -1,30 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
+android:width="48dp"
-    android:height="128dp"
+android:height="48dp"
-    android:viewportWidth="48"
+android:viewportWidth="48"
-    android:viewportHeight="48">
+android:viewportHeight="48"
-  <path
+android:tint="?attr/colorOnSurfaceVariant">
-      android:pathData="M42,38c0,2.209 -1.791,4 -4,4H10c-2.209,0 -4,-1.791 -4,-4V10c0,-2.209 1.791,-4 4,-4h28c2.209,0 4,1.791 4,4V38z"
+<path
-      android:fillColor="#CFD8DC"/>
+    android:fillColor="?attr/colorOnSurfaceVariant"
-  <path
+    android:pathData="M24,28.25Q23.1,28.25 22.425,27.6Q21.75,26.95 21.75,26Q21.75,25.1 22.425,24.425Q23.1,23.75 24.05,23.75Q24.95,23.75 25.6,24.4Q26.25,25.05 26.25,26Q26.25,26.9 25.6,27.575Q24.95,28.25 24,28.25ZM16,28.25Q15.1,28.25 14.425,27.6Q13.75,26.95 13.75,26Q13.75,25.1 14.4,24.425Q15.05,23.75 16,23.75Q16.9,23.75 17.575,24.4Q18.25,25.05 18.25,26Q18.25,26.9 17.6,27.575Q16.95,28.25 16,28.25ZM31.95,28.25Q31.1,28.25 30.425,27.6Q29.75,26.95 29.75,26Q29.75,25.1 30.425,24.425Q31.1,23.75 32,23.75Q32.9,23.75 33.575,24.4Q34.25,25.05 34.25,26Q34.25,26.9 33.575,27.575Q32.9,28.25 31.95,28.25ZM24,36.25Q23.1,36.25 22.425,35.575Q21.75,34.9 21.75,34Q21.75,33.1 22.425,32.425Q23.1,31.75 24.05,31.75Q24.95,31.75 25.6,32.425Q26.25,33.1 26.25,34.05Q26.25,34.9 25.6,35.575Q24.95,36.25 24,36.25ZM16,36.25Q15.1,36.25 14.425,35.575Q13.75,34.9 13.75,34Q13.75,33.1 14.4,32.425Q15.05,31.75 16,31.75Q16.9,31.75 17.575,32.425Q18.25,33.1 18.25,34.05Q18.25,34.9 17.6,35.575Q16.95,36.25 16,36.25ZM31.95,36.25Q31.1,36.25 30.425,35.575Q29.75,34.9 29.75,34Q29.75,33.1 30.425,32.425Q31.1,31.75 32,31.75Q32.9,31.75 33.575,32.425Q34.25,33.1 34.25,34.05Q34.25,34.9 33.575,35.575Q32.9,36.25 31.95,36.25ZM9.5,45.1Q7.65,45.1 6.3,43.725Q4.95,42.35 4.95,40.55V10.5Q4.95,8.6 6.3,7.25Q7.65,5.9 9.5,5.9H12.45V4.8Q12.45,4.1 13.075,3.475Q13.7,2.85 14.45,2.85Q15.3,2.85 15.85,3.475Q16.4,4.1 16.4,4.8V5.9H31.6V4.8Q31.6,4.1 32.175,3.475Q32.75,2.85 33.55,2.85Q34.4,2.85 34.975,3.475Q35.55,4.1 35.55,4.8V5.9H38.5Q40.4,5.9 41.75,7.25Q43.1,8.6 43.1,10.5V40.55Q43.1,42.35 41.75,43.725Q40.4,45.1 38.5,45.1ZM9.5,40.55H38.5Q38.5,40.55 38.5,40.55Q38.5,40.55 38.5,40.55V19.6H9.5V40.55Q9.5,40.55 9.5,40.55Q9.5,40.55 9.5,40.55ZM9.5,16.75H38.5V10.5Q38.5,10.5 38.5,10.5Q38.5,10.5 38.5,10.5H9.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5ZM9.5,16.75V10.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5Q9.5,10.5 9.5,10.5V16.75Z"/>
-      android:pathData="M11,18H16V23H11zM18,18H23V23H18zM25,18H30V23H25zM32,18H37V23H32zM32,25H37V30H32zM11,25H16V30H11zM11,32H16V37H11zM18,25H23V30H18zM25,25H30V30H25zM18,32H23V37H18zM25,32H30V37H25zM32,32H37V37H32z"
-      android:fillColor="#90A4AE"/>
-  <path
-      android:pathData="M11,11H16V16H11zM18,11H23V16H18zM25,11H30V16H25zM32,11H37V16H32z"
-      android:fillColor="#F44336"/>
-  <path
-      android:pathData="M38,26c-0.338,0 -0.669,0.023 -1,0.05V30h-5v-2.382c-1.817,1.052 -3.329,2.565 -4.382,4.382H30v5h-3.95C26.023,37.331 26,37.662 26,38c0,1.405 0.254,2.747 0.697,4H38c2.209,0 4,-1.791 4,-4V26.697C40.747,26.254 39.405,26 38,26z"
-      android:fillColor="#ECEFF1"/>
-  <path
-      android:pathData="M37,30v-3.95c-1.812,0.15 -3.506,0.703 -5,1.568V30H37zM30,32h-2.382c-0.865,1.494 -1.418,3.188 -1.568,5H30V32z"
-      android:fillColor="#CFD8DC"/>
-  <path
-      android:pathData="M48,38c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10s4.5,-10 10,-10S48,32.5 48,38"
-      android:fillColor="#F44336"/>
-  <path
-      android:pathData="M45,38c0,3.9 -3.1,7 -7,7s-7,-3.1 -7,-7s3.1,-7 7,-7S45,34.1 45,38"
-      android:fillColor="#EEEEEE"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M42.4,41.1l-2.9,-2.9c0,-0.1 0,-0.1 0,-0.2c0,-0.4 -0.2,-0.8 -0.5,-1.1V33h-2v3.9c-0.3,0.3 -0.5,0.7 -0.5,1.1c0,0.8 0.7,1.5 1.5,1.5h0.1l2.9,2.9L42.4,41.1z"/>
 </vector>

app/src/main/res/drawable/timetable_lesson_annotation.xml

@@ -7,5 +7,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:shape="rectangle">
     <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
-    <solid android:color="#2196f3" tools:color="?timetable_lesson_change_color" />
+    <solid android:color="?colorTertiary" tools:color="?colorTertiary" />
 </shape>

app/src/main/res/drawable/timetable_marker_triangle.xml

@@ -9,7 +9,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/md_red_500"
+        android:fillColor="?colorTertiary"
         android:pathData="M0,4V20L12,12.25" />
 </vector>
 

app/src/main/res/drawable/unread_red_circle.xml

@@ -5,6 +5,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/red500"/>
+    <solid android:color="?colorError"/>
     <size android:width="10dp" android:height="10dp"/>
 </shape>

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" />
 
             </LinearLayout>
 

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" />
 
             <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"

app/src/main/res/layout/card_home.xml

@@ -4,10 +4,14 @@
   -->
 
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
     android:layout_marginVertical="8dp"
+    android:paddingLeft="8dp"
+    android:paddingTop="8dp"
     android:clickable="true"
     android:focusable="true"
-    style="?attr/materialCardViewFilledStyle" />
+    style="?attr/materialCardViewFilledStyle"
+    app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraLarge" />

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">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        tools:layout_margin="8dp">
-
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical">
+            android:orientation="vertical"
-
+            android:paddingLeft="8dp"
+            android:paddingTop="8dp">
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginBottom="8dp"
+                app:srcCompat="@drawable/ic_archive" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/home_archive_title"
-                android:textAppearance="@style/NavView.TextView.Title" />
+                android:textAppearance="@style/NavView.TextView.TitleMedium" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/homeArchiveText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
+                android:layout_gravity="left"
-                android:layout_margin="16dp"
+                android:gravity="left"
-                android:fontFamily="sans-serif-light"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
-                android:gravity="center_horizontal"
                 android:text="@string/home_archive_text"
-                android:textSize="16sp"
                 tools:text="Przeglądasz dane ucznia z roku szkolnego 2019/2020." />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/homeArchiveClose"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button"
+                android:layout_marginTop="16dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/home_archive_close" />
         </LinearLayout>
-
-        <ImageView
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            app:srcCompat="@drawable/ic_archive" />
-    </LinearLayout>
 </layout>

app/src/main/res/layout/card_home_availability.xml

@@ -6,60 +6,51 @@
 <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">
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
+        android:paddingLeft="8dp"
-        android:orientation="horizontal"
+        android:paddingTop="8dp"
-        tools:layout_margin="8dp">
+        android:orientation="vertical">
-
+        <ImageView
-        <LinearLayout
+            android:id="@+id/homeAvailabilityIcon"
-            android:layout_width="0dp"
+            android:layout_width="24dp"
-            android:layout_height="wrap_content"
+            android:layout_height="24dp"
-            android:layout_weight="1"
+            android:layout_marginBottom="8dp"
-            android:orientation="vertical">
+            app:srcCompat="@drawable/ic_update" />
-
             <TextView
                 android:id="@+id/homeAvailabilityTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/home_availability_title"
-                android:textAppearance="@style/NavView.TextView.Title" />
+                android:textAppearance="@style/NavView.TextView.TitleMedium" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <TextView
                 android:id="@+id/homeAvailabilityText"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
-                android:layout_margin="16dp"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_horizontal"
                 android:text="@string/home_availability_text"
-                android:textSize="16sp"
                 tools:text="Zaktualizuj aplikację do najnowszej wersji 4.3.1." />
 
+        <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="16dp">
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/homeAvailabilityUpdate"
                 style="@style/Widget.Material3.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/home_availability_update" />
-
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/homeAvailabilityInfo"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.TonalButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
                 android:text="@string/home_availability_info" />
         </LinearLayout>
-
-        <ImageView
-            android:id="@+id/homeAvailabilityIcon"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            app:srcCompat="@drawable/ic_update" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/card_home_events.xml

@@ -1,41 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) Kuba Szczodrzyński 2020-2-28.
   -->
 
 <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">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="8dp">
 
-        <TextView
+        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/NavView.TextView.Title"
-            android:text="@string/card_events_header_title" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/eventsNoData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
+            android:gravity="center_vertical"
-            android:layout_margin="16dp"
+            android:orientation="horizontal">
-            android:fontFamily="sans-serif-light"
+
-            android:text="@string/events_no_nearest"
+            <com.google.android.material.button.MaterialButton
-            android:textSize="16sp" />
+                style="@style/Widget.Material3.Button.IconButton.Filled"
+                android:backgroundTint="?colorPrimaryContainer"
+                app:iconTint="?colorOnPrimaryContainer"
+                android:clickable="false"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                app:icon="@drawable/ic_event_note" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/card_events_header_title"
+                    android:textAppearance="@style/NavView.TextView.BodyLarge" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/eventsNoData"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:text="@string/events_no_nearest"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium" />
+            </LinearLayout>
+        </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/eventsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:clipToPadding="false"
-            tools:visibility="visible"
+            tools:itemCount="3"
             tools:listitem="@layout/event_list_item"
-            tools:itemCount="3"/>
+            tools:visibility="visible" />
     </LinearLayout>
 </layout>
 

app/src/main/res/layout/card_home_grades.xml

@@ -2,36 +2,56 @@
   ~ Copyright (c) Kacper Ziubryniewicz 2019-11-29
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="8dp">
 
-        <TextView
+        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/NavView.TextView.Title"
-            android:text="@string/card_grades_header_title" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/noData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
+            android:gravity="center_vertical"
-            android:layout_margin="16dp"
+            android:orientation="horizontal">
-            android:fontFamily="sans-serif-light"
+
-            android:gravity="center"
+            <com.google.android.material.button.MaterialButton
-            android:text="@string/card_grades_no_data"
+                style="@style/Widget.Material3.Button.IconButton.Filled"
-            android:textSize="16sp" />
+                app:icon="@drawable/ic_grade"
+                app:iconTint="?colorOnPrimaryContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                android:backgroundTint="?colorPrimaryContainer"
+                android:clickable="false" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/card_grades_header_title"
+                    android:textAppearance="@style/NavView.TextView.BodyLarge" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/noData"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/card_grades_no_data"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium" />
+            </LinearLayout>
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/gradeList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="16dp"
-            android:orientation="vertical">
+            android:orientation="vertical"/>
-        </LinearLayout>
+
     </LinearLayout>
 </layout>

app/src/main/res/layout/card_home_lucky_number.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
   -->
 
@@ -10,38 +9,48 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="vertical"
-        tools:layout_margin="8dp">
+        android:padding="8dp">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            >
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/image"
-                android:layout_width="40dp"
+                style="@style/Widget.Material3.Button.IconButton.Filled"
-                android:layout_height="40dp"
+                android:backgroundTint="?colorPrimaryContainer"
-                app:srcCompat="@drawable/emoji_sad" />
+                app:iconTint="?colorOnPrimaryContainer"
-
+                android:clickable="false"
-            <TextView
-                android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_marginRight="8dp"
-                android:layout_marginStart="8dp"
+                app:icon="@drawable/emoji_sad" />
-                android:layout_marginLeft="8dp"
-                android:text="@string/home_lucky_number_no_info"
-                android:textAppearance="@style/NavView.TextView.Title" />
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/home_lucky_number_no_info"
+                    android:textAppearance="@style/NavView.TextView.BodyLarge" />
+
+
+                <TextView
+                    android:id="@+id/subText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium"
+                    tools:text="Numer w dzienniku to 23" />
+            </LinearLayout>
         </LinearLayout>
-
-        <TextView
-            android:id="@+id/subText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/NavView.TextView.Helper"
-            tools:text="Oranż Metylowy • Numer w dzienniku to 23" />
-
     </LinearLayout>
 </layout>

app/src/main/res/layout/card_home_notes.xml

@@ -1,36 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) Kuba Szczodrzyński 2021-10-28.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    tools:layout_margin="8dp">
+    android:padding="8dp">
 
-    <TextView
+    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/card_notes_header_title"
-        android:textAppearance="@style/NavView.TextView.Title" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/noData"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical"
-        android:layout_margin="16dp"
+        android:orientation="horizontal">
-        android:fontFamily="sans-serif-light"
+
-        android:text="@string/notes_no_data"
+        <com.google.android.material.button.MaterialButton
-        android:textSize="16sp" />
+            style="@style/Widget.Material3.Button.IconButton.Filled"
+            app:icon="@drawable/ic_note"
+            app:iconTint="?colorOnPrimaryContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:backgroundTint="?colorPrimaryContainer"
+            android:clickable="false" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/card_notes_header_title"
+                android:textAppearance="@style/NavView.TextView.BodyLarge" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/noData"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/notes_no_data"
+                android:textAppearance="@style/NavView.TextView.BodyMedium" />
+
+        </LinearLayout>
+    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
         android:clipToPadding="false"
         tools:itemCount="3"
         tools:listitem="@layout/note_list_item"
@@ -38,8 +58,8 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/addNote"
-        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:text="@string/notes_action_add" />
 </LinearLayout>

app/src/main/res/layout/card_home_timetable.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) Kuba Szczodrzyński 2019-11-24.
   -->
 
@@ -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">
 
-            <LinearLayout
+            <com.google.android.material.button.MaterialButton
-                android:layout_width="0dp"
+                android:id="@+id/noTimetableSync"
+                style="@style/Widget.Material3.Button.IconButton.Filled"
+                android:backgroundTint="?colorPrimaryContainer"
+                app:iconTint="?colorOnPrimaryContainer"
+                android:clickable="false"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_marginRight="8dp"
+                app:icon="@drawable/ic_sync" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/home_timetable_no_timetable"
-                    android:textAppearance="@style/NavView.TextView.Title" />
+                    android:textAppearance="@style/NavView.TextView.BodyLarge" />
 
                 <TextView
                     android:id="@+id/noTimetableText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_margin="16dp"
-                    android:fontFamily="sans-serif-light"
-                    android:gravity="center_horizontal"
                     android:text="@string/home_timetable_no_timetable_text"
-                    android:textSize="16sp" />
+                    android:textAppearance="@style/NavView.TextView.BodyMedium" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/noTimetableSync"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/home_timetable_no_timetable_sync" />
             </LinearLayout>
-
-            <ImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                app:srcCompat="@drawable/ic_sync" />
         </LinearLayout>
 
         <LinearLayout
@@ -67,39 +60,41 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingTop="8dp"
             android:visibility="gone"
-            tools:layout_marginTop="170dp"
+            tools:layout_marginTop="100dp"
             tools:visibility="visible">
 
-            <LinearLayout
+            <com.google.android.material.button.MaterialButton
-                android:layout_width="0dp"
+                style="@style/Widget.Material3.Button.IconButton.Filled"
+                android:backgroundTint="?colorPrimaryContainer"
+                app:iconTint="?colorOnPrimaryContainer"
+                android:clickable="false"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                app:icon="@drawable/ic_timetable" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/home_timetable_no_lessons"
-                    android:textAppearance="@style/NavView.TextView.Title" />
+                    android:textAppearance="@style/NavView.TextView.BodyLarge" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="left"
-                    android:layout_margin="16dp"
+                    android:gravity="left"
-                    android:fontFamily="sans-serif-light"
-                    android:gravity="center_horizontal"
                     android:text="@string/home_timetable_no_lessons_text"
-                    android:textSize="16sp" />
+                    android:textAppearance="@style/NavView.TextView.BodyMedium" />
             </LinearLayout>
-
-            <ImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                app:srcCompat="@drawable/ic_timetable" />
         </LinearLayout>
 
         <LinearLayout
@@ -108,39 +103,39 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:padding="8dp"
             android:visibility="gone"
-            tools:layout_marginTop="270dp"
+            tools:layout_marginTop="185dp"
             tools:visibility="visible">
 
-            <LinearLayout
+            <com.google.android.material.button.MaterialButton
-                android:layout_width="0dp"
+                style="@style/Widget.Material3.Button.IconButton.Filled"
+                android:backgroundTint="?colorPrimaryContainer"
+                app:iconTint="?colorOnPrimaryContainer"
+                android:clickable="false"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                app:icon="@drawable/ic_no_timetable" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/home_timetable_not_public"
-                    android:textAppearance="@style/NavView.TextView.Title" />
+                    android:textAppearance="@style/NavView.TextView.BodyLarge" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_margin="16dp"
-                    android:fontFamily="sans-serif-light"
-                    android:gravity="center_horizontal"
                     android:text="@string/home_timetable_not_public_text"
-                    android:textSize="16sp" />
+                    android:textAppearance="@style/NavView.TextView.BodyMedium" />
-            </LinearLayout>
 
-            <ImageView
+            </LinearLayout>
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                app:srcCompat="@drawable/ic_no_timetable" />
         </LinearLayout>
 
         <LinearLayout
@@ -148,15 +143,27 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            tools:layout_marginTop="410dp">
+            android:padding="8dp"
+            tools:layout_marginTop="290dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center_vertical"
                 android:orientation="horizontal">
 
+                <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.Material3.Button.IconButton.Filled"
+                    android:backgroundTint="?colorPrimaryContainer"
+                    app:iconTint="?colorOnPrimaryContainer"
+                    android:clickable="false"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="8dp"
+                    app:icon="@drawable/ic_timetable" />
+
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical">
@@ -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" />
 
                     <TextView
                         android:id="@+id/lessonInfo"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
                         tools:text="7 lekcji - 8:10 do 14:45" />
                 </LinearLayout>
 
@@ -182,90 +189,99 @@
                     android:layout_height="48dp"
                     android:background="?selectableItemBackgroundBorderless"
                     android:padding="12dp"
-                    android:visibility="gone"
+                    android:visibility="gone" />
-                    tools:src="@sample/settings" />
-
-                <ImageView
-                    android:id="@+id/bellSync"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:padding="12dp"
-                    tools:src="@sample/settings" />
-
-                <ImageView
-                    android:id="@+id/showCounter"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:padding="12dp"
-                    tools:src="@sample/settings" />
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginVertical="4dp"
-                android:background="@color/dividerColor" />
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical"
+                android:layout_marginTop="8dp">
+
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/progress"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:trackCornerRadius="10dp"
+                    tools:max="2700"
+                    tools:progress="2000"
+                    tools:visibility="visible" />
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:layout_weight="1"
+                    android:layout_marginTop="8dp"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <TextView
+                    <LinearLayout
-                        android:id="@+id/lessonBig"
+                        android:layout_width="wrap_content"
-                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Subtitle"
+                        android:layout_weight="1"
-                        tools:text="Pierwsza: informatyka" />
+                        android:orientation="vertical">
 
-                    <TextView
+                        <TextView
-                        android:id="@+id/classroom"
+                            android:id="@+id/lessonBig"
-                        android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                            android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Small"
+                            android:textAppearance="@style/NavView.TextView.BodyMedium"
-                        tools:text="09a komputerowa" />
+                            android:textStyle="bold"
+                            android:textColor="?colorPrimary"
+                            tools:text="Pierwsza: informatyka" />
 
-                    <ProgressBar
+                        <TextView
-                        android:id="@+id/progress"
+                            android:id="@+id/counter"
-                        style="?android:attr/progressBarStyleHorizontal"
+                            android:layout_width="wrap_content"
-                        android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/NavView.TextView.BodyMedium"
+                            tools:text="zostały 2 minuty 35 sekund" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="4dp"
+                        android:layout_weight="1"
-                        android:visibility="gone"
+                        android:orientation="vertical">
-                        tools:max="2700"
+
-                        tools:progress="780"
+                        <TextView
-                        tools:visibility="visible" />
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Sala"
+                            android:textAppearance="@style/NavView.TextView.BodyMedium"
+                            android:textStyle="bold"
+                            android:textColor="?colorPrimary" />
+
+                        <TextView
+                            android:id="@+id/classroom"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/NavView.TextView.BodyMedium"
+                            tools:text="09a komputerowa" />
+                    </LinearLayout>
                 </LinearLayout>
-
-                <TextView
-                    android:id="@+id/counter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center"
-                    tools:text="zostały\n2 minuty\n35 sekund" />
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginVertical="4dp"
-                android:background="@color/dividerColor" />
-
             <TextView
                 android:id="@+id/nextLessons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:layout_marginTop="16dp"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
                 tools:text="Póżniej:\n9:05 informatyka\n10:00 urządzenia techniki komputerowej\n11:00 projektowanie lokalnych sieci komputerowych\n11:55 zajęcia z wychowawcą\n13:00 język polski\n14:05 język niemiecki" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/bellSync"
+                style="@style/Widget.Material3.Button.Icon"
+                android:layout_marginTop="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bell_sync_title"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/showCounter"
+                style="@style/Widget.Material3.Button.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/counter_activity"/>
         </LinearLayout>
     </FrameLayout>
 </layout>

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"

app/src/main/res/layout/dialog_event_details.xml

@@ -22,7 +22,7 @@
     </data>
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -46,18 +46,18 @@
                     android:background="@drawable/unread_red_circle" />
 
                 <LinearLayout
-                    android:orientation="vertical"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{event.typeName}"
+                        android:textAppearance="?textAppearanceTitleLarge"
                         android:textIsSelectable="true"
-                        android:textAppearance="@style/NavView.TextView.Title"
                         android:visibility="@{event.typeName == null ? View.GONE : View.VISIBLE}"
                         tools:text="sprawdzian" />
 
@@ -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" />
 
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:orientation="horizontal">
+                        <!-- cmd_pencil_outline -->
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/editButton"
+                            style="@style/Widget.Material3.Button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="8dp"
+                            android:fontFamily="@font/community_material_font_v5_8_55"
+                            android:minWidth="0dp"
+                            android:text="\uf2f4"
+                            android:textSize="20sp" />
+                        <!-- cmd_calendar_export -->
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/saveInCalendarButton"
+                            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/community_material_font_v5_8_55"
+                            android:minWidth="0dp"
+                            android:text="\uf97a"
+                            android:textSize="20sp" />
+
+                        <!-- cmd_cursor_default_click_outline -->
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/goToTimetableButton"
+                            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/community_material_font_v5_8_55"
+                            android:minWidth="0dp"
+                            android:text="\ufc90"
+                            android:textSize="20sp" />
+                    </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
+                    android:gravity="right"
-                    android:gravity="center">
+                    android:orientation="vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Helper"
-                        android:text="@{event.time == null ? @string/event_all_day : event.time.stringHM}"
-                        tools:text="14:50"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif-light"
                         android:text="@{Integer.toString(event.date.day)}"
-                        android:textSize="36sp"
+                        android:textAppearance="?textAppearanceHeadlineLarge"
+                        android:textColor="?colorOnSurface"
                         tools:text="14" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{monthName}"
+                        android:textAppearance="@style/NavView.TextView.LabelLarge"
                         tools:text="listopada" />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{event.time == null ? @string/event_all_day : event.time.stringHM}"
+                        android:textAppearance="@style/NavView.TextView.LabelLarge"
+                        tools:text="14:50" />
+
                 </LinearLayout>
 
             </LinearLayout>
@@ -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}"/>
             <TextView
@@ -138,7 +179,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_added_by"/>
             <com.mikepenz.iconics.view.IconicsTextView
                 android:id="@+id/addedBy"
@@ -157,7 +200,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_topic"/>
 
             <TextView
@@ -174,7 +219,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_event_details_body"
-                android:textAppearance="@style/NavView.TextView.Helper" />
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary" />
 
             <ProgressBar
                 android:id="@+id/bodyProgressBar"
@@ -189,7 +236,7 @@
                 android:id="@+id/body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/NavView.TextView.Medium"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
                 android:textIsSelectable="true"
                 tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia." />
 
@@ -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" />
 
             <pl.szczodrzynski.edziennik.ui.views.AttachmentsView
                 android:id="@+id/attachmentsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/divider"/>
-
             <com.google.android.flexbox.FlexboxLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 app:flexWrap="wrap"
-                app:justifyContent="flex_end">
+                app:justifyContent="center">
 
                 <!-- cmd_eye_check_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/checkDoneButton"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.IconButton.Outlined"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
+                    android:layout_margin="4dp"
                     android:checkable="true"
                     android:fontFamily="@font/community_material_font_v5_8_55"
                     android:minWidth="0dp"
                     android:text="\uf4df"
                     android:textSize="20sp" />
 
-                <!-- cmd_pencil_outline -->
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/editButton"
+                    android:id="@+id/notesButton"
                     style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
+                    android:layout_margin="4dp"
-                    android:fontFamily="@font/community_material_font_v5_8_55"
+                    android:textColor="?colorOnBackground"
-                    android:minWidth="0dp"
+                    tools:text="@string/notes_button" />
-                    android:text="\uf2f4"
-                    android:textSize="20sp" />
-
-                <!-- cmd_calendar_export -->
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/saveInCalendarButton"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="@font/community_material_font_v5_8_55"
-                    android:minWidth="0dp"
-                    android:text="\uf97a"
-                    android:textSize="20sp" />
-
-                <!-- cmd_cursor_default_click_outline -->
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/goToTimetableButton"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="@font/community_material_font_v5_8_55"
-                    android:minWidth="0dp"
-                    android:text="\ufc90"
-                    android:textSize="20sp" />
 
                 <!-- cmd_download_outline -->
+
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/downloadButton"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.IconButton.Outlined"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
+                    android:layout_margin="4dp"
                     android:fontFamily="@font/community_material_font_v5_8_55"
+                    android:textColor="?colorOnBackground"
                     android:minWidth="0dp"
                     android:text="\uf436"
                     android:textSize="20sp" />
             </com.google.android.flexbox.FlexboxLayout>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/notesButton"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/notes_button" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>

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" />
-                    </LinearLayout>
 
-                    <TextView
+                    </LinearLayout>
-                        android:id="@+id/gradeSubjectName"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{grade.subjectLongName}"
-                        android:textAppearance="@style/NavView.TextView.Title"
-                        android:textIsSelectable="true"
-                        tools:text="pracownia urządzeń techniki komputerowej" />
 
                     <TextView
                         android:id="@+id/gradeWeight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{weightText}"
-                        android:textAppearance="@style/NavView.TextView.Subtitle"
+                        android:textAppearance="?textAppearanceLabelLarge"
                         android:textIsSelectable="true"
                         android:visibility="@{weightText != null ? View.VISIBLE : View.GONE}"
                         tools:text="waga 3"
                         tools:visibility="visible" />
+                    <TextView
+                        android:id="@+id/gradeSubjectName"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{grade.subjectLongName}"
+                        android:textAppearance="?textAppearanceTitleLarge"
+                        android:textIsSelectable="true"
+                        tools:text="pracownia urządzeń techniki komputerowej" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -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" />
 
             <TextView
                 android:id="@+id/teacherName"
@@ -142,7 +145,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_category"
-                android:textAppearance="@style/NavView.TextView.Helper" />
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -157,7 +162,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_description"
-                android:textAppearance="@style/NavView.TextView.Helper" />
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary"
+                />
 
             <TextView
                 android:layout_width="match_parent"
@@ -172,7 +180,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_class_average"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary"
                 android:visibility="@{grade.classAverage != null &amp;&amp; grade.classAverage != -1 ? View.VISIBLE : View.GONE}" />
 
             <TextView
@@ -189,7 +199,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_comment"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary"
                 android:visibility="@{commentVisible ? View.VISIBLE : View.GONE}" />
 
             <TextView
@@ -205,7 +217,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_value"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary"
                 android:visibility="@{gradeValue != -1 ? View.VISIBLE : View.GONE}" />
 
             <TextView
@@ -222,7 +236,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_added_date"
-                android:textAppearance="@style/NavView.TextView.Helper" />
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -237,7 +253,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_id"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
+                android:textStyle="bold"
+                android:textColor="?colorPrimary"
                 android:visibility="@{devMode ? View.VISIBLE : View.GONE}" />
 
             <TextView
@@ -254,7 +272,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_improved"
-                android:textAppearance="@style/NavView.TextView.Small"
+                android:textAppearance="@style/NavView.TextView.LabelLarge"
+                android:textColor="?colorSecondary"
                 android:visibility="@{grade.parentId instanceof Long ? View.VISIBLE : View.GONE}" />
 
             <TextView
@@ -262,13 +281,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/dialog_grade_details_history"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:textAppearance="?textAppearanceBodyLarge"
                 android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}" />
 
             <androidx.core.widget.NestedScrollView
                 android:id="@+id/gradeHistoryNest"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginHorizontal="-8dp"
                 android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}">
 
@@ -309,7 +329,7 @@
 
                 <Button
                     android:id="@+id/customValueButton"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minHeight="0dp"
@@ -323,6 +343,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="8dp"
+                android:visibility="gone"
                 android:text="@string/notes_button" />
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/dialog_lesson_details.xml

@@ -34,21 +34,6 @@
             android:paddingHorizontal="16dp"
             android:paddingTop="24dp">
 
-            <TextView
-                android:id="@+id/annotation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/timetable_lesson_annotation"
-                android:fontFamily="sans-serif-condensed"
-                android:paddingHorizontal="8dp"
-                android:text="@string/timetable_lesson_cancelled"
-                android:textColor="#000"
-                android:textSize="12sp"
-                android:textStyle="italic"
-                android:visibility="@{annotationVisible ? View.VISIBLE : View.GONE}"
-                tools:text="Zastępstwo: zamiast lekcji język polski z Adam Dodatkowy"
-                tools:visibility="visible" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -79,7 +64,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{subjectName}"
                         android:textIsSelectable="true"
-                        android:textAppearance="@style/NavView.TextView.Title"
+                        android:textAppearance="@style/NavView.TextView.TitleLarge"
                         android:visibility="@{subjectName == null ? View.GONE : View.VISIBLE}"
                         tools:text="pracownia urządzeń techniki komputerowej" />
 
@@ -92,33 +77,38 @@
                         tools:text="czwartek, 14 listopada 2019"
                         tools:visibility="visible" />
 
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/annotation"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="@{annotationVisible ? View.VISIBLE : View.GONE}"
+                        app:chipBackgroundColor="?colorError"
+                        android:textColor="?colorOnError"
+                        style="@style/Widget.Material3.Chip.Suggestion"
+                        android:text="@string/timetable_lesson_cancelled"/>
+
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:gravity="center">
+                    android:gravity="right">
+
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Helper"
-                        android:text="@string/dialog_lesson_details_number"
-                        android:visibility="@{lesson.displayLessonNumber == null ? View.GONE : View.VISIBLE}"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif-light"
                         android:text="@{lesson.displayLessonNumber.toString()}"
-                        android:textSize="36sp"
+                        android:textAppearance="?textAppearanceHeadlineLarge"
+                        android:textColor="?colorOnSurface"
                         android:visibility="@{lesson.displayLessonNumber == null ? View.GONE : View.VISIBLE}"
                         tools:text="4" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.LabelLarge"
                         android:text="@{lesson.displayStartTime.stringHM + ` - ` + lesson.displayEndTime.stringHM}"
                         tools:text="14:55 - 15:40" />
 
@@ -182,7 +172,9 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
+                        android:textStyle="bold"
+                        android:textColor="?colorPrimary"
                         android:text="@string/dialog_lesson_details_teacher" />
                     <TextView
                         android:id="@+id/oldTeacherNameView"
@@ -201,6 +193,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{teacherName}"
                         android:textIsSelectable="true"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
                         android:visibility="@{teacherName != null ? View.VISIBLE : View.GONE}"
                         tools:text="Janósz Kowalski" />
                 </LinearLayout>
@@ -214,7 +207,9 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
+                        android:textStyle="bold"
+                        android:textColor="?colorPrimary"
                         android:text="@string/dialog_lesson_details_team" />
                     <TextView
                         android:layout_width="match_parent"
@@ -253,7 +248,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_lesson_details_classroom" />
                     <TextView
                         android:layout_width="match_parent"
@@ -285,7 +282,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_lesson_details_id" />
 
                     <TextView
@@ -347,7 +346,7 @@
 
                 <Button
                     android:id="@+id/attendanceDetails"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/dialog_lesson_attendance_details" />
@@ -370,24 +369,24 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
+                <ImageView
+                    android:id="@+id/image"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginBottom="8dp"
+                    app:srcCompat="@drawable/ic_timetable" />
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
+                    android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:gravity="center"
+                    android:text="@string/dialog_lesson_no_events" />
-                    app:drawableTopCompat="@drawable/ic_no_events"
-                    android:drawablePadding="16dp"
-                    android:fontFamily="sans-serif-light"
-                    android:text="@string/dialog_lesson_no_events"
-                    android:textSize="24sp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/dialog_no_events_hint"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium"
-                    android:layout_gravity="center"
+                    android:text="@string/dialog_no_events_hint" />
-                    android:gravity="center"
-                    android:textStyle="italic"/>
 
             </LinearLayout>
 
@@ -401,11 +400,12 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/notesButton"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.TextButton.Icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:text="@string/notes_button" />
+                android:text="@string/notes_button"
+                android:visibility="gone"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>

app/src/main/res/layout/event_list_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) Kuba Szczodrzyński 2019-12-15.
   -->
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -18,91 +17,98 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
+        android:orientation="horizontal"
-        android:orientation="vertical"
+        android:gravity="center_vertical"
-        android:padding="8dp">
+        android:layout_marginRight="8dp">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical">
+            android:layout_weight="7"
+            android:background="?selectableItemBackground"
+            android:orientation="vertical"
+            android:padding="8dp">
 
-            <View
+            <LinearLayout
-                android:id="@+id/typeColor"
+                android:layout_width="match_parent"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/unread_red_circle" />
-
-            <com.mikepenz.iconics.view.IconicsImageView
-                android:id="@+id/attachmentIcon"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                app:iiv_color="?android:textColorSecondary"
-                app:iiv_icon="cmd-attachment"
-                tools:background="@tools:sample/avatars[4]" />
-
-            <TextView
-                android:id="@+id/details"
-                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:gravity="center_vertical">
-                android:maxLines="2"
-                android:textAppearance="@style/NavView.TextView.Helper"
-                android:textSize="16sp"
-                tools:text="sprawdzian • 9:05 • historia i społeczeństwo" />
 
-            <View
+                <View
-                android:id="@+id/unread"
+                    android:id="@+id/typeColor"
-                android:layout_width="12dp"
+                    android:layout_width="16dp"
-                android:layout_height="12dp"
+                    android:layout_height="16dp"
-                android:layout_marginHorizontal="4dp"
+                    android:layout_marginEnd="8dp"
-                android:background="@drawable/unread_red_circle"
+                    android:layout_marginRight="8dp"
-                android:visibility="gone"
+                    android:background="@drawable/unread_red_circle" />
-                tools:visibility="visible" />
-        </LinearLayout>
 
-        <LinearLayout
+                <com.mikepenz.iconics.view.IconicsImageView
-            android:layout_width="match_parent"
+                    android:id="@+id/attachmentIcon"
-            android:layout_height="wrap_content"
+                    android:layout_width="16dp"
-            android:gravity="center_vertical"
+                    android:layout_height="16dp"
-            android:orientation="horizontal">
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    app:iiv_color="?android:textColorSecondary"
+                    app:iiv_icon="cmd-attachment"
+                    tools:background="@tools:sample/avatars[4]" />
+
+                <TextView
+                    android:id="@+id/details"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:maxLines="2"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium"
+                    android:textColor="?colorPrimary"
+                    tools:text="sprawdzian • 9:05 • historia i społeczeństwo" />
+
+                <View
+                    android:id="@+id/unread"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:background="@drawable/unread_red_circle"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <com.mikepenz.iconics.view.IconicsTextView
+                    android:id="@+id/topic"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:maxLines="3"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium"
+                    tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia. Nie wiem co się dzieje w tym roku nie będzie już religii w szkołach podstawowych w Polsce i Europie zachodniej Afryki" />
+                <!-- cmd_pencil_outline -->
+            </LinearLayout>
 
             <com.mikepenz.iconics.view.IconicsTextView
-                android:id="@+id/topic"
+                android:id="@+id/addedBy"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:ellipsize="middle"
-                android:ellipsize="end"
+                android:singleLine="true"
-                android:maxLines="3"
+                android:textAppearance="@style/NavView.TextView.LabelSmall"
-                android:textAppearance="@style/NavView.TextView.Medium"
+                android:visibility="@{simpleMode ? View.GONE : View.VISIBLE}"
-                tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia. Nie wiem co się dzieje w tym roku nie będzie już religii w szkołach podstawowych w Polsce i Europie zachodniej Afryki" />
+                tools:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
-            <!-- cmd_pencil_outline -->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/editButton"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:layout_marginLeft="4dp"
-                android:fontFamily="@font/community_material_font_v5_8_55"
-                android:minWidth="0dp"
-                android:text="\uf2f4"
-                android:textSize="20sp"
-                tools:visibility="visible" />
         </LinearLayout>
-
+        <com.google.android.material.button.MaterialButton
-        <com.mikepenz.iconics.view.IconicsTextView
+            android:id="@+id/editButton"
-            android:id="@+id/addedBy"
+            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:ellipsize="middle"
+            android:layout_weight="1"
-            android:singleLine="true"
+            android:fontFamily="@font/community_material_font_v5_8_55"
-            android:textAppearance="@style/NavView.TextView.Helper"
+            android:text="\uf2f4"
-            android:visibility="@{simpleMode ? View.GONE : View.VISIBLE}"
+            android:textSize="20sp"
-            tools:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
+            tools:visibility="visible" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_agenda_calendar.xml

@@ -18,7 +18,7 @@
             android:id="@+id/agenda_calendar_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:headerColor="@color/colorPrimary"/>
+            app:headerColor="?colorPrimary"/>
 
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_agenda_default.xml

@@ -18,10 +18,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 agendaCalendar:agendaCurrentDayTextColor="?colorPrimaryDark"
-                agendaCalendar:calendarColor="@color/colorSurface_6dp"
+                agendaCalendar:calendarColor="?colorSurface"
                 agendaCalendar:calendarCurrentDayTextColor="?colorPrimaryDark"
                 agendaCalendar:calendarDayTextColor="?android:textColorPrimary"
-                agendaCalendar:calendarHeaderColor="@color/colorSurface_6dp"
+                agendaCalendar:calendarHeaderColor="?colorSurface"
                 agendaCalendar:calendarHeaderTextColor="?colorOnSurface"
                 agendaCalendar:calendarPastDayTextColor="?android:textColorSecondary"
                 agendaCalendar:fabColor="?colorPrimaryContainer"

app/src/main/res/layout/fragment_announcements.xml

@@ -23,8 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
             android:text="@string/school_notices_no_data"
-            android:textSize="18sp"
+            android:textAppearance="@style/NavView.TextView.BodyMedium"
-            android:textStyle="italic"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_behaviour.xml

@@ -11,80 +11,95 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-
+        <com.google.android.material.button.MaterialButtonToggleGroup
-        <LinearLayout
+            android:id="@+id/toggleGroup"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_margin="8dp"
-            android:layout_marginHorizontal="8dp">
+            app:singleSelection="true"
+            app:selectionRequired="true"
+            android:gravity="center_horizontal">
 
-            <TextView
+            <com.google.android.material.button.MaterialButton
-                android:id="@+id/noticesSummaryTitle"
+                android:id="@+id/semester1"
-                style="@style/Widget.AppCompat.Spinner"
+                style="?materialButtonOutlinedStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-medium"
+                android:text="Semestr 1" />
-                android:text="@string/notices_summary_title_loading_format"
-                android:textSize="20sp" />
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/semester2"
+                style="?materialButtonOutlinedStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Semestr 2" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/allYear"
+                style="?materialButtonOutlinedStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Cały rok" />
+        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal">
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical">
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="?colorPrimary"
+                    android:textAppearance="@style/NavView.TextView.TitleSmall"
                     android:text="@string/notices_praises_title" />
-
                 <TextView
                     android:id="@+id/noticesPraisesCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="5dp"
+                    android:textAppearance="@style/NavView.TextView.TitleSmall"
-                    android:textStyle="bold"
+                    tools:text="342525"/>
-                    tools:text="0" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical"
-
+                android:layout_marginHorizontal="32dp">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="?colorPrimary"
+                    android:textAppearance="@style/NavView.TextView.TitleSmall"
                     android:text="@string/notices_warnings_title" />
-
                 <TextView
                     android:id="@+id/noticesWarningsCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="5dp"
+                    android:textAppearance="@style/NavView.TextView.TitleSmall"
-                    android:textStyle="bold"
+                    tools:text="53535353"/>
-                    tools:text="0" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical">
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="?colorPrimary"
+                    android:textAppearance="@style/NavView.TextView.TitleSmall"
                     android:text="@string/notices_other_title" />
-
                 <TextView
                     android:id="@+id/noticesOtherCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="5dp"
+                    android:textAppearance="@style/NavView.TextView.TitleSmall"
-                    android:textStyle="bold"
+                    tools:text="3331"/>
-                    tools:text="0" />
             </LinearLayout>
-
         </LinearLayout>
 
         <FrameLayout
@@ -118,11 +133,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
+                    android:textAppearance="?textAppearanceBodyMedium"
                     android:gravity="center"
-                    android:text="@string/notices_no_data"
+                    android:text="@string/notices_no_data" />
-                    android:textSize="18sp"
-                    android:textStyle="italic" />
 
             </LinearLayout>
         </FrameLayout>

app/src/main/res/layout/fragment_home.xml

@@ -20,20 +20,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
-
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:itemCount="1"
                     tools:listitem="@layout/card_home_timetable" />
-
                 <View
                     android:id="@+id/configHintDivider"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
                     android:layout_marginVertical="8dp"
-                    android:background="@drawable/divider" />
+                    android:background="?colorOutlineVariant" />
 
                 <LinearLayout
                     android:id="@+id/configHint"
@@ -49,18 +47,15 @@
                         android:layout_marginHorizontal="8dp"
                         android:layout_weight="1"
                         android:text="@string/home_configure_notice"
-                        android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium" />
-                        android:textSize="12sp"
-                        android:textStyle="italic" />
 
                     <Button
                         android:id="@+id/configureCards"
-                        style="@style/Widget.Material3.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.TonalButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
                         android:layout_marginRight="8dp"
-                        android:minHeight="0dp"
                         android:text="@string/home_configure_add_remove" />
                 </LinearLayout>
 

app/src/main/res/layout/fragment_timetable_v2.xml

@@ -21,22 +21,25 @@
                 <com.google.android.material.appbar.AppBarLayout
                     style="@style/Widget.Material3.AppBarLayout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:background="?colorSurface">
 
-                    <com.nshmura.recyclertablayout.RecyclerTabLayout
+                    <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tabLayout"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
+                        android:layout_height="wrap_content"
-                        android:background="@color/colorSurface_1dp"
+                        android:background="?colorSurfaceContainerLow"
-                        app:rtl_tabIndicatorColor="?colorPrimary"
+                        app:tabMode="auto"
-                        app:rtl_tabMaxWidth="300dp"
+                        app:tabIndicatorColor="?colorPrimary"
-                        app:rtl_tabMinWidth="90dp"
+                        app:tabMaxWidth="300dp"
-                        app:rtl_tabPaddingBottom="12dp"
+                        app:tabMinWidth="90dp"
-                        app:rtl_tabPaddingEnd="16dp"
+                        app:tabPaddingBottom="12dp"
-                        app:rtl_tabPaddingStart="16dp"
+                        app:tabPaddingEnd="16dp"
-                        app:rtl_tabPaddingTop="12dp"
+                        app:tabPaddingStart="16dp"
-                        app:rtl_tabSelectedTextColor="?colorPrimary"
+                        app:tabPaddingTop="12dp"
-                        app:rtl_tabTextAppearance="@style/rtl_RecyclerTabLayout.Tab" />
+                        app:tabSelectedTextColor="?colorPrimary"
+                        app:tabTextColor="?colorOnBackground"
+                        app:tabTextAppearance="@style/NavView.TextView.BodyMedium" />
                 </com.google.android.material.appbar.AppBarLayout>
 
                 <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager

app/src/main/res/layout/grades_item_empty.xml

@@ -12,10 +12,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            android:gravity="center"
+            android:gravity="left"
-            android:textSize="18sp"
+            android:textAppearance="@style/NavView.TextView.TitleMedium"
-            android:textColor="?android:textColorSecondary"
-            android:textStyle="italic"
             android:text="@string/grades_empty_text"/>
     </LinearLayout>
 </layout>

app/src/main/res/layout/grades_item_grade.xml

@@ -11,17 +11,18 @@
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
         android:orientation="horizontal"
-        android:paddingVertical="8dp">
+        android:layout_marginLeft="24dp"
+        android:paddingVertical="4dp">
 
         <pl.szczodrzynski.edziennik.ui.grades.GradeView
             android:id="@+id/gradeName"
-            android:layout_width="40dp"
+            android:layout_width="35dp"
-            android:layout_height="40dp"
+            android:layout_height="35dp"
             android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
-            tools:background="@drawable/bg_rounded_8dp"
+            android:background="@drawable/bg_circle"
+            android:textAppearance="@style/NavView.TextView.BodyMedium"
             tools:backgroundTint="#4caf50"
-            tools:textSize="24sp"
             tools:gravity="center"
             tools:text="5+" />
 
@@ -29,7 +30,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -44,6 +44,7 @@
                     android:layout_marginLeft="8dp"
                     android:layout_marginEnd="4dp"
                     android:layout_marginRight="4dp"
+                    android:textAppearance="@style/NavView.TextView.BodyLarge"
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:singleLine="true"
@@ -65,8 +66,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textAppearance="@style/NavView.TextView.LabelSmall"
                     tools:text="14.10.2015" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -74,16 +76,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/gradeWeight"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:textStyle="bold"
-                    tools:text="waga 30"
-                    tools:visibility="visible" />
-
                 <TextView
                     android:id="@+id/gradeCategory"
                     android:layout_width="wrap_content"
@@ -92,22 +84,40 @@
                     android:ellipsize="end"
                     android:maxWidth="200dp"
                     android:maxLines="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textAppearance="@style/NavView.TextView.BodyMedium"
                     tools:text="Kartkówki - K1" />
-
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="right"
+                    android:gravity="end">
                 <TextView
                     android:id="@+id/gradeTeacherName"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
-                    android:layout_weight="1"
                     android:ellipsize="end"
                     android:gravity="end"
                     android:maxLines="1"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textAppearance="@style/NavView.TextView.LabelSmall"
                     tools:text="Jan Kowalski" />
+                <TextView
+                    android:id="@+id/gradeWeight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:ellipsize="end"
+                    android:gravity="end"
+                    android:maxLines="1"
+                    android:textAppearance="@style/NavView.TextView.LabelSmall"
+                    tools:text="waga 30"
+                    tools:visibility="visible" />
+                </LinearLayout>
             </LinearLayout>
+
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/grades_item_semester.xml

@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
         android:gravity="center_vertical"
+        android:layout_marginLeft="16dp"
         android:orientation="horizontal">
 
         <com.mikepenz.iconics.view.IconicsImageView
@@ -33,8 +34,8 @@
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
             android:layout_weight="1"
+            android:textAppearance="@style/NavView.TextView.TitleMedium"
             android:textColor="?android:textColorPrimary"
-            android:textSize="18sp"
             tools:text="Semestr 1" />
 
         <View
@@ -55,7 +56,7 @@
             android:layout_marginEnd="5dp"
             android:layout_marginRight="5dp"
             android:gravity="end"
-            android:textSize="14sp"
+            android:textAppearance="@style/NavView.TextView.LabelSmall"
             tools:text="punkty: 18.75/20\n(95,67%)"
             tools:text1="suma: 175 pkt"
             tools:text2="średnia: 4,78" />
@@ -78,8 +79,8 @@
 
         <com.mikepenz.iconics.view.IconicsImageView
             android:id="@+id/editButton"
-            android:layout_width="32dp"
+            android:layout_width="24dp"
-            android:layout_height="32dp"
+            android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:background="?selectableItemBackgroundBorderless"
             android:scaleType="centerInside"

app/src/main/res/layout/grades_item_stats.xml

@@ -1,189 +1,218 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) Kuba Szczodrzyński 2020-3-3.
   -->
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="32dp"
-            android:background="@drawable/divider" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+
             android:text="@string/grades_stats_title"
-            android:textAppearance="@style/NavView.TextView.Title" />
+            android:textAppearance="@style/NavView.TextView.TitleLarge" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/noData"
+            textAppearance="@style/NavView.TextView.BodyMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
-            android:fontFamily="sans-serif-light"
-            android:gravity="center"
             android:text="@string/grades_stats_no_data"
-            android:textSize="16sp"
             android:visibility="gone"
             tools:visibility="visible" />
 
-        <TextView
+        <LinearLayout
-            android:id="@+id/normalTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="8dp"
+            android:layout_marginTop="16dp"
-            android:text="@string/grades_stats_normal"
+            android:orientation="horizontal">
-            android:textAppearance="@style/NavView.TextView.Subtitle" />
+
+            <TextView
+                android:id="@+id/normalTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/grades_stats_normal"
+                android:textAppearance="@style/NavView.TextView.TitleMedium" />
+
+            <com.mikepenz.iconics.view.IconicsImageView
+                android:id="@+id/helpButton"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:scaleType="centerInside"
+                app:iiv_color="?colorOutline"
+                app:iiv_icon="cmd-help-circle-outline"
+                app:iiv_size="24dp"
+                tools:src="@android:drawable/ic_menu_help" />
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/normalLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
+            android:layout_marginTop="8dp"
-            android:paddingHorizontal="8dp">
+            android:orientation="horizontal">
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/normalSemester1Layout"
+                style="@style/Widget.Material3.CardView.Filled"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="8dp"
                 android:layout_weight="1"
-                android:gravity="center_horizontal"
+                app:cardBackgroundColor="?colorTertiaryContainer"
-                android:orientation="vertical">
+                app:shapeAppearance="?shapeAppearanceCornerLarge">
 
-                <TextView
+                <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:text="@string/grades_stats_semester_1" />
+                    android:gravity="left"
+                    android:orientation="vertical"
+                    android:padding="8dp">
 
-                <TextView
+                    <TextView
-                    android:id="@+id/normalSemester1"
+                        android:layout_width="wrap_content"
-                    android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:text="@string/grades_stats_semester_1"
-                    android:fontFamily="sans-serif-light"
+                        android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:textSize="24sp"
+                        android:textColor="?colorOnTertiaryContainer" />
-                    tools:text="4,56" />
 
-                <TextView
+                    <TextView
-                    android:id="@+id/normalSemester1Notice"
+                        android:id="@+id/normalSemester1"
-                    android:layout_width="wrap_content"
+                        android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
-                    android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textColor="?colorPrimary"
-                    tools:text="*z ocen proponowanych" />
+                        tools:text="4,56" />
-            </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/normalSemester1Notice"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.LabelSmall"
+                        android:textColor="?colorOnTertiaryContainer"
+                        tools:text="*z ocen proponowanych" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
             <View
                 android:id="@+id/normalDiv1"
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/divider" />
+                android:background="?colorSurface" />
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/normalSemester2Layout"
+                style="@style/Widget.Material3.CardView.Filled"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="8dp"
                 android:layout_weight="1"
-                android:gravity="center_horizontal"
+                app:cardBackgroundColor="?colorTertiaryContainer"
-                android:orientation="vertical">
+                app:shapeAppearance="?shapeAppearanceCornerLarge">
 
-                <TextView
+                <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:text="@string/grades_stats_semester_2" />
+                    android:gravity="left"
+                    android:orientation="vertical"
+                    android:padding="8dp">
 
-                <TextView
+                    <TextView
-                    android:id="@+id/normalSemester2"
+                        android:layout_width="wrap_content"
-                    android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:text="@string/grades_stats_semester_2"
-                    android:fontFamily="sans-serif-light"
+                        android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:textSize="24sp"
+                        android:textColor="?colorOnTertiaryContainer" />
-                    tools:text="4,67" />
 
-                <TextView
+                    <TextView
-                    android:id="@+id/normalSemester2Notice"
+                        android:id="@+id/normalSemester2"
-                    android:layout_width="wrap_content"
+                        android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
-                    android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textColor="?colorPrimary"
-                    tools:text="*przewidywana średnia" />
+                        tools:text="4,67" />
-            </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/normalSemester2Notice"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.LabelSmall"
+                        android:textColor="?colorOnTertiaryContainer"
+                        tools:text="*przewidywana średnia" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
             <View
                 android:id="@+id/normalDiv2"
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/divider" />
+                android:background="?colorSurface" />
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/normalYearlyLayout"
+                style="@style/Widget.Material3.CardView.Filled"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="center_horizontal"
+                app:cardBackgroundColor="?colorTertiaryContainer"
-                android:orientation="vertical">
+                app:shapeAppearance="?shapeAppearanceCornerLarge">
 
-                <TextView
+                <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:text="@string/grades_stats_yearly" />
+                    android:gravity="left"
+                    android:orientation="vertical"
+                    android:padding="8dp">
 
-                <TextView
+                    <TextView
-                    android:id="@+id/normalYearly"
+                        android:layout_width="wrap_content"
-                    android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:text="@string/grades_stats_yearly"
-                    android:fontFamily="sans-serif-light"
+                        android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:textSize="24sp"
+                        android:textColor="?colorOnTertiaryContainer" />
-                    tools:text="3,75" />
 
-                <TextView
+                    <TextView
-                    android:id="@+id/normalYearlyNotice"
+                        android:id="@+id/normalYearly"
-                    android:layout_width="wrap_content"
+                        android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
-                    android:textAppearance="@style/NavView.TextView.Helper"
+                        android:textColor="?colorPrimary"
-                    tools:text="*przewidywana średnia" />
+                        tools:text="3,75" />
-            </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/normalYearlyNotice"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.LabelSmall"
+                        android:textColor="?colorOnTertiaryContainer"
+                        tools:text="*przewidywana średnia" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
 
-        <com.mikepenz.iconics.view.IconicsImageView
-            android:id="@+id/helpButton"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="end"
-            android:background="?selectableItemBackgroundBorderless"
-            android:scaleType="centerInside"
-            app:iiv_color="?android:textColorSecondary"
-            app:iiv_icon="cmd-help-circle-outline"
-            app:iiv_size="24dp"
-            tools:src="@android:drawable/ic_menu_help" />
-
         <View
             android:id="@+id/normalDivider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="8dp"
+            android:background="?colorSurface" />
-            android:background="@drawable/divider" />
 
         <TextView
             android:id="@+id/pointTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="16dp"
-            android:layout_marginTop="8dp"
             android:text="@string/grades_stats_point"
             android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -191,89 +220,125 @@
             android:id="@+id/pointLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
+            android:orientation="horizontal">
-            android:paddingHorizontal="8dp">
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/pointSemester1Layout"
+                style="@style/Widget.Material3.CardView.Filled"
+                app:shapeAppearance="?shapeAppearanceCornerLarge"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
                 android:layout_weight="1"
-                android:gravity="center_horizontal"
+                app:cardBackgroundColor="?colorTertiaryContainer">
-                android:orientation="vertical">
 
-                <TextView
+                <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:text="@string/grades_stats_semester_1" />
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:orientation="vertical"
+                    android:padding="8dp">
 
-                <TextView
+                    <TextView
-                    android:id="@+id/pointSemester1"
+                        android:layout_width="wrap_content"
-                    android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:text="@string/grades_stats_semester_1"
-                    android:fontFamily="sans-serif-light"
+                        android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:textSize="24sp"
+                        android:textColor="?colorOnTertiaryContainer" />
-                    tools:text="95%" />
+
-            </LinearLayout>
+                    <TextView
+                        android:id="@+id/pointSemester1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
+                        android:textColor="?colorPrimary"
+                        tools:text="95%" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
             <View
                 android:id="@+id/pointDiv1"
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/divider" />
+                android:background="?colorSurface" />
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/pointSemester2Layout"
+                style="@style/Widget.Material3.CardView.Filled"
+                app:shapeAppearance="?shapeAppearanceCornerLarge"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
                 android:layout_weight="1"
-                android:gravity="center_horizontal"
+                app:cardBackgroundColor="?colorTertiaryContainer">
-                android:orientation="vertical">
 
-                <TextView
+                <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:text="@string/grades_stats_semester_2" />
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:orientation="vertical"
+                    android:padding="8dp">
 
-                <TextView
+                    <TextView
-                    android:id="@+id/pointSemester2"
+                        android:layout_width="wrap_content"
-                    android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:text="@string/grades_stats_semester_2"
-                    android:fontFamily="sans-serif-light"
+                        android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:textSize="24sp"
+                        android:textColor="?colorOnTertiaryContainer" />
-                    tools:text="93,27%" />
+
-            </LinearLayout>
+                    <TextView
+                        android:id="@+id/pointSemester2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
+                        android:textColor="?colorPrimary"
+                        tools:text="93,27%" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
             <View
                 android:id="@+id/pointDiv2"
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/divider" />
+                android:background="?colorSurface" />
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/pointYearlyLayout"
+                style="@style/Widget.Material3.CardView.Filled"
+                app:shapeAppearance="?shapeAppearanceCornerLarge"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="center_horizontal"
+                app:cardBackgroundColor="?colorTertiaryContainer">
-                android:orientation="vertical">
 
-                <TextView
+                <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:text="@string/grades_stats_yearly" />
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:orientation="vertical"
+                    android:padding="8dp">
 
-                <TextView
+                    <TextView
-                    android:id="@+id/pointYearly"
+                        android:layout_width="wrap_content"
-                    android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:text="@string/grades_stats_yearly"
-                    android:fontFamily="sans-serif-light"
+                        android:textAppearance="@style/NavView.TextView.BodyLarge"
-                    android:textSize="24sp"
+                        android:textColor="?colorOnTertiaryContainer" />
-                    tools:text="94,50%" />
-            </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/pointYearly"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/NavView.TextView.BodyMedium"
+                        android:textColor="?colorPrimary"
+                        tools:text="94,50%" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
 
         <View
@@ -281,24 +346,23 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="8dp"
-            android:background="@drawable/divider" />
+            android:background="@drawable/divider"
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/disclaimer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_marginTop="8dp"
             android:text="@string/grades_stats_disclaimer"
-            android:textAppearance="@style/NavView.TextView.Helper"
+            android:textAppearance="@style/NavView.TextView.Helper" />
-            android:textSize="12sp"
-            android:textStyle="italic" />
 
         <View
             android:id="@+id/customValueDivider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginVertical="16dp"
-            android:background="@drawable/divider" />
+            android:background="?colorOutline" />
 
         <LinearLayout
             android:id="@+id/customValueLayout"
@@ -310,21 +374,17 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
                 android:layout_weight="1"
                 android:text="@string/grades_stats_custom_config_notice"
-                android:textAppearance="@style/NavView.TextView.Helper"
+                android:textAppearance="@style/NavView.TextView.BodyMedium" />
-                android:textSize="12sp"
-                android:textStyle="italic" />
 
             <Button
                 android:id="@+id/customValueButton"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.TonalButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
-                android:minHeight="0dp"
                 android:text="@string/configure" />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout/grades_item_subject.xml

@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:layout_marginLeft="8dp"
         android:background="?selectableItemBackground">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/divider"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,10 +26,9 @@
                 android:layout_margin="8dp"
                 android:layout_weight="1"
                 android:ellipsize="end"
-                android:fontFamily="sans-serif"
                 android:maxLines="2"
+                android:textAppearance="@style/NavView.TextView.TitleMedium"
                 android:textColor="?android:textColorPrimary"
-                android:textSize="20sp"
                 tools:text="systemy operacyjne" />
 
             <View
@@ -103,7 +98,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
                     android:layout_weight="1"
-                    android:textSize="14sp"
+                    android:textAppearance="@style/NavView.TextView.LabelSmall"
                     android:visibility="gone"
                     tools:text="Cały rok: 6 ocen • punkty: 34.20/40 (87.5%)"
                     tools:text1="Cały rok: 3 oceny • suma: 320 pkt"

app/src/main/res/layout/grades_list_fragment.xml

@@ -28,12 +28,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:drawablePadding="16dp"
-                android:fontFamily="sans-serif-light"
                 android:gravity="center"
                 android:padding="16dp"
                 android:text="@string/grades_no_data"
-                android:textSize="24sp"
                 android:visibility="gone"
+                android:textAppearance="@style/NavView.TextView.BodyMedium"
                 app:drawableTopCompat="@drawable/ic_no_grades"
                 tools:visibility="visible" />
 

app/src/main/res/layout/homework_fragment.xml

@@ -20,11 +20,11 @@
                 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:tabMode="auto"
                 app:tabSelectedTextColor="?colorPrimary"
-                app:tabTextColor="?android:textColorPrimary" />
+                app:tabTextColor="?colorOnBackground" />
 
             <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"

app/src/main/res/layout/homework_list_fragment.xml

@@ -23,12 +23,11 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:drawablePadding="16dp"
-            android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:padding="16dp"
             android:text="@string/homework_no_data"
-            android:textSize="24sp"
             android:visibility="gone"
+            android:textAppearance="@style/NavView.TextView.BodyMedium"
             app:drawableTopCompat="@drawable/ic_no_homework"
             tools:visibility="visible" />
 

app/src/main/res/layout/login_chooser_fragment.xml

@@ -17,7 +17,7 @@
             android:layout_height="32dp"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="32dp"
-            app:iiv_color="@color/colorPrimary"
+            app:iiv_color="?colorPrimary"
             app:iiv_icon="cmd-school-outline"
             app:iiv_size="32dp"
             tools:srcCompat="@tools:sample/avatars" />
@@ -28,7 +28,7 @@
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="16dp"
             android:text="@string/login_chooser_title"
-            android:textSize="24sp" />
+            android:textAppearance="?textAppearanceHeadlineSmall" />
 
         <TextView
             android:id="@+id/subtitleText"
@@ -36,6 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="2dp"
+            android:textAppearance="?textAppearanceBodyMedium"
             android:text="@string/login_chooser_subtitle" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -79,13 +80,13 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackgroundBorderless"
                 android:gravity="center"
-                android:textAppearance="@style/NavView.TextView.Small"
+                android:textAppearance="?textAppearanceLabelMedium"
                 android:textSize="12sp"
                 tools:text="Szkolny.eu v4.7-rc.2\n2021-04-06" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/helpButton"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.TonalButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"

app/src/main/res/layout/login_chooser_item.xml

@@ -9,7 +9,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingHorizontal="24dp"
@@ -20,6 +19,8 @@
             android:layout_width="100dp"
             android:layout_height="60dp"
             android:adjustViewBounds="true"
+            android:background="@drawable/bg_rounded_16dp"
+            android:padding="8dp"
             tools:src="@drawable/login_logo_vulcan" />
 
         <View

app/src/main/res/layout/login_finish_fragment.xml

@@ -23,7 +23,7 @@
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_marginTop="32dp"
-                app:iiv_color="@color/colorPrimary"
+                app:iiv_color="?colorPrimary"
                 app:iiv_icon="cmd-flag-checkered"
                 app:iiv_size="32dp"
                 tools:srcCompat="@android:drawable/stat_sys_phone_call_forward" />
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:text="@string/login_finish_title"
-                android:textSize="24sp" />
+                android:textAppearance="?textAppearanceHeadlineSmall" />
 
             <TextView
                 android:id="@+id/subTitle"

app/src/main/res/layout/login_form_fragment.xml

@@ -28,7 +28,7 @@
                     android:layout_width="32dp"
                     android:layout_height="32dp"
                     android:layout_marginTop="32dp"
-                    app:iiv_color="@color/colorPrimary"
+                    app:iiv_color="?colorPrimary"
                     app:iiv_icon="cmd-account-circle-outline"
                     app:iiv_size="32dp"
                     tools:srcCompat="@tools:sample/avatars" />
@@ -38,14 +38,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:textSize="24sp"
+                    android:textAppearance="?textAppearanceHeadlineSmall"
                     tools:text="Zaloguj się - VULCAN® UONET+" />
 
                 <TextView
                     android:id="@+id/subTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/NavView.TextView.Medium"
+                    android:textAppearance="?textAppearanceBodyMedium"
                     tools:text="Opolska eSzkoła" />
 
                 <View
@@ -96,6 +96,7 @@
                     android:gravity="center_vertical"
                     android:minHeight="40dp"
                     android:orientation="horizontal"
+                    android:paddingVertical="8dp"
                     android:paddingHorizontal="8dp"
                     android:visibility="gone"
                     tools:backgroundTint="?colorError"
@@ -112,11 +113,10 @@
                         android:id="@+id/errorText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="8dp"
+                        android:layout_marginHorizontal="4dp"
-                        android:layout_marginVertical="4dp"
                         android:layout_weight="1"
+                        android:textAppearance="?textAppearanceBodyMedium"
                         android:textColor="?colorOnError"
-                        android:textStyle="bold"
                         tools:text="Nieprawidłowy login lub hasło, konto nie zostało aktywowane, lub dziennik ma problemy egzystencjalne" />
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout/login_platform_item.xml

@@ -21,6 +21,8 @@
             android:layout_width="100dp"
             android:layout_height="60dp"
             android:adjustViewBounds="true"
+            android:background="@drawable/bg_rounded_16dp"
+            android:padding="8dp"
             tools:src="@sample/vulcan" />
 
         <View

app/src/main/res/layout/login_platform_list_fragment.xml

@@ -17,7 +17,7 @@
             android:layout_height="32dp"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="32dp"
-            app:iiv_color="@color/colorPrimary"
+            app:iiv_color="?colorPrimary"
             app:iiv_icon="cmd-comment-account-outline"
             app:iiv_size="32dp"
             tools:srcCompat="@tools:sample/avatars" />
@@ -28,7 +28,7 @@
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="16dp"
             android:text="@string/login_platform_list_title"
-            android:textSize="24sp" />
+            android:textAppearance="?textAppearanceHeadlineSmall" />
 
         <TextView
             android:layout_width="match_parent"
@@ -109,7 +109,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/helpButton"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.TonalButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"