v1.0.2: quitar cabecera en pantallas principales (Inicio, Cuentas, Movimientos, Ajustes)
This commit is contained in:
+2
-2
@@ -13,8 +13,8 @@ android {
|
|||||||
applicationId "com.conta.app"
|
applicationId "com.conta.app"
|
||||||
minSdk 24
|
minSdk 24
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 2
|
versionCode 3
|
||||||
versionName "1.0.1"
|
versionName "1.0.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import androidx.compose.material.icons.filled.AccountBalance
|
|||||||
import androidx.compose.material.icons.filled.Add
|
import androidx.compose.material.icons.filled.Add
|
||||||
import androidx.compose.material.icons.filled.CreditCard
|
import androidx.compose.material.icons.filled.CreditCard
|
||||||
import androidx.compose.material.icons.filled.Schedule
|
import androidx.compose.material.icons.filled.Schedule
|
||||||
import androidx.compose.material.icons.filled.Sync
|
|
||||||
import androidx.compose.material.icons.filled.Warning
|
import androidx.compose.material.icons.filled.Warning
|
||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
@@ -30,7 +29,6 @@ import androidx.compose.material3.Icon
|
|||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@@ -68,16 +66,6 @@ fun AccountsScreen(viewModel: AppViewModel, navController: NavController) {
|
|||||||
val loading by viewModel.loading.collectAsStateWithLifecycle()
|
val loading by viewModel.loading.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
|
||||||
TopAppBar(
|
|
||||||
title = { Text("Cuentas", fontWeight = FontWeight.Bold) },
|
|
||||||
actions = {
|
|
||||||
androidx.compose.material3.IconButton(onClick = { viewModel.refreshAccounts() }) {
|
|
||||||
Icon(Icons.Filled.Sync, contentDescription = "Actualizar")
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
},
|
|
||||||
floatingActionButton = {
|
floatingActionButton = {
|
||||||
FloatingActionButton(onClick = { navController.navigate(Routes.accountForm()) }) {
|
FloatingActionButton(onClick = { navController.navigate(Routes.accountForm()) }) {
|
||||||
Icon(Icons.Filled.Add, contentDescription = "Nueva cuenta")
|
Icon(Icons.Filled.Add, contentDescription = "Nueva cuenta")
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import androidx.compose.material.icons.filled.CheckCircle
|
|||||||
import androidx.compose.material.icons.filled.CreditCard
|
import androidx.compose.material.icons.filled.CreditCard
|
||||||
import androidx.compose.material.icons.filled.Event
|
import androidx.compose.material.icons.filled.Event
|
||||||
import androidx.compose.material.icons.filled.NotificationsActive
|
import androidx.compose.material.icons.filled.NotificationsActive
|
||||||
import androidx.compose.material.icons.filled.Sync
|
|
||||||
import androidx.compose.material.icons.filled.Savings
|
import androidx.compose.material.icons.filled.Savings
|
||||||
import androidx.compose.material.icons.filled.Schedule
|
import androidx.compose.material.icons.filled.Schedule
|
||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
@@ -33,7 +32,6 @@ import androidx.compose.material3.IconButton
|
|||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@@ -68,16 +66,6 @@ fun DashboardScreen(viewModel: AppViewModel, navController: NavController) {
|
|||||||
val loading by viewModel.loading.collectAsStateWithLifecycle()
|
val loading by viewModel.loading.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
|
||||||
TopAppBar(
|
|
||||||
title = { Text("Conta", fontWeight = FontWeight.Bold) },
|
|
||||||
actions = {
|
|
||||||
IconButton(onClick = { viewModel.refreshDashboard() }) {
|
|
||||||
Icon(Icons.Filled.Sync, contentDescription = "Actualizar")
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
},
|
|
||||||
floatingActionButton = {
|
floatingActionButton = {
|
||||||
FloatingActionButton(onClick = { navController.navigate(Routes.transactionForm(preset = "expense")) }) {
|
FloatingActionButton(onClick = { navController.navigate(Routes.transactionForm(preset = "expense")) }) {
|
||||||
Icon(Icons.Filled.Add, contentDescription = "Nueva transacción")
|
Icon(Icons.Filled.Add, contentDescription = "Nueva transacción")
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import androidx.compose.material3.OutlinedButton
|
|||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@@ -62,13 +61,7 @@ fun SettingsScreen(viewModel: AppViewModel, navController: NavController) {
|
|||||||
|
|
||||||
val summary by viewModel.summary.collectAsStateWithLifecycle()
|
val summary by viewModel.summary.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
Scaffold(
|
Scaffold { padding ->
|
||||||
topBar = {
|
|
||||||
TopAppBar(
|
|
||||||
title = { Text("Ajustes", fontWeight = FontWeight.Bold) },
|
|
||||||
)
|
|
||||||
},
|
|
||||||
) { padding ->
|
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(padding)
|
.padding(padding)
|
||||||
|
|||||||
@@ -10,18 +10,15 @@ import androidx.compose.foundation.lazy.items
|
|||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Add
|
import androidx.compose.material.icons.filled.Add
|
||||||
import androidx.compose.material.icons.filled.Sync
|
|
||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.FilterChip
|
import androidx.compose.material3.FilterChip
|
||||||
import androidx.compose.material3.FloatingActionButton
|
import androidx.compose.material3.FloatingActionButton
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
@@ -56,16 +53,6 @@ fun TransactionsScreen(viewModel: AppViewModel, navController: NavController) {
|
|||||||
val totalExpense = filtered.filter { it.transactionType == "expense" }.sumOf { it.amount }
|
val totalExpense = filtered.filter { it.transactionType == "expense" }.sumOf { it.amount }
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
|
||||||
TopAppBar(
|
|
||||||
title = { Text("Movimientos", fontWeight = FontWeight.Bold) },
|
|
||||||
actions = {
|
|
||||||
IconButton(onClick = { viewModel.refreshDashboard() }) {
|
|
||||||
Icon(Icons.Filled.Sync, contentDescription = "Actualizar")
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
},
|
|
||||||
floatingActionButton = {
|
floatingActionButton = {
|
||||||
FloatingActionButton(onClick = { navController.navigate(Routes.transactionForm()) }) {
|
FloatingActionButton(onClick = { navController.navigate(Routes.transactionForm()) }) {
|
||||||
Icon(Icons.Filled.Add, contentDescription = "Nueva transacción")
|
Icon(Icons.Filled.Add, contentDescription = "Nueva transacción")
|
||||||
|
|||||||
Reference in New Issue
Block a user