aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-23 08:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migration to Material You

Browse Source
This commit is contained in:
Sylwester Zieliński
2021-11-30 16:54:47 +01:00
parent 11bd536caa
commit 4099f56954
30 changed files with 99 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Text
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -21,7 +22,6 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import no.nordicsemi.android.theme.NordicColors
@Composable
fun FeatureButton(@DrawableRes iconId: Int, @StringRes nameId: Int, onClick: () -> Unit) {
@@ -29,7 +29,7 @@ fun FeatureButton(@DrawableRes iconId: Int, @StringRes nameId: Int, onClick: ()
modifier = Modifier
.fillMaxWidth()
.clickable { onClick() }
.background(NordicColors.ItemHighlight.value())
.background(MaterialTheme.colorScheme.background)
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically
) {

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

@@ -2,21 +2,21 @@ package no.nordicsemi.android.nrftoolbox
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import dagger.hilt.android.AndroidEntryPoint
import no.nordicsemi.android.theme.TestTheme
import no.nordicsemi.android.material.you.NordicActivity
import no.nordicsemi.android.material.you.NordicTheme
@AndroidEntryPoint
class MainActivity : AppCompatActivity() {
class MainActivity : NordicActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
TestTheme {
Surface(color = MaterialTheme.colors.background) {
NordicTheme {
Surface(color = MaterialTheme.colorScheme.background) {
HomeScreen()
}
}