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

add undo/redo, link

Browse Source
This commit is contained in:
adrienmalin
2018-08-16 23:41:54 +02:00
parent b5d6fedffc
commit a914912b76
10 changed files with 78 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/activity_main.xml
View File

@ -42,8 +42,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="left"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintBottom_toTopOf="@+id/linearLayoutButtons"
app:layout_constraintEnd_toEndOf="parent"
@ -59,8 +58,7 @@
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="right|center"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

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

@ -19,13 +19,13 @@
android:id="@+id/radioLeftPlayer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="0"
android:checked="true"
android:inputType="text" />
<android.support.design.widget.TextInputEditText
android:id="@+id/inputLeftPlayerName"
android:layout_width="100dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/name"
@ -36,12 +36,12 @@
android:id="@+id/radioRightPlayer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="0"
android:inputType="none" />
<android.support.design.widget.TextInputEditText
android:id="@+id/inputRightPlayerName"
android:layout_width="100dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/name"

14
app/src/main/res/menu/main.xml
View File

@ -1,6 +1,20 @@
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_undo"
android:icon="@drawable/ic_undo"
android:title="@string/undo"
app:showAsAction="ifRoom"
android:enabled="false" />
<item
android:id="@+id/action_redo"
android:icon="@drawable/ic_redo"
android:title="@string/redo"
app:showAsAction="ifRoom"
android:visible="false" />
<item
android:id="@+id/action_new_match"
android:icon="@drawable/ic_new_match"

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

@ -17,8 +17,10 @@
<string name="share_button">Partager</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="PingPointsCredits">Ping Points par Adrien Malin</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>
<string name="service_img_description">Service</string>
<string name="undo">Annuler</string>
<string name="redo">Rétablir</string>
</resources>

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

@ -18,8 +18,10 @@
<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\n\nGet Ping Points on Google Play</string>
<string name="radioText" translatable="false"></string>
<string name="PingPointsCredits">Ping Points by Adrien Malingrey</string>
<string name="PingPointsCredits">Ping Points by Adrien Malin</string>
<string name="iconCredits">Icons made by &lt;a href=&quot;http://www.freepik.com&quot; title=&quot;Freepik&quot;&gt;Freepik&lt;/a&gt; from &lt;a href=&quot;https://www.flaticon.com/&quot; title=&quot;Flaticon&quot;&gt;www.flaticon.com&lt;/a&gt; is licensed by &lt;a href=&quot;http://creativecommons.org/licenses/by/3.0/&quot; title=&quot;Creative Commons BY 3.0&quot; target=&quot;_blank&quot;&gt;CC 3.0 BY&lt;/a&gt;</string>
<string name="about">About</string>
<string name="service_img_description">Service</string>
<string name="undo">Undo</string>
<string name="redo">Redo</string>
</resources>