feat: Menu

app/src/main/java/com/loryblu/loryblu/navigation/NavGraph.kt

@@ -1,6 +1,7 @@
 package com.loryblu.loryblu.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.loryblu.core.util.Screen
@@ -11,10 +12,12 @@ import com.loryblu.feature.auth.register.navigation.registerChildRoute
 import com.loryblu.feature.auth.register.navigation.registerGuardianRoute
 import com.loryblu.feature.auth.register.navigation.registrationConfirmedRoute
 import com.loryblu.feature.logbook.navigation.logbookNavigation
+import com.loryblu.loryblu.R
 import com.odisby.feature.dashboard.navigation.dashboardRoute
 
 @Composable
 fun SetupNavGraph(startDestination: String, navController: NavHostController) {
+    val context = LocalContext.current
     NavHost(
         startDestination = startDestination,
         navController = navController
@@ -64,6 +67,26 @@ fun SetupNavGraph(startDestination: String, navController: NavHostController) {
         dashboardRoute(
             navigateToLogbook = {
                 navController.navigate(Screen.Logbook.route)
+            },
+            navigateToLogin = {
+                navController.popBackStack()
+                navController.navigate(Screen.Login.route)
+            },
+            navigateToFaq = {
+                navController.navigate(
+                    Screen.WebViewScreen.editRoute(
+                        url = " https://drive.google.com/file/d/1AZMx5-b1mLGPs041Zok6X2blpjIkZ2vs/view",
+                        title = context.getString(R.string.faq_title),
+                    )
+                )
+            },
+            navigateToTerms = {
+                navController.navigate(
+                    Screen.WebViewScreen.editRoute(
+                        url = "https://drive.google.com/file/d/1A1WIDpEiSVI9Ep5oA9YMSA-JWC2O8q4M/view",
+                        title = context.getString(R.string.terms_title),
+                    )
+                )
             }
         )
         logbookNavigation(

app/src/main/res/values-en/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="faq_title">Frequently Asked Questions</string>
+    <string name="terms_title">Privacy Policy</string>
+</resources>

app/src/main/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="faq_title" translatable="false">Perguntas Frequentes</string>
+    <string name="terms_title" translatable="false">Termo e Privacidade</string>
+</resources>

core/network/src/main/java/com/loryblu/core/network/di/UserSession.kt

@@ -21,6 +21,7 @@ class UserSession(
 
     private var childIdCache: Int = 0
     private var childNameCache: String = ""
+    private var parentNameCache: String = ""
 
     suspend fun saveToken(loginToken: String) {
         dataStore.edit {
@@ -37,15 +38,20 @@ class UserSession(
         }
     }
 
-    fun saveChild(childId: Int, childName: String) {
+    fun saveChild(childId: Int, childName: String, parentName: String) {
         childIdCache = childId
         childNameCache = childName
+        parentNameCache = parentName
     }
 
     fun getChildName(): String {
         return childNameCache
     }
 
+    fun getParentName(): String {
+        return parentNameCache
+    }
+
     fun getToken(): String {
         var response: String
         runBlocking {
@@ -58,4 +64,4 @@ class UserSession(
     fun getChildId(): Int {
         return childIdCache
     }
-}
+}

core/ui/src/main/java/com/loryblu/core/ui/components/LBCard.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.loryblu.core.ui.components.extensions.loryShadow
 import com.loryblu.core.ui.theme.LBAfternoonBlue
 import com.loryblu.core.ui.theme.LBBottomDisabledColor
 import com.loryblu.core.ui.theme.LBBottomHome
@@ -63,14 +64,25 @@ fun LBCardDashboard(
         colors = CardDefaults.cardColors(
             containerColor = contentColor,
         ),
-        border = BorderStroke(4.dp, borderColor),
+        border = if(card.isDisabled) {
+            CardDefaults.outlinedCardBorder()
+        } else {
+            BorderStroke(4.dp, borderColor)
+        },
         modifier = modifier
             .clickable {
                 if (!card.isDisabled) {
                     onclick()
                 }
-            }
-            .alpha(saturation),
+            }.then(if (card.isDisabled.not()) {
+                Modifier.loryShadow(
+                    offsetX = 1.dp,
+                    offsetY = 5.dp,
+                    cornerRadius = 8.dp,
+                )
+            } else {
+                Modifier
+            }).alpha(saturation),
         shape = RoundedCornerShape(rounded),
     ) {
         Column(
@@ -102,7 +114,7 @@ fun LBCardDashboard(
             Text(
                 text = stringResource(id = card.text),
                 style = TextStyle(
-                    fontSize = 20.sp,
+                    fontSize = 26.sp,
                     lineHeight = 24.sp,
                     fontWeight = FontWeight(500),
                     color = Color.White,
@@ -169,7 +181,7 @@ fun LBCategoryCard(
             Text(
                 text = stringResource(id = card.text),
                 style = TextStyle(
-                    fontSize = 20.sp,
+                    fontSize = 26.sp,
                     lineHeight = 24.sp,
                     fontWeight = FontWeight(500),
                     color = Color.White,
@@ -385,7 +397,7 @@ fun LBCardShift(
 fun LBDashboardCardPreview() {
     LoryBluTheme {
         LBCardDashboard(
-            getAllDashboardItems()[0],
+            getAllDashboardItems().first(),
             modifier = Modifier.size(250.dp),
             onclick = {}
         )
@@ -397,7 +409,7 @@ fun LBDashboardCardPreview() {
 fun LBLogbookCardPreview() {
     LoryBluTheme {
         LBCategoryCard(
-            CategoryItem.getAllCategory()[0],
+            CategoryItem.getAllCategory().first(),
             modifier = Modifier.size(250.dp),
             selected = true,
             onclick = {}
@@ -410,7 +422,7 @@ fun LBLogbookCardPreview() {
 fun LBShiftCardPreview() {
     LoryBluTheme {
         LBCardShift(
-            ShiftItem.getShiftItems()[0],
+            ShiftItem.getShiftItems().first(),
             modifier = Modifier.size(250.dp),
             clicked = false,
             onclick = {}

core/ui/src/main/java/com/loryblu/core/ui/components/LBErrorDialogButton.kt

@@ -0,0 +1,50 @@
+package com.loryblu.core.ui.components
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.loryblu.core.ui.R
+import com.loryblu.core.ui.theme.LBErrorColor
+
+@Composable
+fun LBNegativeDialogButton(
+    @StringRes textRes: Int,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        colors = ButtonDefaults.buttonColors(
+            contentColor = LBErrorColor,
+            containerColor = Color.Transparent
+        ),
+        shape = RoundedCornerShape(8.dp),
+        border = BorderStroke(
+            width = 1.dp,
+            color = LBErrorColor
+        ),
+        modifier = modifier.size(96.dp, 35.dp)
+    ) {
+        Text(text = stringResource(id = textRes), fontSize = 17.sp)
+    }
+}
+
+@Preview
+@Composable
+fun LBNegativeDialogButtonPreview() {
+    LBNegativeDialogButton(
+        textRes = R.string.cancel,
+        onClick = { }
+    )
+}

core/ui/src/main/java/com/loryblu/core/ui/components/LBTransparentButton.kt

@@ -0,0 +1,32 @@
+package com.loryblu.core.ui.components
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun LBTransparentButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    @StringRes textRes: Int
+) {
+    TextButton(
+        onClick = onClick,
+        colors = ButtonDefaults.buttonColors(
+            contentColor = MaterialTheme.colorScheme.onSurface,
+            containerColor = Color.Transparent
+        ),
+        modifier = modifier.size(96.dp, 35.dp)
+    ) {
+        Text(text = stringResource(id = textRes), fontSize = 17.sp)
+    }
+}

core/ui/src/main/java/com/loryblu/core/ui/components/extensions/ModifierExtensions.kt

@@ -0,0 +1,27 @@
+package com.loryblu.core.ui.components.extensions
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+fun Modifier.loryShadow(
+    offsetX: Dp = 0.dp,
+    offsetY: Dp = 0.dp,
+    shadowColor: Color = Color.Black.copy(alpha = 0.2f),
+    cornerRadius: Dp = 0.dp,
+    alpha: Float = 0.7f,
+): Modifier {
+    return this.drawBehind {
+        drawRoundRect(
+            color = shadowColor,
+            topLeft = Offset(x = offsetX.toPx(), y = offsetY.toPx()),
+            size = size,
+            cornerRadius = CornerRadius(cornerRadius.toPx(), cornerRadius.toPx()),
+            alpha = alpha,
+        )
+    }
+}

core/ui/src/main/java/com/loryblu/core/ui/theme/Color.kt

@@ -13,6 +13,7 @@ val LBShadowGray = Color(0xff0F1326)
 val LBMediumGray = Color(0xff616161)
 val LBSmokeGray = Color(0xff49454F)
 val LBErrorColor = Color(0xffD62C2C)
+val LBLightPink = Color(0xffffD3D3)
 val LBLoadingBackground = Color(0xA6808080)
 
 // Card Colors

core/ui/src/main/java/com/loryblu/core/ui/theme/Type.kt

@@ -2,9 +2,11 @@ package com.loryblu.core.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
+import com.loryblu.core.ui.R
 
 // Set of Material typography styles to start with
 val Typography = Typography(
@@ -31,4 +33,9 @@ val Typography = Typography(
         letterSpacing = 0.5.sp
     )
     */
+)
+
+val inter = FontFamily(
+    Font(R.font.inter_regular, weight = FontWeight.Normal),
+    Font(R.font.inter_bold, weight = FontWeight.Bold),
 )

core/util/src/main/java/com/loryblu/core/util/Screen.kt

@@ -29,5 +29,11 @@ sealed class Screen(val route: String) {
     data object EditTaskSummaryScreen: Screen(route = "edit_task_summary_screen/{TASK_ID}") {
         fun editRoute(taskId: Int) = "edit_task_summary_screen/$taskId"
     }
+
+    // WebView
+    data object WebViewScreen: Screen(route = "web_view_screen?url={URL}&title={TITLE}") {
+        fun editRoute(url: String, title: String) = "web_view_screen?url=$url&title=$title"
+    }
+
     data object EditionConfirmedScreen: Screen(route = "edition_confirmed_screen")
 }

data/auth/src/main/java/com/loryblu/data/auth/api/LoginApiImpl.kt

@@ -35,6 +35,7 @@ internal class LoginApiImpl(
 
     private fun handleErrorResponse(httpStatusCode: HttpStatusCode): SignInResult {
         println("Error: ${httpStatusCode.description}")
-        return SignInResult.Error("Estamos com alguns problemas. Tente novamente mais tarde!")
+        // TODO: pass it to a string resources
+        return SignInResult.Error("Servidor indisponível. Tente novamente mais tarde.")
     }
 }

data/dashboard/src/main/java/com/odisby/data/dashboard/local/DashboardItems.kt

@@ -22,10 +22,18 @@ class GameTrack: DashboardItem(
     isDisabled = true
 )
 
+class MusicTrack: DashboardItem(
+    idCard = 3,
+    text = R.string.music_track,
+    drawable = R.drawable.music_track,
+    isDisabled = true
+)
+
 fun getAllDashboardItems(): List<DashboardItem>{
     return listOf(
         Logbook(),
         StoryTrack(),
-        GameTrack()
+        GameTrack(),
+        MusicTrack(),
     )
 }

data/dashboard/src/main/res/values-pt-rBR/strings.xml

@@ -3,6 +3,7 @@
     <string name="logbook">Diário de bordo</string>
     <string name="game_track">Trilha de jogos</string>
     <string name="story_track">Trilha de histórias</string>
+    <string name="music_track">Trilha de música</string>
     <string name="logout">SAIR</string>
     <string name="welcome">Bem-Vindo</string>
 </resources>

data/dashboard/src/main/res/values/strings.xml

@@ -2,6 +2,7 @@
     <string name="logbook">Logbook</string>
     <string name="game_track">Game track</string>
     <string name="story_track">Story track</string>
+    <string name="music_track">Music track</string>
     <string name="logout">LOGOUT</string>
     <string name="welcome">Welcome</string>
 </resources>

feature/auth/login/src/main/java/com/loryblu/feature/auth/login/LoginScreen.kt

@@ -79,7 +79,7 @@ fun LoginScreen(
     var passwordState by rememberSaveable { mutableStateOf<PasswordInputValid>(PasswordInputValid.Empty) }
     var emailState by rememberSaveable { mutableStateOf<EmailInputValid>(EmailInputValid.Empty) }
     var showApiErrors by remember { mutableStateOf(false) }
-    var apiErrorMessage by rememberSaveable { mutableStateOf<String>("") }
+    var apiErrorMessage by rememberSaveable { mutableStateOf("") }
     var rememberButtonChecked by rememberSaveable { mutableStateOf(false) }
 
     val showEmailApiError by remember { mutableStateOf(false) }