From 991823ea22d27db2ac0356addffa6f99f8ab25fd Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Wed, 15 Aug 2018 22:39:08 +0200
Subject: [PATCH] changes
---
.idea/assetWizardSettings.xml | 4 ++--
.../java/adrienmalin/pingpoints/MainActivity.kt | 10 +++++-----
app/src/main/res/drawable/ic_left_service.xml | 5 +++++
app/src/main/res/drawable/ic_relaunch.xml | 8 --------
app/src/main/res/drawable/ic_right_service.xml | 5 +++++
app/src/main/res/drawable/ic_service.xml | 8 --------
app/src/main/res/layout/activity_main.xml | 15 +++++++++++----
app/src/main/res/values-fr/strings.xml | 10 +++++-----
app/src/main/res/values/strings.xml | 12 ++++++------
9 files changed, 39 insertions(+), 38 deletions(-)
create mode 100644 app/src/main/res/drawable/ic_left_service.xml
delete mode 100644 app/src/main/res/drawable/ic_relaunch.xml
create mode 100644 app/src/main/res/drawable/ic_right_service.xml
delete mode 100644 app/src/main/res/drawable/ic_service.xml
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 5258d9f..b5e3304 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -132,8 +132,8 @@
<entry key="assetSourceType" value="FILE" />
<entry key="autoMirrored" value="true" />
<entry key="color" value="ffffff" />
- <entry key="outputName" value="server" />
- <entry key="sourceFile" value="C:\Users\adima\Downloads\ping-pong (2).svg" />
+ <entry key="outputName" value="ic_right_service" />
+ <entry key="sourceFile" value="C:\Users\adima\Downloads\table-tennis (1).svg" />
</map>
</option>
</PersistentState>
diff --git a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
index e28953f..6ef870e 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
@@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity(), StarterNameDialog.StarterNameDialogLis
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
- //setSupportActionBar(findViewById(R.id.toolbar))
+ setSupportActionBar(findViewById(R.id.toolbar))
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
@@ -82,12 +82,12 @@ class MainActivity : AppCompatActivity(), StarterNameDialog.StarterNameDialogLis
when (serviceSide) {
Side.LEFT -> {
- buttons[Side.LEFT.value].setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_service, 0, 0, 0)
- buttons[Side.RIGHT.value].setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_relaunch, 0, 0, 0)
+ buttons[Side.LEFT.value].setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_left_service, 0, 0, 0)
+ buttons[Side.RIGHT.value].setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
}
Side.RIGHT -> {
- buttons[Side.LEFT.value].setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_relaunch, 0)
- buttons[Side.RIGHT.value].setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_service, 0)
+ buttons[Side.LEFT.value].setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
+ buttons[Side.RIGHT.value].setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_right_service, 0)
}
}
}
diff --git a/app/src/main/res/drawable/ic_left_service.xml b/app/src/main/res/drawable/ic_left_service.xml
new file mode 100644
index 0000000..017da1e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left_service.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:viewportHeight="285.876" android:viewportWidth="285.876"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#FFFFFF" android:pathData="M261.207,76.226c-8.573,9.43 -20.236,13.134 -27.668,9.293c0.605,6.751 -3.436,13.287 -10.141,15.544c-18.231,6.139 -37.408,9.21 -56.583,9.21c-10.257,0 -20.512,-0.885 -30.624,-2.643c15.289,20.576 39.358,32.753 65.156,32.753c8.284,0 15,6.716 15,15s-6.716,15 -15,15c-32.82,0 -63.598,-14.394 -84.591,-39.029l-26.497,44.097c30.164,25.599 53.935,55.258 70.763,88.411c3.749,7.387 0.801,16.415 -6.587,20.165c-2.176,1.104 -4.494,1.627 -6.777,1.627c-5.47,0 -10.742,-3.002 -13.388,-8.214c-14.607,-28.78 -35.188,-54.695 -61.282,-77.281c-3.667,27.708 -13.553,54.145 -29.537,78.86c-2.871,4.438 -7.69,6.855 -12.609,6.855c-2.792,0 -5.614,-0.778 -8.132,-2.406c-6.957,-4.499 -8.935,-13.785 -4.436,-20.741c17.485,-27.035 26.365,-56.402 26.365,-87.284v-3.058c0,-4.645 0.568,-9.303 3.111,-13.535L92.94,83.63c6.162,-13.495 19.867,-12.797 26.78,-11.028l0.941,0.311c30.074,9.922 63.158,9.825 93.164,-0.28c4.559,-1.533 9.328,-0.743 13.052,1.715c-0.392,-6.599 2.662,-14.617 8.781,-21.348c9.621,-10.583 23.14,-13.963 30.195,-7.549C272.908,51.864 270.828,65.643 261.207,76.226zM244.508,138.119c-4.768,0 -8.632,3.865 -8.632,8.632s3.865,8.632 8.632,8.632c4.768,0 8.632,-3.865 8.632,-8.632S249.276,138.119 244.508,138.119zM121.3,62.781c17.337,0 31.391,-14.054 31.391,-31.391S138.636,0 121.3,0c-17.337,0 -31.391,14.054 -31.391,31.391S103.963,62.781 121.3,62.781z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_relaunch.xml b/app/src/main/res/drawable/ic_relaunch.xml
deleted file mode 100644
index 672fc21..0000000
--- a/app/src/main/res/drawable/ic_relaunch.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:autoMirrored="true" android:height="512dp"
- android:viewportHeight="24.0" android:viewportWidth="24.0"
- android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#888888" android:pathData="M449.921,62.145C394.726,6.951 313.935,-13.444 239.081,8.921c-5.292,1.581 -8.3,7.152 -6.719,12.444c1.58,5.292 7.158,8.3 12.443,6.719c67.806,-20.259 140.982,-1.788 190.973,48.203c74.886,74.886 74.886,196.734 0,271.62l-28.366,28.365c-29.027,29.027 -66.065,46.86 -104.838,52.817L82.772,209.284c2.887,-18.891 8.617,-37.443 17.277,-54.927c2.451,-4.949 0.427,-10.948 -4.522,-13.399c-4.948,-2.449 -10.947,-0.426 -13.399,4.522c-31.039,62.663 -28.32,137.72 6.701,197.839l-72.237,72.235c-22.034,22.034 -22.034,57.886 0,79.92c11.018,11.017 25.489,16.525 39.96,16.525c14.471,0 28.942,-5.509 39.959,-16.525l72.236,-72.236c31.851,18.552 68.385,28.332 105.32,28.33c7.155,0 14.334,-0.367 21.486,-1.109c47.455,-4.922 92.204,-26.246 126.002,-60.044l28.366,-28.365C532.603,279.365 532.603,144.829 449.921,62.145zM80.593,235.391l58.081,58.081l-35.162,35.163C87.838,299.874 80.141,267.621 80.593,235.391zM160.163,403.538l-77.794,77.795c-14.235,14.236 -37.398,14.237 -51.635,0c-14.236,-14.236 -14.236,-37.398 0,-51.635l77.794,-77.794l44.289,-44.289l51.634,51.634L160.163,403.538zM183.43,408.556l35.164,-35.165l57.895,57.895C244.564,431.8 212.418,424.352 183.43,408.556z"/>
- <path android:fillColor="#888888" android:pathData="M215.907,40.427c-13.222,-13.221 -30.8,-20.502 -49.497,-20.502c-18.697,0 -36.276,7.281 -49.496,20.502c-13.221,13.222 -20.503,30.8 -20.503,49.497c0,18.697 7.282,36.276 20.503,49.496c13.221,13.221 30.8,20.503 49.496,20.503c18.698,0 36.276,-7.281 49.497,-20.502c13.221,-13.222 20.502,-30.8 20.502,-49.497S229.128,53.648 215.907,40.427zM201.764,125.278c-9.443,9.444 -22,14.645 -35.354,14.645s-25.911,-5.201 -35.354,-14.645c-19.495,-19.494 -19.495,-51.215 0,-70.71c9.443,-9.443 21.999,-14.644 35.354,-14.644s25.912,5.201 35.354,14.645c9.444,9.444 14.645,22 14.645,35.354S211.209,115.835 201.764,125.278z"/>
- <path android:fillColor="#888888" android:pathData="M407.873,104.582l-0.227,-0.226c-3.921,-3.888 -10.254,-3.86 -14.142,0.063c-3.888,3.922 -3.859,10.254 0.063,14.142l0.1,0.099c1.957,1.973 4.53,2.961 7.104,2.961c2.544,0 5.089,-0.965 7.039,-2.897C411.733,114.836 411.761,108.505 407.873,104.582z"/>
- <path android:fillColor="#888888" android:pathData="M431.236,134.748c-2.806,-4.756 -8.938,-6.337 -13.694,-3.53c-4.756,2.807 -6.337,8.938 -3.53,13.694c11.898,20.163 18.221,43.269 18.283,66.824c0.015,5.514 4.488,9.974 9.999,9.974c0.009,0 0.019,0 0.027,0c5.523,-0.015 9.988,-4.504 9.974,-10.027C452.223,184.575 444.941,157.971 431.236,134.748z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_right_service.xml b/app/src/main/res/drawable/ic_right_service.xml
new file mode 100644
index 0000000..0c35211
--- /dev/null
+++ b/app/src/main/res/drawable/ic_right_service.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:viewportHeight="285.876" android:viewportWidth="285.876"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#ffffff" android:pathData="m24.693,76.226c8.573,9.43 20.236,13.134 27.668,9.293 -0.605,6.751 3.436,13.287 10.141,15.544 18.231,6.139 37.408,9.21 56.583,9.21 10.257,0 20.512,-0.885 30.624,-2.643 -15.289,20.576 -39.358,32.753 -65.156,32.753 -8.284,0 -15,6.716 -15,15 -0,8.284 6.716,15 15,15 32.82,0 63.598,-14.394 84.591,-39.029l26.497,44.097c-30.164,25.599 -53.935,55.258 -70.763,88.411 -3.749,7.387 -0.801,16.415 6.587,20.165 2.176,1.104 4.494,1.627 6.777,1.627 5.47,0 10.742,-3.002 13.388,-8.214 14.607,-28.78 35.188,-54.695 61.282,-77.281 3.667,27.708 13.553,54.145 29.537,78.86 2.871,4.438 7.69,6.855 12.609,6.855 2.792,0 5.614,-0.778 8.132,-2.406 6.957,-4.499 8.935,-13.785 4.436,-20.741 -17.485,-27.035 -26.365,-56.402 -26.365,-87.284l-0,-3.058c-0,-4.645 -0.568,-9.303 -3.111,-13.535L192.96,83.63c-6.162,-13.495 -19.867,-12.797 -26.78,-11.028l-0.941,0.311c-30.074,9.922 -63.158,9.825 -93.164,-0.28 -4.559,-1.533 -9.328,-0.743 -13.052,1.715 0.392,-6.599 -2.662,-14.617 -8.781,-21.348 -9.621,-10.583 -23.14,-13.963 -30.195,-7.549 -7.055,6.413 -4.975,20.192 4.646,30.775zM41.392,138.119c4.768,0 8.632,3.865 8.632,8.632 -0,4.767 -3.865,8.632 -8.632,8.632 -4.768,0 -8.632,-3.865 -8.632,-8.632 -0,-4.767 3.864,-8.632 8.632,-8.632zM164.6,62.781c-17.337,0 -31.391,-14.054 -31.391,-31.391C133.209,14.053 147.264,0 164.6,0 181.937,0 195.991,14.054 195.991,31.391c-0,17.337 -14.054,31.39 -31.391,31.39z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_service.xml b/app/src/main/res/drawable/ic_service.xml
deleted file mode 100644
index 5fe52b7..0000000
--- a/app/src/main/res/drawable/ic_service.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
- android:viewportHeight="511.999" android:viewportWidth="511.999"
- android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#FFFFFF" android:pathData="M449.921,62.145C394.726,6.951 313.935,-13.444 239.081,8.921c-5.292,1.581 -8.3,7.152 -6.719,12.444c1.58,5.292 7.158,8.3 12.443,6.719c67.806,-20.259 140.982,-1.788 190.973,48.203c74.886,74.886 74.886,196.734 0,271.62l-28.366,28.365c-29.027,29.027 -66.065,46.86 -104.838,52.817L82.772,209.284c2.887,-18.891 8.617,-37.443 17.277,-54.927c2.451,-4.949 0.427,-10.948 -4.522,-13.399c-4.948,-2.449 -10.947,-0.426 -13.399,4.522c-31.039,62.663 -28.32,137.72 6.701,197.839l-72.237,72.235c-22.034,22.034 -22.034,57.886 0,79.92c11.018,11.017 25.489,16.525 39.96,16.525c14.471,0 28.942,-5.509 39.959,-16.525l72.236,-72.236c31.851,18.552 68.385,28.332 105.32,28.33c7.155,0 14.334,-0.367 21.486,-1.109c47.455,-4.922 92.204,-26.246 126.002,-60.044l28.366,-28.365C532.603,279.365 532.603,144.829 449.921,62.145zM80.593,235.391l58.081,58.081l-35.162,35.163C87.838,299.874 80.141,267.621 80.593,235.391zM160.163,403.538l-77.794,77.795c-14.235,14.236 -37.398,14.237 -51.635,0c-14.236,-14.236 -14.236,-37.398 0,-51.635l77.794,-77.794l44.289,-44.289l51.634,51.634L160.163,403.538zM183.43,408.556l35.164,-35.165l57.895,57.895C244.564,431.8 212.418,424.352 183.43,408.556z"/>
- <path android:fillColor="#FFFFFF" android:pathData="M215.907,40.427c-13.222,-13.221 -30.8,-20.502 -49.497,-20.502c-18.697,0 -36.276,7.281 -49.496,20.502c-13.221,13.222 -20.503,30.8 -20.503,49.497c0,18.697 7.282,36.276 20.503,49.496c13.221,13.221 30.8,20.503 49.496,20.503c18.698,0 36.276,-7.281 49.497,-20.502c13.221,-13.222 20.502,-30.8 20.502,-49.497S229.128,53.648 215.907,40.427zM201.764,125.278c-9.443,9.444 -22,14.645 -35.354,14.645s-25.911,-5.201 -35.354,-14.645c-19.495,-19.494 -19.495,-51.215 0,-70.71c9.443,-9.443 21.999,-14.644 35.354,-14.644s25.912,5.201 35.354,14.645c9.444,9.444 14.645,22 14.645,35.354S211.209,115.835 201.764,125.278z"/>
- <path android:fillColor="#FFFFFF" android:pathData="M407.873,104.582l-0.227,-0.226c-3.921,-3.888 -10.254,-3.86 -14.142,0.063c-3.888,3.922 -3.859,10.254 0.063,14.142l0.1,0.099c1.957,1.973 4.53,2.961 7.104,2.961c2.544,0 5.089,-0.965 7.039,-2.897C411.733,114.836 411.761,108.505 407.873,104.582z"/>
- <path android:fillColor="#FFFFFF" android:pathData="M431.236,134.748c-2.806,-4.756 -8.938,-6.337 -13.694,-3.53c-4.756,2.807 -6.337,8.938 -3.53,13.694c11.898,20.163 18.221,43.269 18.283,66.824c0.015,5.514 4.488,9.974 9.999,9.974c0.009,0 0.019,0 0.027,0c5.523,-0.015 9.988,-4.504 9.974,-10.027C452.223,184.575 444.941,157.971 431.236,134.748z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d4ed6c0..36e5527 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,9 +7,16 @@
tools:context=".MainActivity"
tools:layout_editor_absoluteY="73dp">
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp"
+ android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
- <LinearLayout
+ <LinearLayout
android:id="@+id/linearLayoutText"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -23,7 +30,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
- <TextView
+ <TextView
android:id="@+id/textService"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -82,7 +89,7 @@
android:layout_marginTop="8dp"
android:layout_weight="1"
android:bufferType="spannable"
- android:drawableLeft="@drawable/ic_service"
+ android:drawableLeft="@drawable/ic_left_service"
android:onClick="onClickLeftPlayer"
android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 624aaa5..b3d9558 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2,21 +2,21 @@
<resources>
<string name="app_name">Ping Points</string>
<string name="info">Cliquez sur le joueur qui a marqué</string>
- <string name="service">Service : %1s</string>
- <string name="score">Score : %1d - %2d</string>
+ <string name="service">Service : %s</string>
+ <string name="score">Score : %d - %d</string>
<string-array name="default_players_names">
<item>Joueur 1</item>
<item>Joueur 2</item>
</string-array>
- <string name="end_match_dialog_title">Bravo %1s !</string>
+ <string name="end_match_dialog_title">Bravo %s !</string>
<string name="new_match">Nouveau match</string>
<string name="quit_button">Quitter</string>
<string name="name">Nom</string>
<string name="go_button">Allons-y !</string>
<string name="starter_name_dialog_message">Qui commence ?</string>
<string name="share_button">Partager</string>
- <string name="share_subject">Match Ping Points : %1s contre %2s</string>
- <string name="share_message">%1s contre %2s:\n%3s a gagné par %4d à %5d\n\nPing Points est disponible sur Google Play</string>
+ <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</string>
<string name="PingPointsCredits">Ping Points par Adrien Malingrey</string>
<string name="iconCredits"><div>Icônes par <a href="http://www.freepik.com" title="Freepik">Freepik</a> chez <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> Licence <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div></string>
<string name="about">À propos</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 850f291..1399da9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,10 +3,10 @@
<string name="go_button">Play</string>
<string name="starter_name_dialog_message">Who starts?</string>
<string name="info">Click on the scoring player</string>
- <string name="service">Service: %1s</string>
- <string name="score">Score: %1d - %2d</string>
- <string name="button_text" translatable="false">%1s <br /> <br /> <big> <big> %2d </big> </big></string>
- <string name="end_match_dialog_title">Congratulations, %1s!</string>
+ <string name="service">Service: %s</string>
+ <string name="score">Score: %d - %d</string>
+ <string name="button_text" translatable="false">%s <br /> <br /> <big> <big> %d </big> </big></string>
+ <string name="end_match_dialog_title">Congratulations, %s!</string>
<string-array name="default_players_names">
<item>Player 1</item>
<item>Player 2</item>
@@ -15,8 +15,8 @@
<string name="quit_button">Quit</string>
<string name="name">Name</string>
<string name="share_button">Share</string>
- <string name="share_subject">Ping Points Match: %1s vs. %2s</string>
- <string name="share_message">%1s vs. %2s:\n%3s won by %4d to %5d\n\nGet Ping Points on Google Play</string>
+ <string name="share_subject">Ping Points Match: %s vs. %s</string>
+ <string name="share_message">%s vs. %s: %s won by %d to %d Get Ping Points on Google Play</string>
<string name="radioText" translatable="false"></string>
<string name="PingPointsCredits">Ping Points by Adrien Malingrey</string>
<string name="iconCredits"><div>Icons made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div></string>