adrien/PingPoints
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

previous matches table tweaks

Browse Source
This commit is contained in:
adrienmalin 2018-12-07 01:07:30 +01:00
parent ff57c29ce1
commit bcfa4cb57c
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
View File

@ -50,8 +50,7 @@ class VictoryActivity : AppCompatActivity() {
getString( getString(
R.string.results, R.string.results,
players[0].name, players[0].name,
players[0].score, "%2d - %2d".format(players[0].score, players[1].score),
players[1].score,
players[1].name, players[1].name,
previousMatches previousMatches
) )

8
app/src/main/res/layout/activity_victory.xml
View File

@ -72,16 +72,16 @@
android:layout_marginRight="8dp" android:layout_marginTop="32dp"/> android:layout_marginRight="8dp" android:layout_marginTop="32dp"/>
<GridView <GridView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/previousMatchesTextView" 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: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" app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp" android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="parent" 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 <Button
android:text="@string/new_match" android:text="@string/new_match"
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/main/res/values/strings.xml
View File

@ -32,7 +32,7 @@
<string name="previous_matches">Previous matches</string> <string name="previous_matches">Previous matches</string>
<string name="new_match">New match</string> <string name="new_match">New match</string>
<string name="share">Share</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="victory_speech">%s wins by %d to %d.</string>
<string name="share_subject">Ping Points Match: %s vs. %s</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> <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="STT_hint">Say: \"Point for %s\"\nor \"Point for %s\"</string>
<string name="pattern">(?i:Point for %s)</string> <string name="pattern">(?i:Point for %s)</string>
<string name="not_understood">Can you repeat, please?</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> <string name="STT_disabled">Voice recognition disabled.</string>
</resources> </resources>