diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90fbf1e005edfa06bc5bccbb24865f129fa49020..db0c6ebb96e64fc4d7e43710065122f5aef27452 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,8 @@
<activity
android:name=".actionareas.MainActivity"
android:screenOrientation="portrait"
- android:theme="@style/AppTheme" />
+ android:theme="@style/AppTheme"
+ android:windowSoftInputMode="stateHidden"/>
<provider
android:name="android.support.v4.content.FileProvider"
diff --git a/app/src/main/java/com/peruse/saran/amritaod/actionareas/MainActivity.java b/app/src/main/java/com/peruse/saran/amritaod/actionareas/MainActivity.java
index 01f2bba11b8e853d7256a6a9f13369e0fda930f7..e22a56e99c1a903f51dcfeb535c1be3aa3bd6d6f 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/actionareas/MainActivity.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/actionareas/MainActivity.java
@@ -51,9 +51,9 @@ public class MainActivity extends AppCompatActivity implements TabLayout.OnTabSe
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
tabLayout = (TabLayout) findViewById(R.id.tabLayout);
- tabLayout.addTab(tabLayout.newTab().setText("Student"));
- tabLayout.addTab(tabLayout.newTab().setText("Representative"));
- tabLayout.addTab(tabLayout.newTab().setText("Advisor"));
+ tabLayout.addTab(tabLayout.newTab().setText("STUDENT"));
+ tabLayout.addTab(tabLayout.newTab().setText("REPRESENTATIVE"));
+ tabLayout.addTab(tabLayout.newTab().setText("ADVISOR"));
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
viewPager = (ViewPager) findViewById(R.id.pager);
Pager adapter = new Pager(getSupportFragmentManager(), tabLayout.getTabCount());
@@ -390,6 +390,9 @@ public class MainActivity extends AppCompatActivity implements TabLayout.OnTabSe
setCredentials();
Toast.makeText(getContext(), "Logged In", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(getContext(), advisorActivity.class);
+ intent.putExtra("recievedusername",jsonResponse.getString("name"));
+ intent.putExtra("recievedrollno",jsonResponse.getString("rollno"));
+ intent.putExtra("recievedbranch",jsonResponse.getString("branch"));
startActivity(intent);
} else {
clearCredentials();
diff --git a/app/src/main/java/com/peruse/saran/amritaod/actionareas/advisorActivity.java b/app/src/main/java/com/peruse/saran/amritaod/actionareas/advisorActivity.java
index cc532bdb04c39d0dfaa0eace9f0a7858bfc6eee9..fbc11e9c1a0bd3268eb9b9fbe8d11cc58e6c7868 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/actionareas/advisorActivity.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/actionareas/advisorActivity.java
@@ -5,6 +5,8 @@ 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;
import com.peruse.saran.amritaod.R;
@@ -12,10 +14,26 @@ import com.peruse.saran.amritaod.recycler.odApproveActivity;
public class advisorActivity extends AppCompatActivity {
private boolean doubleBackToExitPressedOnce = false;
+ private Button logoutbutton;
+ private TextView advname,advrollno,advbranch;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_advisor);
+ advname = (TextView)findViewById(R.id.advnameid);
+ advrollno = (TextView)findViewById(R.id.advrollnoid);
+ advbranch = (TextView)findViewById(R.id.advbranchid);
+ Intent intent = getIntent();
+ advname.setText(intent.getExtras().getString("recievedusername"));
+ advrollno.setText(intent.getExtras().getString("recievedrollno"));
+ advbranch.setText(intent.getExtras().getString("recievedbranch"));
+ logoutbutton = (Button)findViewById(R.id.button5);
+ logoutbutton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ logout();
+ }
+ });
}
@Override
public void onBackPressed() {
@@ -37,4 +55,9 @@ public class advisorActivity extends AppCompatActivity {
startActivity(intent);
}
+ private void logout(){
+ Toast.makeText(this, "Logged out!", Toast.LENGTH_SHORT).show();
+ finish();
+ }
+
}
diff --git a/app/src/main/java/com/peruse/saran/amritaod/actionareas/userAreaActivity.java b/app/src/main/java/com/peruse/saran/amritaod/actionareas/userAreaActivity.java
index 5d3dde7a54b38d991cba1cc840458b07ad355b5a..d8c9e1b05c98adfaae07f6974dd9abd5589dac16 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/actionareas/userAreaActivity.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/actionareas/userAreaActivity.java
@@ -17,12 +17,19 @@ 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;
+ private Button history,logoutbutton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_area);
+ logoutbutton = (Button)findViewById(R.id.button6);
+ logoutbutton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ logout();
+ }
+ });
Intent intent = getIntent();
TextView recievedUsernameDisplay = (TextView) findViewById(R.id.usernamedisplay_id);
TextView recievedSemesterDisplay = (TextView) findViewById(R.id.textView2);
@@ -81,5 +88,9 @@ public class userAreaActivity extends AppCompatActivity {
intent.putExtra("rollno",recievedRollno);
startActivity(intent);
}
+ private void logout(){
+ Toast.makeText(this, "Logged out!", Toast.LENGTH_SHORT).show();
+ finish();
+ }
}
diff --git a/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/CardAdapter.java b/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/CardAdapter.java
index 60c0252cff1e68953179aeb04b2db2b43457bf79..7b30bfc943e7344505e5bb0e5b532fccbb2d0c7a 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/CardAdapter.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/CardAdapter.java
@@ -50,6 +50,7 @@ public class CardAdapter extends RecyclerView.Adapter<com.peruse.saran.amritaod.
holder.textViewfromdateperiod.setText(superHero.getFromdateperiod());
holder.textViewtodateperiod.setText(superHero.getTodateperiod());
holder.textViewreason.setText(superHero.getReason());
+ holder.textViewstatus.setText(superHero.getStatus());
}
@Override
@@ -68,6 +69,7 @@ public class CardAdapter extends RecyclerView.Adapter<com.peruse.saran.amritaod.
public TextView textViewfromdateperiod;
public TextView textViewtodateperiod;
public TextView textViewreason;
+ public TextView textViewstatus;
public ViewHolder(View itemView) {
super(itemView);
imageView = (NetworkImageView) itemView.findViewById(R.id.imageViewHero);
@@ -80,6 +82,7 @@ public class CardAdapter extends RecyclerView.Adapter<com.peruse.saran.amritaod.
textViewfromdateperiod = (TextView)itemView.findViewById(R.id.fromdateperiodid);
textViewtodateperiod = (TextView)itemView.findViewById(R.id.todateperiodid);
textViewreason = (TextView)itemView.findViewById(R.id.textviewreasonid);
+ textViewstatus = (TextView)itemView.findViewById(R.id.statusid);
}
}
}
diff --git a/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/approvedActivity.java b/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/approvedActivity.java
index aeded1fbfd0a200f05be500a9972d4e6ffed00c9..d0ad5acb9acca307e7433d7a2f2abf9ceb108a30 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/approvedActivity.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/approvedrecycler/approvedActivity.java
@@ -108,6 +108,7 @@ public class approvedActivity extends AppCompatActivity implements OnScrollChang
odDetailsObject.setFromdateperiod(json.getString("fromperiod"));
odDetailsObject.setTodateperiod(json.getString("toperiod"));
odDetailsObject.setReason(json.getString("reason"));
+ odDetailsObject.setStatus(json.getString("status"));
} catch (JSONException e) {
e.printStackTrace();
}
diff --git a/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_approvedActivity.java b/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_approvedActivity.java
index e4dc61ee99af9cfd5dc65cbdc3a3664c3700b3ef..19f5fb2e575527f2a516db9a3b7d700cc0435b4f 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_approvedActivity.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_approvedActivity.java
@@ -16,7 +16,6 @@ import com.android.volley.VolleyError;
import com.android.volley.toolbox.JsonArrayRequest;
import com.android.volley.toolbox.Volley;
import com.peruse.saran.amritaod.R;
-import com.peruse.saran.amritaod.approvedrecycler.CardAdapter;
import com.peruse.saran.amritaod.templates.oddetailstemplate;
import org.json.JSONArray;
@@ -55,7 +54,7 @@ public class history_approvedActivity extends AppCompatActivity implements View.
requestQueue = Volley.newRequestQueue(this);
getData();
recyclerView.setOnScrollChangeListener(this);
- adapter = new CardAdapter(listOdApprove, this);
+ adapter = new history_cardadapter(listOdApprove, this);
recyclerView.setAdapter(adapter);
}
@@ -109,6 +108,7 @@ public class history_approvedActivity extends AppCompatActivity implements View.
odDetailsObject.setFromdateperiod(json.getString("fromperiod"));
odDetailsObject.setTodateperiod(json.getString("toperiod"));
odDetailsObject.setReason(json.getString("reason"));
+ odDetailsObject.setStatus(json.getString("status"));
} catch (JSONException e) {
e.printStackTrace();
}
diff --git a/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_cardadapter.java b/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_cardadapter.java
index 3ad51056f527382767109f55ec319b8e0ff487cf..c465c8bc271bd395d177697b6de091f621d8213a 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_cardadapter.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/odhistory/history_cardadapter.java
@@ -2,6 +2,7 @@ package com.peruse.saran.amritaod.odhistory;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -52,6 +53,8 @@ public class history_cardadapter extends RecyclerView.Adapter<com.peruse.saran.a
holder.textViewfromdateperiod.setText(superHero.getFromdateperiod());
holder.textViewtodateperiod.setText(superHero.getTodateperiod());
holder.textViewreason.setText(superHero.getReason());
+ holder.textViewstatus.setText(superHero.getStatus());
+ Log.d("status",superHero.getStatus());
}
@Override
public int getItemCount() {
@@ -68,6 +71,7 @@ public class history_cardadapter extends RecyclerView.Adapter<com.peruse.saran.a
public TextView textViewfromdateperiod;
public TextView textViewtodateperiod;
public TextView textViewreason;
+ public TextView textViewstatus;
public ViewHolder(View itemView) {
super(itemView);
imageView = (NetworkImageView) itemView.findViewById(R.id.imageViewHero);
@@ -80,6 +84,7 @@ public class history_cardadapter extends RecyclerView.Adapter<com.peruse.saran.a
textViewfromdateperiod = (TextView)itemView.findViewById(R.id.fromdateperiodid);
textViewtodateperiod = (TextView)itemView.findViewById(R.id.todateperiodid);
textViewreason = (TextView)itemView.findViewById(R.id.textviewreasonid);
+ textViewstatus = (TextView)itemView.findViewById(R.id.statusid);
}
}
diff --git a/app/src/main/java/com/peruse/saran/amritaod/templates/oddetailstemplate.java b/app/src/main/java/com/peruse/saran/amritaod/templates/oddetailstemplate.java
index 82760dfcf73376c128a808e8bbb783e625023e33..8f6501331cf7897aea416ef08836296cd4a8b6c5 100644
--- a/app/src/main/java/com/peruse/saran/amritaod/templates/oddetailstemplate.java
+++ b/app/src/main/java/com/peruse/saran/amritaod/templates/oddetailstemplate.java
@@ -10,6 +10,15 @@ public class oddetailstemplate {
private String fromdateperiod;
private String todateperiod;
private String reason;
+ private String status = null;
+
+ public String getStatus(){
+ return status;
+ }
+
+ public void setStatus(String status){
+ this.status = status;
+ }
public String getImageUrl() {
return imageUrl;
diff --git a/app/src/main/res/layout/activity_advisor.xml b/app/src/main/res/layout/activity_advisor.xml
index f9229f71b1ae46bc7211e6e7ff0c5943c5eaaf96..ca2bcb8d4ab7e0a97535e4c3645b21bd22df1a24 100644
--- a/app/src/main/res/layout/activity_advisor.xml
+++ b/app/src/main/res/layout/activity_advisor.xml
@@ -4,34 +4,103 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.peruse.saran.amritaod.actionareas.advisorActivity"
- android:background="@drawable/rep">
+ android:background="@drawable/rep"
+ tools:context="com.peruse.saran.amritaod.actionareas.advisorActivity">
+ <Button
+ android:id="@+id/button2"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+
+ android:layout_above="@+id/button5"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="71dp"
+ android:background="@drawable/mybutton"
+ android:onClick="odapprove"
+ android:text="Approve Leave"
+ android:textColor="@color/cardcolour" />
+
<TextView
- android:id="@+id/textView8"
+ android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="118dp"
- android:text="Advisor Menu"
+ android:layout_marginEnd="12dp"
+ android:layout_marginTop="26dp"
+ android:layout_toStartOf="@+id/button2"
+ android:text="NAME :"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/textView5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textView"
+ android:layout_below="@+id/textView"
+ android:layout_marginTop="37dp"
+ android:text="ROLL NO :"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/textView8"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textView5"
+ android:layout_below="@+id/textView5"
+ android:layout_marginTop="42dp"
+ android:text="BRANCH :"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp"
+ android:textStyle="bold" />
+ <TextView
+ android:id="@+id/advnameid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/textView"
+ android:layout_alignTop="@+id/textView"
+ android:layout_toEndOf="@+id/textView"
+ android:text="TextView"
android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp" />
- android:textAppearance="@style/TextAppearance.AppCompat.Display2" />
+ <TextView
+ android:id="@+id/advrollnoid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/textView5"
+ android:layout_alignStart="@+id/advnameid"
+ android:layout_alignTop="@+id/textView5"
+ android:text="TextView"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp" />
- <Button
- android:id="@+id/button2"
+ <TextView
+ android:id="@+id/advbranchid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView8"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="122dp"
- android:onClick="odapprove"
+ android:layout_alignBottom="@+id/textView8"
+ android:layout_alignStart="@+id/advrollnoid"
+ android:layout_alignTop="@+id/textView8"
+ android:text="TextView"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp" />
- android:text="Approve Leave"
- android:textColor="@color/cardcolour"
- android:background="@drawable/mybutton"/>
+ <Button
+ android:id="@+id/button5"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignStart="@+id/button2"
+ android:layout_marginBottom="62dp"
+ android:background="@drawable/mybutton"
+ android:onClick="logout"
+ android:text="LOGOUT"
+ android:textColor="@color/cardcolour" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_advisor_register.xml b/app/src/main/res/layout/activity_advisor_register.xml
index 8ae618211231942161148139fb3fc80a15c157fe..1511d325788338cd5d7b5c186806196fe3402f65 100644
--- a/app/src/main/res/layout/activity_advisor_register.xml
+++ b/app/src/main/res/layout/activity_advisor_register.xml
@@ -1,117 +1,112 @@
<?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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
-
- tools:context="com.peruse.saran.amritaod.register.advisorRegister"
android:background="@drawable/studentlogin">
-
- <RelativeLayout
- android:layout_width="368dp"
- android:layout_height="495dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <EditText
- android:id="@+id/id_advisorname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_above="@+id/id_advisorbranch"
- android:layout_alignStart="@+id/id_advisorbranch"
- android:layout_marginBottom="14dp"
- android:ems="10"
- android:hint="Name"
- android:inputType="textPersonName"
- tools:layout_editor_absoluteX="83dp"
- tools:layout_editor_absoluteY="35dp" />
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/advrollnoo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/textInputLayout3"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="28dp"
+ android:gravity="center">
<EditText
android:id="@+id/id_advisorrollno"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignStart="@+id/id_advisorpassword"
- android:layout_centerVertical="true"
android:ems="10"
android:hint="Roll Number"
- android:inputType="textCapCharacters"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorname"
- app:layout_constraintRight_toRightOf="@+id/id_advisorname"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorname" />
+ android:inputType="textCapCharacters" />
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/advpas"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textInputLayout5"
+ android:layout_below="@+id/textInputLayout5"
+ android:layout_marginTop="30dp"
+ android:gravity="center">
<EditText
android:id="@+id/id_advisorpassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_above="@+id/id_advisorrepassword"
- android:layout_centerHorizontal="true"
- android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Password"
- android:inputType="textPassword"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorbranch"
- app:layout_constraintRight_toRightOf="@+id/id_advisorbranch"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorbranch" />
+ android:inputType="textPassword" />
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/advpas"
+ android:layout_below="@+id/advpas"
+ android:layout_marginTop="28dp">
<EditText
android:id="@+id/id_advisorrepassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_above="@+id/button"
- android:layout_alignStart="@+id/id_advisorpassword"
- android:layout_marginBottom="22dp"
android:ems="10"
android:hint="Re-Type Password"
- android:inputType="textPassword"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorpassword"
- app:layout_constraintRight_toRightOf="@+id/id_advisorpassword"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorpassword" />
+ android:inputType="textPassword" />
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/advrollnoo"
+ android:layout_below="@+id/advrollnoo"
+ android:layout_marginTop="27dp"
+ android:gravity="center">
<EditText
android:id="@+id/id_advisorbranch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_above="@+id/id_advisorrollno"
- android:layout_alignStart="@+id/id_advisorrollno"
- android:layout_marginBottom="15dp"
android:ems="10"
android:hint="Branch"
- android:inputType="textCapCharacters|textPersonName"
- app:layout_constraintLeft_toLeftOf="@+id/id_semester"
- app:layout_constraintRight_toRightOf="@+id/id_semester"
- app:layout_constraintTop_toBottomOf="@+id/id_semester" />
+ android:inputType="textCapCharacters|textPersonName" />
+ </android.support.design.widget.TextInputLayout>
- <Button
- android:id="@+id/button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"
- android:layout_marginBottom="41dp"
- android:onClick="newAdvisorRegistration"
- android:text="Register"
- android:textColor="@color/cardcolour"
- android:background="@drawable/mybutton"
-
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorrepassword"
- app:layout_constraintRight_toRightOf="@+id/id_advisorrepassword"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorrepassword" />
-
- <TextView
- android:id="@+id/textView5"
+ <Button
+ android:id="@+id/button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/mybutton"
+ android:onClick="newAdvisorRegistration"
+ android:text="Register"
+ android:textColor="@color/cardcolour"/>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/advrollnoo"
+ android:layout_marginTop="20dp">
+
+ <EditText
+ android:id="@+id/id_advisorname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="36dp"
- android:text="ADVISOR REGISTRATION"
- android:textAppearance="@style/TextAppearance.AppCompat"
- android:textSize="30sp" />
- </RelativeLayout>
+ android:ems="10"
+ android:hint="Name"
+ android:inputType="textPersonName">
+ <requestFocus/>
+ </EditText>
+
+ </android.support.design.widget.TextInputLayout>
+
+
+</RelativeLayout>
-</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 07bff44cad69bcec72d7472d1fc14bc4dc618a8c..2c00f7143b101688fcc1438edf894f594ad158b9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,7 +26,9 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:tabSelectedTextColor="@color/colorAccent"
+ app:tabTextAppearance="@style/TextAppearance.AppCompat" />
<!-- View pager to swipe views -->
<android.support.v4.view.ViewPager
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index ca15d51cbfa346d30524fbce354cda27a2ec3717..a569889f067a40cff9926e8e8aa9a21e3f0f7fce 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -1,20 +1,15 @@
<?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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
-
android:layout_height="match_parent"
android:background="@drawable/studentlogin">
-
- <RelativeLayout
- android:layout_width="368dp"
- android:layout_height="495dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignStart="@+id/textInputLayout7"
+ android:layout_marginTop="20dp">
<EditText
android:id="@+id/id_advisorname"
android:layout_width="wrap_content"
@@ -24,10 +19,16 @@
android:layout_alignStart="@+id/id_advisorpassword"
android:ems="10"
android:hint="Name"
- android:inputType="textPersonName"
- tools:layout_editor_absoluteX="83dp"
- tools:layout_editor_absoluteY="35dp" />
+ android:inputType="textPersonName"/>
+ </android.support.design.widget.TextInputLayout>
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout13"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textInputLayout"
+ android:layout_below="@+id/textInputLayout"
+ android:layout_marginTop="10dp">
<EditText
android:id="@+id/id_advisorrollno"
android:layout_width="wrap_content"
@@ -38,11 +39,16 @@
android:layout_marginTop="25dp"
android:ems="10"
android:hint="Roll Number"
- android:inputType="textCapCharacters"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorname"
- app:layout_constraintRight_toRightOf="@+id/id_advisorname"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorname" />
+ android:inputType="textCapCharacters"/>
+ </android.support.design.widget.TextInputLayout>
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout7"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textInputLayout10"
+ android:layout_below="@+id/textInputLayout6"
+ android:layout_marginTop="12dp">
<EditText
android:id="@+id/id_advisorpassword"
android:layout_width="wrap_content"
@@ -52,11 +58,16 @@
android:layout_marginTop="25dp"
android:ems="10"
android:hint="Password"
- android:inputType="textPassword"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorbranch"
- app:layout_constraintRight_toRightOf="@+id/id_advisorbranch"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorbranch" />
+ android:inputType="textPassword"/>
+ </android.support.design.widget.TextInputLayout>
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout10"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/textInputLayout7"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="13dp">
<EditText
android:id="@+id/id_advisorrepassword"
android:layout_width="wrap_content"
@@ -67,11 +78,16 @@
android:layout_marginTop="25dp"
android:ems="10"
android:hint="Re-Type Password"
- android:inputType="textPassword"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorpassword"
- app:layout_constraintRight_toRightOf="@+id/id_advisorpassword"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorpassword" />
+ android:inputType="textPassword"/>
+ </android.support.design.widget.TextInputLayout>
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout14"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textInputLayout13"
+ android:layout_below="@+id/textInputLayout13"
+ android:layout_marginTop="10dp">
<EditText
android:id="@+id/id_semester"
android:layout_width="wrap_content"
@@ -82,10 +98,16 @@
android:layout_marginTop="25dp"
android:ems="10"
android:hint="Semester"
- android:inputType="number"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorrollno"
- app:layout_constraintRight_toRightOf="@+id/id_advisorrollno"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorrollno" />
+ android:inputType="number"/>
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/textInputLayout6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/textInputLayout14"
+ android:layout_below="@+id/textInputLayout14"
+ android:layout_marginTop="12dp">
<EditText
android:id="@+id/id_advisorbranch"
@@ -97,27 +119,20 @@
android:layout_marginTop="25dp"
android:ems="10"
android:hint="Branch"
- android:inputType="textCapCharacters|textPersonName"
- app:layout_constraintLeft_toLeftOf="@+id/id_semester"
- app:layout_constraintRight_toRightOf="@+id/id_semester"
- app:layout_constraintTop_toBottomOf="@+id/id_semester" />
-
- <Button
- android:id="@+id/button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/id_advisorrepassword"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="24dp"
- android:onClick="newRegistration"
- android:text="Register"
+ android:inputType="textCapCharacters|textPersonName" />
+ </android.support.design.widget.TextInputLayout>
- android:background="@drawable/mybutton"
- android:textColor="@color/cardcolour"
- app:layout_constraintLeft_toLeftOf="@+id/id_advisorrepassword"
- app:layout_constraintRight_toRightOf="@+id/id_advisorrepassword"
- app:layout_constraintTop_toBottomOf="@+id/id_advisorrepassword" />
- </RelativeLayout>
-</android.support.constraint.ConstraintLayout>
+ <Button
+ android:id="@+id/button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="19dp"
+ android:background="@drawable/mybutton"
+ android:onClick="newRegistration"
+ android:text="Register"
+ android:textColor="@color/cardcolour" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 811c083450efea7fb4913e4f168ba7ece4c472f9..f724ff993b2beb1bbed974811c40f8e74b5b7efb 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -44,10 +44,9 @@
android:id="@+id/button4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/button3"
- android:layout_alignBottom="@+id/button3"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
- android:layout_toStartOf="@+id/textView2"
android:background="@drawable/mybutton"
android:text="List all OD"
android:textColor="@color/cardcolour" />
@@ -59,14 +58,13 @@
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:layout_alignStart="@+id/button4"
+ android:layout_below="@+id/button4"
+ android:layout_marginTop="39dp"
android:background="@drawable/mybutton"
android:onClick="apply"
android:text="apply"
- android:textColor="@color/cardcolour"/>
+ android:textColor="@color/cardcolour" />
<TextView
android:id="@+id/textView7"
@@ -115,6 +113,18 @@
android:textColor="@color/colorPrimaryDark"
android:textSize="20dp" />
+ <Button
+ android:id="@+id/button6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@+id/button3"
+ android:layout_below="@+id/button3"
+ android:layout_marginTop="42dp"
+ android:background="@drawable/mybutton"
+ android:onClick="logout"
+ android:text="Logout"
+ android:textColor="@color/cardcolour" />
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/advisor_login_tab.xml b/app/src/main/res/layout/advisor_login_tab.xml
index 866b900c028bfc258ae658e9ec743c37cb4e5923..083ceefa152decc1412123c4ae238a380646d39c 100644
--- a/app/src/main/res/layout/advisor_login_tab.xml
+++ b/app/src/main/res/layout/advisor_login_tab.xml
@@ -2,8 +2,8 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:fitsSystemWindows="true"
- android:background="@drawable/studentlogin">
+ android:background="@drawable/studentlogin"
+ android:fitsSystemWindows="true">
<LinearLayout
@@ -50,19 +50,21 @@
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
- android:layout_marginTop="24dp"
android:layout_marginLeft="50dp"
- android:textColor="@color/cardcolour"
+ android:layout_marginTop="24dp"
android:background="@drawable/mybutton"
android:padding="12dp"
- android:text="Login"/>
+ android:text="Login"
+ android:textColor="@color/cardcolour"/>
- <TextView android:id="@+id/Advisor_link_signup"
+ <TextView
+ android:id="@+id/Advisor_link_signup"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:gravity="center"
android:text="No account yet? Create one"
+ android:textColor="@color/colorPrimaryDark"
android:textSize="16dip" />
</LinearLayout>
diff --git a/app/src/main/res/layout/odapprovedlist.xml b/app/src/main/res/layout/odapprovedlist.xml
index 4ff0b5f9abd80ed963bb0984d7c1df2f950db95d..1ea9eda4e248581f06ffac00eddfcd0eabaacbca 100644
--- a/app/src/main/res/layout/odapprovedlist.xml
+++ b/app/src/main/res/layout/odapprovedlist.xml
@@ -2,20 +2,18 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="670dp"
- >
+ android:layout_height="715dp">
<android.support.v7.widget.CardView
android:id="@+id/cardView"
android:layout_width="375dp"
- android:layout_height="700dp"
+ android:layout_height="720dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="center_horizontal"
card_view:cardCornerRadius="5dp"
card_view:cardElevation="10dp"
- card_view:cardUseCompatPadding="true"
- >
+ card_view:cardUseCompatPadding="true">
<LinearLayout
android:layout_width="match_parent"
@@ -100,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
</TableRow>
@@ -134,8 +132,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
+ android:textStyle="bold" />
+
+ </TableRow>
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:text=" Status :"
android:textAppearance="@style/TextAppearance.AppCompat" />
+ <TextView
+ android:id="@+id/statusid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold" />
+
</TableRow>
</TableLayout>
@@ -147,6 +164,7 @@
android:paddingTop="10dp"
android:text=" Reason :"
android:textAppearance="@style/TextAppearance.AppCompat" />
+
<TextView
android:id="@+id/textviewreasonid"
android:layout_width="246dp"
@@ -156,7 +174,7 @@
android:layout_marginTop="-26dp"
android:paddingRight="10dp"
android:paddingTop="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
<com.android.volley.toolbox.NetworkImageView
android:id="@+id/imageViewHero"
@@ -169,6 +187,4 @@
</android.support.v7.widget.CardView>
-
-
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/odapprovelist.xml b/app/src/main/res/layout/odapprovelist.xml
index 38cb76ace1a69070e34ae92e0d2d04b438af887e..90cbf5e434093bdb67a34e376adcac5d95bf231c 100644
--- a/app/src/main/res/layout/odapprovelist.xml
+++ b/app/src/main/res/layout/odapprovelist.xml
@@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
</TableRow>
@@ -132,7 +132,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
</TableRow>
</TableLayout>
@@ -154,7 +154,7 @@
android:layout_marginTop="-26dp"
android:paddingRight="10dp"
android:paddingTop="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
<com.android.volley.toolbox.NetworkImageView
android:id="@+id/imageViewHero"
diff --git a/app/src/main/res/layout/odlist.xml b/app/src/main/res/layout/odlist.xml
index 9e02d353e9ae5133a303a762cfae93c7422fb93f..1ea9eda4e248581f06ffac00eddfcd0eabaacbca 100644
--- a/app/src/main/res/layout/odlist.xml
+++ b/app/src/main/res/layout/odlist.xml
@@ -2,12 +2,12 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="670dp">
+ android:layout_height="715dp">
<android.support.v7.widget.CardView
android:id="@+id/cardView"
android:layout_width="375dp"
- android:layout_height="700dp"
+ android:layout_height="720dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="center_horizontal"
@@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
</TableRow>
@@ -132,8 +132,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
+ android:textStyle="bold" />
+
+ </TableRow>
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:text=" Status :"
android:textAppearance="@style/TextAppearance.AppCompat" />
+ <TextView
+ android:id="@+id/statusid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold" />
+
</TableRow>
</TableLayout>
@@ -145,6 +164,7 @@
android:paddingTop="10dp"
android:text=" Reason :"
android:textAppearance="@style/TextAppearance.AppCompat" />
+
<TextView
android:id="@+id/textviewreasonid"
android:layout_width="246dp"
@@ -154,7 +174,7 @@
android:layout_marginTop="-26dp"
android:paddingRight="10dp"
android:paddingTop="10dp"
- android:textAppearance="@style/TextAppearance.AppCompat" />
+ android:textStyle="bold" />
<com.android.volley.toolbox.NetworkImageView
android:id="@+id/imageViewHero"
diff --git a/app/src/main/res/layout/representative_login_tab.xml b/app/src/main/res/layout/representative_login_tab.xml
index cd0702c9c231d3adccbf4b5f637d41f67e1d88c8..12236478dc1075beaf2285fa619f52d7bdd9267c 100644
--- a/app/src/main/res/layout/representative_login_tab.xml
+++ b/app/src/main/res/layout/representative_login_tab.xml
@@ -3,8 +3,8 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:fitsSystemWindows="true"
- android:background="@drawable/studentlogin">
+ android:background="@drawable/studentlogin"
+ android:fitsSystemWindows="true">
<LinearLayout
@@ -51,20 +51,22 @@
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
- android:layout_marginTop="24dp"
android:layout_marginLeft="50dp"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/mybutton"
android:padding="12dp"
android:text="Login"
- android:textColor="@color/cardcolour"
- android:background="@drawable/mybutton"/>
+ android:textColor="@color/cardcolour"/>
- <TextView android:id="@+id/student_link_signup"
+ <TextView
+ android:id="@+id/student_link_signup"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:gravity="center"
android:text="No account yet? Create one"
+ android:textColor="@color/colorPrimaryDark"
android:textSize="16dip" />
</LinearLayout>
diff --git a/app/src/main/res/layout/student_login_tab.xml b/app/src/main/res/layout/student_login_tab.xml
index cb61af311b182168d2559e23098f1da0cc0adf65..053a42a7c45b365c454d72f749c96a01f310cd90 100644
--- a/app/src/main/res/layout/student_login_tab.xml
+++ b/app/src/main/res/layout/student_login_tab.xml
@@ -2,8 +2,8 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:fitsSystemWindows="true"
- android:background="@drawable/studentlogin">
+ android:background="@drawable/studentlogin"
+ android:fitsSystemWindows="true">
<LinearLayout
@@ -30,28 +30,28 @@
android:id="@+id/student_input_rollno"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="Roll Number"
android:backgroundTint="@color/colorPrimaryDark"
- android:textColorHint="@color/colorPrimaryDark"
+ android:hint="Roll Number"
android:inputType="textCapCharacters"
- android:textColor="@color/colorPrimaryDark"/>
+ android:textColor="@color/colorPrimaryDark"
+ android:textColorHint="@color/colorAccent"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
- android:backgroundTint="@color/colorPrimaryDark"
+ android:layout_marginTop="8dp"
- android:layout_marginTop="8dp">
+ android:backgroundTint="@color/colorPrimaryDark">
<EditText android:id="@+id/student_input_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Password"
-
+ android:inputType="textPassword"
android:textColor="@color/colorPrimaryDark"
- android:inputType="textPassword"/>
+ android:textColorHint="@color/colorAccent"/>
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatButton
@@ -60,13 +60,13 @@
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
- android:layout_marginTop="24dp"
android:layout_marginLeft="50dp"
- android:padding="12dp"
- android:textColor="@color/cardcolour"
+ android:layout_marginTop="24dp"
android:background="@drawable/mybutton"
+ android:padding="12dp"
+ android:text="Login"
- android:text="Login"/>
+ android:textColor="@color/cardcolour"/>
<TextView android:id="@+id/student_link_signup"
android:layout_width="fill_parent"
@@ -74,9 +74,9 @@
android:layout_marginBottom="24dp"
android:gravity="center"
- android:textColor="@color/colorPrimaryDark"
-
android:text="No account yet? Create one"
+
+ android:textColor="@color/colorPrimaryDark"
android:textSize="16dip" />
</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c683ef646b11c1a1708fb7382403ce794fb8dd9a..5cabe330e3112bbeccc2e8bad1641ae7af8d3dd4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,8 +3,8 @@
<color name="colorPrimary">#80475E</color>
- <color name="colorPrimaryDark">#032B43</color>
- <color name="colorAccent">#CC5A71</color>
+ <color name="colorPrimaryDark">#032b43</color>
+ <color name="colorAccent">#eba8b5</color>
<color name="cardcolour">#fafafa</color>