diff --git a/app/build.gradle b/app/build.gradle index a9eaea45..b25ea612 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -120,6 +120,7 @@ android { tasks.whenTaskAdded { task -> if (!task.name.endsWith("Release") && !task.name.endsWith("ReleaseWithR8")) return + def renameTaskName = "rename${task.name.capitalize()}" def flavor = "" @@ -130,16 +131,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) } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8618f020..73b93ce7 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.* { *; } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt index a75d87a8..85684886 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt @@ -40,7 +40,7 @@ class GradeViewHolder( if (grade.isImprovement) app.getString(R.string.grades_improvement_category_format, "") else - grade.category + "" } else { b.gradeDescription.text = grade.getNoteSubstituteText(adapter.showNotes) ?: grade.description diff --git a/app/src/main/res/drawable/ic_note.xml b/app/src/main/res/drawable/ic_note.xml index aeead4fa..a7ccfba5 100644 --- a/app/src/main/res/drawable/ic_note.xml +++ b/app/src/main/res/drawable/ic_note.xml @@ -1,6 +1,6 @@