From 743ddeb3db3e58b1ee6af2d30694e03541d172db Mon Sep 17 00:00:00 2001
From: 230421 <230421@epvc.pt>
Date: Fri, 12 Dec 2025 09:28:14 +0000
Subject: [PATCH] =?UTF-8?q?mudan=C3=A7as?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vdcscore/ui/definicoes/ContaActivity.java |   1 +
 .../vdcscore/ui/gallery/GalleryFragment.java  |  10 +-
 app/src/main/res/layout/fragment_gallery.xml  | 133 ++++++++++++++++--
 app/src/main/res/layout/nav_header_main.xml   |  20 ++-
 app/src/main/res/values/strings.xml           |   2 +-
 5 files changed, 141 insertions(+), 25 deletions(-)

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
index 76a1c12..22b35b8 100644
--- a/app/src/main/java/com/example/vdcscore/ui/definicoes/ContaActivity.java
+++ b/app/src/main/java/com/example/vdcscore/ui/definicoes/ContaActivity.java
@@ -28,6 +28,7 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
+import com.example.vdcscore.LoginActivity;
 import com.example.vdcscore.R;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputEditText;
diff --git a/app/src/main/java/com/example/vdcscore/ui/gallery/GalleryFragment.java b/app/src/main/java/com/example/vdcscore/ui/gallery/GalleryFragment.java
index 2956b7e..2c41436 100644
--- a/app/src/main/java/com/example/vdcscore/ui/gallery/GalleryFragment.java
+++ b/app/src/main/java/com/example/vdcscore/ui/gallery/GalleryFragment.java
@@ -17,15 +17,15 @@ public class GalleryFragment extends Fragment {
     private FragmentGalleryBinding binding;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        GalleryViewModel galleryViewModel =
-                new ViewModelProvider(this).get(GalleryViewModel.class);
+            ViewGroup container, Bundle savedInstanceState) {
+        GalleryViewModel galleryViewModel = new ViewModelProvider(this).get(GalleryViewModel.class);
 
         binding = FragmentGalleryBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
-        final TextView textView = binding.textGallery;
-        galleryViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
+        // final TextView textView = binding.textGallery;
+        // galleryViewModel.getText().observe(getViewLifecycleOwner(),
+        // textView::setText);
         return root;
     }
 
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
index 643fe25..4f541ca 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -6,17 +6,126 @@
     android:layout_height="match_parent"
     tools:context=".ui.gallery.GalleryFragment">
 
-    <TextView
-        android:id="@+id/text_gallery"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Próximas Jornadas"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:layout_marginBottom="16dp"
+                android:textColor="#000000"/>
+
+            <!-- Placeholder for Matchdays -->
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Jornada 10 - 15/12/2025"
+                        android:textStyle="bold"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="VDC vs Rival FC"
+                        android:layout_marginTop="4dp"/>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Jornada 11 - 22/12/2025"
+                        android:textStyle="bold"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Outro Clube vs VDC"
+                        android:layout_marginTop="4dp"/>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Classificação"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:layout_marginBottom="16dp"
+                android:textColor="#000000"/>
+
+            <!-- Placeholder for Standings Table -->
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:stretchColumns="1">
+
+                <TableRow android:background="#E0E0E0" android:padding="8dp">
+                    <TextView android:text="Pos" android:paddingEnd="8dp" android:textStyle="bold"/>
+                    <TextView android:text="Clube" android:textStyle="bold"/>
+                    <TextView android:text="Pts" android:paddingStart="8dp" android:textStyle="bold"/>
+                </TableRow>
+
+                <TableRow android:padding="8dp">
+                    <TextView android:text="1" />
+                    <TextView android:text="VDC Score" />
+                    <TextView android:text="25" />
+                </TableRow>
+
+                <TableRow android:padding="8dp">
+                    <TextView android:text="2" />
+                    <TextView android:text="Rival FC" />
+                    <TextView android:text="22" />
+                </TableRow>
+
+                <TableRow android:padding="8dp">
+                    <TextView android:text="3" />
+                    <TextView android:text="Outro Clube" />
+                    <TextView android:text="18" />
+                </TableRow>
+                 <TableRow android:padding="8dp">
+                    <TextView android:text="4" />
+                    <TextView android:text="Clube A" />
+                    <TextView android:text="15" />
+                </TableRow>
+                 <TableRow android:padding="8dp">
+                    <TextView android:text="5" />
+                    <TextView android:text="Clube B" />
+                    <TextView android:text="12" />
+                </TableRow>
+
+            </TableLayout>
+
+        </LinearLayout>
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 036e278..fa55072 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -12,15 +12,21 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
-    <ImageView
-        android:id="@+id/imageView"
+    <androidx.cardview.widget.CardView
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:contentDescription="@string/nav_header_desc"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:scaleType="centerCrop"
-        android:background="#E0E0E0"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        android:layout_marginTop="@dimen/nav_header_vertical_spacing"
+        app:cardCornerRadius="40dp"
+        app:cardBackgroundColor="#E0E0E0">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/nav_header_desc"
+            android:scaleType="centerCrop"
+            app:srcCompat="@mipmap/ic_launcher_round" />
+    </androidx.cardview.widget.CardView>
 
     <TextView
         android:id="@+id/textViewName"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5602bb7..91fb20e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,6 @@
     <string name="action_settings">Settings</string>
 
     <string name="menu_home">Home</string>
-    <string name="menu_gallery">Gallery</string>
+    <string name="menu_gallery">Classificação</string>
     <string name="menu_definicoes">Definições</string>
 </resources>
\ No newline at end of file