aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-19 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change colors

Browse Source
This commit is contained in:
Sylwester Zieliński
2021-12-07 13:33:32 +01:00
parent 1f5dcfb3dd
commit 5d1962a00b
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt
View File

@@ -35,7 +35,6 @@ fun FeatureButton(
.fillMaxWidth() .fillMaxWidth()
.height(150.dp) .height(150.dp)
.clickable { onClick() } .clickable { onClick() }
.background(MaterialTheme.colorScheme.background)
.padding(16.dp), .padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {

7
app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt
View File

@@ -5,9 +5,11 @@ import android.os.ParcelUuid
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@@ -47,7 +49,10 @@ internal fun HomeScreen() {
val goHome = { navController.navigate(NavDestination.HOME.id) } 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) { composable(NavDestination.HOME.id) {
HomeView { navController.navigate(it.id) } HomeView { navController.navigate(it.id) }
} }

7
app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt
View File

@@ -2,8 +2,10 @@ package no.nordicsemi.android.nrftoolbox
import android.os.Bundle import android.os.Bundle
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import no.nordicsemi.android.material.you.NordicActivity import no.nordicsemi.android.material.you.NordicActivity
import no.nordicsemi.android.material.you.NordicTheme import no.nordicsemi.android.material.you.NordicTheme
@@ -16,7 +18,10 @@ class MainActivity : NordicActivity() {
setContent { setContent {
NordicTheme { NordicTheme {
Surface(color = MaterialTheme.colorScheme.surface) { Surface(
color = MaterialTheme.colorScheme.surface,
modifier = Modifier.fillMaxSize()
) {
HomeScreen() HomeScreen()
} }
} }