Skip to content

Commit

Permalink
He doblado todo al inglés y corregido errores
Browse files Browse the repository at this point in the history
  • Loading branch information
JavierRibaldelRio committed Nov 8, 2020
1 parent 0147673 commit 451759e
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 8 deletions.
6 changes: 6 additions & 0 deletions stira/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions stira/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion stira/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added stira/app/debug/Stira.apk
Binary file not shown.
20 changes: 20 additions & 0 deletions stira/app/debug/output.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.example.stira",
"variantName": "debug",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "app-debug.apk"
}
]
}
18 changes: 13 additions & 5 deletions stira/app/src/main/java/com/example/stira/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Debug;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;


public class MainActivity extends AppCompatActivity {
Expand All @@ -31,17 +34,18 @@ protected void onCreate(Bundle savedInstanceState) {
//Hacer que los botones funcionen
activarEscuchadores();

Log.i("Imprimir datos:", String.valueOf(sacarUltimosDatos()[1]));

if (getIntent().getIntArrayExtra("ultimosIntroducidos") == null) { //Comprobar si hay datos de una ultima vez
if (getIntent().getIntArrayExtra("ultimosIntroducidos") != null) { //Comprobar si hay datos de una ultima vez

guardarUltimosValores(getIntent().getIntArrayExtra("ultimosIntroducidos"));

//ocultar el boton de la ultima vez
ultimaVez.setVisibility(View.GONE);


} else {

//Guardar los valores
guardarUltimosValores(getIntent().getIntArrayExtra("ultimosIntroducidos"));


}

Expand Down Expand Up @@ -98,7 +102,11 @@ public void onClick(View view) {
startActivity(intent);


} else {
}
if(sacarUltimosDatos()[0] == -1){
Toast.makeText(MainActivity.this,"No hay ningún temporizador guardado.", Toast.LENGTH_LONG);
}
else {

Intent intent = new Intent(view.getContext(), Contador.class);

Expand Down
37 changes: 37 additions & 0 deletions stira/app/src/main/res/values-en/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<resources>

<string name="app_name">Stira!</string>

<string name="ronda"> Round</string>

<string name="ejercicio">Exercice: </string>

<string name="descanso">Rest: </string>

<string name="temporizador">Timer</string>20209

<string name="registro">Register</string>

<string name="Asignar">Assing</string>

<string name="repeticiones">Insert\nnumber of\n repetitions</string>

<string name="ejer">Time</string>

<string name="desc">Time of rest </string>

<string name="tiempoFin">Time Out.</string>

<string name="inserteValor">Insert one valid value.</string>

<string name="ultimo">Last time</string>

<string name="Ronda1">Round 1/</string>

<string name="conDescanso">With Rest</string>

<string name="sinDescanso">Without Rest</string>

<string name="inserteSegundos">Insert time\n of\n exercice</string>

</resources>
4 changes: 2 additions & 2 deletions stira/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<resources>

<string name="app_name">Stira!</string>
<string name="app_name" translatable="false">Stira!</string>

<string name="ronda"> Ronda</string>

<string name="ejercicio">Ejercicio: </string>

<string name="descanso">Descanso: </string>

<string name="temporizador">Reloj</string>
<string name="temporizador">Reloj</string>2020

<string name="registro">Registro</string>

Expand Down

0 comments on commit 451759e

Please sign in to comment.