MatchActivity almost finished. Started VictoryActivity
This commit is contained in:
		| @ -1,152 +1,165 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
|  | ||||
| <android.support.design.widget.CoordinatorLayout | ||||
|         android:id="@+id/coordinatorLayout" | ||||
|         xmlns:tools="http://schemas.android.com/tools" android:id="@+id/coordinatorLayout" | ||||
|         xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|         xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent"> | ||||
|  | ||||
|     <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" | ||||
|     <LinearLayout | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="match_parent" | ||||
|             tools:context=".MatchActivity" | ||||
|             tools:layout_editor_absoluteY="73dp"> | ||||
|             android:orientation="vertical"> | ||||
|  | ||||
|         <android.support.v7.widget.Toolbar | ||||
|                 android:id="@+id/toolbar" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="?attr/actionBarSize" | ||||
|                 android:layout_marginBottom="8dp" | ||||
|                 android:background="@color/colorPrimary" | ||||
|                 android:elevation="4dp" | ||||
|                 android:theme="@style/ThemeOverlay.AppCompat.ActionBar" | ||||
|                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light" android:layout_weight="0"/> | ||||
|  | ||||
|         <LinearLayout | ||||
|                 android:id="@+id/linearLayoutText" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:layout_marginEnd="8dp" | ||||
|                 android:layout_marginLeft="8dp" | ||||
|                 android:layout_marginRight="8dp" | ||||
|                 android:layout_marginStart="8dp" | ||||
|                 android:orientation="horizontal" | ||||
|                 app:layout_constraintEnd_toEndOf="parent" | ||||
|                 app:layout_constraintStart_toStartOf="parent" | ||||
|                 tools:layout_editor_absoluteY="8dp" android:layout_weight="0"> | ||||
|  | ||||
|             <TextView | ||||
|                     android:id="@+id/textScore" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:layout_marginLeft="8dp" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:layout_weight="1" | ||||
|                     android:gravity="left" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                     app:layout_constraintStart_toStartOf="parent" | ||||
|                     app:layout_constraintTop_toTopOf="parent" | ||||
|                     android:layout_marginRight="8dp" android:text="@string/score"/> | ||||
|             <TextView | ||||
|                     android:id="@+id/textService" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:layout_marginEnd="8dp" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:layout_weight="1" | ||||
|                     android:gravity="right" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                     app:layout_constraintEnd_toEndOf="parent" | ||||
|                     app:layout_constraintHorizontal_bias="1.0" | ||||
|                     app:layout_constraintStart_toEndOf="@+id/textScore" | ||||
|                     app:layout_constraintTop_toTopOf="parent" | ||||
|                     android:layout_marginRight="8dp" | ||||
|                     android:layout_marginLeft="8dp" android:text="@string/service"/> | ||||
|  | ||||
|         </LinearLayout> | ||||
|  | ||||
|         <LinearLayout | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:orientation="vertical"> | ||||
|                 android:orientation="horizontal" android:layout_weight="1"> | ||||
|  | ||||
|             <android.support.v7.widget.Toolbar | ||||
|                     android:id="@+id/toolbar" | ||||
|             <ImageView | ||||
|                     android:id="@+id/imgService0" | ||||
|                     android:layout_width="48dp" | ||||
|                     android:layout_margin="8dp" | ||||
|                     android:layout_weight="0" | ||||
|                     android:contentDescription="@string/service_img_description" | ||||
|                     app:srcCompat="@drawable/ic_service_1" | ||||
|                     tools:layout_editor_absoluteY="120dp" android:layout_height="match_parent"/> | ||||
|  | ||||
|             <Button | ||||
|                     android:id="@+id/buttonPlayer0" | ||||
|                     android:layout_width="match_parent" | ||||
|                     android:layout_height="?attr/actionBarSize" | ||||
|                     android:layout_height="match_parent" | ||||
|                     android:layout_marginBottom="8dp" | ||||
|                     android:background="@color/colorPrimary" | ||||
|                     android:elevation="4dp" | ||||
|                     android:theme="@style/ThemeOverlay.AppCompat.ActionBar" | ||||
|                     app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> | ||||
|                     android:layout_marginLeft="8dp" | ||||
|                     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" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                     android:textSize="24sp" | ||||
|                     android:textStyle="bold" | ||||
|                     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"/> | ||||
|  | ||||
|             <LinearLayout | ||||
|                     android:id="@+id/linearLayoutText" | ||||
|             <Button | ||||
|                     android:id="@+id/buttonPlayer1" | ||||
|                     android:layout_width="match_parent" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:layout_height="match_parent" | ||||
|                     android:layout_marginBottom="8dp" | ||||
|                     android:layout_marginEnd="8dp" | ||||
|                     android:layout_marginLeft="8dp" | ||||
|                     android:layout_marginRight="8dp" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:orientation="horizontal" | ||||
|                     app:layout_constraintEnd_toEndOf="parent" | ||||
|                     app:layout_constraintStart_toStartOf="parent" | ||||
|                     tools:layout_editor_absoluteY="8dp"> | ||||
|                     android:layout_marginTop="8dp" | ||||
|                     android:layout_weight="1" | ||||
|                     android:background="@color/colorAccent" | ||||
|                     android:bufferType="spannable" | ||||
|                     android:onClick="updateScore" | ||||
|                     android:textAllCaps="false" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                     android:textSize="24sp" | ||||
|                     android:textStyle="bold" | ||||
|                     app:layout_constraintBottom_toBottomOf="parent" | ||||
|                     app:layout_constraintEnd_toStartOf="@+id/imgService1" | ||||
|                     app:layout_constraintStart_toEndOf="@+id/buttonPlayer0" | ||||
|                     tools:text="@string/button_text"/> | ||||
|  | ||||
|                 <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:gravity="left" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                         app:layout_constraintStart_toStartOf="parent" | ||||
|                         app:layout_constraintTop_toTopOf="parent" | ||||
|                         tools:text="@string/score" android:layout_marginRight="8dp"/> | ||||
|                 <TextView | ||||
|                         android:id="@+id/textService" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="wrap_content" | ||||
|                         android:layout_marginEnd="8dp" | ||||
|                         android:layout_marginStart="8dp" | ||||
|                         android:layout_weight="1" | ||||
|                         android:gravity="right" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                         app:layout_constraintEnd_toEndOf="parent" | ||||
|                         app:layout_constraintHorizontal_bias="1.0" | ||||
|                         app:layout_constraintStart_toEndOf="@+id/textScore" | ||||
|                         app:layout_constraintTop_toTopOf="parent" | ||||
|                         tools:text="@string/service" android:layout_marginRight="8dp" | ||||
|                         android:layout_marginLeft="8dp"/> | ||||
|  | ||||
|             </LinearLayout> | ||||
|  | ||||
|             <LinearLayout | ||||
|                     android:layout_width="match_parent" | ||||
|             <ImageView | ||||
|                     android:id="@+id/imgService1" | ||||
|                     android:layout_width="48dp" | ||||
|                     android:layout_height="match_parent" | ||||
|                     android:orientation="horizontal"> | ||||
|  | ||||
|                 <ImageView | ||||
|                         android:id="@+id/imgService0" | ||||
|                         android:layout_width="48dp" | ||||
|                         android:layout_margin="8dp" | ||||
|                         android:layout_weight="0" | ||||
|                         android:contentDescription="@string/service_img_description" | ||||
|                         app:srcCompat="@drawable/ic_service_1" | ||||
|                         tools:layout_editor_absoluteY="120dp" android:layout_height="match_parent"/> | ||||
|  | ||||
|                 <Button | ||||
|                         android:id="@+id/buttonPlayer0" | ||||
|                         style="@style/Widget.AppCompat.Button.Colored" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="match_parent" | ||||
|                         android:layout_marginBottom="8dp" | ||||
|                         android:layout_marginLeft="8dp" | ||||
|                         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" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                         android:textSize="24sp" | ||||
|                         android:textStyle="bold" | ||||
|                         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"/> | ||||
|  | ||||
|                 <Button | ||||
|                         android:id="@+id/buttonPlayer1" | ||||
|                         style="@style/Widget.AppCompat.Button.Colored" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="match_parent" | ||||
|                         android:layout_marginBottom="8dp" | ||||
|                         android:layout_marginEnd="8dp" | ||||
|                         android:layout_marginLeft="8dp" | ||||
|                         android:layout_marginRight="8dp" | ||||
|                         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" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                         android:textSize="24sp" | ||||
|                         android:textStyle="bold" | ||||
|                         app:layout_constraintBottom_toBottomOf="parent" | ||||
|                         app:layout_constraintEnd_toStartOf="@+id/imgService1" | ||||
|                         app:layout_constraintStart_toEndOf="@+id/buttonPlayer0" | ||||
|                         tools:text="@string/button_text"/> | ||||
|  | ||||
|                 <ImageView | ||||
|                         android:id="@+id/imgService1" | ||||
|                         android:layout_width="48dp" | ||||
|                         android:layout_height="match_parent" | ||||
|                         android:layout_margin="8dp" | ||||
|                         android:layout_weight="0" | ||||
|                         android:contentDescription="@string/service_img_description" | ||||
|                         tools:layout_editor_absoluteY="120dp"/> | ||||
|  | ||||
|             </LinearLayout> | ||||
|                     android:layout_margin="8dp" | ||||
|                     android:layout_weight="0" | ||||
|                     android:contentDescription="@string/service_img_description" | ||||
|                     tools:layout_editor_absoluteY="120dp"/> | ||||
|  | ||||
|         </LinearLayout> | ||||
|         <LinearLayout | ||||
|                 android:orientation="horizontal" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" android:layout_weight="0"> | ||||
|             <TextView | ||||
|                     android:id="@+id/pingPointsCredit" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:text="@string/PingPointsCredits" | ||||
|                     app:layout_constraintTop_toBottomOf="@+id/enableSttSwitch" | ||||
|                     app:layout_constraintStart_toStartOf="parent" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     app:layout_constraintEnd_toEndOf="parent" | ||||
|                     android:layout_marginEnd="8dp" | ||||
|                     android:layout_weight="1" android:layout_margin="8dp" android:gravity="left"/> | ||||
|             <TextView | ||||
|                     android:id="@+id/iconsCredit" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:text="@string/iconCredits" | ||||
|                     app:layout_constraintTop_toBottomOf="@+id/PingPointsCredit" | ||||
|                     app:layout_constraintStart_toStartOf="parent" | ||||
|                     android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" | ||||
|                     android:layout_marginEnd="8dp" | ||||
|                     android:layout_weight="1" android:layout_margin="8dp" android:gravity="right"/> | ||||
|         </LinearLayout> | ||||
|  | ||||
|     </android.support.constraint.ConstraintLayout> | ||||
|     </LinearLayout> | ||||
|  | ||||
| </android.support.design.widget.CoordinatorLayout> | ||||
| @ -89,23 +89,6 @@ | ||||
|                 android:layout_marginEnd="8dp" android:layout_marginRight="8dp" | ||||
|                 app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp" | ||||
|                 android:layout_marginStart="8dp"/> | ||||
|         <TextView | ||||
|                 android:id="@+id/pingPointsCredit" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:text="@string/PingPointsCredits" | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/enableSttSwitch" app:layout_constraintStart_toStartOf="parent" | ||||
|                 android:layout_marginLeft="8dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" | ||||
|                 android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:layout_marginTop="24dp"/> | ||||
|         <TextView | ||||
|                 android:id="@+id/iconsCredit" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:text="@string/iconCredits" | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/pingPointsCredit" | ||||
|                 app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp" | ||||
|                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp" | ||||
|                 android:layout_marginRight="8dp"/> | ||||
|         <Button | ||||
|                 android:text="@string/start" | ||||
|                 android:layout_width="wrap_content" | ||||
|  | ||||
| @ -1,144 +1,148 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
|  | ||||
| <android.support.design.widget.CoordinatorLayout | ||||
|         android:id="@+id/coordinatorLayout" | ||||
|         xmlns:tools="http://schemas.android.com/tools" android:id="@+id/coordinatorLayout" | ||||
|         xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|         xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent"> | ||||
|  | ||||
|     <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" | ||||
|     <LinearLayout | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="match_parent" | ||||
|             tools:context=".MatchActivity" | ||||
|             tools:layout_editor_absoluteY="73dp"> | ||||
|             android:orientation="vertical"> | ||||
|  | ||||
|         <android.support.v7.widget.Toolbar | ||||
|                 android:id="@+id/toolbar" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="?attr/actionBarSize" | ||||
|                 android:layout_marginBottom="8dp" | ||||
|                 android:background="@color/colorPrimary" | ||||
|                 android:elevation="4dp" | ||||
|                 android:theme="@style/ThemeOverlay.AppCompat.ActionBar" | ||||
|                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light" android:layout_weight="0"/> | ||||
|  | ||||
|         <LinearLayout | ||||
|                 android:id="@+id/linearLayoutText" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:layout_marginEnd="8dp" | ||||
|                 android:layout_marginLeft="8dp" | ||||
|                 android:layout_marginRight="8dp" | ||||
|                 android:layout_marginStart="8dp" | ||||
|                 android:orientation="horizontal" | ||||
|                 app:layout_constraintEnd_toEndOf="parent" | ||||
|                 app:layout_constraintStart_toStartOf="parent" | ||||
|                 tools:layout_editor_absoluteY="8dp" android:layout_weight="0"> | ||||
|  | ||||
|             <TextView | ||||
|                     android:id="@+id/textScore" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:layout_marginLeft="8dp" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:gravity="left" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                     app:layout_constraintStart_toStartOf="parent" | ||||
|                     app:layout_constraintTop_toTopOf="parent" | ||||
|                     android:layout_marginRight="8dp" android:text="@string/score" | ||||
|                     android:layout_weight="1"/> | ||||
|             <TextView | ||||
|                     android:id="@+id/textService" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:layout_marginEnd="8dp" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                     app:layout_constraintEnd_toEndOf="parent" | ||||
|                     app:layout_constraintHorizontal_bias="1.0" | ||||
|                     app:layout_constraintStart_toEndOf="@+id/textScore" | ||||
|                     app:layout_constraintTop_toTopOf="parent" | ||||
|                     android:gravity="right" android:text="@string/service" | ||||
|                     android:layout_weight="1"/> | ||||
|  | ||||
|         </LinearLayout> | ||||
|  | ||||
|         <LinearLayout | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:orientation="vertical"> | ||||
|                 android:orientation="vertical" android:layout_weight="1"> | ||||
|  | ||||
|             <android.support.v7.widget.Toolbar | ||||
|                     android:id="@+id/toolbar" | ||||
|             <ImageView | ||||
|                     android:id="@+id/imgService0" | ||||
|                     android:layout_width="match_parent" | ||||
|                     android:layout_height="?attr/actionBarSize" | ||||
|                     android:layout_marginBottom="8dp" | ||||
|                     android:background="@color/colorPrimary" | ||||
|                     android:elevation="4dp" | ||||
|                     android:theme="@style/ThemeOverlay.AppCompat.ActionBar" | ||||
|                     app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> | ||||
|                     android:layout_height="48dp" | ||||
|                     android:layout_margin="8dp" | ||||
|                     android:contentDescription="@string/service_img_description" | ||||
|                     app:srcCompat="@drawable/ic_service_1" | ||||
|                     tools:layout_editor_absoluteY="120dp"/> | ||||
|  | ||||
|             <LinearLayout | ||||
|                     android:id="@+id/linearLayoutText" | ||||
|                     android:layout_width="match_parent" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:layout_marginEnd="8dp" | ||||
|                     android:layout_marginLeft="8dp" | ||||
|                     android:layout_marginRight="8dp" | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:orientation="horizontal" | ||||
|                     app:layout_constraintEnd_toEndOf="parent" | ||||
|                     app:layout_constraintStart_toStartOf="parent" | ||||
|                     tools:layout_editor_absoluteY="8dp"> | ||||
|  | ||||
|                 <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:gravity="left" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                         app:layout_constraintStart_toStartOf="parent" | ||||
|                         app:layout_constraintTop_toTopOf="parent" | ||||
|                         tools:text="@string/score" android:layout_marginRight="8dp"/> | ||||
|                 <TextView | ||||
|                         android:id="@+id/textService" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="wrap_content" | ||||
|                         android:layout_marginEnd="8dp" | ||||
|                         android:layout_marginStart="8dp" | ||||
|                         android:layout_weight="1" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Large" | ||||
|                         app:layout_constraintEnd_toEndOf="parent" | ||||
|                         app:layout_constraintHorizontal_bias="1.0" | ||||
|                         app:layout_constraintStart_toEndOf="@+id/textScore" | ||||
|                         app:layout_constraintTop_toTopOf="parent" | ||||
|                         tools:text="@string/service" android:gravity="right"/> | ||||
|  | ||||
|             </LinearLayout> | ||||
|  | ||||
|             <LinearLayout | ||||
|             <Button | ||||
|                     android:id="@+id/buttonPlayer0" | ||||
|                     android:layout_width="match_parent" | ||||
|                     android:layout_height="match_parent" | ||||
|                     android:orientation="vertical"> | ||||
|                     android:layout_marginStart="8dp" | ||||
|                     android:background="@color/colorAccent" | ||||
|                     android:bufferType="spannable" | ||||
|                     android:onClick="updateScore" | ||||
|                     android:textAllCaps="false" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                     android:textSize="24sp" | ||||
|                     android:textStyle="bold" | ||||
|                     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"/> | ||||
|  | ||||
|                 <ImageView | ||||
|                         android:id="@+id/imgService0" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="48dp" | ||||
|                         android:layout_margin="8dp" | ||||
|                         android:layout_weight="0" | ||||
|                         android:contentDescription="@string/service_img_description" | ||||
|                         app:srcCompat="@drawable/ic_service_1" | ||||
|                         tools:layout_editor_absoluteY="120dp"/> | ||||
|             <Button | ||||
|                     android:id="@+id/buttonPlayer1" | ||||
|                     android:layout_width="match_parent" | ||||
|                     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" | ||||
|                     android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                     android:textSize="24sp" | ||||
|                     android:textStyle="bold" | ||||
|                     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"/> | ||||
|  | ||||
|                 <Button | ||||
|                         android:id="@+id/buttonPlayer0" | ||||
|                         style="@style/Widget.AppCompat.Button.Colored" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="match_parent" | ||||
|                         android:layout_marginStart="8dp" | ||||
|                         android:layout_weight="1" | ||||
|                         android:background="@color/colorAccent" | ||||
|                         android:bufferType="spannable" | ||||
|                         android:onClick="updateScore" | ||||
|                         android:textAllCaps="false" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                         android:textSize="24sp" | ||||
|                         android:textStyle="bold" | ||||
|                         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"/> | ||||
|  | ||||
|                 <Button | ||||
|                         android:id="@+id/buttonPlayer1" | ||||
|                         style="@style/Widget.AppCompat.Button.Colored" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="match_parent" | ||||
|                         android:layout_marginEnd="8dp" | ||||
|                         android:layout_marginStart="8dp" | ||||
|                         android:layout_weight="1" | ||||
|                         android:background="@color/colorAccent" | ||||
|                         android:bufferType="spannable" | ||||
|                         android:onClick="updateScore" | ||||
|                         android:textAllCaps="false" | ||||
|                         android:textAppearance="@style/TextAppearance.AppCompat.Button" | ||||
|                         android:textSize="24sp" | ||||
|                         android:textStyle="bold" | ||||
|                         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"/> | ||||
|  | ||||
|                 <ImageView | ||||
|                         android:id="@+id/imgService1" | ||||
|                         android:layout_width="match_parent" | ||||
|                         android:layout_height="48dp" | ||||
|                         android:layout_margin="8dp" | ||||
|                         android:layout_weight="0" | ||||
|                         android:contentDescription="@string/service_img_description" | ||||
|                         tools:layout_editor_absoluteY="120dp"/> | ||||
|  | ||||
|             </LinearLayout> | ||||
|             <ImageView | ||||
|                     android:id="@+id/imgService1" | ||||
|                     android:layout_width="match_parent" | ||||
|                     android:layout_height="48dp" | ||||
|                     android:layout_margin="8dp" | ||||
|                     android:contentDescription="@string/service_img_description" | ||||
|                     tools:layout_editor_absoluteY="120dp"/> | ||||
|  | ||||
|         </LinearLayout> | ||||
|         <TextView | ||||
|                 android:id="@+id/pingPointsCredit" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:text="@string/PingPointsCredits" | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/enableSttSwitch" | ||||
|                 app:layout_constraintStart_toStartOf="parent" | ||||
|                 android:layout_marginLeft="8dp" android:layout_marginStart="8dp" | ||||
|                 app:layout_constraintEnd_toEndOf="parent" | ||||
|                 android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:layout_marginTop="24dp" | ||||
|                 android:layout_weight="0"/> | ||||
|         <TextView | ||||
|                 android:id="@+id/iconsCredit" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:text="@string/iconCredits" | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/PingPointsCredit" | ||||
|                 app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp" | ||||
|                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" | ||||
|                 android:layout_marginEnd="8dp" | ||||
|                 android:layout_marginRight="8dp" android:layout_weight="0"/> | ||||
|  | ||||
|     </android.support.constraint.ConstraintLayout> | ||||
|     </LinearLayout> | ||||
|  | ||||
| </android.support.design.widget.CoordinatorLayout> | ||||
| @ -106,23 +106,6 @@ | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/enableTtsSwitch" android:layout_marginStart="8dp" | ||||
|                 app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp" android:layout_marginEnd="8dp" | ||||
|                 app:layout_constraintEnd_toEndOf="parent" android:layout_marginRight="8dp"/> | ||||
|         <TextView | ||||
|                 android:id="@+id/PingPointsCredit" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:text="@string/PingPointsCredits" | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/enableSttSwitch" app:layout_constraintStart_toStartOf="parent" | ||||
|                 android:layout_marginLeft="8dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" | ||||
|                 android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:layout_marginTop="24dp"/> | ||||
|         <TextView | ||||
|                 android:id="@+id/iconsCredit" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:text="@string/iconCredits" | ||||
|                 app:layout_constraintTop_toBottomOf="@+id/PingPointsCredit" | ||||
|                 app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp" | ||||
|                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp" | ||||
|                 android:layout_marginRight="8dp"/> | ||||
|         <Button | ||||
|                 android:text="@string/start" | ||||
|                 android:layout_width="wrap_content" | ||||
|  | ||||
							
								
								
									
										35
									
								
								app/src/main/res/layout/activity_victory.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								app/src/main/res/layout/activity_victory.xml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,35 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
|  | ||||
| <android.support.design.widget.CoordinatorLayout | ||||
|         xmlns:tools="http://schemas.android.com/tools" android:id="@+id/coordinatorLayout" | ||||
|         xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|         xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent"> | ||||
|  | ||||
|     <android.support.constraint.ConstraintLayout | ||||
|             xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|             xmlns:tools="http://schemas.android.com/tools" | ||||
|             xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="match_parent" | ||||
|             tools:context=".VictoryActivity"> | ||||
|  | ||||
|         <android.support.v7.widget.Toolbar | ||||
|                 android:id="@+id/toolbar" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="?attr/actionBarSize" | ||||
|                 android:layout_marginBottom="8dp" | ||||
|                 android:background="@color/colorPrimary" | ||||
|                 android:elevation="4dp" | ||||
|                 android:theme="@style/ThemeOverlay.AppCompat.ActionBar" | ||||
|                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light" android:layout_weight="0"/> | ||||
|         <TextView | ||||
|                 android:text="TextView" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" tools:layout_editor_absoluteY="106dp" | ||||
|                 tools:layout_editor_absoluteX="57dp" android:id="@+id/textView"/> | ||||
|  | ||||
|     </android.support.constraint.ConstraintLayout> | ||||
|  | ||||
| </android.support.design.widget.CoordinatorLayout> | ||||
							
								
								
									
										20
									
								
								app/src/main/res/menu/match_menu.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								app/src/main/res/menu/match_menu.xml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,20 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
|  | ||||
| <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:visible="false" /> | ||||
|  | ||||
|     <item | ||||
|             android:id="@+id/action_redo" | ||||
|             android:icon="@drawable/ic_redo" | ||||
|             android:title="@string/redo" | ||||
|             app:showAsAction="ifRoom" | ||||
|             android:visible="false" /> | ||||
|  | ||||
| </menu> | ||||
| @ -9,7 +9,7 @@ | ||||
|     <string name="start">Allons-y !</string> | ||||
|     <string name="swap_names">Échanger les noms</string> | ||||
|     <string name="PingPointsCredits">Ping Points par Adrien Malin</string> | ||||
|     <string name="iconCredits"><html>Icônes par <a href="http://www.freepik.com" title="Freepik">Freepik</a> chez <a href="https://www.flaticon.com/" title="Flaticon">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></html></string> | ||||
|     <string name="iconCredits">Icônes par <a href="http://www.freepik.com" title="Freepik">Freepik</a> chez <a href="https://www.flaticon.com/" title="Flaticon">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></string> | ||||
|     <string name="TTS_unavailable">Désolé, votre appareil ne permet pas la synthèse vocale.</string> | ||||
|     <string name="STT_unavailable">Désolé, votre appareil ne permet pas la reconnaissance vocale.</string> | ||||
|     <string name="explain_record_audio_request">"Cette appli utilise l'API de Google pour la reconnaissance vocale : votre voix sera enregistrée et envoyée aux serveurs de Google pour analyse. | ||||
| @ -27,4 +27,6 @@ Vous pouvez à tout moment changer la permission dans les paramètres Android." | ||||
|     <string name="title_activity_match">Ping Points</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> | ||||
| </resources> | ||||
| @ -8,10 +8,10 @@ | ||||
|     <string name="start">Let\'s go!</string> | ||||
|     <string name="swap_names">Swap names</string> | ||||
|     <string name="PingPointsCredits">Ping Points by Adrien Malin</string> | ||||
|     <string name="iconCredits">"<html>Icons made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> | ||||
|     <string name="iconCredits">Icons made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> | ||||
|         from <a href="https://www.flaticon.com/" title="Flaticon">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></html>" | ||||
|         3.0" target="_blank">CC 3.0 BY</a> | ||||
|     </string> | ||||
|     <string name="TTS_unavailable">Sorry, your device doesn\'t support text to speech.</string> | ||||
|     <string name="STT_unavailable">Sorry, your device doesn\'t support voice recognition.</string> | ||||
| @ -27,8 +27,11 @@ | ||||
|     <string name="service">Service: %s</string> | ||||
|     <string name="score">Score: %d - %d</string> | ||||
|     <string name="service_img_description">Service</string> | ||||
|     <string name="button_text" translatable="false">%s <br /> <br /> <big> <big> %d </big> </big> | ||||
|     <string name="button_text" translatable="false">%s <br /> <br /> <big> <big> %d </big> | ||||
|         </big> | ||||
|     </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> | ||||
| </resources> | ||||
|  | ||||
		Reference in New Issue
	
	Block a user