diff --git a/.idea/misc.xml b/.idea/misc.xml index 74dd639..b2c751a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/src/main/java/com/example/tvcontroller/MainActivity.kt b/app/src/main/java/com/example/tvcontroller/MainActivity.kt index 1cfe3c3..3c2c1c7 100644 --- a/app/src/main/java/com/example/tvcontroller/MainActivity.kt +++ b/app/src/main/java/com/example/tvcontroller/MainActivity.kt @@ -1,8 +1,6 @@ package com.example.tvcontroller -import android.content.ContentValues.TAG import android.os.Bundle -import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge @@ -10,8 +8,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.DateRange -import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Icon import androidx.compose.material3.NavigationBar @@ -27,6 +23,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.example.tvcontroller.ui.theme.TVControllerTheme import androidx.compose.runtime.getValue +import androidx.compose.ui.res.painterResource class MainActivity : ComponentActivity() { @@ -47,13 +44,16 @@ fun TvControllerApp( ) { val backStackEntry by navController.currentBackStackEntryAsState() val currentScreen = Screens.valueOf(backStackEntry?.destination?.route ?: Screens.Camera.name) + val baselineCamera24 = painterResource(R.drawable.baseline_camera_24) + val baselineRemote24 = painterResource(R.drawable.baseline_settings_remote_24) + val baselineSettings24 = painterResource(R.drawable.baseline_settings_24) Scaffold(modifier = Modifier.fillMaxSize(), bottomBar = { NavigationBar { NavigationBarItem( onClick = { navController.navigate(Screens.Camera.name) }, icon = { Icon( - Icons.Filled.PlayArrow, + baselineCamera24, contentDescription = "Camera" ) }, @@ -64,7 +64,7 @@ fun TvControllerApp( onClick = { navController.navigate(Screens.Remote.name) }, icon = { Icon( - Icons.Filled.DateRange, + baselineRemote24, contentDescription = "Remote" ) }, @@ -75,7 +75,7 @@ fun TvControllerApp( onClick = { navController.navigate(Screens.Settings.name) }, icon = { Icon( - Icons.Filled.Settings, + baselineSettings24, contentDescription = "Settings" ) }, diff --git a/app/src/main/res/drawable/baseline_camera_24.xml b/app/src/main/res/drawable/baseline_camera_24.xml new file mode 100644 index 0000000..aa75da2 --- /dev/null +++ b/app/src/main/res/drawable/baseline_camera_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/baseline_settings_24.xml b/app/src/main/res/drawable/baseline_settings_24.xml new file mode 100644 index 0000000..6593f3a --- /dev/null +++ b/app/src/main/res/drawable/baseline_settings_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/baseline_settings_remote_24.xml b/app/src/main/res/drawable/baseline_settings_remote_24.xml new file mode 100644 index 0000000..fa763a5 --- /dev/null +++ b/app/src/main/res/drawable/baseline_settings_remote_24.xml @@ -0,0 +1,5 @@ + + + + +