From bcfa4cb57ca839fde5a1e31fb82174ea4eeaa7cf Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Fri, 7 Dec 2018 01:07:30 +0100
Subject: [PATCH] previous matches table tweaks

---
 .../main/java/adrienmalin/pingpoints/VictoryActivity.kt   | 3 +--
 app/src/main/res/layout/activity_victory.xml              | 8 ++++----
 app/src/main/res/values/strings.xml                       | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
index fa529da..0311fa8 100644
--- a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
@@ -50,8 +50,7 @@ class VictoryActivity : AppCompatActivity() {
                         getString(
                             R.string.results,
                             players[0].name,
-                            players[0].score,
-                            players[1].score,
+                            "%2d - %2d".format(players[0].score, players[1].score),
                             players[1].name,
                             previousMatches
                         )
diff --git a/app/src/main/res/layout/activity_victory.xml b/app/src/main/res/layout/activity_victory.xml
index affb3d0..ee70d73 100644
--- a/app/src/main/res/layout/activity_victory.xml
+++ b/app/src/main/res/layout/activity_victory.xml
@@ -72,16 +72,16 @@
                 android:layout_marginRight="8dp" android:layout_marginTop="32dp"/>
         <GridView
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 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"
+                android:gravity="center"
                 app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginRight="16dp"/>
+                android:layout_marginRight="16dp" android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toTopOf="@+id/button3"/>
         <Button
                 android:text="@string/new_match"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1054ea4..7c239b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="previous_matches">Previous matches</string>
     <string name="new_match">New match</string>
     <string name="share">Share</string>
-    <string name="results" translatable="false">%s\t%d - %d\t%s\n%s</string>
+    <string name="results" translatable="false">%s\t%s\t%s\n%s</string>
     <string name="victory_speech">%s wins by %d to %d.</string>
     <string name="share_subject">Ping Points Match: %s vs. %s</string>
     <string name="share_message">%s vs. %s:\n%s won by %d to %d\nGet Ping Points on Google Play</string>
@@ -40,6 +40,6 @@
     <string name="STT_hint">Say: \"Point for %s\"\nor \"Point for %s\"</string>
     <string name="pattern">(?i:Point for %s)</string>
     <string name="not_understood">Can you repeat, please?</string>
-    <string name="score" translatable="false">%2d - %2d</string>
+    <string name="score" translatable="false">%d - %d</string>
     <string name="STT_disabled">Voice recognition disabled.</string>
 </resources>