From 5d1962a00bdaa98d1c216e45ddce8b3f64a34dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Tue, 7 Dec 2021 13:33:32 +0100 Subject: [PATCH] Change colors --- .../java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt | 1 - .../java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt | 7 ++++++- .../java/no/nordicsemi/android/nrftoolbox/MainActivity.kt | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt index 69c1c633..d9134a06 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt @@ -35,7 +35,6 @@ fun FeatureButton( .fillMaxWidth() .height(150.dp) .clickable { onClick() } - .background(MaterialTheme.colorScheme.background) .padding(16.dp), horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt index 16d5e6af..42764ab9 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt @@ -5,9 +5,11 @@ import android.os.ParcelUuid import androidx.activity.OnBackPressedCallback import androidx.activity.compose.BackHandler import androidx.activity.compose.LocalOnBackPressedDispatcherOwner +import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -47,7 +49,10 @@ internal fun HomeScreen() { val goHome = { navController.navigate(NavDestination.HOME.id) } - NavHost(navController = navController, startDestination = NavDestination.HOME.id) { + NavHost( + navController = navController, + startDestination = NavDestination.HOME.id + ) { composable(NavDestination.HOME.id) { HomeView { navController.navigate(it.id) } } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt index 176e20c6..f37c7668 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt @@ -2,8 +2,10 @@ package no.nordicsemi.android.nrftoolbox import android.os.Bundle import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface +import androidx.compose.ui.Modifier import dagger.hilt.android.AndroidEntryPoint import no.nordicsemi.android.material.you.NordicActivity import no.nordicsemi.android.material.you.NordicTheme @@ -16,7 +18,10 @@ class MainActivity : NordicActivity() { setContent { NordicTheme { - Surface(color = MaterialTheme.colorScheme.surface) { + Surface( + color = MaterialTheme.colorScheme.surface, + modifier = Modifier.fillMaxSize() + ) { HomeScreen() } }