From ffaefb60f6ceeded6c9445a143f4dd3bd1f552f7 Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Mon, 29 Mar 2021 21:04:18 +0200 Subject: [PATCH] Fix NPE when opening Settings (resolves #2116) --- lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt b/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt index 78b87c9d10..500ebbb3e1 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt @@ -17,6 +17,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.compose.KEY_ROUTE @@ -29,7 +30,7 @@ fun TopBar(navController: NavController) { val navBackStackEntry by navController.currentBackStackEntryAsState() val currentRoute = navBackStackEntry?.arguments?.getString(KEY_ROUTE) val context = LocalContext.current - val title = getRoutesToLabels(context)[currentRoute]!! + val title = getRoutesToLabels(context)[currentRoute] Row( verticalAlignment = Alignment.CenterVertically, @@ -56,7 +57,7 @@ fun TopBar(navController: NavController) { } } Text( - text = title, + text = title ?: "", style = MaterialTheme.typography.h6, modifier = Modifier.padding(start = 16.dp), color = MaterialTheme.colors.onSurface,