From 5b3018afbb6964ed1fc1944a137de905786fa1c9 Mon Sep 17 00:00:00 2001 From: 230415 <230415@epvc.pt> Date: Wed, 15 Apr 2026 12:18:42 +0100 Subject: [PATCH] erros --- .../java/com/example/lifegrid/LoginActivity.java | 7 +++++++ .../com/example/lifegrid/menu/AtivosFragment.java | 2 +- .../example/lifegrid/menu/DefinicoesFragment.java | 2 +- .../example/lifegrid/menu/DocumentosFragment.java | 2 +- .../com/example/lifegrid/menu/GraficosFragment.java | 2 +- .../com/example/lifegrid/menu/MetasFragment.java | 2 +- app/src/main/res/layout/activity_tela_inicial.xml | 12 ++++++------ app/src/main/res/layout/fragment_ativos.xml | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/example/lifegrid/LoginActivity.java b/app/src/main/java/com/example/lifegrid/LoginActivity.java index 4b6140e..fbf50d7 100644 --- a/app/src/main/java/com/example/lifegrid/LoginActivity.java +++ b/app/src/main/java/com/example/lifegrid/LoginActivity.java @@ -91,6 +91,7 @@ public class LoginActivity extends AppCompatActivity { loadingProgressBar = findViewById(R.id.loadingProgressBar); FirebaseApp.initializeApp(this); + firebaseAuth = FirebaseAuth.getInstance(); mAuth = FirebaseAuth.getInstance(); credentialManager = CredentialManager.create(getBaseContext()); @@ -344,5 +345,11 @@ public class LoginActivity extends AppCompatActivity { super.onStart(); // Check if user is signed in (non-null) and update UI accordingly. FirebaseUser currentUser = mAuth.getCurrentUser(); + if (currentUser != null) { + Intent intent = new Intent(LoginActivity.this, TelaInicialActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + startActivity(intent); + finish(); + } } } \ No newline at end of file diff --git a/app/src/main/java/com/example/lifegrid/menu/AtivosFragment.java b/app/src/main/java/com/example/lifegrid/menu/AtivosFragment.java index 4b2fe45..06804b7 100644 --- a/app/src/main/java/com/example/lifegrid/menu/AtivosFragment.java +++ b/app/src/main/java/com/example/lifegrid/menu/AtivosFragment.java @@ -26,7 +26,7 @@ public class AtivosFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - View root = inflater.inflate(R.layout.fragment_transacoes, container, false); + View root = inflater.inflate(R.layout.fragment_ativos, container, false); return root; diff --git a/app/src/main/java/com/example/lifegrid/menu/DefinicoesFragment.java b/app/src/main/java/com/example/lifegrid/menu/DefinicoesFragment.java index 29a4d4f..e263dfb 100644 --- a/app/src/main/java/com/example/lifegrid/menu/DefinicoesFragment.java +++ b/app/src/main/java/com/example/lifegrid/menu/DefinicoesFragment.java @@ -26,7 +26,7 @@ public class DefinicoesFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - View root = inflater.inflate(R.layout.fragment_transacoes, container, false); + View root = inflater.inflate(R.layout.fragment_definicoes, container, false); return root; diff --git a/app/src/main/java/com/example/lifegrid/menu/DocumentosFragment.java b/app/src/main/java/com/example/lifegrid/menu/DocumentosFragment.java index ddd488c..33d5b5c 100644 --- a/app/src/main/java/com/example/lifegrid/menu/DocumentosFragment.java +++ b/app/src/main/java/com/example/lifegrid/menu/DocumentosFragment.java @@ -26,7 +26,7 @@ public class DocumentosFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - View root = inflater.inflate(R.layout.fragment_transacoes, container, false); + View root = inflater.inflate(R.layout.fragment_documentos, container, false); return root; diff --git a/app/src/main/java/com/example/lifegrid/menu/GraficosFragment.java b/app/src/main/java/com/example/lifegrid/menu/GraficosFragment.java index fbdd802..5cb9ce0 100644 --- a/app/src/main/java/com/example/lifegrid/menu/GraficosFragment.java +++ b/app/src/main/java/com/example/lifegrid/menu/GraficosFragment.java @@ -25,7 +25,7 @@ public class GraficosFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - View root = inflater.inflate(R.layout.fragment_transacoes, container, false); + View root = inflater.inflate(R.layout.fragment_graficos, container, false); return root; diff --git a/app/src/main/java/com/example/lifegrid/menu/MetasFragment.java b/app/src/main/java/com/example/lifegrid/menu/MetasFragment.java index bacbe91..bc2c865 100644 --- a/app/src/main/java/com/example/lifegrid/menu/MetasFragment.java +++ b/app/src/main/java/com/example/lifegrid/menu/MetasFragment.java @@ -25,7 +25,7 @@ public class MetasFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - View root = inflater.inflate(R.layout.fragment_transacoes, container, false); + View root = inflater.inflate(R.layout.fragment_metas, container, false); return root; diff --git a/app/src/main/res/layout/activity_tela_inicial.xml b/app/src/main/res/layout/activity_tela_inicial.xml index 4d3af3a..1eb3fb2 100644 --- a/app/src/main/res/layout/activity_tela_inicial.xml +++ b/app/src/main/res/layout/activity_tela_inicial.xml @@ -8,10 +8,10 @@ android:backgroundTint="@color/preto" tools:context=".TelaInicialActivity"> - - - - + - + diff --git a/app/src/main/res/layout/fragment_ativos.xml b/app/src/main/res/layout/fragment_ativos.xml index 6a89cf5..57c78de 100644 --- a/app/src/main/res/layout/fragment_ativos.xml +++ b/app/src/main/res/layout/fragment_ativos.xml @@ -8,7 +8,7 @@