From c924564bf10305dbf95f16a7068b9908f9b34bdb Mon Sep 17 00:00:00 2001 From: ynerant Date: Fri, 6 Dec 2019 20:28:36 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9liorations=20graphiques?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +-- app/src/main/java/fr/ynerant/tarot/Game.java | 19 +++++++------ .../tarot/ui/newgame/NewGameFragment.java | 27 +++++++++++-------- .../main/res/layout/fragment_game_info.xml | 3 ++- app/src/main/res/layout/fragment_new_game.xml | 5 ++-- .../res/layout/fragment_personal_stats.xml | 6 ++--- 6 files changed, 35 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0b2a97d..d20cb4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.ynerant.tarot" minSdkVersion 24 targetSdkVersion 29 - versionCode 5 - versionName "0.2.1" + versionCode 6 + versionName "0.2.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/fr/ynerant/tarot/Game.java b/app/src/main/java/fr/ynerant/tarot/Game.java index 0c410cc..6f4554c 100644 --- a/app/src/main/java/fr/ynerant/tarot/Game.java +++ b/app/src/main/java/fr/ynerant/tarot/Game.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Executors; +import fr.ynerant.tarot.ui.games.GameInfoFragment; + public class Game { private static final Gson GSON; @SuppressLint("UseSparseArrays") @@ -357,6 +359,12 @@ public class Game { final List games = GSON.fromJson(new InputStreamReader(co.getInputStream()), new TypeToken>(){}.getType()); GAMES.clear(); + + for (Player p : Player.getAllPlayers()) { + for (GameType type : GameType.values()) + p.setScore(type, 0); + } + for (Game g : games) { GAMES.put(g.getId(), g); @@ -395,16 +403,7 @@ public class Game { if (g.player6 != null) g.getMiseries().add(g.misery6); - g.points = new ArrayList<>(); - g.points.add(g.score1); - g.points.add(g.score2); - g.points.add(g.score3); - if (g.player4 != null) - g.points.add(g.score4); - if (g.player5 != null) - g.points.add(g.score5); - if (g.player6 != null) - g.points.add(g.score6); + g.calculateScores(); for (Player p : g.getPlayers()) { p.addScore(g.getGameType(), g.getPoints(p)); diff --git a/app/src/main/java/fr/ynerant/tarot/ui/newgame/NewGameFragment.java b/app/src/main/java/fr/ynerant/tarot/ui/newgame/NewGameFragment.java index 8e2f093..f023bf8 100644 --- a/app/src/main/java/fr/ynerant/tarot/ui/newgame/NewGameFragment.java +++ b/app/src/main/java/fr/ynerant/tarot/ui/newgame/NewGameFragment.java @@ -514,6 +514,22 @@ public class NewGameFragment extends Fragment { co.disconnect(); Game.updateGames(); + + MainActivity.INSTANCE.runOnUiThread(new Runnable() { + @Override + public void run() { + for (int i = 0; i < 6; ++i) { + totalPoints[i].setText(String.valueOf(((Player) spinners[i].getSelectedItem()).getScore(Game.GameType.values()[nb_players.getProgress()]))); + miseries[i].setChecked(false); + handles[i].setAlpha(1.0F); + handles[i].setText(R.string.handle0); + } + + little_end.setProgress(0); + chelem_announced.setChecked(false); + chelem_realized.setChecked(false); + } + }); } catch (IOException ex) { ex.printStackTrace(); } @@ -545,17 +561,6 @@ public class NewGameFragment extends Fragment { game.setMiseries(miseriesList); game.calculateScores(); - for (int i = 0; i < game.getGameType().getNbPlayers(); ++i) - players.get(i).addScore(game.getGameType(), game.getPoints(players.get(i))); - - MainActivity.INSTANCE.runOnUiThread(new Runnable() { - @Override - public void run() { - for (int i = 0; i < 6; ++i) - totalPoints[i].setText(String.valueOf(((Player) spinners[i].getSelectedItem()).getScore(Game.GameType.values()[nb_players.getProgress()]))); - } - }); - return game; } }); diff --git a/app/src/main/res/layout/fragment_game_info.xml b/app/src/main/res/layout/fragment_game_info.xml index c8ce961..a40a2e4 100644 --- a/app/src/main/res/layout/fragment_game_info.xml +++ b/app/src/main/res/layout/fragment_game_info.xml @@ -21,7 +21,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:textAlignment="center"> + android:textAlignment="center" + android:stretchColumns="0,1,2,3,4,5"> + android:textAlignment="center" + android:stretchColumns="0,1,2,3,4,5"> + android:layout_height="wrap_content" + android:stretchColumns="0,1"> + android:textSize="18sp" />