diff --git a/kute-android-app/app/build.gradle b/kute-android-app/app/build.gradle index 1ef8fdce..4b9fc64d 100644 --- a/kute-android-app/app/build.gradle +++ b/kute-android-app/app/build.gradle @@ -29,11 +29,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile('com.android.support.test.espresso:espresso-core:3.0.1', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.google.firebase:firebase-core:11.6.2' compile 'com.google.firebase:firebase-auth:11.6.2' compile 'com.google.firebase:firebase-database:11.6.2' diff --git a/kute-android-app/app/src/main/java/com/scorelab/kute/kute/Activity/RegisterActivity.java b/kute-android-app/app/src/main/java/com/scorelab/kute/kute/Activity/RegisterActivity.java index 5342d3eb..7fc9138c 100644 --- a/kute-android-app/app/src/main/java/com/scorelab/kute/kute/Activity/RegisterActivity.java +++ b/kute-android-app/app/src/main/java/com/scorelab/kute/kute/Activity/RegisterActivity.java @@ -326,7 +326,10 @@ protected void onStop() { @Override protected void onStart() { super.onStart(); - mAuth.addAuthStateListener(mAuthListener); + if (mAuth != null){ + mAuth.addAuthStateListener(mAuthListener); + + } } // [START auth_with_facebook] diff --git a/kute-android-app/app/src/main/java/com/scorelab/kute/kute/SplashActivity.java b/kute-android-app/app/src/main/java/com/scorelab/kute/kute/SplashActivity.java index 31cd1777..71e68478 100644 --- a/kute-android-app/app/src/main/java/com/scorelab/kute/kute/SplashActivity.java +++ b/kute-android-app/app/src/main/java/com/scorelab/kute/kute/SplashActivity.java @@ -4,9 +4,11 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Bitmap; +import android.graphics.drawable.AnimationDrawable; import android.os.AsyncTask; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; import android.widget.ImageView; import com.google.firebase.database.FirebaseDatabase; @@ -32,16 +34,18 @@ protected void onCreate(Bundle savedInstanceState) { anim = (AnimationDrawable)imageView.getBackground(); anim.start(); - } - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_splash); - new DelayTask().execute(); // This will delay the spalsh scrren and redierct to the login/register screen based - //on the ststus of the user. + //on the ststus of the user. } +// @Override +// protected void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// setContentView(R.layout.activity_splash); +// +// +// +// } class DelayTask extends AsyncTask{ diff --git a/kute-android-app/app/src/main/res/drawable/login_bg_raw.jpg b/kute-android-app/app/src/main/res/drawable/login_bg_raw.jpg index ff45e0b5..6ed9ace5 100644 Binary files a/kute-android-app/app/src/main/res/drawable/login_bg_raw.jpg and b/kute-android-app/app/src/main/res/drawable/login_bg_raw.jpg differ diff --git a/kute-android-app/app/src/main/res/layout/testreg.xml b/kute-android-app/app/src/main/res/layout/testreg.xml index 838c86a0..964ed2ce 100644 --- a/kute-android-app/app/src/main/res/layout/testreg.xml +++ b/kute-android-app/app/src/main/res/layout/testreg.xml @@ -3,9 +3,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/login_bg" tools:context=".Activity.RegisterActivity"> - +