Correción de errores menores

ralonsobeas · May 21, 2020 · c9cf790 · c9cf790
1 parent 287d30f
commit c9cf790
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -59,7 +59,7 @@
     <string name="TrenTextoCambiar">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) ________.</string>
     <string-array name="TrenTextoCambiar">
         <item>Vitoria</item>
-        <item>correos</item>
+        <item>Correos</item>
         <item>Vasco-Navarra</item>
     </string-array>
     <string name="TrenTextoError">No es</string>
@@ -141,7 +141,7 @@
     <string name="servidor">Servidor</string>
     <string name="ipCorrecta">IP Cambiada</string>
     <string name="ipIncorrecta">IP Incorrecta</string>
-    <string name="TituloServidor">Zerbitzaria</string>
+    <string name="TituloServidor">Servidor</string>
     <string name="SubituloServidor">Introduce la IP</string>
     <string name="HintServidor">IP del servidor</string>
     <string name="AyudaZumTituloPregunta">Pregunta</string>
@@ -180,11 +180,14 @@
     <string name="AyudaErrepasoDetallePregunta">¿Coinciden imagen y título?</string>
     <string name="AyudaErrepasoTituloCorrecta">Correcta</string>
     <string name="AyudaErrepasoTituloIncorrecta">Incorrecta</string>
-    <string name="AyudaErrepasoDetalleCorrecta">Desliza a la derecha o pincha aqui si es correcta</string>
-    <string name="AyudaErrepasoDetalleIncorrecta">Desliza a la izquierda o pincha aqui si es incorrecta</string>
+    <string name="AyudaErrepasoDetalleCorrecta">Desliza a la derecha o pincha aquí si es correcta</string>
+    <string name="AyudaErrepasoDetalleIncorrecta">Desliza a la izquierda o pincha aquí si es incorrecta</string>
     <string name="AyudaErrepasoTituloVolver">Volver</string>
     <string name="AyudaErrepasoDetalleVolver">Vuelve a la imagen anterior</string>
     <string name="AyudaVideoTitulo">Mira el video</string>
     <string name="AyudaVideoDetalle">Pulsa play para comenzar</string>
+    <string name="vasconavarra">vasco-navarra</string>
+    <string name="vitoria">Vitoria</string>
+    <string name="correos">correos</string>
 
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
@@ -187,5 +187,8 @@
     <string name="AyudaGernikaTituloRespuesta">Zuzendu</string>
     <string name="AyudaErrepasoTituloCorrecta">Zuzena</string>
     <string name="AyudaErrepasoTituloIncorrecta">Okerra</string>
+    <string name="vasconavarra">vasco-navarro</string>
+    <string name="vitoria">Gasteizetik</string>
+    <string name="correos">postetxea</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -289,4 +289,8 @@
     <string name="AyudaVideoTitulo">Mira el video</string>
     <string name="AyudaVideoDetalle">Pulsa play para comenzar</string>
 
+
+    <string name="vasconavarra">vasco-navarra</string>
+    <string name="vitoria">Vitoria</string>
+    <string name="correos">correos</string>
 </resources>