From 24f20191a5d1b7f3871c5621de092289206bf946 Mon Sep 17 00:00:00 2001 From: 230415 <230415@epvc.pt> Date: Mon, 4 May 2026 15:00:28 +0100 Subject: [PATCH] acabar --- app/src/main/AndroidManifest.xml | 6 +- .../com/example/lifegrid/SplashActivity.java | 74 +++++++++++++++++++ app/src/main/res/layout/activity_splash.xml | 30 ++++++++ app/src/main/res/layout/fragment_ativos.xml | 36 ++++----- app/src/main/res/layout/fragment_home.xml | 52 +++++++------ app/src/main/res/layout/item_ativo.xml | 12 ++- 6 files changed, 162 insertions(+), 48 deletions(-) create mode 100644 app/src/main/java/com/example/lifegrid/SplashActivity.java create mode 100644 app/src/main/res/layout/activity_splash.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d05aab..acb3ccd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,14 +26,16 @@ android:name=".CriarContaActivity" android:exported="false" /> - + { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + FirebaseApp.initializeApp(this); + + ImageView ivSplashLogo = findViewById(R.id.ivSplashLogo); + // Configuração inicial da animação + ivSplashLogo.setAlpha(0f); + ivSplashLogo.setScaleX(0f); + ivSplashLogo.setScaleY(0f); + + // Animação do Logo (aumenta e depois diminui um bocado) + ivSplashLogo.animate() + .alpha(1f) + .scaleX(1f) + .scaleY(1f) + .setDuration(1200) + .setInterpolator(new OvershootInterpolator(2.0f)) + .setListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + // Aguarda um pouco e avança + new Handler(Looper.getMainLooper()).postDelayed(() -> navigateToNextActivity(), 600); + } + }) + .start(); + } + + private void navigateToNextActivity() { + FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser(); + Intent intent; + if (currentUser != null) { + intent = new Intent(SplashActivity.this, TelaInicialActivity.class); + } else { + intent = new Intent(SplashActivity.this, LoginActivity.class); + } + startActivity(intent); + finish(); + } +} diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..ebccaa2 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_ativos.xml b/app/src/main/res/layout/fragment_ativos.xml index 77cad1e..b8fd40e 100644 --- a/app/src/main/res/layout/fragment_ativos.xml +++ b/app/src/main/res/layout/fragment_ativos.xml @@ -85,10 +85,10 @@ android:layout_height="wrap_content" android:layout_marginStart="36dp" android:layout_marginTop="36dp" + android:fontFamily="sans-serif" android:text="Valor Total do Portfólio" + android:textColor="#4A5568" android:textSize="16sp" - android:textColor="#3A3A3A" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -98,10 +98,10 @@ android:layout_height="wrap_content" android:layout_marginStart="36dp" android:layout_marginBottom="36dp" - android:text="0,00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:fontFamily="sans-serif-medium" + android:text="0.00€" + android:textColor="#1A202C" + android:textSize="22sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -123,10 +123,10 @@ android:layout_height="wrap_content" android:layout_marginStart="36dp" android:layout_marginTop="36dp" + android:fontFamily="sans-serif" android:text="Total Investido" - android:textColor="#3A3A3A" + android:textColor="#4A5568" android:textSize="16sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -136,10 +136,10 @@ android:layout_height="wrap_content" android:layout_marginStart="36dp" android:layout_marginBottom="36dp" - android:text="0,00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:fontFamily="sans-serif-medium" + android:text="0.00€" + android:textColor="#1A202C" + android:textSize="22sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -161,10 +161,10 @@ android:layout_height="wrap_content" android:layout_marginStart="32dp" android:layout_marginTop="32dp" + android:fontFamily="sans-serif" android:text="ROI Total" - android:textColor="#3A3A3A" + android:textColor="#4A5568" android:textSize="16sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -174,10 +174,10 @@ android:layout_height="wrap_content" android:layout_marginStart="36dp" android:layout_marginBottom="36dp" - android:text="0,00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:fontFamily="sans-serif-medium" + android:text="+0.00%" + android:textColor="#22C55E" + android:textSize="22sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 327b26a..bf31de3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -27,10 +27,10 @@ android:layout_alignParentTop="true" android:layout_marginStart="7dp" android:layout_marginTop="12dp" + android:fontFamily="sans-serif" android:text="Receitas (Mês Atual)" - android:textColor="#3A3A3A" + android:textColor="#4A5568" android:textSize="16sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -54,10 +54,10 @@ android:layout_below="@id/tvTitulo" android:layout_marginStart="7dp" android:layout_marginTop="40dp" + android:fontFamily="sans-serif-medium" android:text="0.00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:textColor="#1A202C" + android:textSize="22sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTitulo" /> @@ -67,8 +67,9 @@ android:layout_height="wrap_content" android:layout_below="@id/tvValor" android:layout_marginStart="7dp" + android:fontFamily="sans-serif" android:text="0 transações" - android:textColor="#8E8E8E" + android:textColor="#718096" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -98,10 +99,10 @@ android:layout_alignParentTop="true" android:layout_marginStart="7dp" android:layout_marginTop="12dp" + android:fontFamily="sans-serif" android:text="Despesas (Mês Atual)" - android:textColor="#3A3A3A" + android:textColor="#4A5568" android:textSize="16sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -125,10 +126,10 @@ android:layout_below="@id/tvTitulo2" android:layout_marginStart="7dp" android:layout_marginTop="40dp" + android:fontFamily="sans-serif-medium" android:text="0.00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:textColor="#1A202C" + android:textSize="22sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTitulo2" /> @@ -138,8 +139,9 @@ android:layout_height="wrap_content" android:layout_below="@id/tvValor2" android:layout_marginStart="7dp" + android:fontFamily="sans-serif" android:text="0 transações" - android:textColor="#8E8E8E" + android:textColor="#718096" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -169,10 +171,10 @@ android:layout_alignParentTop="true" android:layout_marginStart="7dp" android:layout_marginTop="12dp" + android:fontFamily="sans-serif" android:text="Saldo do Mês" - android:textColor="#3A3A3A" + android:textColor="#4A5568" android:textSize="16sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -196,10 +198,10 @@ android:layout_below="@id/tvTitulo3" android:layout_marginStart="7dp" android:layout_marginTop="40dp" + android:fontFamily="sans-serif-medium" android:text="0.00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:textColor="#22C55E" + android:textSize="22sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTitulo3" /> @@ -209,8 +211,9 @@ android:layout_height="wrap_content" android:layout_below="@id/tvValor3" android:layout_marginStart="7dp" + android:fontFamily="sans-serif" android:text="Poupança positiva" - android:textColor="#8E8E8E" + android:textColor="#718096" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -243,10 +246,10 @@ android:layout_alignParentTop="true" android:layout_marginStart="7dp" android:layout_marginTop="12dp" + android:fontFamily="sans-serif" android:text="Valor do Ativos" - android:textColor="#3A3A3A" + android:textColor="#4A5568" android:textSize="16sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -270,10 +273,10 @@ android:layout_below="@id/tvTitulo4" android:layout_marginStart="7dp" android:layout_marginTop="40dp" + android:fontFamily="sans-serif-medium" android:text="0.00€" - android:textColor="#000000" - android:textSize="23sp" - android:textStyle="bold" + android:textColor="#1A202C" + android:textSize="22sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTitulo4" /> @@ -283,8 +286,9 @@ android:layout_height="wrap_content" android:layout_below="@id/tvValor4" android:layout_marginStart="7dp" + android:fontFamily="sans-serif" android:text="+0.00% ROI" - android:textColor="#8E8E8E" + android:textColor="#22C55E" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_ativo.xml b/app/src/main/res/layout/item_ativo.xml index e16e9f4..0d6e96c 100644 --- a/app/src/main/res/layout/item_ativo.xml +++ b/app/src/main/res/layout/item_ativo.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="150dp" android:layout_marginBottom="12dp" android:background="@drawable/cardview_background" android:padding="16dp"> @@ -22,11 +22,15 @@ app:layout_constraintTop_toTopOf="parent" /> + + + - + + -