diff --git a/app/build.gradle b/app/build.gradle
index f256a9a..d44c96f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
minSdkVersion 23
targetSdkVersion 29
versionCode 3
- versionName "2.0.1"
+ versionName "2.0.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// python {
// // If Chaquopy fails to find Python on your build machine, enable the following
diff --git a/app/src/main/java/com/app/didaktikapp/Activities/MapActivity.java b/app/src/main/java/com/app/didaktikapp/Activities/MapActivity.java
index 3643a51..bebceba 100644
--- a/app/src/main/java/com/app/didaktikapp/Activities/MapActivity.java
+++ b/app/src/main/java/com/app/didaktikapp/Activities/MapActivity.java
@@ -222,6 +222,8 @@ public void setStyle(Style style) {
private MediaPlayer mediaPlayer ;
+ private int cont = 0;
+
/**
*
* Crea la actividad MapActivity
@@ -1029,13 +1031,22 @@ private void crearIconos(){
*
*/
private void btnRepasoVisibles(){
+ /*
+ if(administrador && cont == 1){
+ cont++ ;
+ return;
+ }
+ */
+
TranslateAnimation animate = new TranslateAnimation(0,0,btnRepaso1.getHeight(),0);
animate.setDuration(1000);
animate.setFillAfter(true);
- btnRepaso1.startAnimation(animate);
+ //btnRepaso1.startAnimation(animate);
btnRepaso1.setVisibility(View.VISIBLE);
- btnRepaso2.startAnimation(animate);
+ //btnRepaso2.startAnimation(animate);
+
+
btnRepaso2.setVisibility(View.VISIBLE);
}
diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentTrenTexto.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentTrenTexto.java
index 42c4d00..d1499f0 100644
--- a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentTrenTexto.java
+++ b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentTrenTexto.java
@@ -153,7 +153,7 @@ public void onItemSelected(AdapterView arg0, View arg1, int arg2, long arg3)
int location = texto.indexOf("________");
String pp = texto.substring(0,location);
String sp = texto.substring(location+8);
- textoCambiar.setText(pp+"postetxea"+sp);
+ textoCambiar.setText(pp+getString(R.string.correos)+sp);
} else {
if (primerError)
textoError.setText(getResources().getString(R.string.TrenTextoError)+" "+seleccionado);
@@ -168,7 +168,7 @@ public void onItemSelected(AdapterView arg0, View arg1, int arg2, long arg3)
int location = texto.indexOf("________");
String pp = texto.substring(0,location);
String sp = texto.substring(location+8);
- textoCambiar.setText(pp+"vasco-navarro"+sp);
+ textoCambiar.setText(pp+getString(R.string.vasconavarra)+sp);
} else {
textoError.setText(getResources().getString(R.string.TrenTextoError)+" "+seleccionado);
}
@@ -179,7 +179,7 @@ public void onItemSelected(AdapterView arg0, View arg1, int arg2, long arg3)
int location = texto.indexOf("________");
String pp = texto.substring(0,location);
String sp = texto.substring(location+8);
- textoCambiar.setText(pp+"gasteizetik"+sp);
+ textoCambiar.setText(pp+getString(R.string.vitoria)+sp);
btnContinuar.setEnabled(true);
} else {
textoError.setText(getResources().getString(R.string.TrenTextoError)+" "+seleccionado);
diff --git a/app/src/main/java/com/app/didaktikapp/MainActivity.java b/app/src/main/java/com/app/didaktikapp/MainActivity.java
index 57a1eff..d55de19 100644
--- a/app/src/main/java/com/app/didaktikapp/MainActivity.java
+++ b/app/src/main/java/com/app/didaktikapp/MainActivity.java
@@ -246,7 +246,7 @@ public boolean onButtonLongClick(@NonNull CircleMenuView view, int index) {
public void onButtonLongClickAnimationStart(@NonNull CircleMenuView view, int index) {
Log.d("D", "onButtonLongClickAnimationStart| index: " + index);
}
-
+ //Modo Admin
@Override
public void onButtonLongClickAnimationEnd(@NonNull CircleMenuView view, int index) {
Log.d("D", "onButtonLongClickAnimationEnd| index: " + index);
@@ -332,7 +332,7 @@ public void onClick(View v) {
.show();
}
-
+//Lengua
private void setLocale(String lang) {
Locale myLocale = new Locale(lang);
Resources res = getResources();
@@ -512,7 +512,7 @@ private void googleAcc(){
}
-
+//Prueba eventos
private void eventos(){
botonSalir.setOnClickListener(new View.OnClickListener() {
@Override
@@ -644,7 +644,7 @@ private void dialogoFTP(){
flatDialog.setTitle(getString(R.string.TituloServidor))
.setBackgroundColor(Color.parseColor("#2B82C5"))
.setSubtitle(getString(R.string.SubituloServidor))
- .setFirstTextFieldHint("IP del servidor")
+ .setFirstTextFieldHint(getString(R.string.HintServidor))
.setFirstButtonText(getString(R.string.cambiar))
.setFirstButtonColor(Color.parseColor("#FAFAFA"))
.setFirstButtonTextColor(Color.parseColor("#2B82C5"))
@@ -655,7 +655,7 @@ private void dialogoFTP(){
@Override
public void onClick(View view) {
-
+ //cambiar ip servidor
String ip = flatDialog.getFirstTextField();
@@ -723,6 +723,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
Log.i("SIGN","LOGIN0"+requestCode);
// Result returned from launching the Intent from GoogleSignInClient.getSignInIntent(...);
+ //LOG IN
if (requestCode == RC_SIGN_IN) {
// The Task returned from this call is always completed, no need to attach
// a listener.
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a27f644..8d1bcb7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -59,7 +59,7 @@
La antigua estación de tren es un edificio situado en Oñati, y en la actualidad es (1) ________. Fue fundada en 1887 y su último viaje fue en 1967. La ruta era la (2) ________ e iba desde Bergara hasta Estella, pasando por (3) ________.
- Vitoria
- - correos
+ - Correos
- Vasco-Navarra
No es
@@ -141,7 +141,7 @@
Servidor
IP Cambiada
IP Incorrecta
- Zerbitzaria
+ Servidor
Introduce la IP
IP del servidor
Pregunta
@@ -180,11 +180,14 @@
¿Coinciden imagen y título?
Correcta
Incorrecta
- Desliza a la derecha o pincha aqui si es correcta
- Desliza a la izquierda o pincha aqui si es incorrecta
+ Desliza a la derecha o pincha aquí si es correcta
+ Desliza a la izquierda o pincha aquí si es incorrecta
Volver
Vuelve a la imagen anterior
Mira el video
Pulsa play para comenzar
+ vasco-navarra
+ Vitoria
+ correos
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 590659a..2578a97 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -187,5 +187,8 @@
Zuzendu
Zuzena
Okerra
+ vasco-navarro
+ Gasteizetik
+ postetxea
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6491ccd..fc84f27 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -289,4 +289,8 @@
Mira el video
Pulsa play para comenzar
+
+ vasco-navarra
+ Vitoria
+ correos