From bfea110ecc4314c9cbdc4b2866843ef1cbdb7aae Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Wed, 5 Dec 2018 08:49:21 +0100
Subject: [PATCH] change result display on victory activity

---
 .../adrienmalin/pingpoints/MatchActivity.kt   |  2 +-
 .../adrienmalin/pingpoints/VictoryActivity.kt | 15 ++--
 .../main/res/layout-land/activity_match.xml   |  2 +-
 app/src/main/res/layout/activity_match.xml    |  2 +-
 app/src/main/res/layout/activity_victory.xml  | 81 ++++++++++++-------
 app/src/main/res/values-fr/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  3 +-
 7 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index c06d438..1245d8b 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -121,7 +121,7 @@ class MatchActivity : AppCompatActivity(), TextToSpeech.OnInitListener {
             }
 
             textScore?.text = getString(
-                R.string.score,
+                R.string.score_score,
                 players[serviceSide].score,
                 players[relaunchSide].score
             )
diff --git a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
index 548186e..1eb7331 100644
--- a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
@@ -60,16 +60,13 @@ class VictoryActivity : AppCompatActivity() {
 
             // UpdateUI
             findViewById<TextView>(R.id.congrats).text = getString(R.string.congrats, it.winnerName)
-            findViewById<GridView>(R.id.resultGrid).adapter = ArrayAdapter<String>(
-                this,
-                R.layout.grid_item,
-                R.id.grid_item_text,
-                arrayOf<String>(
-                    it.players[0].name,
-                    it.players[0].score.toString() + " - " + it.players[1].score.toString(),
-                    it.players[1].name
-                )
+            findViewById<TextView>(R.id.player1NameTextView).text = it.players[0].name
+            findViewById<TextView>(R.id.scoreTextView).text = getString(
+                R.string.score,
+                it.players[0].score,
+                it.players[1].score
             )
+            findViewById<TextView>(R.id.player2NameTextView).text = it.players[1].name
             findViewById<GridView>(R.id.previousMatchesGrid).adapter = ArrayAdapter<String>(
                 this,
                 R.layout.grid_item,
diff --git a/app/src/main/res/layout-land/activity_match.xml b/app/src/main/res/layout-land/activity_match.xml
index 8217259..4ed2af8 100644
--- a/app/src/main/res/layout-land/activity_match.xml
+++ b/app/src/main/res/layout-land/activity_match.xml
@@ -46,7 +46,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    android:layout_marginRight="8dp" android:text="@string/score"/>
+                    android:layout_marginRight="8dp" android:text="@string/score_score"/>
             <TextView
                     android:id="@+id/textService"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_match.xml b/app/src/main/res/layout/activity_match.xml
index b12f227..b9c6939 100644
--- a/app/src/main/res/layout/activity_match.xml
+++ b/app/src/main/res/layout/activity_match.xml
@@ -45,7 +45,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    android:layout_marginRight="8dp" android:text="@string/score"
+                    android:layout_marginRight="8dp" android:text="@string/score_score"
                     android:layout_weight="1"/>
             <TextView
                     android:id="@+id/textService"
diff --git a/app/src/main/res/layout/activity_victory.xml b/app/src/main/res/layout/activity_victory.xml
index ade6593..2724d84 100644
--- a/app/src/main/res/layout/activity_victory.xml
+++ b/app/src/main/res/layout/activity_victory.xml
@@ -34,27 +34,63 @@
                 android:layout_marginRight="8dp" android:layout_marginStart="8dp"
                 app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp"
                 android:text="@string/congrats"/>
-        <GridView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/congrats" android:id="@+id/resultGrid"
-                android:numColumns="3"
-                android:textFilterEnabled="false" android:gravity="center" app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
-                app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"/>
+        <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@+id/congrats"
+                android:id="@+id/resultLinearLayout" android:layout_marginTop="8dp"
+                app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toTopOf="@+id/previousMatchesTextView">
+            <TextView
+                    android:text="@string/player_1_default_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/player1NameTextView"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:gravity="right" tools:layout_editor_absoluteX="8dp" android:layout_weight="1"/>
+            <TextView
+                    android:text="@string/score"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" android:id="@+id/scoreTextView"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginLeft="24dp" android:layout_weight="0" android:layout_marginRight="24dp"/>
+            <TextView
+                    android:text="@string/player_2_default_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/player2NameTextView"
+                    android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp" android:gravity="left"
+                    android:layout_weight="1"/>
+        </LinearLayout>
         <TextView
                 android:text="@string/previous_matches"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/textView3"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="8dp" android:layout_marginRight="8dp"
-                app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="7dp"
-                android:layout_marginStart="7dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAllCaps="true"
-                app:layout_constraintTop_toBottomOf="@+id/resultGrid" android:layout_marginTop="32dp"/>
+                android:id="@+id/previousMatchesTextView"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/resultLinearLayout"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp" android:layout_marginTop="32dp"/>
+        <GridView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:layout_constraintTop_toBottomOf="@id/previousMatchesTextView"
+                android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
+                android:numColumns="3" android:id="@+id/previousMatchesGrid" android:clickable="false"
+                android:gravity="center" app:layout_constraintVertical_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginRight="8dp"/>
         <Button
                 android:text="@string/new_match"
                 android:layout_width="wrap_content"
@@ -62,6 +98,7 @@
                 android:id="@+id/button3" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp" android:layout_marginBottom="8dp"
                 app:layout_constraintBottom_toBottomOf="parent" android:drawableStart="@drawable/ic_new_match"
+                android:drawableLeft="@drawable/ic_new_match"
                 android:onClick="newMatch"/>
         <Button
                 android:text="@string/share"
@@ -71,18 +108,6 @@
                 app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
                 android:drawableStart="@drawable/ic_share" android:onClick="share"/>
-        <GridView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:layout_constraintTop_toBottomOf="@+id/textView3"
-                android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
-                android:numColumns="3" android:id="@+id/previousMatchesGrid" android:clickable="false"
-                android:gravity="center" app:layout_constraintVertical_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginRight="8dp"/>
 
     </android.support.constraint.ConstraintLayout>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4be1ef5..9d407cd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -22,7 +22,7 @@ Vous pouvez à tout moment changer la permission dans les paramètres Android."
         fichiers audio pour fonctionner.
     </string>
     <string name="service">Service : %s</string>
-    <string name="score">Score : %d - %d</string>
+    <string name="score_score">Score : %d - %d</string>
     <string name="service_img_description">Service</string>
     <string name="title_activity_match">Ping Points</string>
     <string name="update_score_speech">%d - %d. Service : %s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2431a9..edc025a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
     <string name="audio_record_permission_denied">Audio recording permission required to use voice recognition.</string>
     <string name="title_activity_match">Ping Points</string>
     <string name="service">Service: %s</string>
-    <string name="score">Score: %d - %d</string>
+    <string name="score_score">Score: %d - %d</string>
     <string name="service_img_description">Service</string>
     <string name="button_text" translatable="false">%s &lt;br /&gt; &lt;br /&gt; &lt;big&gt; &lt;big&gt; %d &lt;/big&gt;
         &lt;/big&gt;
@@ -46,4 +46,5 @@
     <string name="STT_hint">Say: \"Point for %s\"\nor \"Point for %s\"</string>
     <string name="pattern">point for %s</string>
     <string name="not_understood">Can you repeat?</string>
+    <string name="score" translatable="false">%d - %d</string>
 </resources>