From 4a6690b11fa02b63552aa91eb35d81219fa20133 Mon Sep 17 00:00:00 2001
From: Alishen <alisene@gmail.com>
Date: Fri, 5 Jul 2024 15:37:25 +0200
Subject: [PATCH] main ktlint fix

---
 .../main/java/de/berlindroid/zeapp/zedi/ApiModule.kt | 10 +++-------
 .../de/berlindroid/zeapp/zeservices/ZePassApi.kt     |  1 -
 .../de/berlindroid/zeapp/zeservices/ZeUserApi.kt     |  2 +-
 .../de/berlindroid/zeapp/zeui/zehome/ZeScreen.kt     | 12 +++++++-----
 .../berlindroid/zeapp/zeui/zehome/ZeUserProfile.kt   |  3 +--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zedi/ApiModule.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zedi/ApiModule.kt
index 6e685f1c..780a8ccb 100644
--- a/zeapp/android/src/main/java/de/berlindroid/zeapp/zedi/ApiModule.kt
+++ b/zeapp/android/src/main/java/de/berlindroid/zeapp/zedi/ApiModule.kt
@@ -1,6 +1,5 @@
 package de.berlindroid.zeapp.zedi
 
-import android.util.Log
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -12,11 +11,8 @@ import de.berlindroid.zeapp.zeservices.ZeUserService
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
-import okhttp3.Response
-import retrofit2.HttpException
 import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
-import timber.log.Timber
 
 data class ZeServerBaseUrl(
     val value: String,
@@ -58,7 +54,8 @@ object ApiModule {
         service: ZeUserService,
         baseUrl: ZeServerBaseUrl,
     ): ZeUserApi = ZeUserApi(
-        service, baseUrl,
+        service,
+        baseUrl,
     )
 
     @Provides
@@ -76,7 +73,6 @@ object ApiModule {
             .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
             .build()
             .create(
-                ZeUserService::
-                class.java,
+                ZeUserService::class.java,
             )
 }
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZePassApi.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZePassApi.kt
index f802cb8c..18a76610 100644
--- a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZePassApi.kt
+++ b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZePassApi.kt
@@ -1,6 +1,5 @@
 package de.berlindroid.zeapp.zeservices
 
-import de.berlindroid.zeapp.zedi.ZeServerBaseUrl
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import retrofit2.http.Body
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeUserApi.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeUserApi.kt
index 44e17c07..1183357f 100644
--- a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeUserApi.kt
+++ b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeUserApi.kt
@@ -25,7 +25,7 @@ class ZeUserApi
     private val service: ZeUserService,
     private val baseUrl: ZeServerBaseUrl,
 ) {
-    fun getUserProfilePng(uuid: String): String = "${baseUrl.value}/user/${uuid}/png"
+    fun getUserProfilePng(uuid: String): String = "${baseUrl.value}/user/$uuid/png"
 
     suspend fun getOneUser(uuid: String): User? = service.getOneUser(uuid)
 }
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeScreen.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeScreen.kt
index 683e247d..cdd2773f 100644
--- a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeScreen.kt
+++ b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeScreen.kt
@@ -3,7 +3,6 @@ package de.berlindroid.zeapp.zeui.zehome
 import android.content.Intent
 import android.net.Uri
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.DrawerValue
@@ -16,7 +15,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -69,9 +67,13 @@ internal fun ZeScreen(vm: ZeBadgeViewModel, modifier: Modifier = Modifier) {
     val currentRoute = currentNavBackStackEntry?.destination?.route ?: ROUTE_HOME
 
     fun routeTo(target: String) {
-        if (currentRoute == target) navController.navigateUp() else navController.navigate(
-            target,
-        )
+        if (currentRoute == target) {
+            navController.navigateUp()
+        } else {
+            navController.navigate(
+                target,
+            )
+        }
     }
 
     BackHandler(drawerState.isOpen || currentRoute != ROUTE_HOME) {
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeUserProfile.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeUserProfile.kt
index e443ffbf..9ff68a95 100644
--- a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeUserProfile.kt
+++ b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeUserProfile.kt
@@ -21,7 +21,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
@@ -79,7 +78,7 @@ fun ZeUserProfile(
                         Text(
                             style = MaterialTheme.typography.bodyMedium,
                             text = message.text,
-                            )
+                        )
                     }
                 }
             }