From ab38d9a02361bf27c04f513195d30ff14012265f Mon Sep 17 00:00:00 2001 From: 230421 <230421@epvc.pt> Date: Wed, 3 Dec 2025 10:29:59 +0000 Subject: [PATCH] adicao de ecra de gestao de conta dentro das definicoes --- app/src/main/AndroidManifest.xml | 8 +++--- .../com/example/vdcscore/LoginActivity.java | 13 +++++++--- .../com/example/vdcscore/MainActivity.java | 4 +-- .../vdcscore/ui/definicoes/ContaActivity.java | 26 +++++++++++++++++++ .../ui/definicoes/DefinicoesFragment.java | 16 +++++++++--- app/src/main/res/layout/activity_conta.xml | 10 +++++++ 6 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/example/vdcscore/ui/definicoes/ContaActivity.java create mode 100644 app/src/main/res/layout/activity_conta.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 52d4761..941e770 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,15 +11,17 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.VdcScore"> + - + android:theme="@style/Theme.VdcScore.NoActionBar" /> + android:exported="false" /> diff --git a/app/src/main/java/com/example/vdcscore/LoginActivity.java b/app/src/main/java/com/example/vdcscore/LoginActivity.java index 5c29a98..622792b 100644 --- a/app/src/main/java/com/example/vdcscore/LoginActivity.java +++ b/app/src/main/java/com/example/vdcscore/LoginActivity.java @@ -18,8 +18,6 @@ public class LoginActivity extends AppCompatActivity { FirebaseAuth mAuth; private TextView criarContaTextView; - // comentário que bnão serve para nada. - // masi um comentário @Override protected void onCreate(Bundle savedInstanceState) { @@ -58,7 +56,7 @@ public class LoginActivity extends AppCompatActivity { Toast.makeText(this, "Login efetuado!", Toast.LENGTH_SHORT).show(); // Abre a tua página principal - startActivity(new Intent(LoginActivity.this, CriarContaActivity.class)); + startActivity(new Intent(LoginActivity.this, MainActivity.class)); finish(); } else { @@ -68,4 +66,13 @@ public class LoginActivity extends AppCompatActivity { } }); } + + @Override + protected void onStart() { + super.onStart(); + if (FirebaseAuth.getInstance().getCurrentUser() != null){ + Intent intent = new Intent(LoginActivity.this, MainActivity.class); + startActivity(intent); + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/vdcscore/MainActivity.java b/app/src/main/java/com/example/vdcscore/MainActivity.java index ad83af6..1efa816 100644 --- a/app/src/main/java/com/example/vdcscore/MainActivity.java +++ b/app/src/main/java/com/example/vdcscore/MainActivity.java @@ -53,8 +53,8 @@ public class MainActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; +// getMenuInflater().inflate(R.menu.main, menu); + return false; } @Override diff --git a/app/src/main/java/com/example/vdcscore/ui/definicoes/ContaActivity.java b/app/src/main/java/com/example/vdcscore/ui/definicoes/ContaActivity.java new file mode 100644 index 0000000..4fe823d --- /dev/null +++ b/app/src/main/java/com/example/vdcscore/ui/definicoes/ContaActivity.java @@ -0,0 +1,26 @@ +package com.example.vdcscore.ui.definicoes; + +import android.os.Bundle; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.example.vdcscore.R; + +public class ContaActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_conta); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/vdcscore/ui/definicoes/DefinicoesFragment.java b/app/src/main/java/com/example/vdcscore/ui/definicoes/DefinicoesFragment.java index 9e58f6c..1d6287b 100644 --- a/app/src/main/java/com/example/vdcscore/ui/definicoes/DefinicoesFragment.java +++ b/app/src/main/java/com/example/vdcscore/ui/definicoes/DefinicoesFragment.java @@ -32,10 +32,18 @@ public class DefinicoesFragment extends Fragment { } private void setupUi() { - binding.cardConta.setOnClickListener(view -> - Toast.makeText(requireContext(), - "Gestão de conta disponível em breve.", - Toast.LENGTH_SHORT).show()); + binding.cardConta.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // Criar Intent para abrir ContaActivity + Intent intent = new Intent(getContext(), ContaActivity.class); + startActivity(intent); + + // Adicionar animação (opcional) + requireActivity().overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + } + }); + binding.switchNotifications.setOnCheckedChangeListener((buttonView, isChecked) -> binding.textNotificationsStatus.setText( diff --git a/app/src/main/res/layout/activity_conta.xml b/app/src/main/res/layout/activity_conta.xml new file mode 100644 index 0000000..0b38e5a --- /dev/null +++ b/app/src/main/res/layout/activity_conta.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file