Merge branch 'new-splashscreen' into 'master'

Delete StartedActivity and replace it by SplashActivity

See merge request !4
This commit is contained in:
RicomenPL
2017-04-09 12:35:23 +00:00
8 changed files with 37 additions and 115 deletions

View File

@ -0,0 +1,19 @@
package leszcz_team.wulkanowy.activity.splash;
import leszcz_team.wulkanowy.activity.main.MainActivity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
public class SplashActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();
}
}

View File

@ -1,35 +0,0 @@
package leszcz_team.wulkanowy.activity.started;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import leszcz_team.wulkanowy.activity.main.MainActivity;
public class LoadingTask extends AsyncTask<Void, Void, Void> {
Context activity;
LoadingTask(Context main) {
activity = main;
}
@Override
protected Void doInBackground(Void... voids) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
return null;
}
protected void onPostExecute(Void result) {
Intent intent = new Intent(activity,MainActivity.class);
activity.startActivity(intent);
}
}

View File

@ -1,22 +0,0 @@
package leszcz_team.wulkanowy.activity.started;
import android.app.Activity;
import android.os.Bundle;
import leszcz_team.wulkanowy.R;
public class StartedActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_started);
Task();
}
public void Task(){
new LoadingTask(this).execute();
}
}