diff --git a/docs/laborok/04-android-ui-fragments/assets/datepicker.png b/docs/laborok/04-android-ui-fragments/assets/datepicker.png index e9516de..24a1070 100644 Binary files a/docs/laborok/04-android-ui-fragments/assets/datepicker.png and b/docs/laborok/04-android-ui-fragments/assets/datepicker.png differ diff --git a/docs/laborok/04-android-ui-fragments/assets/holiday1.png b/docs/laborok/04-android-ui-fragments/assets/holiday1.png index 9fb4321..7d870d1 100644 Binary files a/docs/laborok/04-android-ui-fragments/assets/holiday1.png and b/docs/laborok/04-android-ui-fragments/assets/holiday1.png differ diff --git a/docs/laborok/04-android-ui-fragments/assets/menu.png b/docs/laborok/04-android-ui-fragments/assets/menu.png index 9602689..1c0b91a 100644 Binary files a/docs/laborok/04-android-ui-fragments/assets/menu.png and b/docs/laborok/04-android-ui-fragments/assets/menu.png differ diff --git a/docs/laborok/04-android-ui-fragments/assets/profile1.png b/docs/laborok/04-android-ui-fragments/assets/profile1.png index bbb3b6b..6c4952b 100644 Binary files a/docs/laborok/04-android-ui-fragments/assets/profile1.png and b/docs/laborok/04-android-ui-fragments/assets/profile1.png differ diff --git a/docs/laborok/04-android-ui-fragments/assets/profile2.png b/docs/laborok/04-android-ui-fragments/assets/profile2.png index 3a9336c..a4ae0ab 100644 Binary files a/docs/laborok/04-android-ui-fragments/assets/profile2.png and b/docs/laborok/04-android-ui-fragments/assets/profile2.png differ diff --git a/docs/laborok/04-android-ui-fragments/index.md b/docs/laborok/04-android-ui-fragments/index.md index 895db64..3cf6958 100644 --- a/docs/laborok/04-android-ui-fragments/index.md +++ b/docs/laborok/04-android-ui-fragments/index.md @@ -133,13 +133,7 @@ class MainActivity : ComponentActivity() { enableEdgeToEdge() setContent { WorkplaceAppTheme { - Scaffold( - modifier = Modifier.fillMaxSize(), - topBar = { TopBar() } - ) - { innerPadding -> - NavGraph(innerPadding) - } + NavGraph() } } } @@ -183,7 +177,7 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) enableEdgeToEdge() setContent { - WorkplaceAppFinalTestTheme { + WorkplaceAppTheme { NavGraph() } } @@ -364,16 +358,22 @@ fun NavGraph( ){ ... composable("profile"){ - ProfileScreen(modifier = Modifier.padding(paddingValues)) + ProfileScreen() } composable("holiday"){ - HolidayScreen(modifier = Modifier.padding(paddingValues)) + HolidayScreen() + } + composable("cafeteria"){ + /*TODO*/ } } } ``` +!!!note "Cafeteria" + A Cafeteria képernyőre navigációt előre beírtuk, hogy a labor végén a gombra való kattintásnál ne crasheljen az alkalmazás. Ezt a funkciót mindenki tudja otthon módosítani gyakorlás képpen. + Indítsuk el az alkalmazást. Mostmár a felső két gombnak működnie kellene. !!!example "BEADANDÓ (1 pont)"