diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100644 index 0000000..d8e9561 --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ 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 539afe0..107004a 100644 --- a/app/src/main/java/com/f1rq/lifemap/MainActivity.kt +++ b/app/src/main/java/com/f1rq/lifemap/MainActivity.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import com.f1rq.lifemap.ui.theme.LifeMapTheme +import com.f1rq.lifemap.navigationbar.NavigationBar class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -20,9 +21,9 @@ class MainActivity : ComponentActivity() { setContent { LifeMapTheme { Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> - Greeting( - name = "Android", - modifier = Modifier.padding(innerPadding) + NavigationBar( + modifier = Modifier + .fillMaxSize() ) } } @@ -42,6 +43,8 @@ fun Greeting(name: String, modifier: Modifier = Modifier) { @Composable fun GreetingPreview() { LifeMapTheme { - Greeting("Android") + NavigationBar( + modifier = Modifier.fillMaxSize() + ) } } \ No newline at end of file diff --git a/app/src/main/ui-packages/navigation_bar/vector.svg b/app/src/main/ui-packages/navigation_bar/vector.svg index cc73ebd..37019c9 100644 --- a/app/src/main/ui-packages/navigation_bar/vector.svg +++ b/app/src/main/ui-packages/navigation_bar/vector.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/src/main/ui-packages/navigation_bar/vector1.svg b/app/src/main/ui-packages/navigation_bar/vector1.svg index 4c4782e..3045b34 100644 --- a/app/src/main/ui-packages/navigation_bar/vector1.svg +++ b/app/src/main/ui-packages/navigation_bar/vector1.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file