diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c8ff3936..b1f24f9b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -127,6 +143,8 @@
+
+
\ No newline at end of file
diff --git a/.idea/dictionaries/Kuba.xml b/.idea/dictionaries/Kuba.xml
index 7959d9aa..004f29bd 100644
--- a/.idea/dictionaries/Kuba.xml
+++ b/.idea/dictionaries/Kuba.xml
@@ -4,6 +4,7 @@
autoryzacji
ciasteczko
csrf
+ daynight
edziennik
eggfall
elearning
diff --git a/app/build.gradle b/app/build.gradle
index b071c1ef..11d7964d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,10 @@ apply from: 'git-info.gradle'
android {
compileSdkVersion setup.compileSdk
+ namespace "pl.szczodrzynski.edziennik"
+
defaultConfig {
- applicationId 'pl.szczodrzynski.edziennik'
+ applicationId "pl.szczodrzynski.edziennik"
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
@@ -20,8 +22,9 @@ android {
buildConfigField "java.util.Map", "GIT_INFO", gitInfoMap
buildConfigField "String", "VERSION_BASE", "\"${release.versionName}\""
+
manifestPlaceholders = [
- buildTimestamp: String.valueOf(System.currentTimeMillis())
+ buildTimestamp: String.valueOf(System.currentTimeMillis())
]
multiDexEnabled = true
@@ -36,6 +39,8 @@ android {
arguments {
arg("room.schemaLocation", "$projectDir/schemas")
}
+
+ correctErrorTypes = true
}
}
@@ -43,10 +48,12 @@ android {
debug {
getIsDefault().set(true)
minifyEnabled = false
+ applicationIdSuffix = ".debug"
manifestPlaceholders = [
- buildTimestamp: 0
+ buildTimestamp: 0
]
}
+
release {
minifyEnabled = true
shrinkResources = true
@@ -54,28 +61,35 @@ android {
proguardFiles fileTree('proguard').asList().toArray()
}
}
- flavorDimensions "platform"
+
+ flavorDimensions += "platform"
+
productFlavors {
unofficial {
getIsDefault().set(true)
versionName "${release.versionName}-${gitInfo.versionSuffix}"
}
+
official {}
play {}
}
+
variantFilter { variant ->
def flavors = variant.flavors*.name
setIgnore(variant.buildType.name == "debug" && !flavors.contains("unofficial") || flavors.contains("main"))
}
+
sourceSets {
unofficial {
java.srcDirs = ["src/main/java", "src/play-not/java"]
manifest.srcFile("src/play-not/AndroidManifest.xml")
}
+
official {
java.srcDirs = ["src/main/java", "src/play-not/java"]
manifest.srcFile("src/play-not/AndroidManifest.xml")
}
+
play {
java.srcDirs = ["src/main/java", "src/play/java"]
}
@@ -84,29 +98,36 @@ android {
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
+
buildFeatures {
dataBinding = true
viewBinding = true
+ buildConfig = true
}
+
compileOptions {
coreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
+
kotlinOptions {
jvmTarget = "1.8"
}
+
packagingOptions {
resources {
excludes += ['META-INF/library-core_release.kotlin_module']
}
}
+
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.10.2"
}
}
+
lint {
checkReleaseBuilds false
}
@@ -115,6 +136,7 @@ android {
tasks.whenTaskAdded { task ->
if (!task.name.endsWith("Release") && !task.name.endsWith("ReleaseWithR8"))
return
+
def renameTaskName = "rename${task.name.capitalize()}"
def flavor = ""
@@ -125,16 +147,20 @@ tasks.whenTaskAdded { task ->
if (task.name.startsWith("minify"))
flavor = task.name.substring("minify".length(), task.name.indexOf("Release")).uncapitalize()
+ def taskName = "package${flavor.capitalize()}Release"
+
if (flavor != "") {
- tasks.create(renameTaskName, Copy) {
+ tasks.register(renameTaskName, Copy) {
+ dependsOn(taskName)
from file("${projectDir}/${flavor}/release/"),
- file("${buildDir}/outputs/mapping/${flavor}Release/"),
- file("${buildDir}/outputs/apk/${flavor}/release/"),
- file("${buildDir}/outputs/bundle/${flavor}Release/")
+ file("${layout.buildDirectory}/outputs/mapping/${flavor}Release/"),
+ file("${layout.buildDirectory}/outputs/apk/${flavor}/release/"),
+ file("${layout.buildDirectory}/outputs/bundle/${flavor}Release/")
include "*.aab", "*.apk", "mapping.txt", "output-metadata.json"
destinationDir file("${projectDir}/release/")
rename ".+?\\.(.+)", "Edziennik_${android.defaultConfig.versionName}_${flavor}." + '$1'
}
+
task.finalizedBy(renameTaskName)
}
}
@@ -145,29 +171,29 @@ dependencies {
// Language cores
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "androidx.multidex:multidex:2.0.1"
- coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
+ coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
// Android Jetpack
- implementation "androidx.appcompat:appcompat:1.5.1"
+ implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
- implementation "androidx.core:core-ktx:1.9.0"
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
- implementation "androidx.navigation:navigation-fragment-ktx:2.5.2"
- implementation "androidx.recyclerview:recyclerview:1.2.1"
- implementation "androidx.room:room-runtime:2.4.3"
- implementation "androidx.room:room-ktx:2.4.3"
- implementation "androidx.work:work-runtime-ktx:2.7.1"
- kapt "androidx.room:room-compiler:2.4.3"
+ implementation "androidx.core:core-ktx:1.13.1"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
+ implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
+ implementation "androidx.recyclerview:recyclerview:1.3.2"
+ implementation "androidx.room:room-runtime:2.6.1"
+ implementation "androidx.room:room-ktx:2.6.1"
+ implementation "androidx.work:work-runtime-ktx:2.9.0"
+ kapt "androidx.room:room-compiler:2.6.1"
// Google design libs
- implementation "com.google.android.material:material:1.6.1"
+ implementation "com.google.android.material:material:1.12.0"
implementation "com.google.android.flexbox:flexbox:3.0.0"
// Play Services/Firebase
- implementation "com.google.android.gms:play-services-wearable:17.1.0"
+ implementation "com.google.android.gms:play-services-wearable:18.2.0"
implementation("com.google.firebase:firebase-core") { version { strictly "19.0.2" } }
- implementation "com.google.firebase:firebase-crashlytics:18.2.13"
+ implementation "com.google.firebase:firebase-crashlytics:19.0.1"
implementation("com.google.firebase:firebase-messaging") { version { strictly "20.1.3" } }
// OkHttp, Retrofit, Gson, Jsoup
@@ -175,7 +201,7 @@ dependencies {
implementation "com.squareup.retrofit2:retrofit:2.9.0"
implementation "com.squareup.retrofit2:converter-gson:2.9.0"
implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
- implementation 'com.google.code.gson:gson:2.8.8'
+ implementation 'com.google.code.gson:gson:2.11.0'
implementation 'org.jsoup:jsoup:1.14.3'
implementation "pl.droidsonroids:jspoon:1.3.2"
implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2"
@@ -189,19 +215,22 @@ dependencies {
implementation "eu.szkolny:material-about-library:1d5ebaf47c"
implementation "eu.szkolny:mhttp:af4b62e6e9"
implementation "eu.szkolny:nachos:0e5dfcaceb"
- implementation "eu.szkolny.selective-dao:annotation:27f8f3f194"
+ implementation "eu.szkolny.selective-dao:annotation:6a337f9"
officialImplementation "eu.szkolny:ssl-provider:1.0.0"
unofficialImplementation "eu.szkolny:ssl-provider:1.0.0"
+
implementation "pl.szczodrzynski:numberslidingpicker:2921225f76"
implementation "pl.szczodrzynski:recyclertablayout:700f980584"
implementation "pl.szczodrzynski:tachyon:551943a6b5"
- kapt "eu.szkolny.selective-dao:codegen:27f8f3f194"
+ kapt "eu.szkolny.selective-dao:codegen:6a337f9"
// Iconics & related
implementation "com.mikepenz:iconics-core:5.3.2"
implementation "com.mikepenz:iconics-views:5.3.2"
+ implementation "com.mikepenz:materialdrawer:9.0.1"
implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar"
- implementation "eu.szkolny:szkolny-font:77e33acc2a"
+ implementation 'com.mikepenz:google-material-typeface:4.0.0.2-kotlin@aar'
+ implementation "eu.szkolny:szkolny-font:95eabe7"
// Other dependencies
implementation "cat.ereza:customactivityoncrash:2.3.0"
diff --git a/app/git-info.gradle b/app/git-info.gradle
index 3577f668..07ca7ae2 100644
--- a/app/git-info.gradle
+++ b/app/git-info.gradle
@@ -5,7 +5,7 @@
buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
classpath "org.eclipse.jgit:org.eclipse.jgit:5.5.+"
diff --git a/app/google-services.json b/app/google-services.json
index 247bf747..8412fad0 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -36,6 +36,37 @@
"status": 2
}
}
+ },
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:640759989760:android:4aa71407b25cdc8d",
+ "android_client_info": {
+ "package_name": "pl.szczodrzynski.edziennik.debug"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "640759989760-6f8q00u864lnuh3gh36e8g4cer9lv8pv.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyAvq9HMPxulz9ntdAHZ0eZuPf2YQs4nDSU"
+ }
+ ],
+ "services": {
+ "analytics_service": {
+ "status": 1
+ },
+ "appinvite_service": {
+ "status": 1,
+ "other_platform_oauth_client": []
+ },
+ "ads_service": {
+ "status": 2
+ }
+ }
}
],
"configuration_version": "1"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8618f020..1c69c9ce 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,7 +19,10 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
+-keepattributes Signature
-keep class android.support.v7.widget.** { *; }
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
-keep class pl.szczodrzynski.edziennik.utils.models.** { *; }
-keep class pl.szczodrzynski.edziennik.data.db.enums.* { *; }
@@ -32,8 +35,8 @@
-keepnames class pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider
-keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
-keepnames class pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider
--keep class pl.szczodrzynski.edziennik.config.AppData { *; }
--keep class pl.szczodrzynski.edziennik.config.AppData$** { *; }
+-keep class pl.szczodrzynski.edziennik.data.config.AppData { *; }
+-keep class pl.szczodrzynski.edziennik.data.config.AppData$** { *; }
-keep class pl.szczodrzynski.edziennik.utils.managers.TextStylingManager$HtmlMode { *; }
-keepnames class androidx.appcompat.view.menu.MenuBuilder { setHeaderTitleInt(java.lang.CharSequence); }
@@ -42,6 +45,15 @@
-keepclassmembernames class androidx.appcompat.view.menu.MenuItemImpl { private *; }
-keepclassmembernames class com.mikepenz.materialdrawer.widget.MiniDrawerSliderView { private *; }
+-keepclassmembernames class com.mikepenz.iconics.internal.IconicsViewsAttrsApplier {
+ ;
+ readIconicsTextView(android.content.Context, android.util.AttributeSet, com.mikepenz.iconics.internal.CompoundIconsBundle);
+ getIconicsImageViewDrawable(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclassmembernames class com.mikepenz.iconics.internal.CompoundIconsBundle {
+ setIcons(android.widget.TextView);
+}
-keep class .R
-keep class **.R$* {
@@ -55,8 +67,19 @@
-keep class com.google.android.material.tabs.** {*;}
+# Exclude AgendaCalendarView
+# Preserve generic type information for EventRenderer and its subclasses
+-keepclassmembers class * extends com.github.tibolte.agendacalendarview.render.EventRenderer {
+ ;
+ ;
+}
+
+# Keep the EventRenderer class itself and all its subclasses
+-keep class com.github.tibolte.agendacalendarview.render.EventRenderer
+-keep class * extends com.github.tibolte.agendacalendarview.render.EventRenderer
+
# ServiceLoader support
- -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
# Most of volatile fields are updated with AFU and should not be mangled
@@ -70,9 +93,36 @@
-keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); }
+-keepclassmembers class pl.szczodrzynski.edziennik.ui.login.qr.* { *; }
-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
-keepclassmembernames class pl.szczodrzynski.edziennik.ui.login.LoginInfo$Platform { *; }
-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; }
-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; }
+
+# Exclude Retrofit2
+-keepattributes Signature, InnerClasses, EnclosingMethod
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes AnnotationDefault
+
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+ @retrofit2.http.* ;
+}
+
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn javax.annotation.**
+-dontwarn kotlin.Unit
+-dontwarn retrofit2.KotlinExtensions
+-dontwarn retrofit2.KotlinExtensions$*
+
+-if interface * { @retrofit2.http.* ; }
+-keep,allowobfuscation interface <1>
+
+-if interface * { @retrofit2.http.* ; }
+-keep,allowobfuscation interface * extends <1>
+
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-if interface * { @retrofit2.http.* public *** *(...); }
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v1.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..ad54592c
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v1.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v1_foreground.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..66c14405
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v3.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..0478e03e
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v3.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v3_foreground.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..420ec2f2
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v4.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..78e7ecb0
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v4.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v4_foreground.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..80f5d22b
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v5.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..948f03a8
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v5.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v5_foreground.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..33d7f5bc
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_v5_monochrome.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..a4549280
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_splash_v1.webp b/app/src/debug/res/mipmap-hdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..cfd586a9
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_splash_v1.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_splash_v3.webp b/app/src/debug/res/mipmap-hdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..fcae3014
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_splash_v3.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_splash_v4.webp b/app/src/debug/res/mipmap-hdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..456d6575
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_splash_v4.webp differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_splash_v5.webp b/app/src/debug/res/mipmap-hdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..ccb8b820
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_splash_v5.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v1.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..f6ea87aa
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v1.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v1_foreground.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..2f92fb62
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v3.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..7b65cad7
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v3.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v3_foreground.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..eb889d34
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v4.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..24a07e14
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v4.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v4_foreground.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..238b05db
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v5.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..9496c5f7
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v5.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v5_foreground.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..812b4c63
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_v5_monochrome.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..0a0a314f
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_splash_v1.webp b/app/src/debug/res/mipmap-mdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..19be18d2
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_splash_v1.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_splash_v3.webp b/app/src/debug/res/mipmap-mdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..37c6cc22
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_splash_v3.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_splash_v4.webp b/app/src/debug/res/mipmap-mdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..91f670f8
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_splash_v4.webp differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_splash_v5.webp b/app/src/debug/res/mipmap-mdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..f2cb3c41
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_splash_v5.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v1.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..d447f7a5
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v1.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v1_foreground.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..ef14620e
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v3.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..81cf06f1
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v3.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v3_foreground.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..f32537d7
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v4.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..7497c251
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v4.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v4_foreground.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..e308ac65
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..141f52fc
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5_foreground.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..c69a3466
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5_monochrome.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..6534ea42
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_splash_v1.webp b/app/src/debug/res/mipmap-xhdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..9ab41351
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_splash_v1.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_splash_v3.webp b/app/src/debug/res/mipmap-xhdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..cf6101f8
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_splash_v3.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_splash_v4.webp b/app/src/debug/res/mipmap-xhdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..9dce9f09
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_splash_v4.webp differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_splash_v5.webp b/app/src/debug/res/mipmap-xhdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..98081122
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_splash_v5.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v1.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..e7c699cd
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v1.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v1_foreground.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..c07bfd38
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v3.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..acbfe8fd
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v3.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v3_foreground.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..2df83a89
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v4.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..1f9e5abb
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v4.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v4_foreground.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..72a072a4
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..d1f82c0d
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5_foreground.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..706799bb
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5_monochrome.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..dd8577fd
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_splash_v1.webp b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..a9417c25
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v1.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_splash_v3.webp b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..e22029c7
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v3.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_splash_v4.webp b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..1ce9b3dd
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v4.webp differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_splash_v5.webp b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..3b497c13
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_splash_v5.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v1.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..19be18d2
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v1.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v1_foreground.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..df2c5385
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v3.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..37c6cc22
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v3.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v3_foreground.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..9a5ffaad
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v4.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..91f670f8
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v4.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v4_foreground.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..5732a7a3
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..f2cb3c41
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5_foreground.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..4ee7158f
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5_monochrome.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..2d3fc81c
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v1.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..909536cc
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v1.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v3.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..265438fe
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v3.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v4.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..ea815741
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v4.webp differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v5.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..8d694c27
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_splash_v5.webp differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da531480..0818551c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
@@ -12,19 +11,21 @@
-
+
+
-
+
@@ -40,7 +41,6 @@
|___/ -->
@@ -67,7 +67,7 @@
android:excludeFromRecents="true"
android:noHistory="true"
android:exported="true"
- android:theme="@style/AppTheme.Dark.NoDisplay">
+ android:theme="@style/AppTheme.M3.NoDisplay">
@@ -84,14 +84,14 @@
android:resource="@xml/widget_timetable_info" />
+ android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync"/>
+ android:theme="@style/AppTheme.M3.NoDisplay" />
+ android:permission="android.permission.BIND_REMOTEVIEWS" android:foregroundServiceType="dataSync"/>
+ android:theme="@style/AppTheme.M3" />
+ android:theme="@style/AppTheme.M3" />
+ android:theme="@style/AppTheme.M3" />
+ android:theme="@style/AppTheme.M3" />
-
+
+ android:exported="false" android:foregroundServiceType="dataSync">
-
+
+ android:focusable="true"
+ style="?attr/materialCardViewFilledStyle"
+ app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraLarge" />
diff --git a/app/src/main/res/layout/card_home_archive.xml b/app/src/main/res/layout/card_home_archive.xml
index ffe979bc..78dc1690 100644
--- a/app/src/main/res/layout/card_home_archive.xml
+++ b/app/src/main/res/layout/card_home_archive.xml
@@ -7,50 +7,45 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
-
-
+ android:orientation="vertical"
+ android:paddingLeft="8dp"
+ android:paddingTop="8dp">
+
+
+ android:textAppearance="?textAppearanceTitleMedium" />
-
-
-
diff --git a/app/src/main/res/layout/card_home_availability.xml b/app/src/main/res/layout/card_home_availability.xml
index 9b4f67f5..62345d42 100644
--- a/app/src/main/res/layout/card_home_availability.xml
+++ b/app/src/main/res/layout/card_home_availability.xml
@@ -6,60 +6,49 @@
-
-
-
-
+ android:paddingLeft="8dp"
+ android:paddingTop="8dp"
+ android:orientation="vertical">
+
+ android:textAppearance="?textAppearanceTitleMedium" />
-
+
-
-
-
diff --git a/app/src/main/res/layout/card_home_debug.xml b/app/src/main/res/layout/card_home_debug.xml
index 4bcca808..6d8690d2 100644
--- a/app/src/main/res/layout/card_home_debug.xml
+++ b/app/src/main/res/layout/card_home_debug.xml
@@ -20,14 +20,18 @@
+
+
@@ -40,7 +44,6 @@
@@ -53,14 +56,14 @@
@@ -73,7 +76,6 @@
diff --git a/app/src/main/res/layout/card_home_events.xml b/app/src/main/res/layout/card_home_events.xml
index 91ffc6ad..f35e28b0 100644
--- a/app/src/main/res/layout/card_home_events.xml
+++ b/app/src/main/res/layout/card_home_events.xml
@@ -1,41 +1,63 @@
-
-
+ android:orientation="vertical"
+ android:padding="8dp">
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
+
+
+
+
+
+
+
+
+ tools:visibility="visible" />
diff --git a/app/src/main/res/layout/card_home_grades.xml b/app/src/main/res/layout/card_home_grades.xml
index 38ae61de..acc2b18b 100644
--- a/app/src/main/res/layout/card_home_grades.xml
+++ b/app/src/main/res/layout/card_home_grades.xml
@@ -2,36 +2,60 @@
~ Copyright (c) Kacper Ziubryniewicz 2019-11-29
-->
-
+
+ android:orientation="vertical"
+ android:padding="8dp">
-
-
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
-
+ android:layout_marginTop="16dp"
+ android:orientation="vertical"/>
+
diff --git a/app/src/main/res/layout/card_home_lucky_number.xml b/app/src/main/res/layout/card_home_lucky_number.xml
index 40069c32..ab465b35 100644
--- a/app/src/main/res/layout/card_home_lucky_number.xml
+++ b/app/src/main/res/layout/card_home_lucky_number.xml
@@ -1,5 +1,4 @@
-
-
@@ -10,38 +9,49 @@
+ android:padding="8dp">
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ >
-
-
-
+ android:layout_marginEnd="8dp"
+ android:clickable="false"
+ app:iiv_color="?colorOnPrimaryContainer"
+ app:iiv_icon="cmd-emoticon-sad-outline"
+ app:iiv_size="24dp"
+ tools:icon="@sample/settings"
+ tools:iconTint="?colorOnPrimaryContainer" />
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/card_home_notes.xml b/app/src/main/res/layout/card_home_notes.xml
index da14da63..7d1a2a12 100644
--- a/app/src/main/res/layout/card_home_notes.xml
+++ b/app/src/main/res/layout/card_home_notes.xml
@@ -1,36 +1,57 @@
-
-
+ android:padding="8dp">
-
-
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
index 9b210f7b..dfdef13a 100644
--- a/app/src/main/res/layout/card_home_timetable.xml
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -1,5 +1,4 @@
-
-
@@ -19,46 +18,41 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
+ android:padding="8dp"
android:visibility="gone"
tools:visibility="visible">
-
+
+
+ android:textAppearance="?textAppearanceTitleMedium" />
-
-
+ android:text="@string/home_timetable_no_timetable_text" />
-
-
-
+
+
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:layout_gravity="left"
+ android:gravity="left"
+ android:text="@string/home_timetable_no_lessons_text" />
-
-
-
+
+
+ android:textAppearance="?textAppearanceTitleMedium" />
-
+ android:text="@string/home_timetable_not_public_text" />
-
+
+ android:padding="8dp"
+ tools:layout_marginTop="290dp">
+
+
@@ -165,14 +177,14 @@
android:id="@+id/dayInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/NavView.TextView.Title"
+ android:textAppearance="?textAppearanceTitleMedium"
tools:text="Jutro" />
@@ -182,90 +194,101 @@
android:layout_height="48dp"
android:background="?selectableItemBackgroundBorderless"
android:padding="12dp"
- android:visibility="gone"
- tools:src="@sample/settings" />
-
-
-
-
+ android:visibility="gone" />
-
-
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="8dp">
+
+
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="8dp"
+ android:orientation="horizontal">
-
+ android:layout_weight="1"
+ android:orientation="vertical">
-
+
-
+
+
+
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+
+
+
+
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:textAppearance="?textAppearanceLabelLarge"
+ tools:text="Później:"/>
+ tools:text="9: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" />
+
+
+
+
diff --git a/app/src/main/res/layout/contributors_activity.xml b/app/src/main/res/layout/contributors_activity.xml
index fa54100d..cc5e5ebd 100644
--- a/app/src/main/res/layout/contributors_activity.xml
+++ b/app/src/main/res/layout/contributors_activity.xml
@@ -61,7 +61,7 @@
android:scaleType="center"
android:scaleX="0.8"
android:scaleY="0.8"
- android:src="@mipmap/ic_splash" />
+ android:src="@mipmap/ic_splash_v5" />
+ android:textAppearance="?textAppearanceHeadlineMedium" />
+ android:textAppearance="?textAppearanceTitleLarge" />
+ android:textAppearance="?textAppearanceTitleMedium"
+ tools:text="Jan Kowalski" />
+ android:textAppearance="?textAppearanceBodyMedium"
+ tools:text="\@jan - ∞ contributions" />
diff --git a/app/src/main/res/layout/dialog_bell_sync_time_choose.xml b/app/src/main/res/layout/dialog_bell_sync_time_choose.xml
index 0859f5a7..cdfb55c3 100644
--- a/app/src/main/res/layout/dialog_bell_sync_time_choose.xml
+++ b/app/src/main/res/layout/dialog_bell_sync_time_choose.xml
@@ -26,7 +26,7 @@
tools:text="@string/bell_sync_choose_howto" />
diff --git a/app/src/main/res/layout/dialog_config_agenda.xml b/app/src/main/res/layout/dialog_config_agenda.xml
index effe23fe..11f0c454 100644
--- a/app/src/main/res/layout/dialog_config_agenda.xml
+++ b/app/src/main/res/layout/dialog_config_agenda.xml
@@ -11,7 +11,7 @@
+ type="pl.szczodrzynski.edziennik.data.config.ProfileConfig" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceBodySmall" />
+ android:padding="24dp">
+ android:text="@string/grades_config_title"
+ android:textAppearance="?textAppearanceTitleMedium" />
@@ -52,7 +52,6 @@
@@ -78,8 +77,8 @@
+ android:layout_marginVertical="8dp"
+ android:background="@drawable/divider" />
+ app:placeholderText="@string/grades_config_dont_count_placeholder">
+ android:layout_marginTop="16dp"
+ android:text="@string/menu_grades_sort_mode"
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp">
+ android:layout_marginTop="16dp"
+ android:text="@string/menu_grades_color_mode"
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp">
+ android:layout_marginTop="16dp"
+ android:text="@string/menu_grades_average_mode"
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp">
@@ -31,7 +31,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
- android:textAppearance="@style/NavView.TextView.Helper"
android:textIsSelectable="true"
android:visibility="gone"
tools:text="8:00 - 14:20 (7 lekcji, 6 godzin, 20 minut)"
@@ -42,7 +41,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
- android:textAppearance="@style/NavView.TextView.Helper"
+ android:textAppearance="?textAppearanceBodySmall"
tools:text="[ - ] dodano notatki" />
+ android:text="@string/dialog_no_events_hint" />
diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml
index b954ce11..d68a20cb 100644
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:text="@{name}"
android:textIsSelectable="true"
- android:textAppearance="@style/NavView.TextView.Title"
+ android:textAppearance="?textAppearanceTitleLarge"
android:visibility="@{event.typeName == null ? View.GONE : View.VISIBLE}"
tools:text="sprawdzian" />
@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textIsSelectable="true"
- android:textAppearance="@style/NavView.TextView.Subtitle"
+ android:textAppearance="?textAppearanceTitleMedium"
android:text="@{details}"
android:visibility="@{details == null ? View.GONE : View.VISIBLE}"
tools:text="język angielski • 2B3T a2"
@@ -84,16 +84,15 @@
@@ -175,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/dialog_event_details_body"
- android:textAppearance="@style/NavView.TextView.Helper" />
+ android:textAppearance="?textAppearanceLabelMedium" />
@@ -200,7 +199,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/dialog_event_details_attachments"
- android:textAppearance="@style/NavView.TextView.Helper" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ app:justifyContent="center">
@@ -36,7 +36,7 @@
+
@@ -104,7 +106,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{weightText}"
- android:textAppearance="@style/NavView.TextView.Subtitle"
+ android:textAppearance="?textAppearanceTitleMedium"
android:textIsSelectable="true"
android:visibility="@{weightText != null ? View.VISIBLE : View.GONE}"
tools:text="waga 3"
@@ -118,7 +120,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:textAppearance="@style/NavView.TextView.Helper"
+ android:textAppearance="?textAppearanceBodySmall"
tools:text="[ - ] dodano notatki" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ android:textAppearance="?textAppearanceLabelMedium" />
@@ -303,13 +306,11 @@
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:text="@string/grades_stats_custom_value_notice"
- android:textAppearance="@style/NavView.TextView.Helper"
- android:textSize="12sp"
- android:textStyle="italic" />
+ android:textAppearance="?textAppearanceBodySmall" />
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index 03a3c843..091885f7 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -34,21 +34,6 @@
android:paddingHorizontal="16dp"
android:paddingTop="24dp">
-
-
@@ -88,31 +73,35 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textIsSelectable="true"
- android:textAppearance="@style/NavView.TextView.Subtitle"
+ android:textAppearance="?textAppearanceTitleMedium"
tools:text="czwartek, 14 listopada 2019"
tools:visibility="visible" />
+
+
+ android:gravity="right">
+
-
-
@@ -135,20 +124,20 @@
android:baselineAligned="false"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
@@ -160,7 +149,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
- android:textAppearance="@style/NavView.TextView.Helper"
+ android:textAppearance="?textAppearanceBodySmall"
tools:text="[ - ] dodano notatki" />
@@ -370,24 +359,23 @@
android:visibility="gone"
tools:visibility="visible">
+
+
+ android:textAppearance="?textAppearanceHeadlineSmall" />
+ android:text="@string/dialog_no_events_hint" />
@@ -399,13 +387,34 @@
tools:visibility="visible"
tools:listitem="@layout/event_list_item" />
-
+ android:layout_marginHorizontal="8dp"
+ android:layout_marginTop="8dp"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal">
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_profile_config.xml b/app/src/main/res/layout/dialog_profile_config.xml
index 776d62a1..081c92f7 100644
--- a/app/src/main/res/layout/dialog_profile_config.xml
+++ b/app/src/main/res/layout/dialog_profile_config.xml
@@ -68,7 +68,7 @@
@@ -88,8 +88,7 @@
android:layout_marginTop="8dp"
android:gravity="center_horizontal"
android:text="@{profile.subname}"
- android:textAppearance="@style/NavView.TextView.Subtitle"
- android:textColor="?android:textColorSecondary"
+ android:textAppearance="?textAppearanceTitleMedium"
tools:text="3b3t - 2020/2021" />
@@ -42,7 +42,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:textAppearance="@style/NavView.TextView.Helper"
+ android:textAppearance="?textAppearanceLabelMedium"
android:text="@string/dialog_widget_timetable_config_theme" />
-
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:layout_marginRight="8dp">
+ android:layout_weight="7"
+ android:background="?selectableItemBackground"
+ android:orientation="vertical"
+ android:padding="8dp">
-
-
-
-
-
+ android:gravity="center_vertical">
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:ellipsize="middle"
+ android:singleLine="true"
+ android:textAppearance="?textAppearanceBodySmall"
+ android:visibility="@{simpleMode ? View.GONE : View.VISIBLE}"
+ tools:text="Udostępniono 10 grudnia przez Ktoś Z Twojej Klasy • 2B3T" />
-
-
+ android:fontFamily="@font/community_material_font_v5_8_55"
+ android:text="\uf2f4"
+ android:textSize="20sp"
+ tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_agenda_calendar.xml b/app/src/main/res/layout/fragment_agenda_calendar.xml
index 5e5f94a1..91380b23 100644
--- a/app/src/main/res/layout/fragment_agenda_calendar.xml
+++ b/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"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_agenda_default.xml b/app/src/main/res/layout/fragment_agenda_default.xml
index 8cddf0c7..035dfff4 100644
--- a/app/src/main/res/layout/fragment_agenda_default.xml
+++ b/app/src/main/res/layout/fragment_agenda_default.xml
@@ -18,13 +18,13 @@
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="?colorFab"
+ agendaCalendar:fabColor="?colorPrimaryContainer"
agendaCalendar:layout_constraintBottom_toBottomOf="parent"
agendaCalendar:layout_constraintEnd_toEndOf="parent"
agendaCalendar:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout/fragment_announcements.xml b/app/src/main/res/layout/fragment_announcements.xml
index cb7d38d0..e176614d 100644
--- a/app/src/main/res/layout/fragment_announcements.xml
+++ b/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:textStyle="italic"
+ android:textAppearance="?textAppearanceHeadlineSmall"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_behaviour.xml b/app/src/main/res/layout/fragment_behaviour.xml
index 79b8554e..b82e05c5 100644
--- a/app/src/main/res/layout/fragment_behaviour.xml
+++ b/app/src/main/res/layout/fragment_behaviour.xml
@@ -11,80 +11,89 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
-
-
+ android:layout_margin="8dp"
+ app:singleSelection="true"
+ app:selectionRequired="true"
+ android:gravity="center_horizontal">
-
+ android:text="Semestr 1" />
+
+
+
+
+
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+ tools:text="342525"/>
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginHorizontal="32dp">
-
+ tools:text="53535353"/>
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+ tools:text="3331"/>
-
+ android:text="@string/notices_no_data" />
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index f87bd64a..c511d81f 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -13,14 +13,13 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+ style="?textInputOutlinedStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -43,7 +42,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
- style="@style/Widget.MaterialComponents.Button"
android:text="Run"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="parent"
@@ -61,7 +59,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
- style="@style/Widget.MaterialComponents.Button"
android:text="AppConfig"
app:layout_constraintEnd_toStartOf="@+id/guideline3"
app:layout_constraintStart_toStartOf="@+id/guideline2"
@@ -79,7 +76,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
- style="@style/Widget.MaterialComponents.Button"
android:text="AppProfile"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline3"
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index 79d1466d..c5561c53 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -1,6 +1,8 @@
-
+
+ android:visibility="gone"
+ tools:visibility="visible">
+ android:textAppearance="?textAppearanceTitleLarge" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceBodySmall" />
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index 85f18695..b8e551ed 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -19,25 +19,25 @@
tools:visibility="gone">
-
+ android:layout_height="wrap_content"
+ android:background="?colorSurfaceContainerLow"
+ app:tabMode="auto"
+ app:tabIndicatorColor="?colorPrimary"
+ app:tabMaxWidth="300dp"
+ app:tabMinWidth="90dp"
+ app:tabPaddingBottom="12dp"
+ app:tabPaddingEnd="16dp"
+ app:tabPaddingStart="16dp"
+ app:tabPaddingTop="12dp"
+ app:tabSelectedTextColor="?colorPrimary"
+ app:tabTextColor="?colorOnBackground" />
+ android:textAppearance="?textAppearanceHeadlineSmall" />
+ android:textAppearance="?textAppearanceBodyLarge" />
+ android:text="@string/timetable_not_public_hint" />
diff --git a/app/src/main/res/layout/grades_item_empty.xml b/app/src/main/res/layout/grades_item_empty.xml
index 085eed62..03a53b2e 100644
--- a/app/src/main/res/layout/grades_item_empty.xml
+++ b/app/src/main/res/layout/grades_item_empty.xml
@@ -13,9 +13,7 @@
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
- android:textSize="18sp"
- android:textColor="?android:textColorSecondary"
- android:textStyle="italic"
+ android:textAppearance="?textAppearanceBodyLarge"
android:text="@string/grades_empty_text"/>
diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml
index a87f8cf3..7e7c03a5 100644
--- a/app/src/main/res/layout/grades_item_grade.xml
+++ b/app/src/main/res/layout/grades_item_grade.xml
@@ -10,18 +10,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
+ android:gravity="center_vertical"
android:orientation="horizontal"
- android:paddingVertical="8dp">
+ android:paddingVertical="4dp">
@@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
-
+
@@ -88,24 +92,23 @@
android:id="@+id/gradeCategory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_weight="1"
android:ellipsize="end"
android:maxWidth="200dp"
android:maxLines="1"
- android:textAppearance="@style/TextAppearance.AppCompat.Small"
tools:text="Kartkówki - K1" />
diff --git a/app/src/main/res/layout/grades_item_semester.xml b/app/src/main/res/layout/grades_item_semester.xml
index 8419adf0..3c9bf2dc 100644
--- a/app/src/main/res/layout/grades_item_semester.xml
+++ b/app/src/main/res/layout/grades_item_semester.xml
@@ -33,8 +33,7 @@
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
- android:textColor="?android:textColorPrimary"
- android:textSize="18sp"
+ android:textAppearance="?textAppearanceTitleMedium"
tools:text="Semestr 1" />
@@ -78,8 +77,8 @@
-
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
-
+ android:textAppearance="?textAppearanceTitleLarge" />
-
+ android:layout_marginTop="16dp"
+ android:orientation="horizontal">
+
+
+
+
+
+ android:layout_marginTop="8dp"
+ android:orientation="horizontal">
-
+ app:cardBackgroundColor="?colorSecondaryContainer"
+ app:shapeAppearance="?shapeAppearanceCornerLarge">
-
+
-
+
-
-
+
+
+
+
+
+ android:background="?colorSurface" />
-
+ app:cardBackgroundColor="?colorSecondaryContainer"
+ app:shapeAppearance="?shapeAppearanceCornerLarge">
-
+
-
+
-
-
+
+
+
+
+
+ android:background="?colorSurface" />
-
+ app:cardBackgroundColor="?colorSecondaryContainer"
+ app:shapeAppearance="?shapeAppearanceCornerLarge">
-
+
-
+
-
-
+
+
+
+
-
-
+ android:background="?colorSurface" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:orientation="horizontal">
-
+ app:cardBackgroundColor="?colorSecondaryContainer">
-
+
-
-
+
+
+
+
+
+ android:background="?colorSurface" />
-
+ app:cardBackgroundColor="?colorSecondaryContainer">
-
+
-
-
+
+
+
+
+
+ android:background="?colorSurface" />
-
+ app:cardBackgroundColor="?colorSecondaryContainer">
-
+
-
-
+
+
+
+
+ android:background="@drawable/divider"
+ android:visibility="gone" />
+ android:textAppearance="?textAppearanceBodySmall" />
+ android:layout_marginVertical="16dp"
+ android:background="?colorOutline" />
+ android:text="@string/grades_stats_custom_config_notice" />
diff --git a/app/src/main/res/layout/grades_item_subject.xml b/app/src/main/res/layout/grades_item_subject.xml
index b3b8f774..5d19c1e4 100644
--- a/app/src/main/res/layout/grades_item_subject.xml
+++ b/app/src/main/res/layout/grades_item_subject.xml
@@ -13,11 +13,6 @@
android:orientation="vertical"
android:background="?selectableItemBackground">
-
-
+ android:textAppearance="?textAppearanceBodySmall" />
diff --git a/app/src/main/res/layout/grades_list_fragment.xml b/app/src/main/res/layout/grades_list_fragment.xml
index 8427aa8f..4180c310 100644
--- a/app/src/main/res/layout/grades_list_fragment.xml
+++ b/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="?textAppearanceHeadlineSmall"
app:drawableTopCompat="@drawable/ic_no_grades"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/homework_fragment.xml b/app/src/main/res/layout/homework_fragment.xml
index d80df010..16f7f5d2 100644
--- a/app/src/main/res/layout/homework_fragment.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/lab_fragment.xml b/app/src/main/res/layout/lab_fragment.xml
index af55e6f0..280414d1 100644
--- a/app/src/main/res/layout/lab_fragment.xml
+++ b/app/src/main/res/layout/lab_fragment.xml
@@ -132,7 +132,7 @@
@@ -178,7 +178,7 @@
+ android:textAppearance="?textAppearanceBodySmall" />
diff --git a/app/src/main/res/layout/lab_item_object.xml b/app/src/main/res/layout/lab_item_object.xml
index 0336f65e..752fe8b8 100644
--- a/app/src/main/res/layout/lab_item_object.xml
+++ b/app/src/main/res/layout/lab_item_object.xml
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="monospace"
- android:textAppearance="@style/NavView.TextView.Medium"
+ android:textAppearance="?textAppearanceBodyLarge"
tools:text="lessonRanges" />
+ android:textAppearance="?textAppearanceBodySmall" />
diff --git a/app/src/main/res/layout/lab_item_sub_object.xml b/app/src/main/res/layout/lab_item_sub_object.xml
index 9bd72dca..104bb24e 100644
--- a/app/src/main/res/layout/lab_item_sub_object.xml
+++ b/app/src/main/res/layout/lab_item_sub_object.xml
@@ -33,7 +33,7 @@
android:layout_marginHorizontal="8dp"
android:fontFamily="monospace"
android:text="Object"
- android:textAppearance="@style/NavView.TextView.Helper" />
+ android:textAppearance="?textAppearanceBodySmall" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/login_chooser_fragment.xml b/app/src/main/res/layout/login_chooser_fragment.xml
index d39ef3da..0149f6e1 100644
--- a/app/src/main/res/layout/login_chooser_fragment.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/login_chooser_mode_item.xml b/app/src/main/res/layout/login_chooser_mode_item.xml
index 8b237795..b6947e77 100644
--- a/app/src/main/res/layout/login_chooser_mode_item.xml
+++ b/app/src/main/res/layout/login_chooser_mode_item.xml
@@ -9,8 +9,6 @@
diff --git a/app/src/main/res/layout/login_finish_fragment.xml b/app/src/main/res/layout/login_finish_fragment.xml
index fcd2c29c..ac66ee80 100644
--- a/app/src/main/res/layout/login_finish_fragment.xml
+++ b/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" />
@@ -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+" />
@@ -130,14 +129,14 @@
-
diff --git a/app/src/main/res/layout/login_form_item_qr.xml b/app/src/main/res/layout/login_form_item_qr.xml
index ab46a2be..e6730016 100644
--- a/app/src/main/res/layout/login_form_item_qr.xml
+++ b/app/src/main/res/layout/login_form_item_qr.xml
@@ -14,7 +14,7 @@
diff --git a/app/src/main/res/layout/login_platform_list_fragment.xml b/app/src/main/res/layout/login_platform_list_fragment.xml
index 7604f1c7..5ac9b0bc 100644
--- a/app/src/main/res/layout/login_platform_list_fragment.xml
+++ b/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" />
+ android:textAppearance="?textAppearanceTitleMedium" />
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/login_progress_title"
- android:textSize="24sp" />
+ android:textAppearance="?textAppearanceHeadlineSmall" />
@@ -38,7 +38,7 @@
android:layout_marginHorizontal="24dp"
android:layout_marginTop="16dp"
android:text="@string/login_summary_title"
- android:textSize="24sp" />
+ android:textAppearance="?textAppearanceHeadlineSmall" />
@@ -62,7 +62,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginLeft="24dp"
- android:textAppearance="@style/NavView.TextView.Helper"
+ android:textAppearance="?textAppearanceBodySmall"
tools:text="2B3T - 2019/2020" />
diff --git a/app/src/main/res/layout/login_sync_error_fragment.xml b/app/src/main/res/layout/login_sync_error_fragment.xml
index fe7cabb3..6a07fba2 100644
--- a/app/src/main/res/layout/login_sync_error_fragment.xml
+++ b/app/src/main/res/layout/login_sync_error_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-alert-circle-outline"
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_sync_error_title"
- android:textSize="24sp" />
+ android:textAppearance="?textAppearanceHeadlineSmall" />
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/login_sync_title"
- android:textSize="24sp" />
+ android:textAppearance="?textAppearanceHeadlineSmall" />
diff --git a/app/src/main/res/layout/material_drawer_header.xml b/app/src/main/res/layout/material_drawer_header.xml
index 51fffb92..da021514 100644
--- a/app/src/main/res/layout/material_drawer_header.xml
+++ b/app/src/main/res/layout/material_drawer_header.xml
@@ -4,7 +4,9 @@
android:id="@+id/material_drawer_account_header"
android:layout_width="match_parent"
android:layout_height="@dimen/material_drawer_account_header_height"
- android:clickable="true">
+ android:clickable="true"
+ android:focusable="true"
+ tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+ app:layout_constraintTop_toTopOf="parent"
+ tools:src="@tools:sample/backgrounds/scenic[7]" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/material_drawer_account_header_name" />
@@ -70,7 +75,7 @@
android:visibility="visible"
app:materialDrawerSelectorOnPress="#80ffffff"
app:layout_constraintEnd_toStartOf="@id/material_drawer_account_header_small_second"
- app:layout_constraintTop_toBottomOf="@+id/material_drawer_statusbar_guideline" />
+ app:layout_constraintBottom_toTopOf="@id/material_drawer_account_header_name" />
+ app:layout_constraintBottom_toTopOf="@id/material_drawer_account_header_name" />
+ app:layout_constraintBottom_toTopOf="@id/material_drawer_account_header_name" />
+ app:layout_constraintTop_toBottomOf="@id/material_drawer_text_guideline" />
+ android:orientation="horizontal">
-
-
-
+
+
-
+ android:gravity="center_vertical"
+ android:orientation="vertical">
+
+
+
+
+
-
-
-
-
-
-
-
-
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:layout_marginHorizontal="16dp"
+ android:layout_marginTop="8dp" />
+
+
+
+
+
+
+
+
+
+ android:visibility="visible">
-
-
-
-
+ android:id="@+id/notesButton"
+ style="?materialButtonOutlinedStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/notes_button" />
+ tools:visibility="visible" />
-
+
+
+ android:layout_marginHorizontal="16dp"
+ android:layout_marginTop="16dp"
+ android:text="Odbiorcy wiadomości:"
+ android:textAppearance="?textAppearanceTitleMedium" />
+
+
diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml
index 032550bb..11f50562 100644
--- a/app/src/main/res/layout/messages_compose_fragment.xml
+++ b/app/src/main/res/layout/messages_compose_fragment.xml
@@ -1,5 +1,4 @@
-
-
+ type="pl.szczodrzynski.edziennik.data.config.ProfileConfig.UI" />
+ android:textAppearance="?textAppearanceTitleMedium" />
-
@@ -20,11 +19,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:tabMinWidth="90dp"
app:tabMode="auto"
+ app:tabPaddingBottom="12dp"
+ app:tabPaddingEnd="16dp"
+ app:tabPaddingStart="16dp"
+ app:tabPaddingTop="12dp"
app:tabSelectedTextColor="?colorPrimary"
- app:tabTextColor="?android:textColorPrimary" />
+ app:tabTextColor="?colorOnBackground" />
-
@@ -23,11 +22,10 @@
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/messages_no_data"
- android:textSize="24sp"
+ android:textAppearance="?textAppearanceHeadlineSmall"
android:visibility="gone"
app:drawableTopCompat="@drawable/ic_no_messages"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/messages_list_item.xml b/app/src/main/res/layout/messages_list_item.xml
index 51f53a9d..757936a8 100644
--- a/app/src/main/res/layout/messages_list_item.xml
+++ b/app/src/main/res/layout/messages_list_item.xml
@@ -1,5 +1,4 @@
-
-
+ android:background="?attr/selectableItemBackground"
+ android:layout_marginHorizontal="8dp"
+ android:layout_marginBottom="8dp">
-
-
-
-
+
+
diff --git a/app/src/main/res/layout/note_details_dialog.xml b/app/src/main/res/layout/note_details_dialog.xml
index 58c37ed0..15e198bf 100644
--- a/app/src/main/res/layout/note_details_dialog.xml
+++ b/app/src/main/res/layout/note_details_dialog.xml
@@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/dialog_event_details_added_by"
- android:textAppearance="@style/NavView.TextView.Helper" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ android:textAppearance="?textAppearanceLabelMedium" />
+ android:textAppearance="?textAppearanceLabelMedium" />
@@ -128,13 +128,13 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/dialog_event_details_body"
- android:textAppearance="@style/NavView.TextView.Helper" />
+ android:textAppearance="?textAppearanceLabelMedium" />
diff --git a/app/src/main/res/layout/note_dialog_header.xml b/app/src/main/res/layout/note_dialog_header.xml
index a6f21049..6d288bfd 100644
--- a/app/src/main/res/layout/note_dialog_header.xml
+++ b/app/src/main/res/layout/note_dialog_header.xml
@@ -20,7 +20,7 @@
android:layout_marginTop="16dp"
android:drawableLeftAutoSize="@{true}"
android:drawablePadding="8dp"
- android:textAppearance="@style/AppTheme.MaterialAlertDialog.TitleText"
+ android:textAppearance="?textAppearanceTitleLarge"
tools:drawableStartCompat="@drawable/ic_grade"
tools:layout_height="28sp"
tools:text="Ocena" />
diff --git a/app/src/main/res/layout/note_dialog_subtitle.xml b/app/src/main/res/layout/note_dialog_subtitle.xml
index 4c38dbfa..7c0511df 100644
--- a/app/src/main/res/layout/note_dialog_subtitle.xml
+++ b/app/src/main/res/layout/note_dialog_subtitle.xml
@@ -28,7 +28,7 @@
android:drawableLeftAutoSize="@{true}"
android:drawablePadding="8dp"
android:text="@{text}"
- android:textAppearance="@style/AppTheme.MaterialAlertDialog.TitleText"
+ android:textAppearance="?textAppearanceTitleLarge"
app:drawableStartCompat="@drawable/ic_note"
tools:layout_height="28sp"
tools:text="@string/notes_list_dialog_title" />
diff --git a/app/src/main/res/layout/note_editor_dialog.xml b/app/src/main/res/layout/note_editor_dialog.xml
index 2335bda1..ce0f5827 100644
--- a/app/src/main/res/layout/note_editor_dialog.xml
+++ b/app/src/main/res/layout/note_editor_dialog.xml
@@ -51,7 +51,7 @@
+ android:textAppearance="?textAppearanceBodySmall" />
+ android:textAppearance="?textAppearanceBodySmall" />
diff --git a/app/src/main/res/layout/note_list_dialog.xml b/app/src/main/res/layout/note_list_dialog.xml
index 38730de1..f7b4fc40 100644
--- a/app/src/main/res/layout/note_list_dialog.xml
+++ b/app/src/main/res/layout/note_list_dialog.xml
@@ -57,10 +57,10 @@
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/notes_no_data"
- android:textSize="24sp"
+ android:textAppearance="?textAppearanceHeadlineSmall"
app:drawableTopCompat="@drawable/ic_note" />
diff --git a/app/src/main/res/layout/notes_fragment.xml b/app/src/main/res/layout/notes_fragment.xml
index 0234f947..ff4892af 100644
--- a/app/src/main/res/layout/notes_fragment.xml
+++ b/app/src/main/res/layout/notes_fragment.xml
@@ -17,29 +17,26 @@
android:layout_height="wrap_content"
android:layout_gravity="center" />
-
+
-
+
diff --git a/app/src/main/res/layout/notifications_list_fragment.xml b/app/src/main/res/layout/notifications_list_fragment.xml
index f5ca3a28..85d80305 100644
--- a/app/src/main/res/layout/notifications_list_fragment.xml
+++ b/app/src/main/res/layout/notifications_list_fragment.xml
@@ -23,11 +23,10 @@
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/notifications_no_data"
- android:textSize="24sp"
+ android:textAppearance="?textAppearanceHeadlineSmall"
android:visibility="gone"
app:drawableTopCompat="@drawable/ic_no_notifications"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/notifications_list_item.xml b/app/src/main/res/layout/notifications_list_item.xml
index 13df88d1..ef0093b4 100644
--- a/app/src/main/res/layout/notifications_list_item.xml
+++ b/app/src/main/res/layout/notifications_list_item.xml
@@ -5,6 +5,7 @@
@@ -22,32 +23,31 @@
android:scaleType="centerInside"
tools:background="@android:drawable/ic_menu_more" />
-
-
-
-
-
-
-
+
+
+
+
diff --git a/app/src/main/res/layout/row_announcements_item.xml b/app/src/main/res/layout/row_announcements_item.xml
index 38c5e98d..a53b8674 100644
--- a/app/src/main/res/layout/row_announcements_item.xml
+++ b/app/src/main/res/layout/row_announcements_item.xml
@@ -7,7 +7,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
- android:padding="8dp"
+ android:layout_marginHorizontal="8dp"
+ android:layout_marginBottom="8dp"
android:orientation="vertical">
diff --git a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
index 0b8383d1..3ba49562 100644
--- a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
+++ b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
@@ -26,7 +26,7 @@
android:id="@+id/teacherAbsenceTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/NavView.TextView.Helper"
+ android:textAppearance="?textAppearanceBodySmall"
tools:text="2 września - 5 kwietnia"/>
diff --git a/app/src/main/res/layout/row_notices_item.xml b/app/src/main/res/layout/row_notices_item.xml
index 83f8a5d9..f3a3c690 100644
--- a/app/src/main/res/layout/row_notices_item.xml
+++ b/app/src/main/res/layout/row_notices_item.xml
@@ -8,15 +8,11 @@
+ app:cardBackgroundColor="?colorSurfaceContainerHigh">
-
+
+
+ android:autoLink="all"
+ android:textAppearance="?textAppearanceTitleMedium"
+ android:textIsSelectable="true"
+ tools:text="reason" />
-
-
-
-
-
-
+ tools:text="addedDate" />
-
+
-
-
diff --git a/app/src/main/res/layout/row_timetable_block_item.xml b/app/src/main/res/layout/row_timetable_block_item.xml
index abfa8c7f..d83845ee 100644
--- a/app/src/main/res/layout/row_timetable_block_item.xml
+++ b/app/src/main/res/layout/row_timetable_block_item.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="380dp"
android:layout_height="180dp"
- android:theme="@style/AppTheme.Dark"
+ android:theme="@style/AppTheme.M2"
xmlns:autofit="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
@@ -71,4 +71,4 @@
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/search_item.xml b/app/src/main/res/layout/search_item.xml
index e459e61a..8bad3740 100644
--- a/app/src/main/res/layout/search_item.xml
+++ b/app/src/main/res/layout/search_item.xml
@@ -9,10 +9,11 @@
diff --git a/app/src/main/res/layout/styled_text_buttons.xml b/app/src/main/res/layout/styled_text_buttons.xml
index a87e3e41..83cedb07 100644
--- a/app/src/main/res/layout/styled_text_buttons.xml
+++ b/app/src/main/res/layout/styled_text_buttons.xml
@@ -22,7 +22,7 @@
diff --git a/app/src/main/res/layout/styled_text_dialog.xml b/app/src/main/res/layout/styled_text_dialog.xml
index f90a1c2c..efc5d535 100644
--- a/app/src/main/res/layout/styled_text_dialog.xml
+++ b/app/src/main/res/layout/styled_text_dialog.xml
@@ -15,7 +15,7 @@
android:padding="24dp">
+ android:orientation="horizontal"
+ android:layout_marginLeft="8dp"
+ android:paddingHorizontal="4dp">
diff --git a/app/src/main/res/layout/teachers_list_fragment.xml b/app/src/main/res/layout/teachers_list_fragment.xml
index 9138b401..947d6cce 100644
--- a/app/src/main/res/layout/teachers_list_fragment.xml
+++ b/app/src/main/res/layout/teachers_list_fragment.xml
@@ -23,13 +23,12 @@
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/teachers_no_data"
- android:textSize="24sp"
+ android:textAppearance="?textAppearanceHeadlineSmall"
android:visibility="gone"
- app:drawableTopCompat="@drawable/ic_archive"
+ app:drawableTopCompat="@drawable/ic_no_grades"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/template_list_item.xml b/app/src/main/res/layout/template_list_item.xml
index d47227b3..4a4b4495 100644
--- a/app/src/main/res/layout/template_list_item.xml
+++ b/app/src/main/res/layout/template_list_item.xml
@@ -17,7 +17,7 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/NavView.TextView.Medium"
+ android:textAppearance="?textAppearanceBodyLarge"
tools:text="Dzisiaj 1 to szczęśliwy numerek" />
diff --git a/app/src/main/res/layout/template_page_fragment.xml b/app/src/main/res/layout/template_page_fragment.xml
index a83f29b6..874c39ee 100644
--- a/app/src/main/res/layout/template_page_fragment.xml
+++ b/app/src/main/res/layout/template_page_fragment.xml
@@ -20,7 +20,7 @@
-
+
+ type="pl.szczodrzynski.edziennik.data.config.ProfileConfig.UI" />
+ android:textAppearance="?textAppearanceTitleMedium" />
diff --git a/app/src/main/res/layout/timetable_free_day.xml b/app/src/main/res/layout/timetable_free_day.xml
index 0cc275a2..a49ce9bf 100644
--- a/app/src/main/res/layout/timetable_free_day.xml
+++ b/app/src/main/res/layout/timetable_free_day.xml
@@ -15,18 +15,17 @@
+ android:textAppearance="?textAppearanceHeadlineSmall"
+ app:drawableTopCompat="@drawable/ic_sunbed" />
+ android:text="@string/timetable_free_day_text" />
+
+
+ type="boolean" />
+
+
+
-
+ android:paddingLeft="8dp"
+ android:paddingTop="8dp"
+ app:cardBackgroundColor="?colorSurfaceContainerHigh"
+ tools:layout_height="90dp">
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingBottom="8dp"
+ tools:layout_height="90dp">
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+ android:maxLines="@{annotationVisible ? 1 : 2}"
+ android:textAppearance="?textAppearanceTitleMedium"
+ app:autoSizeMaxTextSize="16sp"
+ app:autoSizeMinTextSize="12sp"
+ app:autoSizeTextType="uniform"
+ tools:maxLines="2"
+ tools:text="pracownia urządzeń techniki komputerowej" />
-
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:paddingHorizontal="8dp">
-
+
-
+
+
+
+
+
+
-
-
+
diff --git a/app/src/main/res/layout/timetable_no_lessons.xml b/app/src/main/res/layout/timetable_no_lessons.xml
index 60e98a82..1eb74a72 100644
--- a/app/src/main/res/layout/timetable_no_lessons.xml
+++ b/app/src/main/res/layout/timetable_no_lessons.xml
@@ -16,9 +16,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawablePadding="16dp"
- android:fontFamily="sans-serif-light"
android:text="@string/timetable_no_lessons_title"
- android:textSize="24sp"
+ android:textAppearance="?textAppearanceHeadlineSmall"
app:drawableTopCompat="@drawable/ic_timetable" />
+ android:textAppearance="?textAppearanceHeadlineSmall"
+ app:drawableTopCompat="@drawable/ic_sync" />
+ android:textAppearance="?textAppearanceBodyLarge" />
diff --git a/app/src/main/res/layout/update_progress_dialog.xml b/app/src/main/res/layout/update_progress_dialog.xml
index 767c6a1b..6089bceb 100644
--- a/app/src/main/res/layout/update_progress_dialog.xml
+++ b/app/src/main/res/layout/update_progress_dialog.xml
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/app_name"
- android:textAppearance="@style/NavView.TextView.Medium" />
+ android:textAppearance="?textAppearanceHeadlineSmall" />
diff --git a/app/src/main/res/layout/web_push_browser_item.xml b/app/src/main/res/layout/web_push_browser_item.xml
index 02bea757..8e8576db 100644
--- a/app/src/main/res/layout/web_push_browser_item.xml
+++ b/app/src/main/res/layout/web_push_browser_item.xml
@@ -25,14 +25,15 @@
android:id="@+id/browserName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/NavView.TextView.Medium"
+ android:textAppearance="?textAppearanceBodyLarge"
tools:text="Firefox 71.0 @ Windows 7 64-bit"/>
+ android:textAppearance="?textAppearanceBodySmall"
+ tools:text="Połączono 2019-12-12 19:54:09" />
@@ -45,4 +46,4 @@
android:text="@string/web_push_unpair_button" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/web_push_fragment.xml b/app/src/main/res/layout/web_push_fragment.xml
index ca953e3a..24f3b368 100644
--- a/app/src/main/res/layout/web_push_fragment.xml
+++ b/app/src/main/res/layout/web_push_fragment.xml
@@ -24,9 +24,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:fontFamily="sans-serif-light"
android:text="Jak połączyć komputer z aplikacją?"
- android:textSize="24sp" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceTitleMedium" />
+ android:textAppearance="?textAppearanceTitleMedium" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/widget_profile_dialog_item.xml b/app/src/main/res/layout/widget_profile_dialog_item.xml
index eeae7316..0e1c5ace 100644
--- a/app/src/main/res/layout/widget_profile_dialog_item.xml
+++ b/app/src/main/res/layout/widget_profile_dialog_item.xml
@@ -31,14 +31,14 @@
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/NavView.TextView.Medium"
+ android:textAppearance="?textAppearanceTitleMedium"
tools:text="Title" />
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 036d09bc..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v1.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v1.xml
new file mode 100644
index 00000000..ec67b94d
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v1.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v3.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v3.xml
new file mode 100644
index 00000000..23cbdf86
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v3.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v4.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v4.xml
new file mode 100644
index 00000000..7eac7e4d
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v4.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v5.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v5.xml
new file mode 100644
index 00000000..e72b3147
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_v5.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_agenda.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_agenda.xml
index d8212946..10206380 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_agenda.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_agenda.xml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_grades.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_grades.xml
index 9321db60..81150e05 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_grades.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_grades.xml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_homework.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_homework.xml
index d56eb07b..dc6270ca 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_homework.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_homework.xml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_messages.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_messages.xml
index 63a00a07..ff3c7494 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_messages.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_messages.xml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_timetable.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_timetable.xml
index 98291ac9..8d0f649f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_timetable.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_timetable.xml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 4d4e91f3..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 714e2112..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..66c6a232
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v1.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v1_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..c8e685d0
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v3.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..330a45f9
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v3.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v3_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..838c902c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v4.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..4a174b26
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v4.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v4_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..f34396de
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v5.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..0253fa6f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v5.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v5_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..9ef8fa68
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v5_monochrome.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..f4cb1d12
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_splash.png b/app/src/main/res/mipmap-hdpi/ic_splash.png
deleted file mode 100644
index 07e991c7..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_splash.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_splash_v1.webp b/app/src/main/res/mipmap-hdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..bb96e27f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_splash_v1.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_splash_v3.webp b/app/src/main/res/mipmap-hdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..b1968aaf
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_splash_v3.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_splash_v4.webp b/app/src/main/res/mipmap-hdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..a26c55f3
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_splash_v4.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_splash_v5.webp b/app/src/main/res/mipmap-hdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..bf7a4974
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_splash_v5.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 4f7ceaf6..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 10fce979..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..7eb3ab77
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v1.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v1_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..e71b7836
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v3.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..1001e513
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v3.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v3_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..aeb9dc56
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v4.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..f54c6e2c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v4.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v4_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..e05b1cd2
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v5.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..936efb02
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v5.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v5_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..a527bc37
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v5_monochrome.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..0f93a285
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_splash.png b/app/src/main/res/mipmap-mdpi/ic_splash.png
deleted file mode 100644
index f8ec3f40..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_splash.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_splash_v1.webp b/app/src/main/res/mipmap-mdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..dfb916b2
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_splash_v1.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_splash_v3.webp b/app/src/main/res/mipmap-mdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..e686ea30
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_splash_v3.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_splash_v4.webp b/app/src/main/res/mipmap-mdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..f4659c06
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_splash_v4.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_splash_v5.webp b/app/src/main/res/mipmap-mdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..d81c15c1
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_splash_v5.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 1977b635..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 9e37ac8b..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..92f35f02
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v1.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v1_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..0f2822c9
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v3.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..ea1acac5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v3.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v3_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..594d8393
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v4.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..44e070e0
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v4.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v4_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..52cc855e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v5.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..a39ae664
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v5.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v5_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..bea471af
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v5_monochrome.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..9d7592d2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash.png b/app/src/main/res/mipmap-xhdpi/ic_splash.png
deleted file mode 100644
index ec734e0c..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_splash.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash_v1.webp b/app/src/main/res/mipmap-xhdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..ac7d2137
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_splash_v1.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash_v3.webp b/app/src/main/res/mipmap-xhdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..8b8b86bd
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_splash_v3.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash_v4.webp b/app/src/main/res/mipmap-xhdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..6314c66d
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_splash_v4.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash_v5.webp b/app/src/main/res/mipmap-xhdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..b9af7800
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_splash_v5.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index c0de1cca..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index fa889dd2..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..46caadca
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..27e86591
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v3.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..fe5fdc93
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v3.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v3_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..13940cd8
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v4.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..ffb2fcf9
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v4.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v4_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..1776e04d
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..8a05e4fd
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..5a91470d
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5_monochrome.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..2ba4a47b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash.png b/app/src/main/res/mipmap-xxhdpi/ic_splash.png
deleted file mode 100644
index cd3f7c6d..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_splash.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash_v1.webp b/app/src/main/res/mipmap-xxhdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..61158e0f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_splash_v1.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash_v3.webp b/app/src/main/res/mipmap-xxhdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..cfb63643
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_splash_v3.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash_v4.webp b/app/src/main/res/mipmap-xxhdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..d0698420
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_splash_v4.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash_v5.webp b/app/src/main/res/mipmap-xxhdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..929391a4
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_splash_v5.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index f8ec3f40..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index f8b05ce7..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1.webp
new file mode 100644
index 00000000..dfb916b2
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1_foreground.webp
new file mode 100644
index 00000000..9370fee6
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v3.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v3.webp
new file mode 100644
index 00000000..e686ea30
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v3.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v3_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v3_foreground.webp
new file mode 100644
index 00000000..960ac713
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v3_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v4.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v4.webp
new file mode 100644
index 00000000..f4659c06
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v4.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v4_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v4_foreground.webp
new file mode 100644
index 00000000..47735ee2
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v4_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5.webp
new file mode 100644
index 00000000..d81c15c1
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5_foreground.webp
new file mode 100644
index 00000000..90f112d1
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5_monochrome.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5_monochrome.webp
new file mode 100644
index 00000000..e20caecf
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v5_monochrome.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash.png b/app/src/main/res/mipmap-xxxhdpi/ic_splash.png
deleted file mode 100644
index 5bf6be7a..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_splash.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash_v1.webp b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v1.webp
new file mode 100644
index 00000000..6091bf2e
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v1.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash_v3.webp b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v3.webp
new file mode 100644
index 00000000..d6360fb3
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v3.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash_v4.webp b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v4.webp
new file mode 100644
index 00000000..98427e5f
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v4.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash_v5.webp b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v5.webp
new file mode 100644
index 00000000..664072bf
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_splash_v5.webp differ
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 24486d1e..ab676839 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -119,6 +119,7 @@
Konfigurieren
In die Zwischenablage kopiert
In die Zwischenablage kopieren
+ Runterzählen
Synchronisieren
Wenn sich die App überhaupt nicht öffnet, können Sie versuchen, die Daten erneut herunterzuladen. Klicken Sie auf die Schaltfläche, dann starten Sie die App neu
Fehlerdetails
@@ -467,8 +468,8 @@
Im Kalender speichern
Karten hinzufügen/entfernen
Wischen Sie nach links, um eine Karte zu entfernen, und halten Sie sie gedrückt, um sich zu bewegen.
- %s • Ihre Nummer im Klassenbuch ist %d
- %s • Klicken Sie, um Ihre Nummer Klassenbuch einzustellen,
+ Ihre Nummer im Klassenbuch ist %s
+ Klicken Sie, um Ihre Nummer Klassenbuch einzustellen,
Die Glücksnummer auf %s ist %d.
Keine Information über die Glücksnummer
Heute gibt es keine Glücksnummer.
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index ff2c1c3a..0fd6ed3d 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -119,6 +119,7 @@
Configure
Copied to clipboard
Copy to clipboard
+ Countdown
Synchronize
If the app doesn\'t open at all, you can try to download the data again. Click the button, then Restart the app.
Error details
@@ -467,8 +468,8 @@
Save to calendar
Add/remove cards
Swipe left to remove a card, hold to move.
- %s • Your e-register number is %d
- %s • Click to set your journal number.
+ Your e-register number is %s
+ Click to set your journal number.
The lucky number on %s is %d.
No info about the lucky number.
There is no lucky number today.
@@ -490,7 +491,7 @@
Sync
The timetable for week %s hasn\'t yet been downloaded.
There is no timetable
- The timetable hasn\'t yet been made public by your school.\n\n\Contact your tutor for more information.
+ The timetable hasn\'t yet been made public by your school. Contact your tutor for more information.
Today
Tomorrow (%1$s)
Edit
diff --git a/app/src/main/res/values-night/colors_m2.xml b/app/src/main/res/values-night/colors_m2.xml
new file mode 100644
index 00000000..45f97c1b
--- /dev/null
+++ b/app/src/main/res/values-night/colors_m2.xml
@@ -0,0 +1,32 @@
+
+
+
+ @color/primaryTextDark
+ @color/secondaryTextDark
+
+
+ #ff242424
+ #ff333333
+
+
+ #ff350f0f
+ #ff431f1f
+
+
+ #ff0f2d1b
+ #ff1f3b2b
+
+
+ #ff0a0866
+ #ff0a3591
+
+
+ #ff2f0f34
+ #ff3d1f42
+
+
+ #ff0f2833
+ #ff1f3741
+
diff --git a/app/src/main/res/values-night/colors_m3.xml b/app/src/main/res/values-night/colors_m3.xml
new file mode 100644
index 00000000..2790f35a
--- /dev/null
+++ b/app/src/main/res/values-night/colors_m3.xml
@@ -0,0 +1,250 @@
+
+
+
+
+ #FFB4A8
+ #690100
+ #EB0000
+ #FFFFFF
+ #FFB4A8
+ #690100
+ #860100
+ #FFC8BF
+ #FFB956
+ #462B00
+ #A16900
+ #FFFFFF
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #210E0B
+ #FFDAD4
+ #210E0B
+ #FFDAD4
+ #603E39
+ #EBBBB4
+ #B18780
+ #603E39
+ #000000
+ #FFDAD4
+ #422A27
+ #C00100
+ #FFDAD4
+ #410000
+ #FFB4A8
+ #930100
+ #FFDAD4
+ #410000
+ #FFB4A8
+ #930100
+ #FFDDB5
+ #2A1800
+ #FFB956
+ #643F00
+ #210E0B
+ #4C332F
+ #1B0907
+ #2B1613
+ #2F1A17
+ #3B2420
+ #472F2B
+
+
+ #97D945
+ #1F3700
+ #4F8200
+ #FFFFFF
+ #B1D188
+ #1F3700
+ #2C460C
+ #BDDE94
+ #5DDCB0
+ #003828
+ #008564
+ #FFFFFF
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #11150B
+ #E0E4D4
+ #11150B
+ #E0E4D4
+ #424937
+ #C2CAB2
+ #8C947E
+ #424937
+ #000000
+ #E0E4D4
+ #2E3227
+ #3F6900
+ #B2F65F
+ #102000
+ #97D945
+ #2F4F00
+ #CCEEA1
+ #102000
+ #B1D188
+ #344E14
+ #7CF9CB
+ #002116
+ #5DDCB0
+ #00513C
+ #11150B
+ #363B2F
+ #0B0F07
+ #191D13
+ #1D2117
+ #272B21
+ #32362B
+
+
+ #9ECAFF
+ #003258
+ #0076C4
+ #FFFFFF
+ #ABC9EF
+ #113251
+ #234161
+ #B9D7FD
+ #EBB2FF
+ #51066E
+ #9C57B8
+ #FFFFFF
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #101419
+ #E0E2EA
+ #101419
+ #E0E2EA
+ #404752
+ #C0C7D3
+ #8A919D
+ #404752
+ #000000
+ #E0E2EA
+ #2D3136
+ #0061A3
+ #D1E4FF
+ #001D36
+ #9ECAFF
+ #00497C
+ #D1E4FF
+ #001D36
+ #ABC9EF
+ #2B4968
+ #F8D8FF
+ #320047
+ #EBB2FF
+ #6A2786
+ #101419
+ #36393F
+ #0B0E13
+ #181C21
+ #1C2025
+ #262A30
+ #31353B
+
+
+ #FFAAF3
+ #5B005B
+ #9B009B
+ #FFF9FA
+ #FFAAF3
+ #570D56
+ #6A2167
+ #FFC2F4
+ #FFB2BE
+ #660026
+ #AC0045
+ #FFF8F8
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #1A1018
+ #F1DDE9
+ #1A1018
+ #F1DDE9
+ #53414F
+ #D8BFD1
+ #A18A9B
+ #53414F
+ #000000
+ #F1DDE9
+ #392D36
+ #A900A9
+ #FFD7F5
+ #380038
+ #FFAAF3
+ #810081
+ #FFD7F5
+ #380038
+ #FFAAF3
+ #72296E
+ #FFD9DE
+ #400015
+ #FFB2BE
+ #900038
+ #1A1018
+ #42353F
+ #150B13
+ #231821
+ #271C25
+ #32272F
+ #3D313A
+
+
+ #50F0EF
+ #003737
+ #00C5C5
+ #002B2B
+ #9CD0CF
+ #003737
+ #0D4747
+ #AADEDE
+ #ECD2FF
+ #44196C
+ #CD9FF9
+ #3A0B62
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #0E1514
+ #DDE4E3
+ #0E1514
+ #DDE4E3
+ #3B4949
+ #BAC9C9
+ #859493
+ #3B4949
+ #000000
+ #DDE4E3
+ #2B3231
+ #006A6A
+ #5CF8F8
+ #002020
+ #31DBDB
+ #004F4F
+ #B7ECEB
+ #002020
+ #9CD0CF
+ #184E4E
+ #F0DBFF
+ #2C0050
+ #DDB7FF
+ #5C3284
+ #0E1514
+ #333B3A
+ #090F0F
+ #161D1D
+ #1A2121
+ #242B2B
+ #2F3636
+
diff --git a/app/src/main/res/values-night/styles_black.xml b/app/src/main/res/values-night/styles_black.xml
new file mode 100644
index 00000000..b3ac0b2f
--- /dev/null
+++ b/app/src/main/res/values-night/styles_black.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml
deleted file mode 100644
index 3c08a543..00000000
--- a/app/src/main/res/values-v14/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 0dp
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 55e0d3b5..befcbe1a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,5 +5,9 @@
-
+
+
+
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3c17d618..cad0695f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
#2196F3
#1976D2
#6EC6FF
- #4caf50
+ #ff3d00
#ff101010
#fff3f3f3
@@ -12,60 +12,8 @@
#3e7f7f7f
-
- #ffffffff
- #ffffffff
-
- #ff242424
- #ff333333
-
- #ff000000
- #ff121212
-
- #ff3e2723
- #ff4b3632
-
- #ff1a237e
- #ff2a3287
-
- #ffffffc9
- #ffffffd9
-
- #ff0f2833
- #ff1f3741
-
- #ff0d47a1
- #ff1e53a7
-
- #ffc9ecfc
- #ffd9f1fc
-
- #ff2f0f34
- #ff3d1f42
-
- #ff7b1fa2
- #ff842ea8
-
- #fff6c9fd
- #fff8d9fd
-
- #ff350f0f
- #ff431f1f
-
- #ffff5252
- #ffff5e5e
-
- #fff6c9c9
- #fff8d9d9
-
- #ff0f2d1b
- #ff1f3b2b
-
- #ffffd54f
- #ffffd75b
-
- #ffedfac9
- #fff2fbd9
-
#000000
+
+ #2196f3
+ #77B2FD
diff --git a/app/src/main/res/values/colors_m2.xml b/app/src/main/res/values/colors_m2.xml
new file mode 100644
index 00000000..ae07057e
--- /dev/null
+++ b/app/src/main/res/values/colors_m2.xml
@@ -0,0 +1,48 @@
+
+
+
+ @color/primaryTextLight
+ @color/secondaryTextLight
+
+
+ #ffffffff
+ #ffffffff
+
+
+ #fff6c9c9
+ #fff8d9d9
+
+ #ff3e2723
+ #ff4b3632
+
+
+ #ffedfac9
+ #fff2fbd9
+
+ #ff1b5e20
+ #ff388e3c
+
+
+ #ffc9ecfc
+ #ffd9f1fc
+
+ #ff0d47a1
+ #ff1e53a7
+
+
+ #fff6c9fd
+ #fff8d9fd
+
+ #ff7b1fa2
+ #ff842ea8
+
+
+ #ffb2fef7
+ #ffe5ffff
+
+ #ff004d40
+ #00695c
+
+
diff --git a/app/src/main/res/values/colors_m3.xml b/app/src/main/res/values/colors_m3.xml
new file mode 100644
index 00000000..b9fa0961
--- /dev/null
+++ b/app/src/main/res/values/colors_m3.xml
@@ -0,0 +1,250 @@
+
+
+
+
+ #A50100
+ #FFFFFF
+ #EB0000
+ #FFFFFF
+ #B72114
+ #FFFFFF
+ #FF6F5B
+ #270000
+ #704800
+ #FFFFFF
+ #A16900
+ #FFFFFF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #FFF8F6
+ #2B1613
+ #FFF8F6
+ #2B1613
+ #FFDAD4
+ #603E39
+ #956D67
+ #EBBBB4
+ #000000
+ #422A27
+ #FFEDEA
+ #FFB4A8
+ #FFDAD4
+ #410000
+ #FFB4A8
+ #930100
+ #FFDAD4
+ #410000
+ #FFB4A8
+ #930100
+ #FFDDB5
+ #2A1800
+ #FFB956
+ #643F00
+ #F8D1CB
+ #FFF8F6
+ #FFFFFF
+ #FFF0EE
+ #FFE9E6
+ #FFE2DD
+ #FFDAD4
+
+
+ #3F6900
+ #FFFFFF
+ #6FAE19
+ #071200
+ #4B662A
+ #FFFFFF
+ #D0F2A5
+ #385217
+ #006C50
+ #FFFFFF
+ #24B087
+ #00110A
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #F7FBEA
+ #191D13
+ #F7FBEA
+ #191D13
+ #DEE6CD
+ #424937
+ #727A66
+ #C2CAB2
+ #000000
+ #2E3227
+ #EFF3E2
+ #97D945
+ #B2F65F
+ #102000
+ #97D945
+ #2F4F00
+ #CCEEA1
+ #102000
+ #B1D188
+ #344E14
+ #7CF9CB
+ #002116
+ #5DDCB0
+ #00513C
+ #D8DCCC
+ #F7FBEA
+ #FFFFFF
+ #F2F5E5
+ #ECF0DF
+ #E6EADA
+ #E0E4D4
+
+
+ #00538C
+ #FFFFFF
+ #0078C7
+ #FFFFFF
+ #446081
+ #FFFFFF
+ #C3DDFF
+ #274565
+ #743190
+ #FFFFFF
+ #9C58B8
+ #FFFFFF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #F8F9FF
+ #181C21
+ #F8F9FF
+ #181C21
+ #DCE3F0
+ #404752
+ #707883
+ #C0C7D3
+ #000000
+ #2D3136
+ #EEF1F8
+ #9ECAFF
+ #D1E4FF
+ #001D36
+ #9ECAFF
+ #00497C
+ #D1E4FF
+ #001D36
+ #ABC9EF
+ #2B4968
+ #F8D8FF
+ #320047
+ #EBB2FF
+ #6A2786
+ #D7DAE1
+ #F8F9FF
+ #FFFFFF
+ #F1F3FB
+ #EBEEF5
+ #E5E8F0
+ #E0E2EA
+
+
+ #840084
+ #FFFFFF
+ #BB22B9
+ #FFFFFF
+ #8D4188
+ #FFFFFF
+ #FFAEF3
+ #60175E
+ #95003B
+ #FFFFFF
+ #D0235B
+ #FFFFFF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #FFF7F9
+ #231821
+ #FFF7F9
+ #231821
+ #F5DBED
+ #53414F
+ #867181
+ #D8BFD1
+ #000000
+ #392D36
+ #FFEBF8
+ #FFAAF3
+ #FFD7F5
+ #380038
+ #FFAAF3
+ #810081
+ #FFD7F5
+ #380038
+ #FFAAF3
+ #72296E
+ #FFD9DE
+ #400015
+ #FFB2BE
+ #900038
+ #E8D5E1
+ #FFF7F9
+ #FFFFFF
+ #FFEFF8
+ #FCE8F5
+ #F6E3EF
+ #F1DDE9
+
+
+ #006A6A
+ #FFFFFF
+ #25D6D6
+ #003939
+ #336666
+ #FFFFFF
+ #BBF0EF
+ #1C5252
+ #754B9E
+ #FFFFFF
+ #D9AFFF
+ #451A6D
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #F4FBFA
+ #161D1D
+ #F4FBFA
+ #161D1D
+ #D6E6E5
+ #3B4949
+ #6B7A79
+ #BAC9C9
+ #000000
+ #2B3231
+ #EBF2F1
+ #31DBDB
+ #5CF8F8
+ #002020
+ #31DBDB
+ #004F4F
+ #B7ECEB
+ #002020
+ #9CD0CF
+ #184E4E
+ #F0DBFF
+ #2C0050
+ #DDB7FF
+ #5C3284
+ #D4DBDB
+ #F4FBFA
+ #FFFFFF
+ #EEF5F4
+ #E8EFEE
+ #E2EAE9
+ #DDE4E3
+
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5505aecb..34ad0c4e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,15 +1,7 @@
-
-
-
- 8dp
-
+
+ 0dp
15dp
-
16dp
2dp
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index d75968c4..00000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- #0C92D6
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4204e21..3d52b857 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,6 +144,7 @@
Konfiguruj
Skopiowano do schowka
Skopiuj do schowka
+ Odliczanie
Synchronizuj
Jeśli aplikacja nie chce się uruchomić, możesz spróbować ponownie pobrać dane. Kliknij na przycisk, a następnie Restartuj aplikację.
Szczegóły błędu
@@ -510,8 +511,8 @@
Zapisz do kalendarza
Dodaj/usuń karty
Możesz usunąć karty przesuwając w lewo lub zmienić ich kolejność, przytrzymując na kartę.
- %s • Numer w dzienniku to %d
- %s • Kliknij, aby ustawić swój numerek.
+ Numer w dzienniku to %s
+ Kliknij, aby ustawić swój numerek.
Dnia %s szczęśliwy numerek to %d.
Brak informacji o szczęśliwym numerku.
Nie ma dzisiaj szczęśliwego numerka.
@@ -535,7 +536,7 @@
Pobierz
Plan lekcji na tydzień %s nie został jeszcze pobrany.
Brak planu lekcji
- Plan lekcji nie został opublikowany przez szkołę.\n\nSkontaktuj się z wychowawcą.
+ Plan lekcji nie został opublikowany przez szkołę. Skontaktuj się z wychowawcą.
Dzisiaj
Jutro (%1$s)
Edytuj
@@ -737,7 +738,7 @@
Napisz wiadomość…
Napisz wiadomość
Do
- %s\n%s
+ %s • %s
Czy chcesz usunąć wiadomość?
Spowoduje to przeniesienie wiadomości do zakładki \"Usunięte\" w aplikacji. Zmiany nie wpłyną na wiadomość w e-dzienniku (nie zostanie ona tam usunięta).
Błąd pobierania wiadomości
@@ -1553,4 +1554,7 @@
Wszystkie lekcje:
Wyświetl nazwę przedmiotu zamiast rodzaju
Odśwież wybrany tydzień
+ Zwyczajny
+ Morski
+ Zielony
diff --git a/app/src/main/res/values/styleable.xml b/app/src/main/res/values/styleable.xml
new file mode 100644
index 00000000..7e943974
--- /dev/null
+++ b/app/src/main/res/values/styleable.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4f22fc81..715a2209 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,32 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/values/styles_black.xml b/app/src/main/res/values/styles_black.xml
new file mode 100644
index 00000000..50b2d1f3
--- /dev/null
+++ b/app/src/main/res/values/styles_black.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/styles_m2.xml b/app/src/main/res/values/styles_m2.xml
new file mode 100644
index 00000000..3beda3af
--- /dev/null
+++ b/app/src/main/res/values/styles_m2.xml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/styles_m3.xml b/app/src/main/res/values/styles_m3.xml
new file mode 100644
index 00000000..d261f13d
--- /dev/null
+++ b/app/src/main/res/values/styles_m3.xml
@@ -0,0 +1,350 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 64d1f3c8..d4c8087d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
ext {
- kotlin_version = '1.6.10'
+ kotlin_version = '1.9.24'
release = [
versionName: "4.13.6",
@@ -10,9 +10,9 @@ buildscript {
]
setup = [
- compileSdk: 33,
- minSdk : 16,
- targetSdk : 33
+ compileSdk: 34,
+ minSdk : 19,
+ targetSdk : 34
]
}
@@ -20,11 +20,12 @@ buildscript {
google()
mavenCentral()
}
+
dependencies {
- classpath 'com.android.tools.build:gradle:7.2.2'
+ classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.google.gms:google-services:4.3.14'
- classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
+ classpath 'com.google.gms:google-services:4.4.2'
+ classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.1'
}
}
diff --git a/gradle.properties b/gradle.properties
index 8de50581..32243057 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,8 +7,14 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
+android.ndk.suppressMinSdkVersionError=21
+android.nonFinalResIds=true
+android.nonTransitiveRClass=false
android.useAndroidX=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
org.gradle.jvmargs=-Xmx1536m
+org.gradle.parallel=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e004eb08..4168db90 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Wed Feb 17 14:04:38 CET 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/navlib-font/build.gradle b/navlib-font/build.gradle
index 7f254181..9b332a4f 100644
--- a/navlib-font/build.gradle
+++ b/navlib-font/build.gradle
@@ -25,20 +25,30 @@ android {
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
consumerProguardFiles 'consumer-proguard-rules.pro'
- versionCode 10
- versionName "1.0"
resValue "string", "NavLibFont_version", "${versionName}"
}
+
+ buildFeatures {
+ dataBinding = true
+ viewBinding = true
+ }
+
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+
+ namespace 'com.mikepenz.iconics.typeface.library.navlibfont'
}
dependencies {
- implementation "com.mikepenz:iconics-typeface-api:5.3.0-b01"
+ implementation "com.mikepenz:iconics-typeface-api:5.3.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
diff --git a/navlib-font/src/main/AndroidManifest.xml b/navlib-font/src/main/AndroidManifest.xml
index edcc9806..76cb4e70 100644
--- a/navlib-font/src/main/AndroidManifest.xml
+++ b/navlib-font/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/navlib/build.gradle b/navlib/build.gradle
index b935281b..98a65211 100644
--- a/navlib/build.gradle
+++ b/navlib/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion setup.compileSdk
@@ -9,12 +8,14 @@ android {
defaultConfig {
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
- versionCode release.versionCode
- versionName release.versionName
consumerProguardFiles 'consumer-rules.pro'
-
vectorDrawables.useSupportLibrary = true
+ multiDexEnabled true
+ }
+
+ kotlinOptions {
+ jvmTarget = "1.8"
}
buildTypes {
@@ -26,30 +27,33 @@ android {
buildFeatures {
dataBinding = true
+ viewBinding = true
}
packagingOptions {
- exclude 'META-INF/library-core_release.kotlin_module'
+ resources {
+ excludes += ['META-INF/library-core_release.kotlin_module']
+ }
}
-}
+
+ namespace 'pl.szczodrzynski.navlib'
+}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- implementation "androidx.appcompat:appcompat:1.2.0"
- implementation "androidx.core:core-ktx:1.3.2"
- implementation "androidx.recyclerview:recyclerview:1.1.0"
- implementation "com.google.android.material:material:1.3.0"
+ implementation "androidx.appcompat:appcompat:1.7.0"
+ implementation "androidx.core:core-ktx:1.13.1"
+ implementation "androidx.recyclerview:recyclerview:1.3.2"
+ implementation "com.google.android.material:material:1.12.0"
api "com.mikepenz:materialize:1.2.1"
- api "com.mikepenz:materialdrawer:8.3.3"
- api "com.mikepenz:iconics-core:5.3.0-b01"
+ api "com.mikepenz:materialdrawer:9.0.1"
+ api "com.mikepenz:iconics-core:5.3.2"
api "com.mikepenz:itemanimators:1.1.0"
compileOnly "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
- implementation "com.balysv:material-ripple:1.0.2"
-
implementation project(":navlib-font")
}
diff --git a/navlib/src/main/AndroidManifest.xml b/navlib/src/main/AndroidManifest.xml
index 7b521725..64b085f6 100644
--- a/navlib/src/main/AndroidManifest.xml
+++ b/navlib/src/main/AndroidManifest.xml
@@ -1,2 +1,4 @@
+ xmlns:tools="http://schemas.android.com/tools">
+
+
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/NavBottomBar.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/NavBottomBar.kt
index 6bc40157..a27cc859 100644
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/NavBottomBar.kt
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/NavBottomBar.kt
@@ -9,6 +9,7 @@ import android.view.MenuItem
import android.view.View
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
import com.google.android.material.bottomappbar.BottomAppBar
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -19,33 +20,27 @@ import com.mikepenz.iconics.utils.sizeDp
import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
import pl.szczodrzynski.navlib.drawer.NavDrawer
-class NavBottomBar : BottomAppBar {
- constructor(context: Context) : super(context) {
- create(null, 0)
- }
+class NavBottomBar @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyle: Int = 0,
+) : BottomAppBar(context, attrs, defStyle), NavMenuBarBase {
- constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
- create(attrs, 0)
- }
-
- constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
- create(attrs, defStyle)
- }
-
- var drawer: NavDrawer? = null
- var bottomSheet: NavBottomSheet? = null
- var fabView: FloatingActionButton? = null
- var fabExtendedView: ExtendedFloatingActionButton? = null
+ internal lateinit var navView: NavView
+ override lateinit var bottomSheet: NavBottomSheet
+ internal lateinit var fabView: FloatingActionButton
+ internal lateinit var fabExtendedView: ExtendedFloatingActionButton
/**
* Shows the BottomAppBar and sets the contentView's margin to be
* above the BottomAppBar.
*/
- var enable = true
+ var enable
+ get() = isVisible
set(value) {
- field = value
- visibility = if (value) View.VISIBLE else View.GONE
+ isVisible = value
setFabParams()
+ navView.setContentMargins()
}
/**
* Whether the FAB should be visible.
@@ -82,9 +77,9 @@ class NavBottomBar : BottomAppBar {
set(value) {
field = value
if (fabExtended)
- fabExtendedView?.extend()
+ fabExtendedView.extend()
else
- fabExtendedView?.shrink()
+ fabExtendedView.shrink()
}
/**
* Set the FAB's icon.
@@ -92,14 +87,14 @@ class NavBottomBar : BottomAppBar {
var fabIcon: IIcon? = null
set(value) {
field = value
- fabView?.setImageDrawable(IconicsDrawable(context).apply {
+ fabView.setImageDrawable(IconicsDrawable(context).apply {
icon = value
- colorAttr(context, R.attr.colorFabIcon)
+ colorAttr(context, R.attr.colorOnPrimaryContainer)
sizeDp = 24
})
- fabExtendedView?.icon = IconicsDrawable(context).apply {
+ fabExtendedView.icon = IconicsDrawable(context).apply {
icon = value
- colorAttr(context, R.attr.colorFabIcon)
+ colorAttr(context, R.attr.colorOnPrimaryContainer)
sizeDp = 24
}
}
@@ -107,21 +102,23 @@ class NavBottomBar : BottomAppBar {
* Set the ExtendedFAB's text.
*/
var fabExtendedText
- get() = fabExtendedView?.text
+ get() = fabExtendedView.text
set(value) {
- fabExtendedView?.text = value
+ fabExtendedView.text = value
}
/**
* Set the FAB's on click listener
*/
fun setFabOnClickListener(onClickListener: OnClickListener?) {
- fabView?.setOnClickListener(onClickListener)
- fabExtendedView?.setOnClickListener(onClickListener)
+ fabView.setOnClickListener(onClickListener)
+ fabExtendedView.setOnClickListener(onClickListener)
}
- @SuppressLint("ClickableViewAccessibility")
- private fun create(attrs: AttributeSet?, defStyle: Int) {
+ override var drawerClickListener: (() -> Unit)? = null
+ override var menuClickListener: (() -> Unit)? = null
+
+ init {
setOnTouchListener { _, event ->
if (bottomSheet?.enable != true || bottomSheet?.enableDragToOpen != true)
return@setOnTouchListener false
@@ -130,45 +127,11 @@ class NavBottomBar : BottomAppBar {
}
elevation = 0f
-
- val icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_badge) as LayerDrawable?
- icon?.apply {
- mutate()
- setDrawableByLayerId(R.id.ic_menu, IconicsDrawable(context).apply {
- this.icon = NavLibFont.Icon.nav_menu
- sizeDp = 24
- colorAttr(context, R.attr.colorOnPrimary)
- })
- setDrawableByLayerId(R.id.ic_badge, BadgeDrawable(context))
- }
- navigationIcon = icon
-
- menu.add(0, -1, 0, "Menu")
- .setIcon(IconicsDrawable(context).apply {
- this.icon = NavLibFont.Icon.nav_dots_vertical
- sizeDp = 24
- colorAttr(context, R.attr.colorOnPrimary)
- })
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
-
- setNavigationOnClickListener {
- drawer?.toggle()
- }
-
- super.setOnMenuItemClickListener {
- if (it.itemId == -1 && bottomSheet?.enable == true) {
- bottomSheet?.toggle()
- }
- else {
- onMenuItemClickListener?.onMenuItemClick(it)
- }
- true
- }
}
private fun setFabParams() {
val layoutParams =
- ((if (fabExtendable) fabExtendedView?.layoutParams else fabView?.layoutParams) ?: return) as CoordinatorLayout.LayoutParams
+ ((if (fabExtendable) fabExtendedView.layoutParams else fabView.layoutParams) ?: return) as CoordinatorLayout.LayoutParams
if (enable) {
layoutParams.anchorId = this.id
@@ -184,28 +147,23 @@ class NavBottomBar : BottomAppBar {
}
fabAlignmentMode = if (fabGravity == Gravity.END) FAB_ALIGNMENT_MODE_END else FAB_ALIGNMENT_MODE_CENTER
if (fabExtendable)
- fabExtendedView?.layoutParams = layoutParams
+ fabExtendedView.layoutParams = layoutParams
else
- fabView?.layoutParams = layoutParams
+ fabView.layoutParams = layoutParams
setFabVisibility()
}
private fun setFabVisibility() {
if (fabEnable && fabExtendable) {
- fabView?.hide()
- fabExtendedView?.show()
+ fabView.hide()
+ fabExtendedView.show()
}
else if (fabEnable) {
- fabView?.show()
- fabExtendedView?.hide()
+ fabView.show()
+ fabExtendedView.hide()
}
else {
- fabView?.hide()
- fabExtendedView?.hide()
+ fabView.hide()
+ fabExtendedView.hide()
}
}
-
- private var onMenuItemClickListener: OnMenuItemClickListener? = null
- override fun setOnMenuItemClickListener(listener: OnMenuItemClickListener?) {
- onMenuItemClickListener = listener
- }
}
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/NavMenuBarBase.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/NavMenuBarBase.kt
new file mode 100644
index 00000000..b2419f5e
--- /dev/null
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/NavMenuBarBase.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2024-6-20.
+ */
+
+package pl.szczodrzynski.navlib
+
+import android.graphics.drawable.LayerDrawable
+import android.view.MenuItem
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.navlibfont.NavLibFont
+import com.mikepenz.iconics.utils.sizeDp
+import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
+
+interface NavMenuBarBase {
+
+ var bottomSheet: NavBottomSheet
+ var drawerClickListener: (() -> Unit)?
+ var menuClickListener: (() -> Unit)?
+
+ var Toolbar.enableMenuControls: Boolean
+ get() = navigationIcon != null
+ set(value) {
+ if (value)
+ this.attach()
+ else
+ this.detach()
+ }
+
+ private fun Toolbar.attach() {
+ val navIcon = ContextCompat.getDrawable(context, R.drawable.ic_menu_badge) as LayerDrawable?
+ navIcon?.apply {
+ mutate()
+ setDrawableByLayerId(R.id.ic_menu, IconicsDrawable(context).apply {
+ this.icon = NavLibFont.Icon.nav_menu
+ sizeDp = 24
+ colorAttr(context, R.attr.colorOnSurface)
+ })
+ setDrawableByLayerId(R.id.ic_badge, BadgeDrawable(context))
+ }
+
+ navigationIcon = navIcon
+ setNavigationOnClickListener {
+ drawerClickListener?.invoke()
+ }
+
+ menu.add(0, -1, 0, "Menu")
+ .setIcon(IconicsDrawable(context).apply {
+ this.icon = NavLibFont.Icon.nav_dots_vertical
+ sizeDp = 24
+ colorAttr(context, R.attr.colorOnSurface)
+ })
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+
+ setOnMenuItemClickListener {
+ if (it.itemId == -1 && bottomSheet.enable) {
+ bottomSheet.toggle()
+ } else {
+ menuClickListener?.invoke()
+ }
+ true
+ }
+ }
+
+ private fun Toolbar.detach() {
+ navigationIcon = null
+ setNavigationOnClickListener(null)
+ menu.clear()
+ setOnMenuItemClickListener(null)
+ }
+}
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/NavToolbar.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/NavToolbar.kt
index 1bc88813..ac1db47e 100644
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/NavToolbar.kt
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/NavToolbar.kt
@@ -2,22 +2,31 @@ package pl.szczodrzynski.navlib
import android.content.Context
import android.util.AttributeSet
+import android.view.View
import android.widget.ImageView
+import androidx.core.view.isVisible
import com.google.android.material.appbar.MaterialToolbar
+import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
-class NavToolbar : MaterialToolbar {
+class NavToolbar @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyle: Int = 0,
+) : MaterialToolbar(context, attrs, defStyle), NavMenuBarBase {
- constructor(context: Context) : super(context) {
- create(null, 0)
- }
+ internal lateinit var navView: NavView
+ override lateinit var bottomSheet: NavBottomSheet
- constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
- create(attrs, 0)
- }
-
- constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
- create(attrs, defStyle)
- }
+ /**
+ * Shows the toolbar and sets the contentView's margin to be
+ * below the toolbar.
+ */
+ var enable
+ get() = isVisible
+ set(value) {
+ isVisible = value
+ navView.setContentMargins()
+ }
var toolbarImage: ImageView? = null
set(value) {
@@ -27,8 +36,12 @@ class NavToolbar : MaterialToolbar {
}
}
+ override var drawerClickListener: (() -> Unit)? = null
+ override var menuClickListener: (() -> Unit)? = null
+ var profileImageClickListener: (() -> Unit)? = null
+
override fun setSubtitle(subtitle: CharSequence?) {
- if(subtitle.isNullOrEmpty()) {
+ if (subtitle.isNullOrEmpty()) {
setPadding(0, 0, 0, 0)
toolbarImage?.translationY = 0f
} else {
@@ -38,18 +51,9 @@ class NavToolbar : MaterialToolbar {
super.setSubtitle(subtitle)
}
- private fun create(attrs: AttributeSet?, defStyle: Int) {
-
- }
-
- var subtitleFormat: Int? = null
- var subtitleFormatWithUnread: Int? = null
-
- var profileImageClickListener: (() -> Unit)? = null
-
var profileImage
get() = toolbarImage?.drawable
set(value) {
toolbarImage?.setImageDrawable(value)
}
-}
\ No newline at end of file
+}
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/NavView.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/NavView.kt
index 496597c3..98550b81 100644
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/NavView.kt
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/NavView.kt
@@ -3,155 +3,78 @@ package pl.szczodrzynski.navlib
import android.content.Context
import android.content.res.Configuration
import android.content.res.Configuration.ORIENTATION_PORTRAIT
-import android.graphics.Point
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
import android.widget.FrameLayout
import android.widget.LinearLayout
+import android.widget.TextView
import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.view.children
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import kotlinx.android.synthetic.main.nav_view.view.*
+import androidx.core.view.updateLayoutParams
import pl.szczodrzynski.navlib.bottomsheet.NavBottomSheet
+import pl.szczodrzynski.navlib.databinding.NavViewBinding
import pl.szczodrzynski.navlib.drawer.NavDrawer
+class NavView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyle: Int = 0,
+) : FrameLayout(context, attrs, defStyle) {
-class NavView : FrameLayout {
- companion object {
- const val SOURCE_OTHER = 0
- const val SOURCE_DRAWER = 1
- const val SOURCE_BOTTOM_SHEET = 1
- }
-
+ private val b = NavViewBinding.inflate(LayoutInflater.from(context), this)
private var contentView: LinearLayout? = null
+ val drawer: NavDrawer
- private lateinit var statusBarBackground: View
- private lateinit var navigationBarBackground: View
- private lateinit var mainView: LinearLayout
- private lateinit var floatingActionButton: FloatingActionButton
- private lateinit var extendedFloatingActionButton: ExtendedFloatingActionButton
+ val coordinator
+ get() = b.nvCoordinator
+ val toolbar
+ get() = b.nvToolbar
+ val bottomBar: NavBottomBar
+ get() = b.nvBottomBar
+ val nightlyText: TextView
+ get() = b.nvNightlyText
+ val bottomSheet: NavBottomSheet
+ get() = b.nvBottomSheet
- lateinit var drawer: NavDrawer
- lateinit var toolbar: NavToolbar
- lateinit var bottomBar: NavBottomBar
- lateinit var bottomSheet: NavBottomSheet
- val coordinator by lazy {
- findViewById(R.id.nv_coordinator)
- }
-
- var navigationLoader: NavigationLoader? = null
-
- constructor(context: Context) : super(context) {
- create(null, 0)
- }
-
- constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
- create(attrs, 0)
- }
-
- constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
- create(attrs, defStyle)
- }
-
- private fun create(attrs: AttributeSet?, defStyle: Int) {
- // Load attributes
- val a = context.obtainStyledAttributes(attrs, R.styleable.NavView, defStyle, 0)
- /*_exampleString = a.getString(
- R.styleable.NavView_exampleString
- )*/
- a.recycle()
-
- val layoutInflater = LayoutInflater.from(context)
- layoutInflater.inflate(R.layout.nav_view, this)
-
- contentView = findViewById(R.id.nv_content)
-
- statusBarBackground = findViewById(R.id.nv_statusBarBackground)
- navigationBarBackground = findViewById(R.id.nv_navigationBarBackground)
- mainView = findViewById(R.id.nv_main)
- floatingActionButton = findViewById(R.id.nv_floatingActionButton)
- extendedFloatingActionButton = findViewById(R.id.nv_extendedFloatingActionButton)
+ init {
+ contentView = b.nvContent
drawer = NavDrawer(
context,
- findViewById(R.id.nv_drawerLayout),
- findViewById(R.id.nv_drawerContainerLandscape),
- findViewById(R.id.nv_miniDrawerContainerPortrait),
- findViewById(R.id.nv_miniDrawerElevation)
+ b.nvDrawerLayout,
+ b.nvDrawerContainerLandscape,
+ b.nvMiniDrawerContainerPortrait,
+ b.nvMiniDrawerElevation,
)
- toolbar = findViewById(R.id.nv_toolbar)
- bottomBar = findViewById(R.id.nv_bottomBar)
- bottomSheet = findViewById(R.id.nv_bottomSheet)
- drawer.toolbar = toolbar
- drawer.bottomBar = bottomBar
+ drawer.toolbar = b.nvToolbar
+ drawer.bottomBar = b.nvBottomBar
- toolbar.toolbarImage = findViewById(R.id.nv_toolbar_image)
+ b.nvToolbar.navView = this
+ b.nvToolbar.bottomSheet = b.nvBottomSheet
+ b.nvToolbar.toolbarImage = b.nvToolbarImage
- bottomBar.drawer = drawer
- bottomBar.bottomSheet = bottomSheet
- bottomBar.fabView = floatingActionButton
- bottomBar.fabExtendedView = extendedFloatingActionButton
-
- ripple.isEnabled = false
- ripple.children.forEach { it.isEnabled = false }
-
- //bottomSheetBehavior.peekHeight = displayHeight
- }
-
- private fun convertDpToPixel(dp: Float): Float {
- val resources = context.resources
- val metrics = resources.displayMetrics
- return dp * (metrics.densityDpi / 160f)
- }
-
- fun gainAttentionOnBottomBar() {
- var x = ripple.width.toFloat()
- var y = ripple.height.toFloat()
- x -= convertDpToPixel(56f) / 2
- y -= convertDpToPixel(56f) / 2
- ripple.performRipple(Point(x.toInt(), y.toInt()))
+ b.nvBottomBar.navView = this
+ b.nvBottomBar.bottomSheet = b.nvBottomSheet
+ b.nvBottomBar.fabView = b.nvFloatingActionButton
+ b.nvBottomBar.fabExtendedView = b.nvExtendedFloatingActionButton
}
fun configSystemBarsUtil(systemBarsUtil: SystemBarsUtil) {
this.systemBarsUtil = systemBarsUtil.apply {
- this.statusBarBgView = statusBarBackground
- this.navigationBarBgView = navigationBarBackground
- this.statusBarDarkView = nv_statusBarDarker
- //this.navigationBarDarkView = navigationBarBackground
- this.insetsListener = nv_drawerLayout
- this.marginBySystemBars = mainView
- this.paddingByNavigationBar = bottomSheet.getContentView()
+ this.statusBarBgView = b.nvStatusBarBackground
+ this.navigationBarBgView = b.nvNavigationBarBackground
+ this.statusBarDarkView = b.nvStatusBarDarker
+ this.navigationBarDarkView = b.nvNavigationBarBackground
+ this.insetsListener = b.nvDrawerLayout
+ this.marginBySystemBars = b.nvMain
}
}
-
- var enableBottomSheet = true
- var enableBottomSheetDrag = true
-
- var bottomBarEnable = true
- get() = bottomBar.enable
- set(value) {
- field = value
- bottomBar.enable = value
- setContentMargins() // TODO combine bottomBarEnable and bottomBar.enable
- }
-
- /**
- * Shows the toolbar and sets the contentView's margin to be
- * below the toolbar.
- */
- var showToolbar = true; set(value) {
- toolbar.visibility = if (value) View.VISIBLE else View.GONE
- field = value
- setContentMargins()
- }
-
/**
* Set the FAB's on click listener
*/
@@ -161,12 +84,17 @@ class NavView : FrameLayout {
internal var systemBarsUtil: SystemBarsUtil? = null
- private fun setContentMargins() {
- val layoutParams = CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)
- val actionBarSize = 56 * context.resources.displayMetrics.density
- layoutParams.topMargin = if (showToolbar) actionBarSize.toInt() else 0
- layoutParams.bottomMargin = if (bottomBarEnable) actionBarSize.toInt() else 0
- contentView?.layoutParams = layoutParams
+ internal fun setContentMargins() {
+ contentView?.updateLayoutParams {
+ topMargin = if (toolbar.enable) {
+ toolbar.measure(MATCH_PARENT, WRAP_CONTENT)
+ toolbar.measuredHeight
+ } else 0
+ bottomMargin = if (bottomBar.enable) {
+ bottomBar.measure(MATCH_PARENT, WRAP_CONTENT)
+ bottomBar.measuredHeight
+ } else 0
+ }
}
override fun onConfigurationChanged(newConfig: Configuration?) {
@@ -174,7 +102,7 @@ class NavView : FrameLayout {
Log.d(
"NavLib",
- "CONFIGURATION CHANGED: ${newConfig?.screenWidthDp}x${newConfig?.screenHeightDp} "+if (newConfig?.orientation == ORIENTATION_PORTRAIT) "portrait" else "landscape"
+ "CONFIGURATION CHANGED: ${newConfig?.screenWidthDp}x${newConfig?.screenHeightDp} " + if (newConfig?.orientation == ORIENTATION_PORTRAIT) "portrait" else "landscape"
)
systemBarsUtil?.commit()
@@ -202,12 +130,6 @@ class NavView : FrameLayout {
return false
}
- override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
- if (contentView == null) {
- super.addView(child, index, params)
- }
- else {
- contentView!!.addView(child, index, params)
- }
- }
+ override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) =
+ contentView?.addView(child, index, params) ?: super.addView(child, index, params)
}
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/NavigationLoader.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/NavigationLoader.kt
deleted file mode 100644
index 09428d74..00000000
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/NavigationLoader.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package pl.szczodrzynski.navlib
-
-interface NavigationLoader {
- fun load(itemId: Int, callerId: Int, source: Int, args: Map)
-}
\ No newline at end of file
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/Utils.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/Utils.kt
index fc324f77..51b78a24 100644
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/Utils.kt
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/Utils.kt
@@ -4,6 +4,7 @@ import android.app.Activity
import android.content.Context
import android.content.res.Configuration
import android.graphics.drawable.Drawable
+import android.graphics.drawable.LayerDrawable
import android.os.Build
import android.util.DisplayMetrics
import android.util.TypedValue
@@ -13,6 +14,7 @@ import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
import com.google.android.material.elevation.ElevationOverlayProvider
import com.mikepenz.iconics.IconicsColor
import com.mikepenz.iconics.IconicsDrawable
@@ -127,6 +129,9 @@ fun IconicsDrawable.colorAttr(context: Context, @AttrRes attrRes: Int) {
fun getColorFromAttr(context: Context, @AttrRes color: Int): Int {
val typedValue = TypedValue()
context.theme.resolveAttribute(color, typedValue, true)
+ if (typedValue.resourceId != 0) {
+ return ContextCompat.getColor(context, typedValue.resourceId)
+ }
return typedValue.data
}
@@ -149,6 +154,20 @@ fun Context.getColorFromRes(@ColorRes id: Int): Int {
}
}
+fun Drawable.setBadgeCount(count: Int) {
+ if (this is LayerDrawable) {
+ (this as LayerDrawable?)?.apply {
+ findDrawableByLayerId(R.id.ic_badge)
+ .takeIf { it is BadgeDrawable }
+ ?.also { badge ->
+ (badge as BadgeDrawable).setCount(count.toString())
+ mutate()
+ setDrawableByLayerId(R.id.ic_badge, badge)
+ }
+ }
+ }
+}
+
fun crc16(buffer: String): Int {
/* Note the change here */
var crc = 0x1D0F
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/bottomsheet/NavBottomSheet.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/bottomsheet/NavBottomSheet.kt
index 024985ce..547c5890 100644
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/bottomsheet/NavBottomSheet.kt
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/bottomsheet/NavBottomSheet.kt
@@ -17,6 +17,8 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.annotation.DrawableRes
import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
import androidx.core.widget.NestedScrollView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
@@ -130,6 +132,18 @@ class NavBottomSheet : CoordinatorLayout {
bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+ ViewCompat.setOnApplyWindowInsetsListener(list) { view, windowInsets ->
+ val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+ // Apply the insets as a margin to the view. Here the system is setting
+ // only the bottom, left, and right dimensions, but apply whichever insets are
+ // appropriate to your layout. You can also update the view padding
+ // if that's more appropriate.
+ view.setPadding(insets.left, 0, insets.right, insets.bottom)
+ // Return CONSUMED if you don't want want the window insets to keep being
+ // passed down to descendant views.
+ WindowInsetsCompat.CONSUMED
+ }
+
scrimView.setOnTouchListener { _, event ->
if (!scrimViewTapToClose)
return@setOnTouchListener true
diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt
index 63c66766..ccb87083 100644
--- a/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt
+++ b/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt
@@ -6,23 +6,31 @@ import android.content.Context
import android.content.res.Configuration
import android.content.res.Resources
import android.graphics.Color
+import android.graphics.Outline
import android.graphics.PorterDuff
import android.graphics.drawable.LayerDrawable
+import android.os.Build
+import android.util.AttributeSet
import android.util.Log
+import android.util.TypedValue
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.view.ViewGroup.MarginLayoutParams
+import android.view.ViewOutlineProvider
import android.widget.FrameLayout
-import android.widget.LinearLayout
import android.widget.Toast
-import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
import androidx.customview.widget.ViewDragHelper
import androidx.drawerlayout.widget.DrawerLayout
-import com.mikepenz.fastadapter.IAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.appbar.CollapsingToolbarLayout
import com.mikepenz.itemanimators.AlphaCrossFadeAnimator
-import com.mikepenz.materialdrawer.*
import com.mikepenz.materialdrawer.holder.BadgeStyle
import com.mikepenz.materialdrawer.holder.ColorHolder
import com.mikepenz.materialdrawer.holder.StringHolder
@@ -37,7 +45,6 @@ import com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
import com.mikepenz.materialdrawer.widget.MiniDrawerSliderView
import com.mikepenz.materialize.util.UIUtils
import pl.szczodrzynski.navlib.*
-import pl.szczodrzynski.navlib.R
import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
class NavDrawer(
@@ -98,6 +105,7 @@ class NavDrawer(
})
accountHeader = AccountHeaderView(context).apply {
+ dividerBelowHeader = false
headerBackground = ImageHolder(R.drawable.header)
displayBadgesOnSmallProfileImages = true
@@ -168,6 +176,19 @@ class NavDrawer(
}
}
+ setOnApplyWindowInsetsListener(drawer) { view, windowInsets ->
+ val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+ // Apply the insets as a margin to the view. Here the system is setting
+ // only the bottom, left, and right dimensions, but apply whichever insets are
+ // appropriate to your layout. You can also update the view padding
+ // if that's more appropriate.
+ view.setPadding(insets.left, insets.top, insets.right, insets.bottom)
+
+ // Return CONSUMED if you don't want want the window insets to keep being
+ // passed down to descendant views.
+ WindowInsetsCompat.CONSUMED
+ }
+
miniDrawer = MiniDrawerSliderView(context).apply {
drawer = this@NavDrawer.drawer
includeSecondaryDrawerItems = false
@@ -191,6 +212,12 @@ class NavDrawer(
profileSelectionOpen()
open()
}
+ toolbar.drawerClickListener = {
+ open()
+ }
+ bottomBar.drawerClickListener = {
+ open()
+ }
val configuration = context.resources.configuration
decideDrawerMode(
@@ -671,32 +698,8 @@ class NavDrawer(
}
updateMiniDrawer()
- if (bottomBar.navigationIcon is LayerDrawable) {
- (bottomBar.navigationIcon as LayerDrawable?)?.apply {
- findDrawableByLayerId(R.id.ic_badge)
- .takeIf { it is BadgeDrawable }
- ?.also { badge ->
- (badge as BadgeDrawable).setCount(totalCount.toString())
- mutate()
- setDrawableByLayerId(R.id.ic_badge, badge)
- }
- }
- }
-
- if (totalCount == 0) {
- toolbar.subtitle = resources.getString(
- toolbar.subtitleFormat ?: return,
- currentProfileObj?.name ?: ""
- )
- }
- else {
- toolbar.subtitle = resources.getQuantityString(
- toolbar.subtitleFormatWithUnread ?: toolbar.subtitleFormat ?: return,
- totalCount,
- currentProfileObj?.name ?: "",
- totalCount
- )
- }
+ toolbar.navigationIcon?.setBadgeCount(totalCount)
+ bottomBar.navigationIcon?.setBadgeCount(totalCount)
}
fun setUnreadCounterList(unreadCounterList: MutableList) {
diff --git a/navlib/src/main/res/drawable/nightly_text_rounded.xml b/navlib/src/main/res/drawable/nightly_text_rounded.xml
new file mode 100644
index 00000000..f20ff2b8
--- /dev/null
+++ b/navlib/src/main/res/drawable/nightly_text_rounded.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/navlib/src/main/res/layout/nav_bottom_sheet.xml b/navlib/src/main/res/layout/nav_bottom_sheet.xml
index 5cb25d10..ce7cec8b 100644
--- a/navlib/src/main/res/layout/nav_bottom_sheet.xml
+++ b/navlib/src/main/res/layout/nav_bottom_sheet.xml
@@ -19,7 +19,8 @@
-
\ No newline at end of file
+
diff --git a/navlib/src/main/res/layout/nav_view.xml b/navlib/src/main/res/layout/nav_view.xml
index 4b46d117..81805ce5 100644
--- a/navlib/src/main/res/layout/nav_view.xml
+++ b/navlib/src/main/res/layout/nav_view.xml
@@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="top"
- android:background="?android:windowBackground"
+ android:background="?nvStatusBarBackground"
tools:layout_height="25dp" />
+
+
-
-
-
-
-
-
@@ -158,11 +148,9 @@
android:id="@+id/nv_floatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="16dp"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
- app:backgroundTint="?colorFab"
app:layout_anchor="@id/nv_bottomBar"
tools:srcCompat="@android:drawable/ic_menu_edit" />
@@ -175,7 +163,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="bottom"
- android:background="?navigationBarBackground"
+ android:background="?nvNavigationBarBackground"
tools:layout_height="48dp" />
diff --git a/navlib/src/main/res/values-w600dp/styles.xml b/navlib/src/main/res/values-w600dp/styles.xml
deleted file mode 100644
index 6674487f..00000000
--- a/navlib/src/main/res/values-w600dp/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/navlib/src/main/res/values/attrs.xml b/navlib/src/main/res/values/attrs.xml
index a239e4e4..d72c434b 100644
--- a/navlib/src/main/res/values/attrs.xml
+++ b/navlib/src/main/res/values/attrs.xml
@@ -1,8 +1,7 @@
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
diff --git a/navlib/src/main/res/values/attrs_nav_view.xml b/navlib/src/main/res/values/attrs_nav_view.xml
deleted file mode 100644
index c6169965..00000000
--- a/navlib/src/main/res/values/attrs_nav_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/navlib/src/main/res/values/colors.xml b/navlib/src/main/res/values/colors.xml
index e881e7bd..ea4f6a00 100644
--- a/navlib/src/main/res/values/colors.xml
+++ b/navlib/src/main/res/values/colors.xml
@@ -1,11 +1,6 @@
#202196f3
- #154FBC
-
- #ffffff
- #242424
- #000000
#0dffffff
#12ffffff
@@ -16,4 +11,4 @@
#24ffffff
#26ffffff
#29ffffff
-
\ No newline at end of file
+
diff --git a/navlib/src/main/res/values/strings.xml b/navlib/src/main/res/values/strings.xml
deleted file mode 100644
index 6f67dcd6..00000000
--- a/navlib/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
- NavLib
- %1$s
-
diff --git a/navlib/src/main/res/values/styles.xml b/navlib/src/main/res/values/styles.xml
deleted file mode 100644
index 6ad92c22..00000000
--- a/navlib/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-