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

Match point + previous matches in table

Browse Source
This commit is contained in:
adrienmalin
2018-12-04 20:52:15 +01:00
parent 7b2c35c5a6
commit 3a34e9a390
9 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,25 +34,25 @@
android:layout_marginRight="8dp" android:layout_marginStart="8dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp"
android:text="@string/congrats"/>
<TextView
android:text="@string/score_names"
android:layout_width="wrap_content"
<GridView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/scoreNames" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/congrats" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp" android:layout_marginRight="8dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:textAppearance="@style/TextAppearance.AppCompat.Large"/>
app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/congrats" android:id="@+id/resultGrid"
android:numColumns="3"/>
<TextView
android:text="@string/previous_matches"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView3" android:layout_marginTop="24dp"
app:layout_constraintTop_toBottomOf="@+id/scoreNames" app:layout_constraintEnd_toEndOf="parent"
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"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAllCaps="true"
app:layout_constraintTop_toBottomOf="@+id/resultGrid" android:layout_marginTop="32dp"/>
<Button
android:text="@string/new_match"
android:layout_width="wrap_content"
@ -69,16 +69,14 @@
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"/>
<TextView
android:text="TextView"
<GridView
android:layout_width="0dp"
android:layout_height="0dp"
android:id="@+id/previousMatches" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/textView3" android:layout_marginBottom="8dp"
android:gravity="center_horizontal" app:layout_constraintBottom_toBottomOf="parent"/>
android:layout_height="0dp" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/textView3" android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
android:numColumns="5" android:id="@+id/previousMatchesGrid" android:clickable="false"/>
</android.support.constraint.ConstraintLayout>

1
app/src/main/res/values-fr/strings.xml
View File

@ -37,4 +37,5 @@ Vous pouvez à tout moment changer la permission dans les paramètres Android."
<string name="share_subject">Match Ping Points : %s contre %s</string>
<string name="share_message">"%s contre %s:\n%s a gagné par %s\nPing Points est disponible sur Google Play\n "</string>
<string name="score_only">%d - %d</string>
<string name="match_point">Balle de match</string>
</resources>

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

@ -38,9 +38,10 @@
<string name="previous_matches">Previous matches</string>
<string name="new_match">New match</string>
<string name="share">Share</string>
<string name="score_names" translatable="false">%s %s %s</string>
<string name="result" translatable="false">"%s\t%s\t%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 %s\nGet Ping Points on Google Play</string>
<string name="score_only">%d - %d</string>
<string name="score_only">"%d\t-\t%d"</string>
<string name="match_point">Match point</string>
</resources>