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

Add Starter Name Dialog, minor UI changes

Browse Source
This commit is contained in:
adrienmalin
2018-08-14 18:30:20 +02:00
parent 7500de9e73
commit 0de1a4aa91
12 changed files with 228 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,20 +21,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/textScore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/score"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textService"
android:layout_width="match_parent"
@ -51,6 +37,20 @@
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textScore"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textScore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/score"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<LinearLayout
@ -71,7 +71,7 @@
<Button
android:id="@+id/buttonPlayer1"
style="@style/Widget.AppCompat.Button.Colored"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="8dp"
@ -91,7 +91,8 @@
app:layout_constraintEnd_toStartOf="@+id/buttonPlayer2"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textService" />
app:layout_constraintTop_toBottomOf="@+id/textService"
tools:text="@string/button_text" />
<Button
android:id="@+id/buttonPlayer2"
@ -114,7 +115,8 @@
app:layout_constraintBottom_toTopOf="@+id/textScore"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/buttonPlayer1"
app:layout_constraintTop_toBottomOf="@+id/textService" />
app:layout_constraintTop_toBottomOf="@+id/textService"
tools:text="@string/button_text" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>

20
app/src/main/res/layout/dialog.xml → app/src/main/res/layout/starter_name_dialog.xml
View File

@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
tools:context=".NomsJoueursEtPremierServeurDialog">
<!-- TODO: Update blank fragment layout -->
@ -14,10 +14,9 @@
<RadioButton
android:id="@+id/radioButtonJoueur1"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="RadioButton" />
android:layout_weight="1" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
@ -25,18 +24,17 @@
android:layout_weight="1">
<android.support.design.widget.TextInputEditText
android:id="@+id/InputJoueur1"
android:id="@+id/input_player_1_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="hint" />
android:hint="@string/name" />
</android.support.design.widget.TextInputLayout>
<RadioButton
android:id="@+id/radioButton2"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="RadioButton" />
android:layout_weight="1" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
@ -44,10 +42,10 @@
android:layout_weight="1">
<android.support.design.widget.TextInputEditText
android:id="@+id/InputJoueur2"
android:id="@+id/input_player_2_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="hint" />
android:hint="@string/name" />
</android.support.design.widget.TextInputLayout>
</RadioGroup>
</FrameLayout>

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

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Ping Points</string>
<string name="go">Allons-y !</string>
<string name="dialog_title">Nouvelle partie</string>
<string name="dialog_message">Qui commence ?</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="quit">Quitter</string>
<string-array name="players_names">
<item>Joueur 1</item>
<item>Joueur 2</item>
</string-array>
<string name="end_match_dialog_title">Bravo %1s !</string>
<string name="new_match_button">Nouvelle partie</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 vs. %2s\\nVainqueur : %3s\\nScore : %4d - %5d\\n\\n--\\nArbitré avec l\'application gratuite Ping Points disponible sur Google Play</string>
</resources>

8
app/src/main/res/values/colors.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3f51b5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
</resources>
<color name="colorPrimary">#4caf50</color>
<color name="colorPrimaryDark">#009688</color>
<color name="colorAccent">#69f0ae</color>
</resources>

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

@ -1,18 +1,20 @@
<resources>
<string name="app_name">Ping Points</string>
<string name="go">Play</string>
<string name="quit">Quit</string>
<string name="dialog_title">New match</string>
<string name="dialog_message">Who starts?</string>
<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 &lt;br /&gt; &lt;big&gt; &lt;big&gt; %2d &lt;/big&gt; &lt;/big&gt;</string>
<string name="button_text" translatable="false">%1s &lt;br /&gt; &lt;br /&gt; &lt;big&gt; &lt;big&gt; %2d &lt;/big&gt; &lt;/big&gt;</string>
<string name="end_match_dialog_title">Congratulations, %1s!</string>
<string-array name="players_names">
<item>Player 1</item>
<item>Player 2</item>
</string-array>
<string name="new_match_button">New match</string>
<string name="new_match">New match</string>
<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\\nWinner: %3s\\nScore: %4d - %5d\\n\\n--\\nRefereed with Ping Points free Android app on Google Play</string>
</resources>

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

@ -1,11 +1,11 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="PingPoints" parent="Theme.AppCompat">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
</resources>
</resources>