diff --git a/.idea/misc.xml b/.idea/misc.xml
index 75318f728051c43fdceee22b5a4b65d2c821fd4b..79461bc634dbe899a24de835544722d6900b371f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/src/main/assets/fonts/AvenirLTStd-Book.otf b/app/src/main/assets/fonts/AvenirLTStd-Book.otf
new file mode 100755
index 0000000000000000000000000000000000000000..52ab53e85d7b38c94d6a76a41b43042fd9d9eea1
Binary files /dev/null and b/app/src/main/assets/fonts/AvenirLTStd-Book.otf differ
diff --git a/app/src/main/assets/fonts/BebasNeue Bold.ttf b/app/src/main/assets/fonts/BebasNeue Bold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..6fff6057a6d059da75fecd537932ada084868042
Binary files /dev/null and b/app/src/main/assets/fonts/BebasNeue Bold.ttf differ
diff --git a/app/src/main/assets/fonts/BebasNeue Book.ttf b/app/src/main/assets/fonts/BebasNeue Book.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a0c612f50fe79d0ea849a9051a3f4f031a538118
Binary files /dev/null and b/app/src/main/assets/fonts/BebasNeue Book.ttf differ
diff --git a/app/src/main/assets/fonts/BebasNeue Light.ttf b/app/src/main/assets/fonts/BebasNeue Light.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a3a66d611a4f016d787bab6b08f49994de5b715a
Binary files /dev/null and b/app/src/main/assets/fonts/BebasNeue Light.ttf differ
diff --git a/app/src/main/assets/fonts/BebasNeue Regular.ttf b/app/src/main/assets/fonts/BebasNeue Regular.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..2fff54cd5b387843a27f9232ebb768f9ec1e7585
Binary files /dev/null and b/app/src/main/assets/fonts/BebasNeue Regular.ttf differ
diff --git a/app/src/main/assets/fonts/BebasNeue Thin.ttf b/app/src/main/assets/fonts/BebasNeue Thin.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..9a7a95caef4c0fe870473eb260a45717744c19aa
Binary files /dev/null and b/app/src/main/assets/fonts/BebasNeue Thin.ttf differ
diff --git a/app/src/main/assets/fonts/Montserrat-ExtraLight.otf b/app/src/main/assets/fonts/Montserrat-ExtraLight.otf
new file mode 100755
index 0000000000000000000000000000000000000000..a964b6d19d50a84b77210ec2a67f8fd3444882a9
Binary files /dev/null and b/app/src/main/assets/fonts/Montserrat-ExtraLight.otf differ
diff --git a/app/src/main/assets/fonts/MontserratAlternates-Regular.otf b/app/src/main/assets/fonts/MontserratAlternates-Regular.otf
new file mode 100755
index 0000000000000000000000000000000000000000..58ba4a6326278ab2a0ac6eb8f2d3c388146f7709
Binary files /dev/null and b/app/src/main/assets/fonts/MontserratAlternates-Regular.otf differ
diff --git a/app/src/main/java/com/darshanbshah/odsystem/CustomListAdapter.java b/app/src/main/java/com/darshanbshah/odsystem/CustomListAdapter.java
index 3fd6a20e18f09cb6868b291f4a83589c36844df0..8dd2a7ca07f45802ac58f83ef1c69c8448cd20e1 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/CustomListAdapter.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/CustomListAdapter.java
@@ -23,7 +23,7 @@ public class CustomListAdapter extends ArrayAdapter {
static class DataHandler {
- TextView tv, tv1, tv2, tv3, tv4;
+ TextView tv, tv1, tv2, tv3, tv4, tv5, tv6;
}
List list = new ArrayList();
@@ -68,19 +68,28 @@ public class CustomListAdapter extends ArrayAdapter {
handler.tv1 = (TextView)row.findViewById(R.id.listTextReason);
handler.tv2 = (TextView)row.findViewById(R.id.fromText);
handler.tv3 = (TextView)row.findViewById(R.id.toText);
+ handler.tv4 = (TextView)row.findViewById(R.id.reasonLabel);
+ handler.tv5 = (TextView)row.findViewById(R.id.fromLabel);
+ handler.tv6 = (TextView)row.findViewById(R.id.toLabel);
row.setTag(handler);
}
else {
handler = (DataHandler) row.getTag();
}
-// Typeface one = Typeface.createFromAsset(parent.getContext().getAssets(), "fonts/BebasNeue Bold.ttf");
+ Typeface one = Typeface.createFromAsset(parent.getContext().getAssets(), "fonts/AvenirLTStd-Book.otf");
DataProvider provider = (DataProvider) this.getItem(position);
handler.tv.setText(provider.getRollno());
handler.tv1.setText(provider.getReason());
handler.tv2.setText(provider.getFrom());
handler.tv3.setText(provider.getTo());
-// handler.tv.setTypeface(one);
+ handler.tv.setTypeface(one);
+ handler.tv1.setTypeface(one);
+ handler.tv2.setTypeface(one);
+ handler.tv3.setTypeface(one);
+ handler.tv4.setTypeface(one);
+ handler.tv5.setTypeface(one);
+ handler.tv6.setTypeface(one);
handler.tv.setTextSize(30);
handler.tv1.setTextSize(20);
handler.tv2.setTextSize(20);
diff --git a/app/src/main/java/com/darshanbshah/odsystem/Login.java b/app/src/main/java/com/darshanbshah/odsystem/Login.java
index 475f2c281cd17bd61c1be3b084c0606e1b743dfb..0918bcc6a23d0972abc6360d09eb365f34f4e546 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/Login.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/Login.java
@@ -3,11 +3,13 @@ package com.darshanbshah.odsystem;
import android.app.ProgressDialog;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.graphics.Typeface;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
+import android.widget.TextView;
import com.google.android.gms.auth.api.Auth;
import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
@@ -36,12 +38,16 @@ public class Login extends AppCompatActivity implements GoogleApiClient.OnConnec
private static int RC_SIGN_IN = 0;
private static String TAG = "MAIN_ACTIVITY";
-
+ TextView title;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
+ title = (TextView)findViewById(R.id.textView3);
+ Typeface one = Typeface.createFromAsset(getAssets(), "fonts/BebasNeue Book.ttf");
+ title.setTypeface(one);
+ title.setTextSize(70);
mAuth = FirebaseAuth.getInstance();
if (mAuth.getCurrentUser() != null) {
diff --git a/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java b/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
index 32425b28372fdc7c648f411702214acd2e137f27..d7424e736fa3d5e41bb560d484dec42103b67e90 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
@@ -14,6 +14,7 @@ import android.view.View;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
+import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
@@ -79,7 +80,7 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
@Override
public void onDataChange(DataSnapshot dataSnapshot) {
for(DataSnapshot dsp : dataSnapshot.getChildren()){
- list.add(String.valueOf(dsp.getKey())); //add result into array list
+ list.add(String.valueOf(dsp.getKey()));
Log.e("VALUE: ", String.valueOf(dsp.getKey()));
}
Log.e("LISTSIZE", String.valueOf(list.size()));
diff --git a/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java b/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java
index 37f31a46affe4f580d88b7f8a1ba55babbde0822..fca7560e6087a53c7ca3f9c5a911ed171b23da83 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/TeacherActivity.java
@@ -4,12 +4,14 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
+import android.graphics.Typeface;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
+import android.widget.Button;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -48,6 +50,7 @@ public class TeacherActivity extends AppCompatActivity {
DataProvider itemValue;
FirebaseAuth mAuth;
FirebaseDatabase database = FirebaseDatabase.getInstance();
+ TextView title;
DatabaseReference root;
DatabaseReference adv;
@@ -64,7 +67,6 @@ public class TeacherActivity extends AppCompatActivity {
List<String> roll = new ArrayList<String>();
List<String> random = new ArrayList<String>();
List<String> adv_list = new ArrayList<String>();
-// List<DatabaseReference> od_student_list = new ArrayList<DatabaseReference>();
String flag = "", reason = "", from = "", to = "", fullday = "";
@@ -78,7 +80,9 @@ public class TeacherActivity extends AppCompatActivity {
adv = root.child("Advisors");
student = root.child("Student");
listView = (ListView)findViewById(R.id.listView);
-
+ title = (TextView)findViewById(R.id.pendingTitle);
+ Typeface one = Typeface.createFromAsset(getAssets(), "fonts/AvenirLTStd-Book.otf");
+ title.setTypeface(one);
student.addChildEventListener(new ChildEventListener() {
@Override
public void onChildAdded(DataSnapshot dataSnapshot, String s) {