diff --git a/kute-android-app/app/build.gradle b/kute-android-app/app/build.gradle
index be480862..9eacab4d 100644
--- a/kute-android-app/app/build.gradle
+++ b/kute-android-app/app/build.gradle
@@ -2,30 +2,72 @@ apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.0"
- defaultConfig {
- applicationId "com.scorelab.kute.kute"
- minSdkVersion 15
- targetSdkVersion 25
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ packagingOptions {
+ exclude 'META-INF/DEPENDENCIES.txt'
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'META-INF/NOTICE.txt'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/DEPENDENCIES'
+ exclude 'META-INF/notice.txt'
+ exclude 'META-INF/license.txt'
+ exclude 'META-INF/dependencies.txt'
+ exclude 'META-INF/LGPL2.1'
}
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ compileSdkVersion 23
+ buildToolsVersion '26.0.2'
+
+
+ android {
+ compileSdkVersion 25
+ buildToolsVersion "26.0.2"
+ defaultConfig {
+ applicationId "com.scorelab.kute.kute"
+ minSdkVersion 15
+ targetSdkVersion 25
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ packagingOptions {
+ exclude 'META-INF/DEPENDENCIES'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/NOTICE.txt'
+ exclude 'META-INF/LICENSE.txt'
}
}
- packagingOptions {
- exclude 'META-INF/DEPENDENCIES'
- exclude 'META-INF/NOTICE'
- exclude 'META-INF/LICENSE'
- exclude 'META-INF/NOTICE.txt'
- exclude 'META-INF/LICENSE.txt'
+ dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ })
+
+
+
+ compile 'com.google.firebase:firebase-core:11.0.1'
+ compile 'com.google.firebase:firebase-auth:11.0.1'
+ compile 'com.google.firebase:firebase-database:11.0.1'
+ compile 'com.google.android.gms:play-services-auth:11.0.1'
+ compile 'com.google.android.gms:play-services-plus:11.0.1'
+ compile 'com.google.android.gms:play-services-maps:11.0.1'
+ compile 'com.google.android.gms:play-services-location:11.0.1'
+ compile 'com.facebook.android:facebook-android-sdk:4.11.0'
+ compile 'com.android.volley:volley:1.0.0'
+ compile 'com.android.support:appcompat-v7:25.0.0'
+ compile 'com.android.support:design:25.1.1'
+ compile 'de.hdodenhof:circleimageview:2.1.0'
+ testCompile 'junit:junit:4.12'
}
+
}
dependencies {
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 3349d730..9556e854 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
@@ -5,10 +5,17 @@
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.os.AsyncTask;
+import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+import android.widget.ImageView;
+import android.widget.TextView;
import com.google.firebase.database.FirebaseDatabase;
+import com.scorelab.kute.kute.Activity.MainActivity;
import com.scorelab.kute.kute.Activity.RegisterActivity;
import com.scorelab.kute.kute.Activity.SwitchPrivatePublicActivity;
import com.scorelab.kute.kute.Util.ImageHandler;
@@ -19,7 +26,24 @@ public class SplashActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash);
-
+ final TextView imageview = (TextView) findViewById(R.id.splash_blue_cover);
+ final ImageView imageview2 = (ImageView) findViewById(R.id.splash_bus_icon);
+ final Animation animation1=new TranslateAnimation(0.0f, 1000.0f, 0.0f, 0.0f);
+ animation1.setDuration(1200);
+ imageview.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ imageview.startAnimation(animation1);
+ imageview2.startAnimation(animation1);
+ }
+ },1000);
+ imageview.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ imageview.setVisibility(View.GONE);
+ imageview2.setVisibility(View.GONE);
+ }
+ },1000);
new DelayTask().execute(); // This will delay the spalsh scrren and redierct to the login/register screen based
//on the ststus of the user.
diff --git a/kute-android-app/app/src/main/res/drawable/busflaticon.png b/kute-android-app/app/src/main/res/drawable/busflaticon.png
new file mode 100644
index 00000000..8bddfe84
Binary files /dev/null and b/kute-android-app/app/src/main/res/drawable/busflaticon.png differ
diff --git a/kute-android-app/app/src/main/res/layout/activity_splash.xml b/kute-android-app/app/src/main/res/layout/activity_splash.xml
index 9b3e849e..d80522d9 100644
--- a/kute-android-app/app/src/main/res/layout/activity_splash.xml
+++ b/kute-android-app/app/src/main/res/layout/activity_splash.xml
@@ -20,8 +20,22 @@
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:id="@+id/textView"
- android:textSize="36sp"
+ android:textSize="90sp"
android:textColor="@android:color/background_light"
android:textStyle="normal|bold"
- android:fontFamily="sans-serif-smallcaps" />
+ android:fontFamily="sans-serif" />
+
+