diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/MainActivity.kt b/app/src/main/java/com/f1rq/lifemap/MainActivity.kt index 0997da2..24c1d7c 100644 --- a/app/src/main/java/com/f1rq/lifemap/MainActivity.kt +++ b/app/src/main/java/com/f1rq/lifemap/MainActivity.kt @@ -10,11 +10,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.f1rq.lifemap.navigationbar.NavigationBar import com.f1rq.lifemap.screens.ListView import com.f1rq.lifemap.screens.MapView import com.f1rq.lifemap.ui.theme.LifeMapTheme +import com.f1rq.lifemap.ui.theme.ActiveNavColor +import com.f1rq.lifemap.ui.theme.InactiveNavColor class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -24,7 +27,17 @@ class MainActivity : ComponentActivity() { val navController = rememberNavController() Scaffold( - bottomBar = { NavigationBar(navController) } + bottomBar = { + val navBackStackEntry = navController.currentBackStackEntryAsState() + val currentRoute = navBackStackEntry.value?.destination?.route + + NavigationBar( + onWorldViewTapped = { navController.navigate("mapview") }, + onListViewTapped = { navController.navigate("listview") }, + worldViewBackgroundColor = if (currentRoute == "mapview") ActiveNavColor else InactiveNavColor, + listViewBackgroundColor = if (currentRoute == "listview") ActiveNavColor else InactiveNavColor + ) + } ) { innerPadding -> NavHost( navController = navController, @@ -44,7 +57,9 @@ class MainActivity : ComponentActivity() { @Composable fun GreetingPreview() { LifeMapTheme { - val previewNavController = rememberNavController() - NavigationBar(navController = previewNavController) + NavigationBar( + onWorldViewTapped = {}, + onListViewTapped = {} + ) } } \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/NavBarHandler.kt b/app/src/main/java/com/f1rq/lifemap/NavBarHandler.kt deleted file mode 100644 index 4d0140c..0000000 --- a/app/src/main/java/com/f1rq/lifemap/NavBarHandler.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.f1rq.lifemap - -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.navigation.NavHostController -import com.f1rq.lifemap.navigationbar.NavigationBar -import androidx.navigation.compose.currentBackStackEntryAsState -import androidx.compose.runtime.getValue - - -@Composable -fun NavBarHandler(navController: NavHostController) { - val currentRoute = currentRoute(navController) - - NavigationBar( - modifier = Modifier, - onWorldViewTapped = { - if (currentRoute != "mapview") navController.navigate("mapview") - }, - onListViewTapped = { - if (currentRoute != "listview") navController.navigate("listview") - }, - //homeState = if (currentRoute == "home") "active" else "inactive", - //settingsState = if (currentRoute == "settings") "active" else "inactive", - ) -} - -@Composable -private fun currentRoute(navController: NavHostController): String? { - val navBackStackEntry by navController.currentBackStackEntryAsState() - return navBackStackEntry?.destination?.route -} \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/screens/ListView.kt b/app/src/main/java/com/f1rq/lifemap/screens/ListView.kt index 44b2b45..e3d1513 100644 --- a/app/src/main/java/com/f1rq/lifemap/screens/ListView.kt +++ b/app/src/main/java/com/f1rq/lifemap/screens/ListView.kt @@ -13,6 +13,6 @@ fun ListView(modifier: Modifier = Modifier) { modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center ) { - Text("Settings Screen") + Text("List view") } } \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/screens/MapView.kt b/app/src/main/java/com/f1rq/lifemap/screens/MapView.kt index faa18eb..343bd02 100644 --- a/app/src/main/java/com/f1rq/lifemap/screens/MapView.kt +++ b/app/src/main/java/com/f1rq/lifemap/screens/MapView.kt @@ -13,6 +13,6 @@ fun MapView(modifier: Modifier = Modifier) { modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center ) { - Text("Home Screen") + Text("Map view") } } \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/ui/theme/Color.kt b/app/src/main/java/com/f1rq/lifemap/ui/theme/Color.kt index 39b5d57..34b0e2f 100644 --- a/app/src/main/java/com/f1rq/lifemap/ui/theme/Color.kt +++ b/app/src/main/java/com/f1rq/lifemap/ui/theme/Color.kt @@ -8,4 +8,7 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val Pink40 = Color(0xFF7D5260) + +val ActiveNavColor = Color(0xFFDDDDDD) +val InactiveNavColor = Color.Transparent \ No newline at end of file diff --git a/app/src/main/ui-packages/navigation_bar/navigation_bar.json b/app/src/main/ui-packages/navigation_bar/navigation_bar.json index 2ea1775..733df75 100644 --- a/app/src/main/ui-packages/navigation_bar/navigation_bar.json +++ b/app/src/main/ui-packages/navigation_bar/navigation_bar.json @@ -5,7 +5,7 @@ "type": "figma", "file": "7RzB5mC9Qj82hGEbAM11GM", "node": "38:3", - "version": "2204970891916878617", + "version": "2205486309991144776", "component-id": "915162a5cdf4f7f91ace42d239b4d1faf0d5c6e7" }, "default": "Navigation bar", @@ -110,7 +110,6 @@ "icon-container" ], "item-spacing": 4.0, - "background-color": "$world view background color", "clip-content": false }, { @@ -133,7 +132,6 @@ "icon-container1" ], "item-spacing": 4.0, - "background-color": "$list view background color", "clip-content": false }, { @@ -149,13 +147,7 @@ }, "children": [ "state-layer" - ], - "background-color": { - "alpha": 1.0, - "hue": 0.0, - "saturation": 0.0, - "value": 1.0 - } + ] }, { "id": "state-layer", @@ -179,12 +171,7 @@ "children": [ "Frame" ], - "background-color": { - "alpha": 1.0, - "hue": 0.0, - "saturation": 0.0, - "value": 0.8666666666666667 - }, + "background-color": "$world view background color", "clip-content": false }, { @@ -256,6 +243,7 @@ "children": [ "Frame1" ], + "background-color": "$list view background color", "clip-content": false }, { @@ -300,23 +288,23 @@ } }, "parameters": { - "world view background color": { - "data-type": "color", - "required": false, - "description": "" - }, "on world view tapped": { "data-type": "void-callback", "required": false, "description": "" }, - "list view background color": { + "on list view tapped": { + "data-type": "void-callback", + "required": false, + "description": "" + }, + "world view background color": { "data-type": "color", "required": false, "description": "" }, - "on list view tapped": { - "data-type": "void-callback", + "list view background color": { + "data-type": "color", "required": false, "description": "" } @@ -327,6 +315,14 @@ "size": { "width": 375.0, "height": 76.0 + }, + "parameters": { + "world view background color": { + "alpha": 1.0, + "hue": 0.0, + "saturation": 0.0, + "value": 0.8666666666666667 + } } } ],