diff --git a/app/src/androidTest/java/com/exemple/profedam/aboutrobots2017/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/exemple/rogergcoscojuela/aboutrobots2017/ExampleInstrumentedTest.java similarity index 93% rename from app/src/androidTest/java/com/exemple/profedam/aboutrobots2017/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/exemple/rogergcoscojuela/aboutrobots2017/ExampleInstrumentedTest.java index ce1c4ed..77bef7c 100644 --- a/app/src/androidTest/java/com/exemple/profedam/aboutrobots2017/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/exemple/rogergcoscojuela/aboutrobots2017/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.exemple.profedam.aboutrobots2017; +package com.exemple.rogergcoscojuela.aboutrobots2017; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 879df5c..ef03c03 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.exemple.rogergcoscojuela.aboutrobots2017"> - + diff --git a/app/src/main/java/com/exemple/profedam/aboutrobots2017/RobotActivity.java b/app/src/main/java/com/exemple/rogergcoscojuela/aboutrobots2017/RobotActivity.java similarity index 73% rename from app/src/main/java/com/exemple/profedam/aboutrobots2017/RobotActivity.java rename to app/src/main/java/com/exemple/rogergcoscojuela/aboutrobots2017/RobotActivity.java index d99135a..6cfe84f 100644 --- a/app/src/main/java/com/exemple/profedam/aboutrobots2017/RobotActivity.java +++ b/app/src/main/java/com/exemple/rogergcoscojuela/aboutrobots2017/RobotActivity.java @@ -1,4 +1,4 @@ -package com.exemple.profedam.aboutrobots2017; +package com.exemple.rogergcoscojuela.aboutrobots2017; import android.net.Uri; import android.support.v7.app.AppCompatActivity; @@ -36,6 +36,11 @@ protected void onCreate(Bundle savedInstanceState) { ImageButton btnSalir = (ImageButton) findViewById(R.id.imageButtonSalir); btnSalir.setOnClickListener(this); + if (savedInstanceState != null){ + this.numeroVeces= savedInstanceState.getInt("numeroVeces"); + } + refrescaPantalla(); + // ATTENTION: This was auto-generated to implement the App Indexing API. // See https://g.co/AppIndexing/AndroidStudio for more information. client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build(); @@ -49,28 +54,28 @@ protected void onCreate(Bundle savedInstanceState) { public void onClick(View v) { if (v.getId()==R.id.btnNoTocar) { - Button btnNoTocar = (Button) v; - TextView cajaTexto = (TextView) findViewById(R.id.textView); - ImageView imageRob = (ImageView) findViewById(R.id.imageView); numeroVeces++; - if (numeroVeces == 1) { - btnNoTocar.setText("¡Que no me toques!!!"); - cajaTexto.setText("Parece ser que los humanos no son muy inteligentes"); - imageRob.setImageResource(R.mipmap.robot_enfadado); - } - - if (numeroVeces == 2) { - btnNoTocar.setVisibility(View.INVISIBLE); - cajaTexto.setText("Te lo advertí!"); - imageRob.setImageResource(R.mipmap.robot_fumando); - } + refrescaPantalla(); } if (v.getId() == R.id.imageButtonSalir) { finish(); - + } + } + public void refrescaPantalla(){ + Button btnNoTocar = (Button) findViewById(R.id.btnNoTocar); + TextView cajaTexto = (TextView) findViewById(R.id.textView); + ImageView imageRob = (ImageView) findViewById(R.id.imageView); + if (numeroVeces == 1) { + btnNoTocar.setText("¡Que no me toques!!!"); + cajaTexto.setText("Parece ser que los humanos no son muy inteligentes"); + imageRob.setImageResource(R.mipmap.robot_enfadado); } - + if (numeroVeces == 2) { + btnNoTocar.setVisibility(View.INVISIBLE); + cajaTexto.setText("Te lo advertí!"); + imageRob.setImageResource(R.mipmap.robot_fumando); + } } /** @@ -89,6 +94,13 @@ public Action getIndexApiAction() { .build(); } + @Override + protected void onSaveInstanceState (Bundle outState){ + super.onSaveInstanceState(outState); + outState.putInt("numeroVeces", this.numeroVeces); + } + + @Override public void onStart() { super.onStart(); diff --git a/app/src/main/res/layout/activity_robot.xml b/app/src/main/res/layout/activity_robot.xml index eeda4c7..f4157bb 100644 --- a/app/src/main/res/layout/activity_robot.xml +++ b/app/src/main/res/layout/activity_robot.xml @@ -9,7 +9,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context="com.exemple.profedam.aboutrobots2017.RobotActivity"> + tools:context="com.exemple.rogergcoscojuela.aboutrobots2017.RobotActivity">