From 358f5541885b7bdcc0a45877a1a7a375a7e6a2ac Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 2 Dec 2019 17:14:15 +0100 Subject: [PATCH] Modifications de quelques chaines --- app/build.gradle | 4 ++-- .../java/fr/ynerant/tarot/ui/newgame/NewGameFragment.java | 4 ++++ app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d5fe702..e950aab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.ynerant.tarot" minSdkVersion 24 targetSdkVersion 29 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "0.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { 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 60a2472..db8566f 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 @@ -72,6 +72,10 @@ public class NewGameFragment extends Fragment { ArrayAdapter adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, new ArrayList<>(Player.getAllPlayers())); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); player1.setAdapter(adapter); + int id = 0; + while (adapter.getItem(id) != Player.THIS_PLAYER) + ++id; + player1.setSelection(id); player2.setAdapter(adapter); player2.setSelection(1); player3.setAdapter(adapter); diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index faacbf0..c9505c8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,6 @@ - Tarot ENS Info + Sécat[ENS] Paramètres Accueil En-tête de navigation diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d9dc60..9c70bce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Tarot ENS Info + Secat[ENS] Open navigation drawer Close navigation drawer Tarot ENS Info