Refactoring & CR fixes

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

@@ -4,16 +4,16 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 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.Button
-import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -25,10 +25,13 @@ import no.nordicsemi.android.theme.NordicColors
 
 @Composable
 fun FeatureButton(@DrawableRes iconId: Int, @StringRes nameId: Int, onClick: () -> Unit) {
-    Button(
-        modifier = Modifier.fillMaxWidth(),
-        onClick = { onClick() },
-        colors = ButtonDefaults.buttonColors(backgroundColor =  NordicColors.NordicGray4.value()),
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick() }
+            .background(NordicColors.ItemHighlight.value())
+            .padding(16.dp),
+        verticalAlignment = Alignment.CenterVertically
     ) {
         Image(
             painter = painterResource(iconId),
@@ -41,14 +44,10 @@ fun FeatureButton(@DrawableRes iconId: Int, @StringRes nameId: Int, onClick: ()
         )
         Row(
             modifier = Modifier
-                .padding(16.dp)
                 .fillMaxWidth(),
             horizontalArrangement = Arrangement.Center
         ) {
-            Text(
-                text = stringResource(id = nameId),
-                modifier = Modifier.padding(16.dp),
-            )
+            Text(text = stringResource(id = nameId))
         }
     }
 }

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

@@ -1,10 +1,11 @@
 package no.nordicsemi.android.nrftoolbox
 
+import android.app.Activity
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.foundation.layout.Column
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -12,14 +13,17 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import no.nordicsemi.android.csc.view.CscScreen
+import no.nordicsemi.android.csc.view.CSCScreen
 import no.nordicsemi.android.gls.view.GLSScreen
 import no.nordicsemi.android.hrs.view.HRSScreen
 import no.nordicsemi.android.hts.view.HTSScreen
@@ -28,6 +32,7 @@ import no.nordicsemi.android.scanner.view.BluetoothNotEnabledScreen
 import no.nordicsemi.android.scanner.view.RequestPermissionScreen
 import no.nordicsemi.android.scanner.view.ScanDeviceScreen
 import no.nordicsemi.android.scanner.view.ScanDeviceScreenResult
+import no.nordicsemi.android.theme.view.CloseIconAppBar
 import no.nordicsemi.android.utils.exhaustive
 
 @Composable
@@ -42,12 +47,12 @@ internal fun HomeScreen() {
 
     NavHost(navController = navController, startDestination = NavDestination.HOME.id) {
         composable(NavDestination.HOME.id) { HomeView { viewModel.navigate(it) } }
-        composable(NavDestination.CSC.id) { CscScreen { viewModel.navigateUp() } }
+        composable(NavDestination.CSC.id) { CSCScreen { viewModel.navigateUp() } }
         composable(NavDestination.HRS.id) { HRSScreen { viewModel.navigateUp() } }
         composable(NavDestination.HTS.id) { HTSScreen { viewModel.navigateUp() } }
         composable(NavDestination.GLS.id) { GLSScreen { viewModel.navigateUp() } }
         composable(NavDestination.REQUEST_PERMISSION.id) { RequestPermissionScreen(continueAction) }
-        composable(NavDestination.BLUETOOTH_NOT_AVAILABLE.id) { BluetoothNotAvailableScreen() }
+        composable(NavDestination.BLUETOOTH_NOT_AVAILABLE.id) { BluetoothNotAvailableScreen{ viewModel.finish() } }
         composable(NavDestination.BLUETOOTH_NOT_ENABLED.id) {
             BluetoothNotEnabledScreen(continueAction)
         }
@@ -69,11 +74,18 @@ internal fun HomeScreen() {
 @Composable
 fun HomeView(callback: (NavDestination) -> Unit) {
     Column {
-        TopAppBar(title = { Text(text = stringResource(id = R.string.app_name)) })
+        val context = LocalContext.current
+        CloseIconAppBar(stringResource(id = R.string.app_name)) {
+            (context as? Activity)?.finish()
+        }
 
         FeatureButton(R.drawable.ic_csc, R.string.csc_module) { callback(NavDestination.CSC) }
+        Spacer(modifier = Modifier.height(1.dp))
         FeatureButton(R.drawable.ic_hrs, R.string.hrs_module) { callback(NavDestination.HRS) }
+        Spacer(modifier = Modifier.height(1.dp))
         FeatureButton(R.drawable.ic_gls, R.string.gls_module) { callback(NavDestination.GLS) }
+        Spacer(modifier = Modifier.height(1.dp))
+        FeatureButton(R.drawable.ic_hts, R.string.hts_module) { callback(NavDestination.HTS) }
     }
 }
 
@@ -102,7 +114,6 @@ private fun BackHandler(enabled: Boolean = true, onBack: () -> Unit) {
     }
 }
 
-
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {

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

@@ -1,15 +1,15 @@
 package no.nordicsemi.android.nrftoolbox
 
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import dagger.hilt.android.AndroidEntryPoint
 import no.nordicsemi.android.theme.TestTheme
 
 @AndroidEntryPoint
-class MainActivity : ComponentActivity() {
+class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt

@@ -4,5 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class NrfToolboxApplication : Application() {
-}
+class NrfToolboxApplication : Application()

app/src/main/res/values/strings.xml

@@ -2,4 +2,5 @@
     <string name="csc_module">CSC</string>
     <string name="hrs_module">HRS</string>
     <string name="gls_module">GLS</string>
+    <string name="hts_module">HTS</string>
 </resources>