Skip to content

GitLab

Commit 14315e1c authored by Vinicius Monteiro's avatar Vinicius Monteiro
Browse files
Options

alterando icones, alterando navegação carregamento para tela de inicio atraves do botao

parent ffbc0e35
Hide whitespace changes
Inline Side-by-side
Showing with 301 additions and 25 deletions
app/build.gradle.kts
View file @ 14315e1c
......@@ -60,6 +60,7 @@ dependencies {
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
implementation("androidx.navigation:navigation-compose:2.7.7")
implementation("androidx.navigation:navigation-runtime-ktx:2.7.7")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
......
app/src/main/java/com/br/fechadura/mobile/ui/screens/CarregamentoScreen.kt
View file @ 14315e1c
......@@ -5,6 +5,8 @@ import android.os.Looper
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.*
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
......@@ -19,27 +21,14 @@ import androidx.compose.ui.unit.sp
import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.br.fechadura.mobile.R
import com.br.fechadura.mobile.ui.theme.BotaoAcesso
import com.br.fechadura.mobile.ui.theme.FechaduraColor
import com.br.fechadura.mobile.ui.theme.FechaduraMobileTheme
import com.br.fechadura.mobile.ui.theme.Purple40
@Composable
fun CarregamentoScreen(navController: NavController) {
var navigateToNextScreen by remember { mutableStateOf(false) }
// atraso para navegação automática
LaunchedEffect(Unit) {
Handler(Looper.getMainLooper()).postDelayed({
navigateToNextScreen = true
}, 2000) // 2 segundos de atraso
}
// Navegar para a tela inicial
if (navigateToNextScreen) {
navController.navigate("inicio") {
popUpTo("carregamento") { inclusive = true }
}
}
Surface(
modifier = Modifier.fillMaxSize(),
color = FechaduraColor
......@@ -59,12 +48,15 @@ fun CarregamentoScreen(navController: NavController) {
Spacer(modifier = Modifier.height(40.dp))
Button(
onClick = { navController.navigate("") }, //colocar a tela que vem depois do carregamento que é o login
onClick = { navController.navigate("inicio") }, //colocar a tela que vem depois do carregamento que é o login
modifier = Modifier
.padding(16.dp)
.height(50.dp)
.width(250.dp),
shape = MaterialTheme.shapes.large
shape = MaterialTheme.shapes.large,
colors = ButtonDefaults.buttonColors(
containerColor = BotaoAcesso
)
) {
Text(
text = "Acessar a minha conta",
......
app/src/main/java/com/br/fechadura/mobile/ui/screens/GrupoPortaScreen.kt
View file @ 14315e1c
......@@ -8,10 +8,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
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.NavController
import androidx.navigation.compose.rememberNavController
import com.br.fechadura.mobile.R
import com.br.fechadura.mobile.ui.theme.FechaduraMobileTheme
@OptIn(ExperimentalMaterial3Api::class)
......@@ -33,6 +35,63 @@ fun GrupoPortaScreen(navController: NavController) {
}
}
)
},
bottomBar = {
BottomAppBar(
containerColor = Color.White,
contentColor = Color.Black
) {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
IconButton(
onClick = { navController.navigate("inicio") }
) {
Icon(
painter = painterResource(id = R.drawable.home48),
contentDescription = "Home",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.user48),
contentDescription = "Usuário",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.usergroup48),
contentDescription = "Grupo de Usuários",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("porta") }
) {
Icon(
painter = painterResource(id = R.drawable.door),
contentDescription = "Portas",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_porta") }
) {
Icon(
painter = painterResource(id = R.drawable.doorgroup),
contentDescription = "Grupo de Portas",
modifier = Modifier.size(40.dp)
)
}
}
}
}
) { innerPadding ->
Column(
......
app/src/main/java/com/br/fechadura/mobile/ui/screens/GrupoUsuarioScreen.kt
View file @ 14315e1c
......@@ -8,10 +8,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
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.NavController
import androidx.navigation.compose.rememberNavController
import com.br.fechadura.mobile.R
import com.br.fechadura.mobile.ui.theme.FechaduraMobileTheme
@OptIn(ExperimentalMaterial3Api::class)
......@@ -33,6 +35,63 @@ fun GrupoUsuarioScreen(navController: NavController) {
}
}
)
},
bottomBar = {
BottomAppBar(
containerColor = Color.White,
contentColor = Color.Black
) {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
IconButton(
onClick = { navController.navigate("inicio") }
) {
Icon(
painter = painterResource(id = R.drawable.home48),
contentDescription = "Home",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.user48),
contentDescription = "Usuário",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.usergroup48),
contentDescription = "Grupo de Usuários",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("porta") }
) {
Icon(
painter = painterResource(id = R.drawable.door),
contentDescription = "Portas",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_porta") }
) {
Icon(
painter = painterResource(id = R.drawable.doorgroup),
contentDescription = "Grupo de Portas",
modifier = Modifier.size(40.dp)
)
}
}
}
}
) { innerPadding ->
Column(
......
app/src/main/java/com/br/fechadura/mobile/ui/screens/InicioScreen.kt
View file @ 14315e1c
......@@ -29,7 +29,7 @@ fun InicioScreen(navController: NavController) {
containerColor = Color.White
),
navigationIcon = {
IconButton(onClick = { }) {
IconButton(onClick = { navController.navigate("carregamento") }) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = "Voltar"
......@@ -56,7 +56,7 @@ fun InicioScreen(navController: NavController) {
onClick = { navController.navigate("inicio") }
) {
Icon(
painter = painterResource(id = R.drawable.home),
painter = painterResource(id = R.drawable.home48),
contentDescription = "Home",
modifier = Modifier.size(40.dp)
)
......@@ -65,7 +65,7 @@ fun InicioScreen(navController: NavController) {
onClick = { navController.navigate("usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.person),
painter = painterResource(id = R.drawable.user48),
contentDescription = "Usuário",
modifier = Modifier.size(40.dp)
)
......@@ -74,7 +74,7 @@ fun InicioScreen(navController: NavController) {
onClick = { navController.navigate("grupo_usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.grupos),
painter = painterResource(id = R.drawable.usergroup48),
contentDescription = "Grupo de Usuários",
modifier = Modifier.size(40.dp)
)
......@@ -83,7 +83,7 @@ fun InicioScreen(navController: NavController) {
onClick = { navController.navigate("porta") }
) {
Icon(
painter = painterResource(id = R.drawable.portas),
painter = painterResource(id = R.drawable.door),
contentDescription = "Portas",
modifier = Modifier.size(40.dp)
)
......@@ -92,7 +92,7 @@ fun InicioScreen(navController: NavController) {
onClick = { navController.navigate("grupo_porta") }
) {
Icon(
painter = painterResource(id = R.drawable.grupoportas),
painter = painterResource(id = R.drawable.doorgroup),
contentDescription = "Grupo de Portas",
modifier = Modifier.size(40.dp)
)
......
app/src/main/java/com/br/fechadura/mobile/ui/screens/PortaScreen.kt
View file @ 14315e1c
......@@ -8,10 +8,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
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.NavController
import androidx.navigation.compose.rememberNavController
import com.br.fechadura.mobile.R
import com.br.fechadura.mobile.ui.theme.FechaduraMobileTheme
@OptIn(ExperimentalMaterial3Api::class)
......@@ -33,6 +35,63 @@ fun PortaScreen(navController: NavController) {
}
}
)
},
bottomBar = {
BottomAppBar(
containerColor = Color.White,
contentColor = Color.Black
) {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
IconButton(
onClick = { navController.navigate("inicio") }
) {
Icon(
painter = painterResource(id = R.drawable.home48),
contentDescription = "Home",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.user48),
contentDescription = "Usuário",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.usergroup48),
contentDescription = "Grupo de Usuários",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("porta") }
) {
Icon(
painter = painterResource(id = R.drawable.door),
contentDescription = "Portas",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_porta") }
) {
Icon(
painter = painterResource(id = R.drawable.doorgroup),
contentDescription = "Grupo de Portas",
modifier = Modifier.size(40.dp)
)
}
}
}
}
) { innerPadding ->
Column(
......
app/src/main/java/com/br/fechadura/mobile/ui/screens/UsuarioScreen.kt
View file @ 14315e1c
......@@ -8,10 +8,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
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.NavController
import androidx.navigation.compose.rememberNavController
import com.br.fechadura.mobile.R
import com.br.fechadura.mobile.ui.theme.FechaduraMobileTheme
@OptIn(ExperimentalMaterial3Api::class)
......@@ -33,6 +35,63 @@ fun UsuarioScreen(navController: NavController) {
}
}
)
},
bottomBar = {
BottomAppBar(
containerColor = Color.White,
contentColor = Color.Black
) {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
IconButton(
onClick = { navController.navigate("inicio") }
) {
Icon(
painter = painterResource(id = R.drawable.home48),
contentDescription = "Home",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.user48),
contentDescription = "Usuário",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_usuario") }
) {
Icon(
painter = painterResource(id = R.drawable.usergroup48),
contentDescription = "Grupo de Usuários",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("porta") }
) {
Icon(
painter = painterResource(id = R.drawable.door),
contentDescription = "Portas",
modifier = Modifier.size(40.dp)
)
}
IconButton(
onClick = { navController.navigate("grupo_porta") }
) {
Icon(
painter = painterResource(id = R.drawable.doorgroup),
contentDescription = "Grupo de Portas",
modifier = Modifier.size(40.dp)
)
}
}
}
}
) { innerPadding ->
Column(
......
app/src/main/java/com/br/fechadura/mobile/ui/theme/Color.kt
View file @ 14315e1c
......@@ -9,4 +9,5 @@ val Pink80 = Color(0xFFEFB8C8)
val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
val FechaduraColor = Color(0xFFBACBBA)
\ No newline at end of file
val FechaduraColor = Color(0xFFBACBBA)
val BotaoAcesso = Color(0xFF5DBEA7)
\ No newline at end of file
app/src/main/res/drawable/door.xml 0 → 100644
View file @ 14315e1c
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M120,840v-60h80v-600q0,-24 18,-42t42,-18h440q24,0 42,18t18,42v600h80v60L120,840ZM700,780v-600L260,180v600h440ZM567,511q14.45,0 24.22,-9.77Q601,491.45 601,477q0,-14.45 -9.78,-24.23Q581.45,443 567,443t-24.22,9.77Q533,462.55 533,477q0,14.45 9.78,24.23Q552.55,511 567,511ZM260,180v600,-600Z"
android:fillColor="#000000"/>
</vector>
app/src/main/res/drawable/doorgroup.xml 0 → 100644
View file @ 14315e1c
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M120,840v-60h92v-660h390v45h147v615h91v60L689,840v-615h-87v615L120,840ZM272,180v600,-600ZM451,520q17,0 28.5,-11.5T491,480q0,-17 -11.5,-28.5T451,440q-17,0 -28.5,11.5T411,480q0,17 11.5,28.5T451,520ZM272,780h270v-600L272,180v600Z"
android:fillColor="#000000"/>
</vector>
app/src/main/res/drawable/home48.xml 0 → 100644
View file @ 14315e1c
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M240,760h120v-240h240v240h120v-360L480,220 240,400v360ZM160,840v-480l320,-240 320,240v480L520,840v-240h-80v240L160,840ZM480,490Z"
android:fillColor="#000000"/>
</vector>
app/src/main/res/drawable/user48.xml 0 → 100644
View file @ 14315e1c
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M480,479q-66,0 -108,-42t-42,-108q0,-66 42,-108t108,-42q66,0 108,42t42,108q0,66 -42,108t-108,42ZM160,800v-94q0,-38 19,-65t49,-41q67,-30 128.5,-45T480,540q62,0 123,15.5t127.92,44.69q31.3,14.13 50.19,40.97Q800,668 800,706v94L160,800ZM220,740h520v-34q0,-16 -9.5,-30.5T707,654q-64,-31 -117,-42.5T480,600q-57,0 -111,11.5T252,654q-14,7 -23,21.5t-9,30.5v34ZM480,419q39,0 64.5,-25.5T570,329q0,-39 -25.5,-64.5T480,239q-39,0 -64.5,25.5T390,329q0,39 25.5,64.5T480,419ZM480,329ZM480,740Z"
android:fillColor="#000000"/>
</vector>
app/src/main/res/drawable/usergroup48.xml 0 → 100644
View file @ 14315e1c
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M38,800v-94q0,-35 18,-63.5t50,-42.5q73,-32 131.5,-46T358,540q62,0 120,14t131,46q32,14 50.5,42.5T678,706v94L38,800ZM738,800v-94q0,-63 -32,-103.5T622,537q69,8 130,23.5t99,35.5q33,19 52,47t19,63v94L738,800ZM358,479q-66,0 -108,-42t-42,-108q0,-66 42,-108t108,-42q66,0 108,42t42,108q0,66 -42,108t-108,42ZM718,329q0,66 -42,108t-108,42q-11,0 -24.5,-1.5T519,472q24,-25 36.5,-61.5T568,329q0,-45 -12.5,-79.5T519,186q11,-3 24.5,-5t24.5,-2q66,0 108,42t42,108ZM98,740h520v-34q0,-16 -9.5,-31T585,654q-72,-32 -121,-43t-106,-11q-57,0 -106.5,11T130,654q-14,6 -23,21t-9,31v34ZM358,419q39,0 64.5,-25.5T448,329q0,-39 -25.5,-64.5T358,239q-39,0 -64.5,25.5T268,329q0,39 25.5,64.5T358,419ZM358,740ZM358,329Z"
android:fillColor="#000000"/>
</vector>
app/src/main/res/values/colors.xml
View file @ 14315e1c
......@@ -7,4 +7,5 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="botaoacesso">#5DBEA7</color>
</resources>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment