diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..039b804
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java b/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java
index d81c2c6..5fc9633 100644
--- a/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java
+++ b/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java
@@ -13,6 +13,8 @@
import android.util.Log;
import android.util.TypedValue;
import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
import android.widget.Button;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
@@ -320,12 +322,20 @@ private void setCurrentAlternativesViews() {
currentTextView.setText(currentStation.getName());
}
+ Animation scaleAnimation = AnimationUtils.loadAnimation(this,R.anim.scale);
+
+
// OnClickListener
for (TextView textView: alternativesTextView) {
String lineName = textView.getText().toString();
- textView.setOnClickListener(view -> this.checkAlternative(lineName));
+ textView.setOnClickListener(view -> {
+ view.startAnimation(scaleAnimation);
+ this.checkAlternative(lineName);
+ });
}
+
+
}
private void setCurrentStationData(int position) {
diff --git a/app/src/main/res/anim/scale.xml b/app/src/main/res/anim/scale.xml
new file mode 100644
index 0000000..ff30162
--- /dev/null
+++ b/app/src/main/res/anim/scale.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fe07728..017ead0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,7 +16,9 @@
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:srcCompat="@drawable/logo" />
+ app:srcCompat="@drawable/logo"
+ android:contentDescription="@string/content_description_menu_logo"
+ />
+ app:srcCompat="@drawable/main_menu_button_play"
+ android:contentDescription="@string/content_description_button_play"
+ />
+ android:contentDescription="@string/content_description_button_information"
+ />
+ app:srcCompat="@drawable/main_menu_button_reset"
+ android:contentDescription="@string/content_description_button_reset"
+ />
+ app:srcCompat="@drawable/main_menu_configuration"
+ android:contentDescription="@string/content_description_button_configuration"
+ />
+ tools:ignore="MissingConstraints" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_menu_metro.xml b/app/src/main/res/layout/activity_menu_metro.xml
index c846295..23c740f 100644
--- a/app/src/main/res/layout/activity_menu_metro.xml
+++ b/app/src/main/res/layout/activity_menu_metro.xml
@@ -18,7 +18,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- tools:ignore="MissingConstraints">
+ tools:ignore="MissingConstraints" />
-
+ app:layout_constraintTop_toBottomOf="@+id/imageViewLineMenuTitle"
+ >
+ app:srcCompat="@drawable/lines_metro_title"
+ android:contentDescription="@string/content_description_title_menu"
+ />
+ app:srcCompat="@drawable/lines_metro_button_back"
+ android:contentDescription="@string/content_description_go_back_button"
+ />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_metro_information.xml b/app/src/main/res/layout/activity_metro_information.xml
index 9d51a60..95230b0 100644
--- a/app/src/main/res/layout/activity_metro_information.xml
+++ b/app/src/main/res/layout/activity_metro_information.xml
@@ -7,23 +7,12 @@
android:background="@drawable/lines_metro_background"
tools:context=".activities.MetroInformationActivity">
-
-
+ android:layout_height="match_parent"
+ android:contentDescription="@string/description_metro_information_scroll"
+ >
+ app:srcCompat="@drawable/lines_metro_button_back"
+ android:contentDescription="@string/content_description_go_back_button"
+ />
+ app:srcCompat="@drawable/info_metro_image_map"
+ tools:ignore="ImageContrastCheck"
+ android:contentDescription="@string/image_metro_santiago"
+ />
+ app:layout_constraintTop_toTopOf="parent" />
+ android:text="@string/separator_current_number_question"
+ android:textSize="30sp"
+ tools:ignore="TextContrastCheck" />
@@ -167,7 +168,9 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textViewTitle">
+ app:layout_constraintTop_toBottomOf="@+id/textViewTitle"
+ android:contentDescription="@string/description_scroll_view_gameplay"
+ >
+ app:layout_constraintTop_toBottomOf="@+id/switchSoundConfiguration"
+ tools:ignore="UseSwitchCompatOrMaterialXml" />
+ app:layout_constraintTop_toBottomOf="@+id/lostTextView"
+ tools:ignore="UseSwitchCompatOrMaterialXml" />
+ app:srcCompat="@drawable/lines_metro_button_back"
+ android:contentDescription="@string/content_description_go_back_button"
+ />
\ No newline at end of file
diff --git a/app/src/main/res/layout/confirmation_reset_dialog.xml b/app/src/main/res/layout/confirmation_reset_dialog.xml
index 1da3578..c3c1006 100644
--- a/app/src/main/res/layout/confirmation_reset_dialog.xml
+++ b/app/src/main/res/layout/confirmation_reset_dialog.xml
@@ -13,15 +13,15 @@
android:layout_height="wrap_content"
android:fontFamily="@font/titiliumweb_bold"
android:padding="20dp"
- android:text="¿Estas seguro que quieres reiniciar? (Perderas todo tu progreso)"
+ android:text="@string/reset_question"
android:textAlignment="center"
android:textColor="#000000"
android:textSize="24sp"
android:textStyle="bold"
- app:layout_constraintBottom_toTopOf="@+id/imageViewConfirmationDialog"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
@@ -44,7 +44,7 @@
android:layout_marginBottom="4dp"
android:backgroundTint="#6F1AFF00"
android:fontFamily="@font/titiliumweb_bold"
- android:text="Volver"
+ android:text="@string/reset_button_go_back"
android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/buttonResetConfirmationDialog"
@@ -61,6 +61,8 @@
app:layout_constraintEnd_toStartOf="@+id/buttonResetConfirmationDialog"
app:layout_constraintStart_toEndOf="@+id/buttonGoBackConfirmationDialog"
app:layout_constraintTop_toBottomOf="@+id/lostTextView"
- app:srcCompat="@drawable/confirmation_dialog" />
+ app:srcCompat="@drawable/confirmation_dialog"
+ android:contentDescription="@string/content_description_reset_alert"
+ />
\ No newline at end of file
diff --git a/app/src/main/res/layout/lost_dialog.xml b/app/src/main/res/layout/lost_dialog.xml
index 04a0922..9c42b00 100644
--- a/app/src/main/res/layout/lost_dialog.xml
+++ b/app/src/main/res/layout/lost_dialog.xml
@@ -14,7 +14,7 @@
android:layout_marginTop="8dp"
android:fontFamily="@font/titiliumweb_bold"
android:padding="20dp"
- android:text="¡Acabas de perder! :("
+ android:text="@string/lost_dialog_title"
android:textAlignment="center"
android:textColor="#000000"
android:textSize="24sp"
@@ -33,7 +33,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageViewAds"
app:layout_constraintStart_toStartOf="parent"
- app:srcCompat="@drawable/main_menu_button_reset" />
+ app:srcCompat="@drawable/main_menu_button_reset"
+ android:contentDescription="@string/lost_dialog_reset_level_button"
+ />
+ app:srcCompat="@drawable/gameplay_button_ad"
+ android:contentDescription="@string/reset_dialog_ads_button"
+ />
+ app:srcCompat="@drawable/metro_svg"
+ android:contentDescription="@string/menu_row_metro_color"
+ />
+ app:srcCompat="@drawable/ic_baseline_circle_24"
+ android:contentDescription="@string/menu_row_background_color"
+ />
@@ -53,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="46dp"
android:fontFamily="@font/titiliumweb_bold"
- android:text="Linea 1"
+ android:text="@string/menu_row_default_value"
android:textColor="#2C0453"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -71,7 +73,9 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/lines_metro_star"
- app:tint="#939393" />
+ app:tint="#939393"
+ android:contentDescription="@string/menu_row_star_description"
+ />
\ No newline at end of file
diff --git a/app/src/main/res/layout/station_layout.xml b/app/src/main/res/layout/station_layout.xml
index 441cd26..f027b52 100644
--- a/app/src/main/res/layout/station_layout.xml
+++ b/app/src/main/res/layout/station_layout.xml
@@ -19,7 +19,9 @@
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginStart="-10dp"
- app:srcCompat="@drawable/metro_svg" />
+ app:srcCompat="@drawable/metro_svg"
+ android:contentDescription="@string/station_layout_background_metro_color"
+ />
+ tools:layout_centerVertical="true"
+ android:contentDescription="@string/station_layout_white_color"
+ />
+ app:srcCompat="@drawable/ic_mediamodifier_design_5_"
+ android:contentDescription="@string/station_layout_line_color"
+ />
diff --git a/app/src/main/res/layout/winning_dialog.xml b/app/src/main/res/layout/winning_dialog.xml
index e8e125f..946ec64 100644
--- a/app/src/main/res/layout/winning_dialog.xml
+++ b/app/src/main/res/layout/winning_dialog.xml
@@ -14,7 +14,7 @@
android:layout_marginTop="8dp"
android:fontFamily="@font/titiliumweb_bold"
android:padding="20dp"
- android:text="¡Felicidades, ganaste una estrella!"
+ android:text="@string/winning_dialog_title"
android:textAlignment="center"
android:textColor="#000000"
android:textSize="24sp"
@@ -30,7 +30,7 @@
android:layout_marginBottom="16dp"
android:backgroundTint="#000000"
android:fontFamily="@font/titiliumweb_bold"
- android:text="Ir al menu"
+ android:text="@string/winning_dialog_go_to_menu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
@@ -41,10 +41,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
+ android:contentDescription="@string/winning_dialog_star_description"
app:layout_constraintBottom_toTopOf="@+id/buttonResetConfirmationDialog"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lostTextView"
- app:srcCompat="@drawable/lines_metro_star" />
+ app:srcCompat="@drawable/lines_metro_star"
+ tools:ignore="ImageContrastCheck" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba82738..859540f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,46 @@
Metro metro
+ Logo de la aplicacion
+ Boton principal para jugar
+ Boton para ver la informacion del Metro
+ Boton para ver la configuracion del juego
+ Boton para resetear el juego
+ 0
+ Titulo de la pantalla
+ Boton para ir hacia atras
+ Mapa del metro (Se puede hacer Zoom)
+ Imagen del Metro de Santiago de Chile
+ Lineas Metro
+ Lineas del Metro de Santiago de Chile
+ alternative1
+ alternative2
+ alternative3
+ alternative4
+ 0
+ /
+ 20
+ Vista donde se muestran las lineas del metro avanzando
+ Configuración
+ Sonido
+ Musica
+ ¿Estas seguro que quieres reiniciar? (Perderas todo tu progreso)
+ Reiniciar
+ Volver
+ Advertencia para reiniciar
+ ¡Acabas de perder! :(
+ Boton para reiniciar nivel
+ Boton para ver ads y continuar jugando
+ Continuar
+ Reiniciar nivel
+ Linea 1
+ Color del metro
+ Color de fondo del metro
+ Estrella del nivel, si esta conseguida aparece con color
+ Color de fondo del metro
+ Color blanco del metro
+ Color del la linea
+ TextView
+ ¡Felicidades, ganaste una estrella!
+ Ir al menu
+ Estrella ganada por completar el nivel
\ No newline at end of file