From 47e9c71ea948e7b5999aa701c14a2a176f59ad1e Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 7 Oct 2024 16:34:59 +0200 Subject: [PATCH] style(ktlint): Fix formatting in kotlin Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/models/json/conversations/Conversation.kt | 3 ++- .../com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index af0757c85..2e48b7c81 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt @@ -58,7 +58,8 @@ data class Conversation( @JsonField(name = ["actorType"]) var actorType: String = "", - var password: String? = null, // check if this can be removed.Does not belong to api response but is used internally? + // check if this can be removed. Doesn't belong to api-response but is used internally? + var password: String? = null, @JsonField(name = ["isFavorite"]) var favorite: Boolean = false, diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt index 747cdc09e..fb2bc1aca 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt @@ -238,7 +238,7 @@ class DateTimePickerFragment : DialogFragment() { month, day, timePicker.hour, - timePicker.minute, + timePicker.minute ) setTimeStamp(getTimeFromTimeStamp(timestamp)) currentTimeStamp = timestamp / ONE_SEC @@ -264,7 +264,7 @@ class DateTimePickerFragment : DialogFragment() { val calendar: Calendar = Calendar.getInstance().apply { set(Calendar.YEAR, year) set(Calendar.MONTH, month) - set(Calendar.DAY_OF_YEAR,day) + set(Calendar.DAY_OF_YEAR, day) if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay) if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd) if (weekInYear != -1) set(Calendar.WEEK_OF_YEAR, weekInYear)