Merge pull request #11 from gennakk/branch1

Pull 2.0.2
ralonsobeas · May 21, 2020 · 6444d14 · 6444d14
2 parents 89d2fdd + c9cf790
commit 6444d14
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 55 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.app.didaktikapp"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "2.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 //        python {
 //            // If Chaquopy fails to find Python on your build machine, enable the following
@@ -69,7 +69,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'com.google.firebase:firebase-auth:16.0.5'
+    implementation 'com.google.firebase:firebase-auth:19.3.1'
     testImplementation 'junit:junit:4.12'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'

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);
     }
 
@@ -1289,6 +1300,8 @@ && distanciaCoord(location.getLatitude(),location.getLongitude(),coordenadas.get
 //                lanzarFragmentPorDistancia(latitud,longitud);
 
                 locationEngineResult[0] = result;
+
+                crearIconos();
             }
         }
 
@@ -1445,6 +1458,7 @@ public void onResume() {
 
 
 
+
         mapView.onResume();
     }
 

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentErrepasoBatKotlin.kt b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentErrepasoBatKotlin.kt
@@ -32,6 +32,8 @@ import com.wooplr.spotlight.SpotlightConfig
 import com.wooplr.spotlight.utils.SpotlightSequence
 import com.wooplr.spotlight.utils.Utils
 import com.yuyakaido.android.cardstackview.*
+import java.util.*
+import kotlin.collections.ArrayList
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -83,7 +85,7 @@ class FragmentErrepasoBatKotlin : Fragment(), CardStackListener {
         /*
         Botón flotante de ayuda
          */
-        val floatingActionButton: FloatingActionButton = view!!.findViewById(R.id.helpButton)
+        val floatingActionButton: FloatingActionButton = views!!.findViewById(R.id.helpButton)
         floatingActionButton.setOnClickListener {
             val config = SpotlightConfig()
             config.maskColor = Color.parseColor("#E63A3A3A")
@@ -103,11 +105,13 @@ class FragmentErrepasoBatKotlin : Fragment(), CardStackListener {
             config.setShowTargetArc(true)
             val handler = Handler()
             handler.postDelayed({
+                var rndGenerator: Random? = Random()
                 SpotlightSequence.getInstance(activity, config)
-                        .addSpotlight(view!!.findViewById(R.id.helpButton), getString(R.string.AyudaErrepasoTituloPregunta), getString(R.string.AyudaErrepasoDetallePregunta), "pregunta")
-                        .addSpotlight(view!!.findViewById(R.id.like_button), getString(R.string.AyudaErrepasoTituloCorrecta), getString(R.string.AyudaErrepasoDetalleCorrecta), "correcta")
-                        .addSpotlight(view!!.findViewById(R.id.skip_button), getString(R.string.AyudaErrepasoTituloIncorrecta), getString(R.string.AyudaErrepasoDetalleIncorrecta), "incorrecta")
-                        .addSpotlight(view!!.findViewById(R.id.rewind_button), getString(R.string.AyudaErrepasoTituloVolver), getString(R.string.AyudaErrepasoDetalleVolver), "volver")
+
+                        .addSpotlight(views!!.findViewById(R.id.helpButton), getString(R.string.AyudaErrepasoTituloPregunta), getString(R.string.AyudaErrepasoDetallePregunta), "preguntaEB"+  rndGenerator!!.nextInt(999999999) )
+                        .addSpotlight(views!!.findViewById(R.id.like_button), getString(R.string.AyudaErrepasoTituloCorrecta), getString(R.string.AyudaErrepasoDetalleCorrecta), "correctaEB"+ rndGenerator!!.nextInt(999999999) )
+                        .addSpotlight(views!!.findViewById(R.id.skip_button), getString(R.string.AyudaErrepasoTituloIncorrecta), getString(R.string.AyudaErrepasoDetalleIncorrecta), "incorrectaEB"+ rndGenerator!!.nextInt(999999999) )
+                        .addSpotlight(views!!.findViewById(R.id.rewind_button), getString(R.string.AyudaErrepasoTituloVolver), getString(R.string.AyudaErrepasoDetalleVolver), "volverEB"+ rndGenerator!!.nextInt(999999999) )
                         .startSequence()
             }, 0)
         }

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentErrotaFotos.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentErrotaFotos.java
@@ -188,10 +188,10 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-
+                         java.util.Random rndGenerator = new java.util.Random();
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaErrotaTituloPregunta), getString(R.string.AyudaErrotaDetallePregunta), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaErrotaTituloPregunta), getString(R.string.AyudaErrotaDetallePregunta), "preguntaEF" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarEF"+rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentErrotaTextos.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentErrotaTextos.java
@@ -177,10 +177,11 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        java.util.Random rndGenerator = new java.util.Random();
 
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaErrotaTituloTextos), getString(R.string.AyudaErrotaDetalleTextos), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaErrotaTituloTextos), getString(R.string.AyudaErrotaDetalleTextos), "preguntaET" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarET" + rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentGernikaPreguntas.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentGernikaPreguntas.java
@@ -241,11 +241,12 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        java.util.Random rndGenerator = new java.util.Random();
 
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaGernikaTituloPregunta), getString(R.string.AyudaGernikaDetallePregunta), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnCorregir),  getString(R.string.AyudaGernikaTituloRespuesta),  getString(R.string.AyudaGernikaDetalleRespuesta), "respuesta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaGernikaTituloPregunta), getString(R.string.AyudaGernikaDetallePregunta), "preguntaGP"+ rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnCorregir),  getString(R.string.AyudaGernikaTituloRespuesta),  getString(R.string.AyudaGernikaDetalleRespuesta), "respuestaGP"+ rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarGP"+ rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentSanMiguel.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentSanMiguel.java
@@ -283,11 +283,12 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        java.util.Random rndGenerator = new java.util.Random();
 
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaSanMiguelTituloPregunta), getString(R.string.AyudaSanMiguelDetallePregunta), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnCorregir),  getString(R.string.AyudaSanMiguelTituloRespuesta),  getString(R.string.AyudaSanMiguelDetalleRespuesta), "respuesta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaSanMiguelTituloPregunta), getString(R.string.AyudaSanMiguelDetallePregunta), "preguntaSM" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnCorregir),  getString(R.string.AyudaSanMiguelTituloRespuesta),  getString(R.string.AyudaSanMiguelDetalleRespuesta), "respuestaSM" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarSM" + rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentSanMiguelTinderKotlin.kt b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentSanMiguelTinderKotlin.kt
@@ -33,6 +33,8 @@ import com.wooplr.spotlight.SpotlightConfig
 import com.wooplr.spotlight.utils.SpotlightSequence
 import com.wooplr.spotlight.utils.Utils
 import com.yuyakaido.android.cardstackview.*
+import java.util.*
+import kotlin.collections.ArrayList
 
 
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -92,7 +94,11 @@ class FragmentSanMiguelTinderKotlin : Fragment(), CardStackListener {
         /*
         Botón flotante de ayuda
          */
-        val floatingActionButton: FloatingActionButton = view!!.findViewById(R.id.helpButton)
+
+        /*
+        Botón flotante de ayuda
+         */
+        val floatingActionButton: FloatingActionButton = views!!.findViewById(R.id.helpButton)
         floatingActionButton.setOnClickListener {
             val config = SpotlightConfig()
             config.maskColor = Color.parseColor("#E63A3A3A")
@@ -111,14 +117,18 @@ class FragmentSanMiguelTinderKotlin : Fragment(), CardStackListener {
             config.lineAndArcColor = Color.parseColor("#2B82C5")
             config.setShowTargetArc(true)
             val handler = Handler()
+
             handler.postDelayed({
+                var rndGenerator: Random? = Random()
+
                 SpotlightSequence.getInstance(activity, config)
-                        .addSpotlight(view!!.findViewById(R.id.like_button), getString(R.string.AyudaSanMiguelTinderTituloCorrecta), getString(R.string.AyudaSanMiguelTinderDetalleCorrecta), "correcta")
-                        .addSpotlight(view!!.findViewById(R.id.skip_button), getString(R.string.AyudaSanMiguelTinderTituloIncorrecta), getString(R.string.AyudaSanMiguelTinderDetalleIncorrecta), "incorrecta")
-                        .addSpotlight(view!!.findViewById(R.id.rewind_button), getString(R.string.AyudaSanMiguelTinderTituloRetroceder), getString(R.string.AyudaSanMiguelTinderDetalleRetroceder), "retroceder")
-                        .addSpotlight(view!!.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                        .addSpotlight(views!!.findViewById(R.id.helpButton), getString(R.string.AyudaErrepasoTituloPregunta), getString(R.string.AyudaErrepasoDetallePregunta), "preguntaSMT"+  rndGenerator!!.nextInt(999999999) )
+                        .addSpotlight(views!!.findViewById(R.id.like_button), getString(R.string.AyudaSanMiguelTinderTituloCorrecta), getString(R.string.AyudaSanMiguelTinderDetalleCorrecta), "correctaSMT"+  rndGenerator!!.nextInt(999999999) )
+                        .addSpotlight(views!!.findViewById(R.id.skip_button), getString(R.string.AyudaSanMiguelTinderTituloIncorrecta), getString(R.string.AyudaSanMiguelTinderDetalleIncorrecta), "incorrectaSMT"+  rndGenerator!!.nextInt(999999999) )
+                        .addSpotlight(views!!.findViewById(R.id.rewind_button), getString(R.string.AyudaSanMiguelTinderTituloRetroceder), getString(R.string.AyudaSanMiguelTinderDetalleRetroceder), "retrocederSMT"+  rndGenerator!!.nextInt(999999999) )
                         .startSequence()
             }, 0)
+
         }
         return views
     }

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);
@@ -227,10 +227,11 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        java.util.Random rndGenerator = new java.util.Random();
 
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.trenTextoSpinner), getString(R.string.AyudaTrenTitulo), getString(R.string.AyudaTrenDetalle), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.trenTextoSpinner), getString(R.string.AyudaTrenTitulo), getString(R.string.AyudaTrenDetalle), "preguntaTT" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarTT" + rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentUnibertsitateaFotos.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentUnibertsitateaFotos.java
@@ -216,10 +216,11 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        java.util.Random rndGenerator = new java.util.Random();
 
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaUniversidadTituloFotos), getString(R.string.AyudaUniversidadDetalleFotos), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaUniversidadTituloFotos), getString(R.string.AyudaUniversidadDetalleFotos), "preguntaUF" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarUF" + rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);

diff --git a/app/src/main/java/com/app/didaktikapp/Fragments/FragmentUnibertsitateaPreguntas.java b/app/src/main/java/com/app/didaktikapp/Fragments/FragmentUnibertsitateaPreguntas.java
@@ -198,11 +198,12 @@ public void onClick(View viewBoton) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+                        java.util.Random rndGenerator = new java.util.Random();
 
                         SpotlightSequence.getInstance(getActivity(),config)
-                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaUniversidadTituloPregunta), getString(R.string.AyudaUniversidadDetallePregunta), "pregunta")
-                                .addSpotlight(view.findViewById(R.id.btnCorregir),  getString(R.string.AyudaUniversidadTituloRespuesta),  getString(R.string.AyudaUniversidadDetalleRespuesta), "respuesta")
-                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuar")
+                                .addSpotlight(view.findViewById(R.id.helpButton), getString(R.string.AyudaUniversidadTituloPregunta), getString(R.string.AyudaUniversidadDetallePregunta), "preguntaUP" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnCorregir),  getString(R.string.AyudaUniversidadTituloRespuesta),  getString(R.string.AyudaUniversidadDetalleRespuesta), "respuestaUP" + rndGenerator.nextInt(999999999))
+                                .addSpotlight(view.findViewById(R.id.btnContinuar), getString(R.string.AyudaZumTituloContinuar), getString(R.string.AyudaZumDetalleContinuar), "continuarUP" + rndGenerator.nextInt(999999999))
                                 .startSequence();
                     }
                 },0);