Skip to content

Commit

Permalink
finalizações
Browse files Browse the repository at this point in the history
  • Loading branch information
@wjrcode
wjrcode committed Oct 23, 2022
1 parent fb4bd58 commit bced97c
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 28 deletions.
6 changes: 3 additions & 3 deletions lib/Controller/AtividadeController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class AtividadeController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -113,7 +113,7 @@ class AtividadeController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -151,7 +151,7 @@ class AtividadeController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down
8 changes: 4 additions & 4 deletions lib/Controller/HabitoController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class HabitoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -93,7 +93,7 @@ class HabitoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -138,7 +138,7 @@ class HabitoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -176,7 +176,7 @@ class HabitoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/ItemController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ItemController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -86,7 +86,7 @@ class ItemController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down
8 changes: 4 additions & 4 deletions lib/Controller/LembreteController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class LembreteController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -88,7 +88,7 @@ class LembreteController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -137,7 +137,7 @@ class LembreteController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -175,7 +175,7 @@ class LembreteController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down
6 changes: 3 additions & 3 deletions lib/Controller/ListaController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ListaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -87,7 +87,7 @@ class ListaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -130,7 +130,7 @@ class ListaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down
8 changes: 4 additions & 4 deletions lib/Controller/ProjetoController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class ProjetoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -94,7 +94,7 @@ class ProjetoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -139,7 +139,7 @@ class ProjetoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down Expand Up @@ -177,7 +177,7 @@ class ProjetoController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
return value.valido!;
Expand Down
8 changes: 4 additions & 4 deletions lib/Controller/TarefaController.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TarefaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
await NotificationApi.showScheduledNotification(
Expand Down Expand Up @@ -99,7 +99,7 @@ class TarefaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
await NotificationApi.showScheduledNotification(
Expand Down Expand Up @@ -153,7 +153,7 @@ class TarefaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
NotificationApi.cancelScheduleNotification(model.id ?? 0);
Expand Down Expand Up @@ -192,7 +192,7 @@ class TarefaController extends Base {
),
);

await Future.delayed(const Duration(milliseconds: 500));
await Future.delayed(const Duration(seconds: 1));

if (value.valido!) {
NotificationApi.cancelScheduleNotification(model.id ?? 0);
Expand Down
3 changes: 2 additions & 1 deletion lib/Model/API/APIModel.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import 'package:shared_preferences/shared_preferences.dart';

class ApiModel {
//String ApiUrl = "http://192.168.100.74:4444";
String ApiUrl = "http://10.0.0.91:4444";
//String ApiUrl = "http://10.0.0.91:4444";
String ApiUrl = "http://192.168.100.82:4444";

Future<Map<String, String>> getHeaders() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
Expand Down
11 changes: 10 additions & 1 deletion lib/components/card_item.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ class cardItem extends StatelessWidget {
final String? nome;
final String? dash;
final Function? abrirDialog;
final String? prioridade;

const cardItem(
{Key? key,
this.cor,
this.horario,
this.nome,
this.abrirDialog,
this.dash})
this.dash,
this.prioridade})
: super(key: key);

String formatarNome() {
Expand Down Expand Up @@ -61,6 +63,13 @@ class cardItem extends StatelessWidget {
//borderRadius: BorderRadius.all(Radius.circular(16)),
color: cor,
),
child: Center(
child: Text(
prioridade ?? "",
style: TextStyle(
color: Colors.white,
),
)),
)
: Container(
width: 90,
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/atividades/atividadeCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Future<dynamic> criarAtividade(BuildContext context,
child: DialogPersonalizado(
nome: 'Atividade',
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/habitos/habitoCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Future<dynamic> criarHabito(BuildContext context,
child: DialogPersonalizado(
nome: 'Hábito',
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/lembretes/lembreteCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Future<dynamic> criarLembrete(BuildContext context,
child: DialogPersonalizado(
nome: 'Lembrete',
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/listas/listaCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Future<dynamic> criarLista(BuildContext context,
child: DialogPersonalizado(
nome: 'Lista',
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/login/usuarioCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Future<dynamic> cadastrarUsuario(BuildContext context,
nome: 'Cadastro',
//minHeight: MediaQuery.of(context).size.height * 0.8,
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/projetos/projetoCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Future<dynamic> criarProjeto(
child: DialogPersonalizado(
nome: 'Projeto',
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
1 change: 1 addition & 0 deletions lib/components/dialogs/tarefas/tarefaCadastroDialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Future<dynamic> criarTarefa(BuildContext context,
child: DialogPersonalizado(
nome: 'Tarefa',
child: <Widget>[
const Text('*Todos os campos são obrigatórios'),
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: input(
Expand Down
3 changes: 3 additions & 0 deletions lib/home_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ class _HomePageState extends State<HomePage> {
item.cor ?? '0xFF6385C3') ??
0),
nome: item.nome,
prioridade: snapshot.data['tarefas']
[index]['prioridade'] ??
"",
horario: snapshot.data['tarefas']
[index]['dataFormatada'],
abrirDialog: () {
Expand Down
3 changes: 1 addition & 2 deletions lib/listas_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ class _HomePageState extends State<ListasPage> {
Column(
children: <Widget>[
Padding(
padding:
const EdgeInsets.fromLTRB(24.0, 80.0, 24.0, 110),
padding: const EdgeInsets.fromLTRB(24.0, 80.0, 24.0, 0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Expand Down

0 comments on commit bced97c

Please sign in to comment.