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