sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

add cosmetic ui changes + fix build issues

Browse Source
This commit is contained in:
Franek 2024-06-14 22:48:50 +02:00
parent 92ef6b211d
commit 663243da8b
No known key found for this signature in database
GPG Key ID: 0329F871B2079351
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@ -120,6 +120,7 @@ android {
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
if (!task.name.endsWith("Release") && !task.name.endsWith("ReleaseWithR8")) if (!task.name.endsWith("Release") && !task.name.endsWith("ReleaseWithR8"))
return return
def renameTaskName = "rename${task.name.capitalize()}" def renameTaskName = "rename${task.name.capitalize()}"
def flavor = "" def flavor = ""
@ -130,16 +131,20 @@ tasks.whenTaskAdded { task ->
if (task.name.startsWith("minify")) if (task.name.startsWith("minify"))
flavor = task.name.substring("minify".length(), task.name.indexOf("Release")).uncapitalize() flavor = task.name.substring("minify".length(), task.name.indexOf("Release")).uncapitalize()
def taskName = "package${flavor.capitalize()}Release"
if (flavor != "") { if (flavor != "") {
tasks.create(renameTaskName, Copy) { tasks.register(renameTaskName, Copy) {
dependsOn(taskName)
from file("${projectDir}/${flavor}/release/"), from file("${projectDir}/${flavor}/release/"),
file("${buildDir}/outputs/mapping/${flavor}Release/"), file("${layout.buildDirectory}/outputs/mapping/${flavor}Release/"),
file("${buildDir}/outputs/apk/${flavor}/release/"), file("${layout.buildDirectory}/outputs/apk/${flavor}/release/"),
file("${buildDir}/outputs/bundle/${flavor}Release/") file("${layout.buildDirectory}/outputs/bundle/${flavor}Release/")
include "*.aab", "*.apk", "mapping.txt", "output-metadata.json" include "*.aab", "*.apk", "mapping.txt", "output-metadata.json"
destinationDir file("${projectDir}/release/") destinationDir file("${projectDir}/release/")
rename ".+?\\.(.+)", "Edziennik_${android.defaultConfig.versionName}_${flavor}." + '$1' rename ".+?\\.(.+)", "Edziennik_${android.defaultConfig.versionName}_${flavor}." + '$1'
} }
task.finalizedBy(renameTaskName) task.finalizedBy(renameTaskName)
} }
} }

3
app/proguard-rules.pro vendored
View File

@ -19,7 +19,10 @@
# If you keep the line number information, uncomment this to # If you keep the line number information, uncomment this to
# hide the original source file name. # hide the original source file name.
#-renamesourcefileattribute SourceFile #-renamesourcefileattribute SourceFile
-keepattributes Signature
-keep class android.support.v7.widget.** { *; } -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.utils.models.** { *; }
-keep class pl.szczodrzynski.edziennik.data.db.enums.* { *; } -keep class pl.szczodrzynski.edziennik.data.db.enums.* { *; }

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt
View File

@ -40,7 +40,7 @@ class GradeViewHolder(
if (grade.isImprovement) if (grade.isImprovement)
app.getString(R.string.grades_improvement_category_format, "") app.getString(R.string.grades_improvement_category_format, "")
else else
grade.category ""
} else { } else {
b.gradeDescription.text = b.gradeDescription.text =
grade.getNoteSubstituteText(adapter.showNotes) ?: grade.description grade.getNoteSubstituteText(adapter.showNotes) ?: grade.description

4
app/src/main/res/drawable/ic_note.xml
View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="64dp" android:width="128dp"
android:height="64dp" android:height="128dp"
android:viewportWidth="48" android:viewportWidth="48"
android:viewportHeight="48"> android:viewportHeight="48">
<path <path

4
app/src/main/res/layout/note_list_dialog.xml
View File

@ -57,10 +57,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:drawablePadding="16dp" android:drawablePadding="16dp"
android:fontFamily="sans-serif-light"
android:gravity="center" android:gravity="center"
android:padding="16dp"
android:text="@string/notes_no_data" android:text="@string/notes_no_data"
android:textSize="24sp" android:textAppearance="@style/NavView.TextView.BodyMedium"
app:drawableTopCompat="@drawable/ic_note" /> app:drawableTopCompat="@drawable/ic_note" />
<TextView <TextView

8
build.gradle
View File

@ -21,10 +21,10 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.4.2' classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.14' classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.1'
} }
} }
@ -44,4 +44,4 @@ allprojects {
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }