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

improvements

Browse Source
This commit is contained in:
adrienmalin 2018-12-05 20:17:41 +01:00
parent 8d0cadaf88
commit 8bfb519bb3
9 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "adrienmalin.pingpoints"
minSdkVersion 15
targetSdkVersion 28
versionCode 1
versionName "1.0"
versionCode 3
versionName "2.0"
vectorDrawables.useSupportLibrary true
}
buildTypes {

BIN
app/release/app-release.apk Normal file
View File

Binary file not shown.

1
app/release/output.json Normal file
View File

@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

3
app/src/main/AndroidManifest.xml
View File

@ -23,8 +23,7 @@
</intent-filter>
</activity>
<activity
android:name=".MatchActivity"
android:label="@string/title_activity_match">
android:name=".MatchActivity">
</activity>
<activity android:name=".VictoryActivity">
</activity>

22
app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
View File

@ -156,23 +156,19 @@ class MatchActivity : AppCompatActivity() {
hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "Victory")
)
} else {
var scoreSpeech: String = getString(
R.string.update_score_speech,
players[serviceSide].score,
players[relaunchSide].score,
players[serviceSide].name
)
if (matchPoint)
scoreSpeech += getString(R.string.match_point)
tts?.speak(
getString(
R.string.update_score_speech,
players[serviceSide].score,
players[relaunchSide].score,
players[serviceSide].name
),
scoreSpeech,
TextToSpeech.QUEUE_FLUSH,
hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "MessageId")
)
if (matchPoint) {
tts?.speak(
getString(R.string.match_point),
TextToSpeech.QUEUE_ADD,
hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "MessageId")
)
}
}
}
}

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

@ -10,6 +10,8 @@ import android.view.View
import android.widget.ArrayAdapter
import android.widget.GridView
import android.widget.TextView
import kotlin.math.max
import kotlin.math.min
class VictoryActivity : AppCompatActivity() {
@ -46,12 +48,13 @@ class VictoryActivity : AppCompatActivity() {
putString(
"previousMatches",
getString(
R.string.result,
R.string.results,
players[0].name,
players[0].score,
players[1].score,
players[1].name
) + previousMatches
players[1].name,
previousMatches
)
)
commit()
}
@ -101,8 +104,8 @@ class VictoryActivity : AppCompatActivity() {
players[0].name,
players[1].name,
winnerName,
players[0].score,
players[1].score
max(players[0].score, players[1].score),
min(players[0].score, players[1].score)
)
)
type = "text/plain"

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

@ -20,8 +20,7 @@
<string name="service">Service : %s</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>
<string name="update_score_speech">"%d - %d. Service : %s. "</string>
<string name="button_hint">Cliquez sur le joueur qui a marqué</string>
<string name="redo">Rétablir</string>
<string name="undo">Annuler</string>
@ -33,8 +32,8 @@
<string name="share_subject">Match Ping Points : %s contre %s</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">(?i:Point pour %s)</string>
<string name="STT_hint">Dîtes : \"%s\" ou \"%s\"</string>
<string name="pattern">(?i:%s)</string>
<string name="not_understood">Pouvez-vous répéter ?</string>
<string name="STT_disabled">Reconnaissance vocale désactivée.</string>
</resources>

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

@ -18,14 +18,13 @@
<string name="OK">OK</string>
<string name="cancel">Cancel</string>
<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">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;
</string>
<string name="update_score_speech">%d - %d. Service: %s</string>
<string name="update_score_speech">"%d - %d. Service: %s. "</string>
<string name="button_hint">Click on the scoring player</string>
<string name="undo">Undo</string>
<string name="redo">Redo</string>
@ -33,14 +32,14 @@
<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%d - %d\t%s\n"</string>
<string name="results" translatable="false">%s\t%d - %d\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>
<string name="match_point">Match point</string>
<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?</string>
<string name="STT_hint">Say: \"%s\" or \"%s\"</string>
<string name="pattern">(?i:%s)</string>
<string name="not_understood">Can you repeat, please?</string>
<string name="score" translatable="false">%d - %d</string>
<string name="STT_disabled">Voice recognition disabled.</string>
</resources>