From 749587cf125e7648139f4ff43b37dd3d5e594a66 Mon Sep 17 00:00:00 2001 From: Diamond <33725716+DiamondMiner88@users.noreply.github.com> Date: Sun, 18 Sep 2022 12:32:37 -0700 Subject: [PATCH] fix: null author in commits (#16) --- .../main/kotlin/com/aliucord/manager/network/dto/Commit.kt | 2 +- .../kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt | 2 +- build.gradle.kts | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/network/dto/Commit.kt b/app/src/main/kotlin/com/aliucord/manager/network/dto/Commit.kt index 8521794..2a6797c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/dto/Commit.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/dto/Commit.kt @@ -14,7 +14,7 @@ data class Commit( val htmlUrl: String, val sha: String, val commit: Commit, - val author: Author + val author: Author? ) { @Serializable data class Author(@SerialName("login") val name: String) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt index 78faa8f..dbbb238 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt @@ -201,7 +201,7 @@ fun HomeScreen( ListItem( modifier = Modifier.clickable { uriHandler.openUri(commitData.htmlUrl) }, overlineText = { Text(commitData.sha.substring(0, 7)) }, - headlineText = { Text("${commitData.commit.message.split("\n").first()} - ${commitData.author.name}") } + headlineText = { Text("${commitData.commit.message.split("\n").first()} - ${commitData.author?.name ?: "UNKNOWN"}") } ) } diff --git a/build.gradle.kts b/build.gradle.kts index b340350..71ed25d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { google() @@ -6,11 +5,8 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha10") + classpath("com.android.tools.build:gradle:7.3.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle.kts files } }