main page improvements

app/src/main/kotlin/org/mjdev/tvapp/ui/pages/MainPage.kt

@@ -56,21 +56,12 @@ class MainPage : Page() {
         val viewModel: MainViewModel = appViewModel { context ->
             MainViewModel.mockMainViewModel(context)
         }
-        val streamingData = remember(viewModel.categoryList) {
-            viewModel.categoryList
-        }.collectAsState()
-        val categoryList = remember(viewModel.countryList){
-            viewModel.countryList
-        }.collectAsState()
-        val featuredMovieList = remember(viewModel.featuredMovieList) {
-            viewModel.featuredMovieList
-        }.collectAsState()
-        val messages = remember(viewModel.messages) {
-            viewModel.messages
-        }.collectAsState()
-        val networkState = remember(viewModel.networkInfo.networkStatus) {
-            viewModel.networkInfo.networkStatus
-        }.collectAsState(null)
+
+        val streamingData = viewModel.categoryList.collectAsState()
+        val countryList = viewModel.countryList.collectAsState()
+        val featuredMovieList = viewModel.featuredMovieList.collectAsState()
+        val messages = viewModel.messages.collectAsState()
+        val networkState = viewModel.networkInfo.networkStatus.collectAsState(null)
 
         val errorState = remember(viewModel.error) { mutableStateOf(viewModel.error.value) }
         val titleState = remember { mutableStateOf<Any?>(R.string.app_name) }
@@ -138,7 +129,7 @@ class MainPage : Page() {
                 userIcon = R.drawable.milanj,
                 title = titleState.value,
                 messages = messages.value,
-                categories = categoryList.value,
+                categories = countryList.value,
                 featuredItems = featuredMovieList.value,
                 categoriesAndItemsMap = streamingData.value,
                 networkState = networkState,

app/src/main/kotlin/org/mjdev/tvapp/ui/screens/MainScreen.kt

@@ -35,10 +35,6 @@ class MainScreen : ScreenWithPages() {
 
     override val pages: (PagerScope.() -> Unit) = {
 
-//        menuItem(MENU_ITEM_SETTINGS.action {
-//            navController.openSettings()
-//        })
-
         page(SearchPage())
 
         page(MainPage(), isStartPage = true)