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

STT

Browse Source
This commit is contained in:
adrienmalin
2018-12-05 00:17:15 +01:00
parent 3a34e9a390
commit aab005447d
14 changed files with 205 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/layout-land/activity_match.xml
View File

@ -88,7 +88,6 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_weight="1"
android:background="@color/colorAccent"
android:bufferType="spannable"
android:onClick="updateScore"
android:textAllCaps="false"
@ -98,7 +97,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/imgService0"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/button_text" android:layout_marginRight="8dp"/>
tools:text="@string/button_text" android:layout_marginRight="8dp"
android:theme="@style/ScoreButton"/>
<Button
android:id="@+id/buttonPlayer1"
@ -111,7 +111,6 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_weight="1"
android:background="@color/colorAccent"
android:bufferType="spannable"
android:onClick="updateScore"
android:textAllCaps="false"
@ -121,7 +120,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imgService1"
app:layout_constraintStart_toEndOf="@+id/buttonPlayer0"
tools:text="@string/button_text"/>
tools:text="@string/button_text" android:theme="@style/ScoreButton"/>
<ImageView
android:id="@+id/imgService1"

10
app/src/main/res/layout/activity_match.xml
View File

@ -82,7 +82,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:background="@color/colorAccent"
android:bufferType="spannable"
android:onClick="updateScore"
android:textAllCaps="false"
@ -92,7 +91,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/imgService0"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/button_text" android:layout_margin="8dp" android:layout_weight="1"/>
tools:text="@string/button_text" android:layout_margin="8dp" android:layout_weight="1"
android:clickable="true" android:focusableInTouchMode="true"
android:theme="@style/ScoreButton"/>
<Button
android:id="@+id/buttonPlayer1"
@ -100,7 +101,6 @@
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:background="@color/colorAccent"
android:bufferType="spannable"
android:onClick="updateScore"
android:textAllCaps="false"
@ -110,7 +110,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imgService1"
app:layout_constraintStart_toEndOf="@+id/buttonPlayer0"
tools:text="@string/button_text" android:layout_margin="8dp" android:layout_weight="1"/>
tools:text="@string/button_text" android:layout_margin="8dp" android:layout_weight="1"
android:clickable="true" android:focusableInTouchMode="true"
android:theme="@style/ScoreButton"/>
<ImageView
android:id="@+id/imgService1"

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

@ -37,11 +37,13 @@
<GridView
android:layout_width="0dp"
android:layout_height="wrap_content"
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"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/congrats" android:id="@+id/resultGrid"
android:numColumns="3"/>
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"/>
<TextView
android:text="@string/previous_matches"
android:layout_width="wrap_content"
@ -71,12 +73,16 @@
android:drawableStart="@drawable/ic_share" android:onClick="share"/>
<GridView
android:layout_width="0dp"
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_height="wrap_content"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/textView3"
android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
android:numColumns="5" 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"
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>

14
app/src/main/res/layout/grid_item.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:text="TextView"
android:layout_width="0dp"
android:layout_height="wrap_content" tools:layout_editor_absoluteY="254dp"
android:id="@+id/grid_item_text" android:gravity="center" 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.support.constraint.ConstraintLayout>

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

@ -35,7 +35,8 @@ Vous pouvez à tout moment changer la permission dans les paramètres Android."
<string name="share">Partager</string>
<string name="victory_speech">%s gagne par %d à %d.</string>
<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="share_message">"%s contre %s:\n%s a gagné par %d à %d\nPing Points est disponible sur Google Play\n "</string>
<string name="match_point">Balle de match</string>
<string name="STT_hint">Dîtes : \"Point pour %s\"\nou \"Point pour %s\"</string>
<string name="pattern">Point pour %s</string>
</resources>

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

@ -38,10 +38,11 @@
<string name="previous_matches">Previous matches</string>
<string name="new_match">New match</string>
<string name="share">Share</string>
<string name="result" translatable="false">"%s\t%s\t%s"</string>
<string name="result" translatable="false">"%s\t%d - %d\t%s\n"</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\t-\t%d"</string>
<string name="share_message">%s vs. %s:\n%s won by %d to %d\nGet Ping Points on Google Play</string>
<string name="match_point">Match point</string>
<string name="STT_hint">Say: \"Point for %s\"\nor \"Point for %s\"</string>
<string name="pattern">Point for %s</string>
</resources>

3
app/src/main/res/values/styles.xml
View File

@ -3,4 +3,7 @@
<style name="AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="ScoreButton">
<item name="colorButtonNormal">@color/colorAccent</item>
</style>
</resources>