Skip to content

Commit

Permalink
Merge branch 'main' into droidcon/stewemetal
Browse files Browse the repository at this point in the history
alisen authored Jul 5, 2024

Verified

This commit was signed with the committer’s verified signature.
MrHadiSatrio Hadi Satrio
2 parents 5f2f3a6 + 4eb830e commit d95e3d0
Showing 5 changed files with 12 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -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,
)
}
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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)
}
Original file line number Diff line number Diff line change
@@ -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) {
Original file line number Diff line number Diff line change
@@ -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,
)
)
}
}
}

0 comments on commit d95e3d0

Please sign in to comment.