2 Lab

2023-10-26 00:00:08 +04:00
19 changed files with 587 additions and 54 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -49,13 +49,17 @@ android {
 dependencies {

    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.activity:activity-compose:1.7.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.activity:activity-compose:1.7.2")
    implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    implementation("androidx.navigation:navigation-compose:2.6.0")
    implementation("androidx.compose.ui:ui")
    implementation("androidx.compose.ui:ui-graphics")
    implementation("androidx.compose.ui:ui-tooling-preview")
    implementation("androidx.compose.material3:material3")
+    implementation("io.coil-kt:coil-compose:2.2.2")
+    implementation("io.coil-kt:coil-svg:2.2.2")
+
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.1.5")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@ -63,4 +67,5 @@ dependencies {
    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
    debugImplementation("androidx.compose.ui:ui-tooling")
    debugImplementation("androidx.compose.ui:ui-test-manifest")
+
 }
--- a/app/src/main/java/com/example/myapplication/Dishes/Model/Dish.kt
+++ b/app/src/main/java/com/example/myapplication/Dishes/Model/Dish.kt
@ -0,0 +1,45 @@
+package com.example.myapplication.Dishes.Model
+
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import com.example.myapplication.R
+import com.example.myapplication.User.Model.User
+import com.example.myapplication.User.Model.firstUser
+import com.example.myapplication.User.Model.secondUser
+import java.io.Serializable
+data class Dish (
+    val name: String,
+    val description: Int,
+    val author: User,
+    val category: DishCategory,
+    val favorite: Boolean,
+    val image: Int?
+) : Serializable
+
+fun getAllDishes(): List<Dish> {
+    return listOf(
+        Dish("Pepperoni", R.string.lorem_ipsum,
+            firstUser, DishCategory.PIZZA, false,
+            R.drawable.pepperoni),
+        Dish("Pepperoni", R.string.lorem_ipsum,
+            secondUser, DishCategory.PIZZA, true,
+            R.drawable.pepperoni),
+        Dish("Sushi", R.string.lorem_ipsum, firstUser, DishCategory.CHICKEN, true, R.drawable.sushi),
+        Dish("Pepperoni", R.string.lorem_ipsum,
+            firstUser, DishCategory.PIZZA, false,
+            R.drawable.pepperoni),
+        Dish("Pepperoni", R.string.lorem_ipsum,
+            secondUser, DishCategory.PIZZA, true,
+            R.drawable.pepperoni),
+        Dish("Sushi", R.string.lorem_ipsum, secondUser, DishCategory.CHICKEN, true, R.drawable.sushi),
+        Dish("Pepperoni", R.string.lorem_ipsum,
+            firstUser, DishCategory.PIZZA, false,
+            R.drawable.pepperoni),
+        Dish("Pepperoni", R.string.lorem_ipsum,
+            secondUser, DishCategory.PIZZA, false,
+            R.drawable.pepperoni),
+        Dish("Sushi", R.string.lorem_ipsum, firstUser, DishCategory.CHICKEN, true, R.drawable.sushi)
+    )
+}
+
--- a/app/src/main/java/com/example/myapplication/Dishes/Model/DishCategory.kt
+++ b/app/src/main/java/com/example/myapplication/Dishes/Model/DishCategory.kt
@ -0,0 +1,26 @@
+package com.example.myapplication.Dishes.Model
+
+enum class DishCategory(
+    val value: String,
+) {
+    CHICKEN("Chicken"),
+    BEEF("Beef"),
+    SOUP("Soup"),
+    DESSERT("Dessert"),
+    VEGETARIAN("Vegetarian"),
+    MILK("Milk"),
+    VEGAN("Vegan"),
+    PIZZA("Pizza"),
+    DONUT("Donut");
+
+    companion object {
+        val allDishCategories = listOf(
+            CHICKEN, BEEF, SOUP, DESSERT, VEGETARIAN, MILK, VEGAN, PIZZA, DONUT
+        )
+
+        fun getDishCategory(value: String): DishCategory? {
+            val map = DishCategory.values().associateBy(DishCategory::value)
+            return map[value]
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/Dishes/ui/DishList.kt
+++ b/app/src/main/java/com/example/myapplication/Dishes/ui/DishList.kt
@ -0,0 +1,99 @@
+package com.example.myapplication.Dishes.ui
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.example.myapplication.Dishes.Model.getAllDishes
+import com.example.myapplication.R
+import com.example.myapplication.User.Model.User
+import com.example.myapplication.ui.navigation.Screen
+import com.example.myapplication.ui.theme.MyApplicationTheme
+import com.example.myapplication.ui.theme.textFont
+
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Composable
+fun DishList(navController: NavController?, onlyFavorites: Boolean = false, someUser: User? = null) {
+    Column(Modifier.padding(horizontal = 10.dp, vertical = 5.dp).verticalScroll(ScrollState(0))) {
+
+        Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+            Column {
+                var text = stringResource(R.string.all_dishes)
+                if (onlyFavorites) text = stringResource(id = R.string.favorite_dishes)
+                if (someUser != null) text = stringResource(id = R.string.user_dishes)
+                Text(text, fontFamily= textFont,
+                    fontSize=26.sp, textAlign = TextAlign.Start)
+            }
+        }
+            // TODO separate image with text
+        getAllDishes().filter { it.author == someUser || someUser == null }.forEachIndexed() {index, dish ->
+            if (onlyFavorites) {
+                if (!dish.favorite) return@forEachIndexed;
+            }
+            val dishId = Screen.DishView.route.replace("{id}", index.toString())
+            Row(
+                Modifier
+                    .padding(vertical = 5.dp)
+                    .clickable {
+                        navController?.navigate(dishId)
+                    }) {
+                if (dish.image != null) {
+                    Column() {
+                        Image(
+                            painter = painterResource(id = dish.image),
+                            contentDescription = "Dish Image",
+                            Modifier.width(150.dp)
+                        )
+                    }
+                }
+                Column {
+                    Text(dish.name, fontFamily=textFont,
+                        fontSize=15.sp, textAlign=TextAlign.Center )
+                    Text(
+                        stringResource(id = dish.description), fontFamily=textFont,
+                        fontSize = 12.sp,
+                        softWrap = true,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 3)
+                }
+            }
+        }
+    }
+}
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Preview
+@Composable
+fun ListDishes() {
+    MyApplicationTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            DishList(navController = null, onlyFavorites = false)
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/Dishes/ui/DishView.kt
+++ b/app/src/main/java/com/example/myapplication/Dishes/ui/DishView.kt
@ -0,0 +1,86 @@
+package com.example.myapplication.Dishes.ui
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.example.myapplication.Dishes.Model.getAllDishes
+import com.example.myapplication.ui.theme.MyApplicationTheme
+import com.example.myapplication.ui.theme.textFont
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Composable
+fun DishView(id: Int) {
+    val dish = getAllDishes()[id];
+    Column(
+        Modifier
+            .fillMaxWidth()
+            .padding(vertical = 5.dp, horizontal = 10.dp)
+            .verticalScroll(ScrollState(0))) {
+        if (dish.image != null) {
+            Row(Modifier.padding(vertical = 5.dp)) {
+                Image(
+                    painter = painterResource(id = dish.image),
+                    contentDescription = "Dish Image",
+                    Modifier.fillMaxWidth(),
+                )
+            }
+        }
+        Row(horizontalArrangement = Arrangement.SpaceAround, modifier = Modifier.fillMaxWidth()) {
+            Column {
+                Text(dish.name, fontFamily=textFont,
+                    fontSize=15.sp, textAlign = TextAlign.Start)
+            }
+            Column {
+                Text("@" + dish.author.nickname, fontFamily=textFont,
+                    fontSize=15.sp,  textAlign = TextAlign.End)
+            }
+        }
+        Row(horizontalArrangement = Arrangement.Center, modifier = Modifier
+            .fillMaxSize()
+            .padding(
+                horizontal = 30.dp, vertical = 10.dp
+            )) {
+            Text(
+                stringResource(id = dish.description), fontFamily=textFont,
+                fontSize = 13.sp,
+                softWrap = true,
+                overflow = TextOverflow.Ellipsis,
+                )
+        }
+    }
+}
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Preview
+@Composable
+fun DishPreview() {
+    MyApplicationTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            DishView(id = 0)
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/MainActivity.kt
+++ b/app/src/main/java/com/example/myapplication/MainActivity.kt
@ -1,43 +1,37 @@
 package com.example.myapplication

+import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.annotation.RequiresApi
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import com.example.myapplication.ui.navigation.MainNavbar
 import com.example.myapplication.ui.theme.MyApplicationTheme

 class MainActivity : ComponentActivity() {
+    @RequiresApi(Build.VERSION_CODES.Q)
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContent {
            MyApplicationTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
-                    Greeting("Android")
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    MainNavbar();
                }
            }
        }
    }
 }

-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-            text = "Hello $name!",
-            modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    MyApplicationTheme {
-        Greeting("Android")
-    }
-}
--- a/app/src/main/java/com/example/myapplication/User/Model/User.kt
+++ b/app/src/main/java/com/example/myapplication/User/Model/User.kt
@ -0,0 +1,20 @@
+package com.example.myapplication.User.Model
+
+import android.provider.ContactsContract.CommonDataKinds.Nickname
+import com.example.myapplication.Dishes.Model.Dish
+import com.example.myapplication.Dishes.Model.DishCategory
+import com.example.myapplication.R
+import java.io.Serializable
+data class User (
+    val nickname: String,
+    val email: String,
+    val password: String
+)
+
+val firstUser = User("UserNickname1", "UserEmail1", "UserPassword1")
+val secondUser = User("UserNickname2", "UserEmail2", "UserPassword2")
+fun getAllUsers(): List<User> {
+    return listOf(
+        firstUser, secondUser
+    )
+}
--- a/app/src/main/java/com/example/myapplication/User/ui/UserView.kt
+++ b/app/src/main/java/com/example/myapplication/User/ui/UserView.kt
@ -0,0 +1,62 @@
+package com.example.myapplication.User.ui
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.example.myapplication.Dishes.Model.getAllDishes
+import com.example.myapplication.Dishes.ui.DishList
+import com.example.myapplication.User.Model.getAllUsers
+import com.example.myapplication.ui.theme.MyApplicationTheme
+import com.example.myapplication.ui.theme.textFont
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Composable
+fun UserView(id: Int, navController: NavController?) {
+    val user = getAllUsers()[id];
+    Column(
+        Modifier
+            .fillMaxWidth()
+            .padding(vertical = 5.dp, horizontal = 10.dp)) {
+        Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+            Column {
+                Text(user.nickname, fontFamily= textFont,
+                    fontSize=26.sp, textAlign = TextAlign.Start)
+            }
+        }
+        Row(modifier = Modifier.fillMaxSize()) {
+            DishList(navController, someUser = user)
+        }
+    }
+}
+
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Preview
+@Composable
+fun UserPreview() {
+    MyApplicationTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            UserView(id = 0, null)
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/ui/components/Navbar.kt
+++ b/app/src/main/java/com/example/myapplication/ui/components/Navbar.kt
@ -0,0 +1,67 @@
+package com.example.myapplication.ui.components
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavHostController
+import com.example.myapplication.ui.navigation.Screen
+import com.example.myapplication.ui.theme.MyApplicationTheme
+
+@Composable
+fun Navbar(
+    navController: NavHostController?,
+    currentDestination: NavDestination?,
+    modifier: Modifier = Modifier
+) {
+    NavigationBar(modifier, containerColor = MaterialTheme.colorScheme.primary) {
+        Screen.navbarItems.forEach {screen ->
+            NavigationBarItem(
+                selected = currentDestination?.hierarchy?.any {it.route == screen.route} == true,
+                icon = {
+                    if (screen.icon != null) {
+                        Icon(screen.icon, contentDescription = null, modifier = Modifier.width(50.dp).height(50.dp))
+                    }
+                    else if (screen.icon_id != null){
+                        Icon(painter = painterResource(id = screen.icon_id), contentDescription = null,  modifier = Modifier.width(50.dp).height(50.dp))
+                    }
+                },
+                onClick = {
+                    navController?.navigate(screen.route) {
+                    popUpTo(navController.graph.findStartDestination().id) {
+                        saveState = false
+                    }
+                    launchSingleTop = true
+                    restoreState = true
+                } },
+            )
+        }
+    }
+}
+
+@Preview(name="Navbar")
+@Composable
+fun NavBarPreview() {
+    MyApplicationTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.primary
+        ) {
+            Navbar(navController = null, currentDestination = null)
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/ui/navigation/MainNavbar.kt
+++ b/app/src/main/java/com/example/myapplication/ui/navigation/MainNavbar.kt
@ -0,0 +1,84 @@
+package com.example.myapplication.ui.navigation
+
+import android.annotation.SuppressLint
+import android.content.res.Configuration
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import com.example.myapplication.Dishes.ui.DishList
+import com.example.myapplication.Dishes.ui.DishView
+import com.example.myapplication.User.ui.UserView
+import com.example.myapplication.ui.components.Navbar
+import com.example.myapplication.ui.theme.MyApplicationTheme
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Composable
+fun Navhost(
+    navController: NavHostController,
+    innerPadding: PaddingValues, modifier:
+    Modifier = Modifier
+) {
+    NavHost(
+        navController,
+        startDestination = Screen.AllDishes.route,
+        modifier.padding(innerPadding)
+    ) {
+        composable(Screen.AllDishes.route) { DishList(navController) }
+        composable(Screen.FavoriteDishes.route) { DishList(navController, true)}
+        composable(Screen.UserPage.route) {UserView(id = 0, navController = navController)} // TODO Remove hardcode
+
+        composable(Screen.DishView.route,
+            arguments = listOf(navArgument("id") { type = NavType.IntType })
+        ) { backStackEntry ->
+            backStackEntry.arguments?.let { DishView(it.getInt("id")) }
+        }
+    }
+}
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainNavbar() {
+    val navController = rememberNavController()
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentDestination = navBackStackEntry?.destination
+
+    Scaffold(
+        bottomBar = {
+            Navbar(navController, currentDestination, Modifier.background(MaterialTheme.colorScheme.primary))
+        }
+    ) { innerPadding ->
+            Navhost(navController, innerPadding)
+    }
+}
+
+@RequiresApi(Build.VERSION_CODES.Q)
+@Preview(name = "Dark Mode")
+@Composable
+fun MainNavbarPreview() {
+    MyApplicationTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            MainNavbar()
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/ui/navigation/Screen.kt
+++ b/app/src/main/java/com/example/myapplication/ui/navigation/Screen.kt
@ -0,0 +1,37 @@
+package com.example.myapplication.ui.navigation
+
+import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AccountCircle
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.List
+import androidx.compose.ui.graphics.vector.ImageVector
+import com.example.myapplication.R
+
+enum class Screen(
+    val route: String,
+    @StringRes val resourceId: Int,
+    val icon: ImageVector? = null,
+    val icon_id: Int? = null,
+
+) {
+    AllDishes("all-dishes", R.string.all_dishes, icon_id = R.drawable.cooking_book),
+    DishView("dish/{id}", R.string.all_dishes, icon=Icons.Filled.Info),
+    FavoriteDishes("favorite-dishes", R.string.favorite_dishes, icon=Icons.Filled.Favorite),
+    UserPage("user", R.string.account_title, icon=Icons.Filled.AccountCircle);
+
+
+    companion object {
+        val navbarItems = listOf(
+            FavoriteDishes,
+            AllDishes,
+            UserPage
+        )
+
+        fun getItem(route: String): Screen? {
+            val findRoute = route.split("/").first()
+            return values().find { value -> value.route.startsWith(findRoute) }
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/ui/theme/Color.kt
+++ b/app/src/main/java/com/example/myapplication/ui/theme/Color.kt
@ -2,10 +2,6 @@ package com.example.myapplication.ui.theme

 import androidx.compose.ui.graphics.Color

-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)

-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val GreyBackground = Color(0xFFE9DFDF);
+val SkinExtra = Color(0xFFE6CF94)
--- a/app/src/main/java/com/example/myapplication/ui/theme/Font.kt
+++ b/app/src/main/java/com/example/myapplication/ui/theme/Font.kt
@ -0,0 +1,13 @@
+package com.example.myapplication.ui.theme
+
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.ui.text.font.FontWeight
+import com.example.myapplication.R
+
+@RequiresApi(Build.VERSION_CODES.Q)
+val textFont = FontFamily(
+    Font(R.font.header1, FontWeight.Light),
+)
--- a/app/src/main/java/com/example/myapplication/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/myapplication/ui/theme/Theme.kt
@ -10,21 +10,15 @@ import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat

-private val DarkColorScheme = darkColorScheme(
-        primary = Purple80,
-        secondary = PurpleGrey80,
-        tertiary = Pink80
-)
-
 private val LightColorScheme = lightColorScheme(
-        primary = Purple40,
-        secondary = PurpleGrey40,
-        tertiary = Pink40
+        background = GreyBackground,
+        primary = SkinExtra

        /* Other default colors to override
    background = Color(0xFFFFFBFE),
@ -44,26 +38,9 @@ fun MyApplicationTheme(
        dynamicColor: Boolean = true,
        content: @Composable () -> Unit
 ) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }

    MaterialTheme(
-            colorScheme = colorScheme,
+            colorScheme = LightColorScheme,
            typography = Typography,
            content = content
    )
--- a/app/src/main/res/drawable/cooking_book.xml
+++ b/app/src/main/res/drawable/cooking_book.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M12,39h32V2H12C8.691,2 6,4.691 6,8v34.417C6,45.496 8.691,48 12,48h32v-2H12c-2.168,0 -4,-1.641 -4,-3.583C8,40.501 9.757,39 12,39zM36.709,31.706C36.514,31.902 36.257,32 36,32c-0.255,0 -0.511,-0.097 -0.705,-0.292l-6.523,-6.494l-1.76,1.76l-1.846,-1.879l3.153,-3.153l8.387,8.349C37.097,30.681 37.099,31.314 36.709,31.706zM16.286,10.007l7.733,7.781l-3.044,3.044L16.23,16C14.568,14.338 14.594,11.637 16.286,10.007zM14.329,30.293l13.024,-13.024c-0.034,-0.085 -0.083,-0.163 -0.107,-0.252c-0.399,-1.509 -0.322,-3.426 1.045,-4.777c2.031,-2.094 5.497,-2.989 6.998,-1.505c1.501,1.571 0.596,4.909 -1.435,6.916c-1.444,1.428 -3.298,1.545 -4.8,1.16c-0.104,-0.027 -0.196,-0.081 -0.294,-0.122L14.743,31.707C14.548,31.902 15.292,32 15.036,32s-0.512,-0.098 -0.707,-0.293C13.938,31.316 13.938,30.684 14.329,30.293z"
+      android:fillColor="#000000"/>
+</vector>
--- a/app/src/main/res/drawable/pepperoni.png
+++ b/app/src/main/res/drawable/pepperoni.png
--- a/app/src/main/res/drawable/sushi.png
+++ b/app/src/main/res/drawable/sushi.png
--- a/app/src/main/res/font/header1.ttf
+++ b/app/src/main/res/font/header1.ttf
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -1,3 +1,16 @@
 <resources>
-    <string name="app_name">My Application</string>
+    <string name="app_name">Food Warriors</string>
+    <string name="account_title">Account</string>
+    <string name="all_dishes">All Dishes</string>
+    <string name="favorite_dishes">Favorite Dishes</string>
+    <string name="user_dishes">User Dishes</string>
+    <string name="lorem_ipsum">
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam risus orci, ultrices at risus pulvinar, volutpat dapibus ex. Pellentesque vel efficitur libero. Vestibulum consequat, mauris nec vehicula tempus, risus libero dignissim purus, quis porttitor risus metus et erat. Maecenas cursus justo a augue euismod, sed faucibus tortor consectetur. Praesent vitae feugiat ipsum. Sed nulla lacus, varius sit amet libero vitae, ornare auctor enim. Proin molestie arcu sapien, eget accumsan magna dignissim sed. Sed elementum vel nisi vitae sollicitudin. Suspendisse sollicitudin fermentum leo quis fermentum. Aenean semper sem leo, in scelerisque mi eleifend vitae.
+Quisque efficitur, nunc vitae varius faucibus, turpis nunc ullamcorper neque, in semper nibh purus ac elit. Nulla dapibus sed sem eu fermentum. Mauris imperdiet sapien ut laoreet cursus. Fusce finibus augue et risus dignissim vehicula. Ut at mi fermentum, posuere nulla ornare, mollis neque. Quisque mattis accumsan odio at commodo. Nullam accumsan fermentum rhoncus. Donec ut sapien velit. Fusce id vulputate augue. Quisque faucibus dolor id leo feugiat feugiat.
+Donec molestie scelerisque sollicitudin. Duis orci felis, lacinia laoreet scelerisque sed, molestie sed ipsum. Duis auctor aliquet laoreet. Mauris vitae commodo nibh. Sed pulvinar metus lacus, a faucibus nulla ornare ultricies. Aliquam varius sem a nibh dapibus congue. Phasellus dignissim nibh diam. Etiam elit nulla, bibendum ac quam sed, dictum condimentum ligula.
+Phasellus eget ex sed tortor placerat suscipit quis quis magna. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean mi quam, auctor quis ante nec, condimentum maximus justo. Morbi varius est massa. Integer nec semper mi. Fusce nisl neque, mollis quis tempus eget, vulputate vitae sem. Donec sit amet maximus augue. Quisque sit amet ante fermentum, bibendum mi ut, porta eros. Phasellus ultrices, augue a fringilla accumsan, elit arcu vehicula lectus, condimentum malesuada lectus enim nec tellus. Nunc ante erat, convallis a dui vitae, rhoncus rhoncus metus. Suspendisse in sapien odio.
+Cras semper magna id libero gravida, at varius elit molestie. Quisque ullamcorper nisi tincidunt, feugiat justo nec, aliquam massa. Quisque sit amet quam semper, pretium justo non, tincidunt lorem. Proin rhoncus turpis orci, efficitur dignissim ex sollicitudin eget. Etiam porttitor est eget erat pellentesque, ut maximus mi dictum. Pellentesque ac mauris non eros mollis pharetra et eu augue. Nam a bibendum ipsum, vel pellentesque nisi. Nam gravida dolor sed risus ornare dignissim. Praesent semper, tellus sed posuere efficitur, neque justo efficitur dui, et mollis leo ex in quam. Fusce pulvinar turpis a justo pretium semper. Integer dapibus, risus vel facilisis porttitor, eros sapien venenatis risus, eget aliquet lectus ipsum a orci. Ut at arcu a augue varius gravida non sit amet quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nullam eget enim eu mauris rutrum pulvinar.
+
+
+    </string>
 </resources>