First commit

app/src/main/AndroidManifest.xml

@@ -76,6 +76,10 @@
             android:label="Advisor"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme1" />
+        <activity android:name=".odhistory.history_approvedActivity"
+            android:label="Leave History"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme1"></activity>
 
         <activity
             android:name=".approvedrecycler.approvedActivity"

app/src/main/java/com/peruse/saran/amritaod/actionareas/userAreaActivity.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -16,6 +17,7 @@ public class userAreaActivity extends AppCompatActivity {
     String recievedUsername, recievedRollno, recievedSemester, recievedBranch;
     //When Apply Button is clicked 'apply' function should be called via onClick attribute in xml
     private boolean doubleBackToExitPressedOnce = false;
+    private Button history;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -36,6 +38,13 @@ public class userAreaActivity extends AppCompatActivity {
         receivedRollnumberDisplay.setText(recievedRollno);
 
         recievedSemesterDisplay.setText(recievedSemester);
+        history = (Button)findViewById(R.id.button4);
+        history.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                list(v);
+            }
+        });
     }
     @Override
     public void onBackPressed() {
@@ -69,6 +78,7 @@ public class userAreaActivity extends AppCompatActivity {
 
     protected void list(View view){
         Intent intent = new Intent(this,history_approvedActivity.class);
+        intent.putExtra("rollno",recievedRollno);
         startActivity(intent);
     }
 

app/src/main/java/com/peruse/saran/amritaod/odhistory/history_CustomVolleyRequest.java

@@ -17,7 +17,7 @@ import com.android.volley.toolbox.ImageLoader;
  */
 
 public class history_CustomVolleyRequest {
-    private static com.peruse.saran.amritaod.recycler.CustomVolleyRequest customVolleyRequest;
+    private static history_CustomVolleyRequest customVolleyRequest;
     private static Context context;
     private RequestQueue requestQueue;
     private ImageLoader imageLoader;
@@ -41,9 +41,9 @@ public class history_CustomVolleyRequest {
                     }
                 });
     }
-    public static synchronized com.peruse.saran.amritaod.recycler.CustomVolleyRequest getInstance(Context context) {
+    public static synchronized history_CustomVolleyRequest getInstance(Context context) {
         if (customVolleyRequest == null) {
-            customVolleyRequest = new com.peruse.saran.amritaod.recycler.CustomVolleyRequest(context);
+            customVolleyRequest = new history_CustomVolleyRequest(context);
         }
         return customVolleyRequest;
     }

app/src/main/java/com/peruse/saran/amritaod/odhistory/history_approvedActivity.java

 package com.peruse.saran.amritaod.odhistory;
 
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.RequiresApi;
@@ -39,8 +40,11 @@ public class history_approvedActivity extends AppCompatActivity implements View.
     private RequestQueue requestQueue;
     private int requestCount = 1;
     private boolean mLoading = false;
+    private String rollno;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Intent intent = getIntent();
+        rollno = intent.getExtras().getString("rollno");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_history_odapprove);
         recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
@@ -64,7 +68,7 @@ public class history_approvedActivity extends AppCompatActivity implements View.
         setProgressBarIndeterminateVisibility(true);
 
         //JsonArrayRequest of volley
-        JsonArrayRequest jsonArrayRequest = new JsonArrayRequest("https://amritaod.000webhostapp.com/androidmain.php?page=" + String.valueOf(requestCount),
+        JsonArrayRequest jsonArrayRequest = new JsonArrayRequest("https://amritaod.000webhostapp.com/androidmain.php?page=" + String.valueOf(requestCount)+"&historyrollno="+String.valueOf(rollno),
                 new Response.Listener<JSONArray>() {
                     @Override
                     public void onResponse(JSONArray response) {

app/src/main/java/com/peruse/saran/amritaod/odhistory/history_cardadapter.java

@@ -11,7 +11,6 @@ import android.widget.TextView;
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.NetworkImageView;
 import com.peruse.saran.amritaod.R;
-import com.peruse.saran.amritaod.recycler.CustomVolleyRequest;
 import com.peruse.saran.amritaod.templates.oddetailstemplate;
 
 import java.util.List;
@@ -43,7 +42,7 @@ public class history_cardadapter extends RecyclerView.Adapter<com.peruse.saran.a
     public void onBindViewHolder(final com.peruse.saran.amritaod.odhistory.history_cardadapter.ViewHolder holder, int position) {
         oddetailstemplate superHero =  listOdApprove.get(position);
         final String id = superHero.getId();
-        imageLoader = CustomVolleyRequest.getInstance(context).getImageLoader();
+        imageLoader = history_CustomVolleyRequest.getInstance(context).getImageLoader();
         imageLoader.get(superHero.getImageUrl(), ImageLoader.getImageListener(holder.imageView, R.drawable.image, R.drawable.loaderror));
         holder.imageView.setImageUrl(superHero.getImageUrl(), imageLoader);
         holder.textViewName.setText(superHero.getName());
@@ -59,7 +58,6 @@ public class history_cardadapter extends RecyclerView.Adapter<com.peruse.saran.a
         return listOdApprove.size();
     }
 
-
     class ViewHolder extends RecyclerView.ViewHolder{
         public NetworkImageView imageView;
         public TextView textViewName;

app/src/main/java/com/peruse/saran/amritaod/recycler/CardAdapter.java

@@ -92,7 +92,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ViewHolder> {
                         Log.d("volley","error");
                     }
                 };
-                odapproveTemplate odapproveobject = new odapproveTemplate(id, "true", responseListener);
+                odapproveTemplate odapproveobject = new odapproveTemplate(id, "Approved", responseListener);
                 queue = Volley.newRequestQueue(context);
                 queue.add(odapproveobject);
             }
@@ -137,7 +137,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ViewHolder> {
                         Log.d("volley","error");
                     }
                 };
-                odapproveTemplate odapproveobject = new odapproveTemplate(id, "denied", responseListener);
+                odapproveTemplate odapproveobject = new odapproveTemplate(id, "Denied", responseListener);
                 queue = Volley.newRequestQueue(context);
                 queue.add(odapproveobject);
             }

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

 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.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="com.peruse.saran.amritaod.actionareas.userAreaActivity"
-    android:background="@drawable/rep">
+    android:background="@drawable/rep"
+    tools:context="com.peruse.saran.amritaod.actionareas.userAreaActivity">
 
 
     <RelativeLayout
@@ -21,15 +20,15 @@
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignStart="@+id/textView7"
             android:layout_marginTop="41dp"
             android:text="NAME :"
             android:textColor="@color/colorPrimaryDark"
             android:textSize="20dp"
             android:textStyle="bold"
             tools:layout_editor_absoluteX="143dp"
-            tools:layout_editor_absoluteY="31dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignStart="@+id/textView7" />
+            tools:layout_editor_absoluteY="31dp" />
 
         <TextView
             android:id="@+id/usernamedisplay_id"
@@ -45,14 +44,13 @@
             android:id="@+id/button4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:onClick="list"
-            android:text="List all OD"
-            android:textColor="@color/cardcolour"
-            android:background="@drawable/mybutton"
             android:layout_alignBaseline="@+id/button3"
             android:layout_alignBottom="@+id/button3"
-            android:layout_toStartOf="@+id/textView2" />
+            android:layout_marginLeft="20dp"
+            android:layout_toStartOf="@+id/textView2"
+            android:background="@drawable/mybutton"
+            android:text="List all OD"
+            android:textColor="@color/cardcolour" />
 
 
 
@@ -61,14 +59,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
 
+            android:layout_below="@+id/textView2"
+            android:layout_marginStart="11dp"
             android:layout_marginTop="143dp"
+            android:layout_toEndOf="@+id/textView2"
+            android:background="@drawable/mybutton"
             android:onClick="apply"
             android:text="apply"
-            android:textColor="@color/cardcolour"
-            android:layout_marginStart="11dp"
-            android:layout_below="@+id/textView2"
-            android:layout_toEndOf="@+id/textView2"
-            android:background="@drawable/mybutton"/>
+            android:textColor="@color/cardcolour"/>
 
         <TextView
             android:id="@+id/textView7"