diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 78bc935ce67488955b57c7172d04606878e78069..ce65fea6e9bd7100b815f0357c4cf2e39d9b2489 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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
diff --git a/app/src/main/java/com/darshanbshah/odsystem/Login.java b/app/src/main/java/com/darshanbshah/odsystem/Login.java
index a46ecd5259eb4199bc8dc6e1cbf3171892b8b7cd..475f2c281cd17bd61c1be3b084c0606e1b743dfb 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/Login.java
+++ b/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);
diff --git a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
index 7586e34f47a0e866b33f5fb9508d4f528145c01c..2db1140d64153ef38496af165a0dac9565731ca7 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
@@ -75,7 +75,7 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onChildAdded(DataSnapshot dataSnapshot, String s) {
for(DataSnapshot dsp : dataSnapshot.getChildren()){
- if (dsp.getKey().toString().equals("Advisor")) {
+ if (dsp.getKey().toString().equals("Advisor")) {
list1.add(String.valueOf(dsp.getValue()));
Log.e("E-MAIL ", String.valueOf(dsp.getValue()));
}
diff --git a/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java b/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
index 7d3dd52ea8258d9e0b293ca2593d976dcaa8c092..2f15eb65709aa811515cbe4d32bbeb0eb5d49c66 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
+++ b/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,15 +152,26 @@ 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 {
- roll_no.setValue(rollNumber.getText().toString());
- email.setValue(mAuth.getCurrentUser().getEmail());
- startActivity(new Intent(this, MainActivity.class));
- finish();
+ 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();
+ }
}
}
@@ -172,4 +180,4 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
startActivity(new Intent(this, Login.class));
finish();
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java b/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..b77ea654ab2a1df0c711ea9d3b36e65a944504ce
--- /dev/null
+++ b/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java
@@ -0,0 +1,26 @@
+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();
+ }
+}
diff --git a/app/src/main/res/layout/activity_teacher.xml b/app/src/main/res/layout/activity_teacher.xml
new file mode 100644
index 0000000000000000000000000000000000000000..09f9bf8084f71e69f10aceb9ae74a7f869f2aa0c
--- /dev/null
+++ b/app/src/main/res/layout/activity_teacher.xml
@@ -0,0 +1,22 @@
+<?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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 779b1d367f4e028f0cf334ea404d107f40f5d4b1..57f012925075f2d92d064b310da9b87f9d4452c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
<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>