From b414670ab5bf22148c19676f975936568f1bdb5d Mon Sep 17 00:00:00 2001
From: "Edrisa A. Turay" <eturay@iom.int>
Date: Wed, 16 Oct 2019 21:44:39 +0200
Subject: [PATCH 1/4] Created Sign Up Activity

---
 .idea/vcs.xml                                 |  2 +-
 app/src/main/AndroidManifest.xml              |  3 +-
 .../animationchallenge/SignInActivity.java    | 48 +++++++++++++++
 ...{MainActivity.java => SignUpActivity.java} |  4 +-
 app/src/main/res/layout/activity_sign_in.xml  | 58 +++++++++++++++++++
 ...activity_main.xml => activity_sign_up.xml} | 11 +---
 build.gradle                                  |  2 +-
 7 files changed, 113 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
 rename app/src/main/java/com/andela/app/animationchallenge/{MainActivity.java => SignUpActivity.java} (69%)
 create mode 100644 app/src/main/res/layout/activity_sign_in.xml
 rename app/src/main/res/layout/{activity_main.xml => activity_sign_up.xml} (50%)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d1567f..f85080f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".SignUpActivity"></activity>
+        <activity android:name=".SignInActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
new file mode 100644
index 0000000..863904d
--- /dev/null
+++ b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
@@ -0,0 +1,48 @@
+package com.andela.app.animationchallenge;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class SignInActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private EditText mUsername, mPassword;
+    private Button mSignin;
+    private TextView mSignup;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sign_in);
+        initComp();
+    }
+
+    private void initComp(){
+        mUsername = findViewById(R.id.et_username);
+        mPassword = findViewById(R.id.et_password);
+        mSignin = findViewById(R.id.btn_signin);
+        mSignin.setOnClickListener(this);
+        mSignup = findViewById(R.id.tv_signup);
+        mSignup.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()){
+            case R.id.btn_signin : mSigninButtonClicked();
+            break;
+            case  R.id.tv_signup : mSignupButtonClicked();
+        }
+    }
+    private  void mSigninButtonClicked(){
+        Toast.makeText(SignInActivity.this, "Ooh, i did something", Toast.LENGTH_LONG).show();
+    }
+
+    private void mSignupButtonClicked(){
+
+    }
+}
diff --git a/app/src/main/java/com/andela/app/animationchallenge/MainActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java
similarity index 69%
rename from app/src/main/java/com/andela/app/animationchallenge/MainActivity.java
rename to app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java
index c110b7b..fc89145 100644
--- a/app/src/main/java/com/andela/app/animationchallenge/MainActivity.java
+++ b/app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java
@@ -4,11 +4,11 @@
 
 import android.os.Bundle;
 
-public class MainActivity extends AppCompatActivity {
+public class SignUpActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_sign_up);
     }
 }
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
new file mode 100644
index 0000000..bbdc95c
--- /dev/null
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/main_layout"
+    tools:context=".SignInActivity">
+
+
+   <LinearLayout
+       android:id="@+id/ll_input_area"
+       android:layout_margin="16dp"
+       android:orientation="vertical"
+       android:layout_alignParentBottom="true"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content">
+       <ImageView
+           android:id="@+id/iv_logo"
+           android:src="@drawable/ic_launcher_foreground"
+           android:layout_gravity="center_horizontal"
+           android:layout_width="wrap_content"
+           android:layout_marginBottom="50dp"
+           android:layout_height="wrap_content" />
+
+       <EditText
+           android:id="@+id/et_username"
+           android:hint="Username"
+           android:inputType="textEmailAddress"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"/>
+
+       <EditText
+           android:id="@+id/et_password"
+           android:hint="Password"
+           android:inputType="textPassword"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"/>
+
+       <Button
+           android:id="@+id/btn_signin"
+           android:layout_marginTop="12dp"
+           android:layout_gravity="right"
+           android:text="Sign in"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"/>
+       <TextView
+           android:id="@+id/tv_signup"
+           android:textAlignment="center"
+           android:layout_marginTop="32dp"
+           android:layout_marginBottom="32dp"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:clickable="true"
+           android:text="Dont have an account? Sign up."/>
+   </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_sign_up.xml
similarity index 50%
rename from app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_sign_up.xml
index 4fc2444..5d9d69e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -4,15 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    tools:context=".SignUpActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f5fb2cc..48947c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From a8208cacba6bca4779335199b3ca6bb630457e90 Mon Sep 17 00:00:00 2001
From: "Edrisa A. Turay" <eturay@iom.int>
Date: Wed, 16 Oct 2019 23:01:41 +0200
Subject: [PATCH 2/4] Selection Activity Added

---
 app/src/main/AndroidManifest.xml              |  7 ++-
 .../animationchallenge/SelectionActivity.java | 44 ++++++++++++++++
 .../animationchallenge/SignInActivity.java    |  9 +++-
 .../animationchallenge/SignUpActivity.java    |  1 +
 .../main/res/layout/activity_selection.xml    | 52 +++++++++++++++++++
 5 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java
 create mode 100644 app/src/main/res/layout/activity_selection.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f85080f..d84fda2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,14 +9,17 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SignUpActivity"></activity>
-        <activity android:name=".SignInActivity">
+        <activity android:name=".SelectionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".SignUpActivity" />
+        <activity android:name=".SignInActivity">
+
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java
new file mode 100644
index 0000000..3cc9c1d
--- /dev/null
+++ b/app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java
@@ -0,0 +1,44 @@
+package com.andela.app.animationchallenge;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class SelectionActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private Button mDoctor, mPatient;
+    private int DOCTOR_SIGN_IN_CODE = 0001;
+    private int PATIENT_SIGN_IN_CODE = 0002;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_selection);
+        initComponents();
+
+    }
+
+    private void initComponents(){
+        mDoctor = findViewById(R.id.btn_doctor);
+        mPatient = findViewById(R.id.btn_patient);
+        mDoctor.setOnClickListener(this);
+        mPatient.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()){
+            case R.id.btn_doctor: handleButtonClick(DOCTOR_SIGN_IN_CODE);
+            break;
+            case R.id.btn_patient: handleButtonClick(PATIENT_SIGN_IN_CODE);
+        }
+    }
+
+    private void handleButtonClick(int signInCode){
+        Intent intent = new Intent(SelectionActivity.this, SignInActivity.class);
+        intent.putExtra("SIGN_IN_CODE", signInCode);
+        startActivity(intent);
+    }
+}
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
index 863904d..7cc4287 100644
--- a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
+++ b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
@@ -18,10 +18,13 @@ public class SignInActivity extends AppCompatActivity implements View.OnClickLis
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_in);
-        initComp();
+        initComponents();
     }
 
-    private void initComp(){
+    private void handleIntents(){
+
+    }
+    private void initComponents(){
         mUsername = findViewById(R.id.et_username);
         mPassword = findViewById(R.id.et_password);
         mSignin = findViewById(R.id.btn_signin);
@@ -45,4 +48,6 @@ private  void mSigninButtonClicked(){
     private void mSignupButtonClicked(){
 
     }
+
+
 }
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java
index fc89145..edc58e5 100644
--- a/app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java
+++ b/app/src/main/java/com/andela/app/animationchallenge/SignUpActivity.java
@@ -10,5 +10,6 @@ public class SignUpActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_up);
+
     }
 }
diff --git a/app/src/main/res/layout/activity_selection.xml b/app/src/main/res/layout/activity_selection.xml
new file mode 100644
index 0000000..c9abbdc
--- /dev/null
+++ b/app/src/main/res/layout/activity_selection.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    tools:context=".SelectionActivity">
+
+    <ImageView
+        android:id="@+id/iv_logo"
+        android:src="@drawable/ic_launcher_foreground"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/tv_instruction_text"
+        android:text="Who are you please?"
+        android:textAlignment="center"
+        android:layout_above="@id/ll_selection_area"
+        android:layout_marginBottom="16dp"
+        android:textSize="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:id="@+id/ll_selection_area"
+        android:layout_marginBottom="16dp"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:weightSum="2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/btn_doctor"
+            android:layout_weight="1"
+            android:text="I'm a Doctor"
+            android:textAllCaps="false"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+        <Button
+            android:id="@+id/btn_patient"
+            android:layout_weight="1"
+            android:text="I'm a Patiennt"
+            android:textAllCaps="false"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file

From cd5e4d85c911d601d65dc7d3b1be99ab96cad974 Mon Sep 17 00:00:00 2001
From: "Edrisa A. Turay" <eturay@iom.int>
Date: Thu, 17 Oct 2019 11:30:12 +0200
Subject: [PATCH 3/4] Changed origin

---
 .../animationchallenge/SignInActivity.java    | 21 ++++++++++++++-----
 app/src/main/res/layout/activity_sign_in.xml  |  7 +++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
index 7cc4287..e275925 100644
--- a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
+++ b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
@@ -2,6 +2,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -13,17 +14,26 @@ public class SignInActivity extends AppCompatActivity implements View.OnClickLis
 
     private EditText mUsername, mPassword;
     private Button mSignin;
-    private TextView mSignup;
+    private TextView mSignup, mWelcomeMessage;
+    private Intent intent;
+    private int CALLING_PAGE_CODE;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_in);
+        handleIntents();
         initComponents();
     }
-
+    //Handle the intent and get the page code
     private void handleIntents(){
-
+        intent =  getIntent();
+        if(intent.hasExtra("SIGN_IN_CODE")){
+            CALLING_PAGE_CODE = intent.getIntExtra("SIGN_IN_CODE", 0001);
+        }else{
+            CALLING_PAGE_CODE = 0001;
+        }
     }
+
     private void initComponents(){
         mUsername = findViewById(R.id.et_username);
         mPassword = findViewById(R.id.et_password);
@@ -31,6 +41,8 @@ private void initComponents(){
         mSignin.setOnClickListener(this);
         mSignup = findViewById(R.id.tv_signup);
         mSignup.setOnClickListener(this);
+        mWelcomeMessage = findViewById(R.id.tv_welcome_message);
+        mWelcomeMessage.setText("Welcome " + ((CALLING_PAGE_CODE == 0001) ? "Doctor" : "Patient"));
     }
 
     @Override
@@ -41,6 +53,7 @@ public void onClick(View view) {
             case  R.id.tv_signup : mSignupButtonClicked();
         }
     }
+
     private  void mSigninButtonClicked(){
         Toast.makeText(SignInActivity.this, "Ooh, i did something", Toast.LENGTH_LONG).show();
     }
@@ -48,6 +61,4 @@ private  void mSigninButtonClicked(){
     private void mSignupButtonClicked(){
 
     }
-
-
 }
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index bbdc95c..ad52b02 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -22,6 +22,13 @@
            android:layout_width="wrap_content"
            android:layout_marginBottom="50dp"
            android:layout_height="wrap_content" />
+       <TextView
+           android:id="@+id/tv_welcome_message"
+           android:textAlignment="center"
+           android:layout_marginBottom="16dp"
+           android:textSize="16sp"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"/>
 
        <EditText
            android:id="@+id/et_username"

From 3780a0f663e7437b87839fe41716ec3f48266413 Mon Sep 17 00:00:00 2001
From: "Edrisa A. Turay" <eturay@iom.int>
Date: Thu, 17 Oct 2019 16:31:33 +0200
Subject: [PATCH 4/4] Added Eric's Suggestion.. Animate Splash Screen Animation

---
 app/src/main/AndroidManifest.xml              |  9 +-
 .../app/animationchallenge/MainActivity.java  | 15 ++++
 .../animationchallenge/SelectionActivity.java | 44 ----------
 .../animationchallenge/SignInActivity.java    | 14 +---
 .../animationchallenge/SplashActivity.java    | 84 +++++++++++++++++++
 .../animations/AppAnimator.java               | 27 ++++++
 .../alpha_splash_screen_logo_animator.xml     | 11 +++
 app/src/main/res/layout/activity_main.xml     |  9 ++
 .../main/res/layout/activity_selection.xml    | 52 ------------
 app/src/main/res/layout/activity_splash.xml   | 17 ++++
 app/src/main/res/values/styles.xml            |  6 ++
 11 files changed, 175 insertions(+), 113 deletions(-)
 create mode 100644 app/src/main/java/com/andela/app/animationchallenge/MainActivity.java
 delete mode 100644 app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java
 create mode 100644 app/src/main/java/com/andela/app/animationchallenge/SplashActivity.java
 create mode 100644 app/src/main/java/com/andela/app/animationchallenge/animations/AppAnimator.java
 create mode 100644 app/src/main/res/animator/alpha_splash_screen_logo_animator.xml
 create mode 100644 app/src/main/res/layout/activity_main.xml
 delete mode 100644 app/src/main/res/layout/activity_selection.xml
 create mode 100644 app/src/main/res/layout/activity_splash.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d84fda2..dcdea46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SelectionActivity">
+        <activity android:name=".MainActivity"></activity>
+        <activity
+            android:name=".SplashActivity"
+            android:theme="@style/AppTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -17,9 +20,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".SignUpActivity" />
-        <activity android:name=".SignInActivity">
-
-        </activity>
+        <activity android:name=".SignInActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/andela/app/animationchallenge/MainActivity.java b/app/src/main/java/com/andela/app/animationchallenge/MainActivity.java
new file mode 100644
index 0000000..8c8152e
--- /dev/null
+++ b/app/src/main/java/com/andela/app/animationchallenge/MainActivity.java
@@ -0,0 +1,15 @@
+package com.andela.app.animationchallenge;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.animation.Animator;
+import android.os.Bundle;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+    }
+}
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java
deleted file mode 100644
index 3cc9c1d..0000000
--- a/app/src/main/java/com/andela/app/animationchallenge/SelectionActivity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.andela.app.animationchallenge;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-public class SelectionActivity extends AppCompatActivity implements View.OnClickListener {
-
-    private Button mDoctor, mPatient;
-    private int DOCTOR_SIGN_IN_CODE = 0001;
-    private int PATIENT_SIGN_IN_CODE = 0002;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_selection);
-        initComponents();
-
-    }
-
-    private void initComponents(){
-        mDoctor = findViewById(R.id.btn_doctor);
-        mPatient = findViewById(R.id.btn_patient);
-        mDoctor.setOnClickListener(this);
-        mPatient.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()){
-            case R.id.btn_doctor: handleButtonClick(DOCTOR_SIGN_IN_CODE);
-            break;
-            case R.id.btn_patient: handleButtonClick(PATIENT_SIGN_IN_CODE);
-        }
-    }
-
-    private void handleButtonClick(int signInCode){
-        Intent intent = new Intent(SelectionActivity.this, SignInActivity.class);
-        intent.putExtra("SIGN_IN_CODE", signInCode);
-        startActivity(intent);
-    }
-}
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
index e275925..177b355 100644
--- a/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
+++ b/app/src/main/java/com/andela/app/animationchallenge/SignInActivity.java
@@ -15,24 +15,13 @@ public class SignInActivity extends AppCompatActivity implements View.OnClickLis
     private EditText mUsername, mPassword;
     private Button mSignin;
     private TextView mSignup, mWelcomeMessage;
-    private Intent intent;
-    private int CALLING_PAGE_CODE;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_in);
-        handleIntents();
+
         initComponents();
     }
-    //Handle the intent and get the page code
-    private void handleIntents(){
-        intent =  getIntent();
-        if(intent.hasExtra("SIGN_IN_CODE")){
-            CALLING_PAGE_CODE = intent.getIntExtra("SIGN_IN_CODE", 0001);
-        }else{
-            CALLING_PAGE_CODE = 0001;
-        }
-    }
 
     private void initComponents(){
         mUsername = findViewById(R.id.et_username);
@@ -42,7 +31,6 @@ private void initComponents(){
         mSignup = findViewById(R.id.tv_signup);
         mSignup.setOnClickListener(this);
         mWelcomeMessage = findViewById(R.id.tv_welcome_message);
-        mWelcomeMessage.setText("Welcome " + ((CALLING_PAGE_CODE == 0001) ? "Doctor" : "Patient"));
     }
 
     @Override
diff --git a/app/src/main/java/com/andela/app/animationchallenge/SplashActivity.java b/app/src/main/java/com/andela/app/animationchallenge/SplashActivity.java
new file mode 100644
index 0000000..a7e7491
--- /dev/null
+++ b/app/src/main/java/com/andela/app/animationchallenge/SplashActivity.java
@@ -0,0 +1,84 @@
+package com.andela.app.animationchallenge;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.animation.Animator;
+import android.content.Intent;
+import android.media.Image;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import com.andela.app.animationchallenge.animations.AppAnimator;
+
+public class SplashActivity extends AppCompatActivity implements Animator.AnimatorListener {
+
+    private ImageView mLogo;
+    private int splashTime;
+    private Handler handler;
+    private AppAnimator appAnimator;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
+        initVariables();
+        initComponents();
+
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        handler = new Handler();
+
+
+
+        handler.postDelayed(goToMainActivity(), splashTime);
+    }
+
+    private void initVariables(){
+
+        splashTime = 5000;
+        appAnimator = new AppAnimator(SplashActivity.this);
+    }
+    private void initComponents(){
+        mLogo = findViewById(R.id.iv_logo);
+    }
+
+
+    private Runnable goToMainActivity(){
+        appAnimator.fadeAnimation(mLogo, R.animator.alpha_splash_screen_logo_animator);
+        return new Runnable() {
+            @Override
+            public void run() {
+                startActivity(new Intent(SplashActivity.this, MainActivity.class));
+                finish();
+            }
+        };
+    }
+
+    @Override
+    public void onAnimationStart(Animator animation) {
+        Toast.makeText(SplashActivity.this, "Animation Started", Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onAnimationEnd(Animator animation) {
+        Toast.makeText(SplashActivity.this, "Animation Ended", Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onAnimationRepeat(Animator animation) {
+        Toast.makeText(SplashActivity.this, "Animation Repeated", Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onAnimationCancel(Animator animator) {
+        Toast.makeText(SplashActivity.this, "Animation Repeated", Toast.LENGTH_LONG).show();
+    }
+}
diff --git a/app/src/main/java/com/andela/app/animationchallenge/animations/AppAnimator.java b/app/src/main/java/com/andela/app/animationchallenge/animations/AppAnimator.java
new file mode 100644
index 0000000..4d880b4
--- /dev/null
+++ b/app/src/main/java/com/andela/app/animationchallenge/animations/AppAnimator.java
@@ -0,0 +1,27 @@
+package com.andela.app.animationchallenge.animations;
+
+import android.animation.Animator;
+import android.animation.AnimatorInflater;
+import android.animation.AnimatorSet;
+import android.content.Context;
+import android.view.View;
+
+import com.andela.app.animationchallenge.R;
+
+public class AppAnimator {
+
+    private Context context;
+    public AppAnimator() {
+    }
+
+    public AppAnimator(Context context) {
+        this.context = context;
+    }
+
+    public void fadeAnimation(View view, int resource){
+        AnimatorSet animatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(this.context, resource);
+        animatorSet.setTarget(view);
+        animatorSet.addListener((Animator.AnimatorListener) this.context);
+        animatorSet.start();
+    }
+}
diff --git a/app/src/main/res/animator/alpha_splash_screen_logo_animator.xml b/app/src/main/res/animator/alpha_splash_screen_logo_animator.xml
new file mode 100644
index 0000000..9cb77fc
--- /dev/null
+++ b/app/src/main/res/animator/alpha_splash_screen_logo_animator.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<objectAnimator
+    android:propertyName="alpha"
+    android:valueFrom="0.0"
+    android:valueTo="1.0"
+    android:valueType="floatType"
+    android:duration="3000"
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+    />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..0b15a20
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_selection.xml b/app/src/main/res/layout/activity_selection.xml
deleted file mode 100644
index c9abbdc..0000000
--- a/app/src/main/res/layout/activity_selection.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp"
-    tools:context=".SelectionActivity">
-
-    <ImageView
-        android:id="@+id/iv_logo"
-        android:src="@drawable/ic_launcher_foreground"
-        android:layout_centerInParent="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-    <TextView
-        android:id="@+id/tv_instruction_text"
-        android:text="Who are you please?"
-        android:textAlignment="center"
-        android:layout_above="@id/ll_selection_area"
-        android:layout_marginBottom="16dp"
-        android:textSize="20sp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout
-        android:id="@+id/ll_selection_area"
-        android:layout_marginBottom="16dp"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:weightSum="2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <Button
-            android:id="@+id/btn_doctor"
-            android:layout_weight="1"
-            android:text="I'm a Doctor"
-            android:textAllCaps="false"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"/>
-        <Button
-            android:id="@+id/btn_patient"
-            android:layout_weight="1"
-            android:text="I'm a Patiennt"
-            android:textAllCaps="false"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
new file mode 100644
index 0000000..0085f80
--- /dev/null
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    tools:context=".SplashActivity">
+
+    <ImageView
+        android:id="@+id/iv_logo"
+        android:src="@drawable/ic_launcher_foreground"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..bdf2194 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,4 +8,10 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <!--Splash Screen Custom Theme-->
+    <style name="AppTheme.SplashScreen" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
 </resources>