Added separate activity for teacher

app/src/main/AndroidManifest.xml

@@ -16,7 +16,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".MainActivity" />
-        <activity android:name=".RollNumber"></activity>
+        <activity android:name=".RollNumber" />
+        <activity android:name=".TeacherActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/darshanbshah/odsystem/Login.java

@@ -23,6 +23,9 @@ import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Login extends AppCompatActivity implements GoogleApiClient.OnConnectionFailedListener, View.OnClickListener{
 
     private GoogleApiClient mGoogleApiClient;
@@ -33,6 +36,8 @@ public class Login extends AppCompatActivity implements GoogleApiClient.OnConnec
     private static int RC_SIGN_IN = 0;
     private static String TAG = "MAIN_ACTIVITY";
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/darshanbshah/odsystem/RollNumber.java

@@ -117,21 +117,18 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
             }
         });
 
-
-
-
-        SharedPreferences preferences = getSharedPreferences("ActivityPREF", Context.MODE_PRIVATE);
-
-        if(preferences.getBoolean("activity_executed", false)){
-            Intent intent = new Intent(this, MainActivity.class);
-            startActivity(intent);
-            finish();
-        }
-        else {
-            SharedPreferences.Editor edit = preferences.edit();
-            edit.putBoolean("activity_executed", true);
-            edit.commit();
-        }
+//        SharedPreferences preferences = getSharedPreferences("ActivityPREF", Context.MODE_PRIVATE);
+//
+//        if(preferences.getBoolean("activity_executed", false)){
+//            Intent intent = new Intent(this, MainActivity.class);
+//            startActivity(intent);
+//            finish();
+//        }
+//        else {
+//            SharedPreferences.Editor edit = preferences.edit();
+//            edit.putBoolean("activity_executed", true);
+//            edit.commit();
+//        }
 
 
     }
@@ -155,17 +152,28 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
 
     }
 
+    int flag = 0;
     public void nextAct(View view) {
         if (TextUtils.isEmpty(rollNumber.getText().toString())) {
             Toast.makeText(this, "Enter Roll Number", Toast.LENGTH_SHORT).show();
         }
         else {
+            for (String email : lst) {
+                if (email.equals(mAuth.getCurrentUser().getEmail())) {
+                    startActivity(new Intent(this, TeacherActivity.class));
+                    flag = 1;
+                    finish();
+                    break;
+                }
+            }
+            if (flag == 0) {
                 roll_no.setValue(rollNumber.getText().toString());
                 email.setValue(mAuth.getCurrentUser().getEmail());
                 startActivity(new Intent(this, MainActivity.class));
                 finish();
             }
         }
+    }
 
     public void signOut(View view) {
         mAuth.signOut();

app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java

+package com.darshanbshah.odsystem;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+import com.google.firebase.auth.FirebaseAuth;
+
+public class TeacherActivity extends AppCompatActivity {
+
+    FirebaseAuth mAuth;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_teacher);
+        mAuth = FirebaseAuth.getInstance();
+    }
+
+    public void signOut(View view) {
+        mAuth.signOut();
+        startActivity(new Intent(this, Login.class));
+        finish();
+    }
+}

app/src/main/res/layout/activity_teacher.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_teacher"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.darshanbshah.odsystem.TeacherActivity">
+
+    <Button
+        android:text="Logout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="181dp"
+        android:id="@+id/button2"
+        android:onClick="signOut" />
+</RelativeLayout>

app/src/main/res/values/strings.xml

 <resources>
     <string name="app_name">OD System</string>
     <string-array name="advisors">
+        <item>Select Advisor</item>
         <item>One</item>
         <item>Two</item>
-        <item>Three</item>
     </string-array>
 </resources>