diff --git a/app/src/main/java/com/example/vdcscore/ui/home/HomeFragment.java b/app/src/main/java/com/example/vdcscore/ui/home/HomeFragment.java index 563130b..0302c59 100644 --- a/app/src/main/java/com/example/vdcscore/ui/home/HomeFragment.java +++ b/app/src/main/java/com/example/vdcscore/ui/home/HomeFragment.java @@ -61,7 +61,7 @@ public class HomeFragment extends Fragment { } private void fetchStandings() { - mDatabase = FirebaseDatabase.getInstance().getReference("classificacoes").child(currentEscalao); + mDatabase = FirebaseDatabase.getInstance().getReference("standings").child(currentEscalao); // Remove previous listener to avoid duplicate data or leaks if (mValueEventListener != null) { @@ -75,22 +75,22 @@ public class HomeFragment extends Fragment { for (DataSnapshot postSnapshot : snapshot.getChildren()) { Team team = postSnapshot.getValue(Team.class); if (team != null) { - // If ID is missing, set it from the key (although team_id comes from json usually) - if (team.getTeam_id() == null) { - team.setTeam_id(postSnapshot.getKey()); + // If ID is missing, set it from the key + if (team.getId() == null) { + team.setId(postSnapshot.getKey()); } teams.add(team); } } - // Sort properly (JSON might already be sorted by "posicao", but we sort by points and GD just in case) + // Sort by Points (Descending), then Goal Difference, then Goals For Collections.sort(teams, new Comparator() { @Override public int compare(Team t1, Team t2) { - if (t1.getPontos() != t2.getPontos()) { - return t2.getPontos() - t1.getPontos(); // Descending points + if (t1.getPoints() != t2.getPoints()) { + return t2.getPoints() - t1.getPoints(); // Descending points } - return t2.getDiferenca_golos() - t1.getDiferenca_golos(); // Descending GD + return t2.getGoalDifference() - t1.getGoalDifference(); // Descending GD } }); diff --git a/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java b/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java index 4075ae1..287f797 100644 --- a/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java +++ b/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java @@ -13,8 +13,6 @@ import com.example.vdcscore.R; import java.util.ArrayList; import java.util.List; -import com.bumptech.glide.Glide; - public class StandingsAdapter extends RecyclerView.Adapter { private List mTeams; @@ -57,18 +55,13 @@ public class StandingsAdapter extends RecyclerView.Adapter