diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981032aa01b060f5a568641d7a8840cc90dc..fbb68289f4352bf149aa31a2c9940faa99174224 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,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/build.gradle b/app/build.gradle
index 50ead450f1ba6dac331fc27f03f4653d5a3bf2d7..47e68b3c9e711f078207afa7a8772d1208824f56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ buildToolsVersion '25.0.2'
defaultConfig {
applicationId "com.peruse.saran.amritaod"
minSdkVersion 21
@@ -30,7 +30,7 @@ dependencies {
compile 'com.android.support:recyclerview-v7:25.2.0'
compile 'com.android.support:gridlayout-v7:25.2.0'
compile 'com.android.support:cardview-v7:25.2.0'
- compile 'com.android.support:design:26.0.0-alpha1'
+ compile 'com.android.support:design:25.0.0'
compile 'com.jakewharton:butterknife:6.1.0'
testCompile 'junit:junit:4.12'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7dfd43f3b18af0265dad0cebccf69fc9188b7fef..34505590e57dcf5466427da4183d027e6a244eb3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,11 +76,14 @@
android:label="Advisor"
android:screenOrientation="portrait"
android:theme="@style/AppTheme1" />
- <activity android:name=".approvedrecycler.approvedActivity"
+
+ <activity
+ android:name=".approvedrecycler.approvedActivity"
android:label="Approved Leave(s)"
android:screenOrientation="portrait"
- android:theme="@style/AppTheme1">
- </activity>
+ android:theme="@style/AppTheme1"></activity>
+ <activity android:name=".actionareas.od_display"></activity>
+
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/peruse/saran/amritaod/actionareas/od_display.java b/app/src/main/java/com/peruse/saran/amritaod/actionareas/od_display.java
new file mode 100644
index 0000000000000000000000000000000000000000..e183a94a3d6e0f7d815b70f4e14afa6c2e82fa99
--- /dev/null
+++ b/app/src/main/java/com/peruse/saran/amritaod/actionareas/od_display.java
@@ -0,0 +1,15 @@
+package com.peruse.saran.amritaod.actionareas;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.peruse.saran.amritaod.R;
+
+public class od_display extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_od_display);
+ }
+}
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 3935874d6086b7cc3dd1799e15f5d8db94436a02..32d03e294b4c59ab0a8cee89c2e992bef31e6f7b 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
@@ -23,11 +23,17 @@ public class userAreaActivity extends AppCompatActivity {
Intent intent = getIntent();
TextView recievedUsernameDisplay = (TextView) findViewById(R.id.usernamedisplay_id);
TextView recievedSemesterDisplay = (TextView) findViewById(R.id.textView2);
+
+ TextView receivedRollnumberDisplay = (TextView) findViewById(R.id.roll);
+
recievedUsername = intent.getExtras().getString("recievedUsername");
recievedRollno = intent.getExtras().getString("recievedRollno");
recievedSemester = intent.getExtras().getString("recievedSemester");
recievedBranch = intent.getExtras().getString("recievedBranch");
- recievedUsernameDisplay.setText("Hi " + recievedUsername + '!');
+
+ recievedUsernameDisplay.setText(recievedUsername);
+ receivedRollnumberDisplay.setText(recievedRollno);
+
recievedSemesterDisplay.setText(recievedSemester);
}
@Override
@@ -59,4 +65,14 @@ public class userAreaActivity extends AppCompatActivity {
Intent intent = new Intent(this,odApproveActivity.class);
startActivity(intent);
}
+
+ protected void list(View view){
+ Intent newintent = new Intent(this,od_display.class);
+ newintent.putExtra("recievedUsername",recievedUsername)
+ .putExtra("recievedRollno",recievedRollno)
+ .putExtra("recievedSemester",recievedSemester)
+ .putExtra("recievedBranch",recievedBranch);
+ startActivity(newintent);
+ }
+
}
diff --git a/app/src/main/res/drawable/Thumbs.db b/app/src/main/res/drawable/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..bb9ddc91319d601213430bec8f1d2eafc21b6d2c
Binary files /dev/null and b/app/src/main/res/drawable/Thumbs.db differ
diff --git a/app/src/main/res/drawable/activity.jpg b/app/src/main/res/drawable/activity.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b95b879b53faf6be2e0ae3bb1fc599e43b9825e6
Binary files /dev/null and b/app/src/main/res/drawable/activity.jpg differ
diff --git a/app/src/main/res/drawable/apply.jpg b/app/src/main/res/drawable/apply.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1cb1e799bda77218907bc534ad4ec73eeb05abc8
Binary files /dev/null and b/app/src/main/res/drawable/apply.jpg differ
diff --git a/app/src/main/res/drawable/mybutton.xml b/app/src/main/res/drawable/mybutton.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea33b72ad616e7f13794bcc73a2fd6dcaf148016
--- /dev/null
+++ b/app/src/main/res/drawable/mybutton.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+ <item android:state_pressed="true" >
+ <shape android:shape="rectangle" >
+ <corners android:radius="3dip" />
+ <stroke android:width="1dip" android:color="#51513D" />
+ <gradient android:angle="-90" android:startColor="#345953" android:endColor="#689a92" />
+ </shape>
+ </item>
+ <item android:state_focused="true">
+ <shape android:shape="rectangle" >
+ <corners android:radius="3dip" />
+ <stroke android:width="1dip" android:color="#51513D" />
+ <solid android:color="#58857e"/>
+ </shape>
+ </item>
+ <item >
+ <shape android:shape="rectangle" >
+ <corners android:radius="3dip" />
+ <stroke android:width="1dip" android:color="#031049" />
+ <gradient android:angle="-90" android:startColor="#031049" android:endColor="#031049" />
+ </shape>
+ </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rep.jpg b/app/src/main/res/drawable/rep.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eb22308d9045f8e19a632419367fa61375ff9b68
Binary files /dev/null and b/app/src/main/res/drawable/rep.jpg differ
diff --git a/app/src/main/res/drawable/studentlogin.jpg b/app/src/main/res/drawable/studentlogin.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..653faab37b13761e224bee6d7f2e169119bb933f
Binary files /dev/null and b/app/src/main/res/drawable/studentlogin.jpg differ
diff --git a/app/src/main/res/layout/activity_advisor.xml b/app/src/main/res/layout/activity_advisor.xml
index e8e93799947e0e320dc5cb714cd40c89f4e97dd2..f9229f71b1ae46bc7211e6e7ff0c5943c5eaaf96 100644
--- a/app/src/main/res/layout/activity_advisor.xml
+++ b/app/src/main/res/layout/activity_advisor.xml
@@ -3,7 +3,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.peruse.saran.amritaod.actionareas.advisorActivity">
+
+ tools:context="com.peruse.saran.amritaod.actionareas.advisorActivity"
+ android:background="@drawable/rep">
+
<TextView
android:id="@+id/textView8"
@@ -13,6 +16,9 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="118dp"
android:text="Advisor Menu"
+
+ android:textColor="@color/colorPrimaryDark"
+
android:textAppearance="@style/TextAppearance.AppCompat.Display2" />
<Button
@@ -23,5 +29,9 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="122dp"
android:onClick="odapprove"
- android:text="Approve Leave" />
+
+ android:text="Approve Leave"
+ android:textColor="@color/cardcolour"
+ android:background="@drawable/mybutton"/>
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_advisor_register.xml b/app/src/main/res/layout/activity_advisor_register.xml
index 105bdcc5aa1f9c389dfede762faeff260fc72d67..8ae618211231942161148139fb3fc80a15c157fe 100644
--- a/app/src/main/res/layout/activity_advisor_register.xml
+++ b/app/src/main/res/layout/activity_advisor_register.xml
@@ -4,7 +4,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.peruse.saran.amritaod.register.advisorRegister">
+
+ tools:context="com.peruse.saran.amritaod.register.advisorRegister"
+ android:background="@drawable/studentlogin">
+
<RelativeLayout
android:layout_width="368dp"
@@ -91,6 +94,9 @@
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" />
diff --git a/app/src/main/res/layout/activity_applyod.xml b/app/src/main/res/layout/activity_applyod.xml
index 1290fe5d56a78def174ce2df49b141f8dd78803f..e7f3121be7ae0c75ddcda0cb1af449bcaf3e5417 100644
--- a/app/src/main/res/layout/activity_applyod.xml
+++ b/app/src/main/res/layout/activity_applyod.xml
@@ -3,7 +3,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.peruse.saran.amritaod.actionareas.applyodActivity">
+
+ tools:context="com.peruse.saran.amritaod.actionareas.applyodActivity"
+ android:background="@drawable/rep">
+
<TextView
@@ -34,7 +37,7 @@
android:layout_alignStart="@+id/rollno"
android:layout_below="@+id/rollno"
android:layout_marginTop="14dp"
- android:text="SEMSTER :"
+ android:text="SEMESTER :"
android:textAppearance="@style/TextAppearance.AppCompat.Button" />
<TextView
@@ -221,6 +224,9 @@
android:layout_marginBottom="14dp"
android:layout_toEndOf="@+id/textView17"
android:onClick="takepicture"
+
+ android:background="@drawable/mybutton"
+ android:textColor="@color/cardcolour"
android:text="CAMERA"/>
<Button
@@ -231,6 +237,10 @@
android:layout_alignBottom="@+id/odapplycamera_id"
android:layout_alignEnd="@+id/odapplyreason_id"
android:onClick="showFileChooser"
+
+ android:background="@drawable/mybutton"
+ android:textColor="@color/cardcolour"
+
android:text="Gallery"/>
<Button
@@ -240,9 +250,13 @@
android:layout_alignBaseline="@+id/odapplygallery_id"
android:layout_alignBottom="@+id/odapplygallery_id"
android:layout_marginStart="21dp"
+
+ android:textColor="@color/cardcolour"
android:layout_toEndOf="@+id/odapplygallery_id"
android:onClick="applyOd"
- android:text="APPLY" />
+ android:text="APPLY"
+ android:background="@drawable/mybutton"/>
+
<Spinner
android:id="@+id/spinner"
diff --git a/app/src/main/res/layout/activity_od_display.xml b/app/src/main/res/layout/activity_od_display.xml
new file mode 100644
index 0000000000000000000000000000000000000000..49df4712d8d73fbf206750ab22af59c8843b6903
--- /dev/null
+++ b/app/src/main/res/layout/activity_od_display.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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.support.v7.widget.CardView
+ android:id="@+id/cardView"
+ android:layout_width="375dp"
+ android:layout_height="700dp"
+ 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">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/cardcolour"
+ android:backgroundTint="@color/cardcolour"
+ android:orientation="vertical">
+
+ <TableLayout
+ android:id="@+id/tableLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <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=" Roll No :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <TextView
+ android:id="@+id/textViewName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold" />
+
+ </TableRow>
+
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:text=" Leave Type :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <TextView
+ android:id="@+id/textViewPublisher"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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=" From Date :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <TextView
+ android:id="@+id/fromdateid"
+ android:layout_width="90dp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:text="Period :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <TextView
+ android:id="@+id/fromdateperiodid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ </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=" To Date :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <TextView
+ android:id="@+id/todateid"
+ android:layout_width="90dp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:text="Period :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <TextView
+ android:id="@+id/todateperiodid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="10dp"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ </TableRow>
+ </TableLayout>
+
+ <TextView
+ android:id="@+id/reasonpos"
+ android:layout_width="wrap_content"
+ android:layout_height="26dp"
+ android:paddingRight="10dp"
+ android:paddingTop="10dp"
+ android:text=" Reason :"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+ <TextView
+ android:id="@+id/textviewreasonid"
+ android:layout_width="246dp"
+ android:layout_height="52dp"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="105dp"
+ android:layout_marginTop="-26dp"
+ android:paddingRight="10dp"
+ android:paddingTop="10dp"
+ android:textAppearance="@style/TextAppearance.AppCompat" />
+
+ <com.android.volley.toolbox.NetworkImageView
+ android:id="@+id/imageViewHero"
+ android:layout_width="381dp"
+ android:layout_height="431dp"
+ android:layout_gravity="center"
+ android:padding="15dp" />
+
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
+
+
+
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 67b27065f2e7ac6dc2e1d0f980daf32827a13020..ca15d51cbfa346d30524fbce354cda27a2ec3717 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -3,7 +3,9 @@
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">
+
+ android:layout_height="match_parent"
+ android:background="@drawable/studentlogin">
<RelativeLayout
android:layout_width="368dp"
@@ -109,6 +111,9 @@
android:layout_marginTop="24dp"
android:onClick="newRegistration"
android:text="Register"
+
+ 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" />
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 7574d8bb47c3eec73cd9d6becd7e273dc73935aa..6af6efc8755634a826dca74bdc30411fd7929534 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -1,45 +1,122 @@
<?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">
+ tools:context="com.peruse.saran.amritaod.actionareas.userAreaActivity"
+ android:background="@drawable/rep">
+
<RelativeLayout
android:layout_width="368dp"
android:layout_height="495dp"
+
tools:layout_editor_absoluteX="7dp"
tools:layout_editor_absoluteY="8dp">
+
<TextView
- android:id="@+id/usernamedisplay_id"
+ android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ 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_centerHorizontal="true"
+ android:layout_alignStart="@+id/textView7" />
+
+ <TextView
+ android:id="@+id/usernamedisplay_id"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/textView7"
+ android:layout_toEndOf="@+id/textView6"
android:text="TextView"
- android:textAppearance="@style/TextAppearance.AppCompat.Display1"
- tools:layout_editor_absoluteX="143dp"
- tools:layout_editor_absoluteY="31dp" />
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp" />
+
+ <Button
+ 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" />
+
+
<Button
android:id="@+id/button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/usernamedisplay_id"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="159dp"
+
+ android:layout_marginTop="143dp"
android:onClick="apply"
- android:text="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"/>
+
+ <TextView
+ android:id="@+id/textView7"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/name"
+ android:layout_marginLeft="13dp"
+ android:layout_marginTop="19dp"
+ android:text="ROLL NO :"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/roll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/textView6"
+ android:layout_alignStart="@+id/usernamedisplay_id"
+ android:text="TextView"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp" />
+
+
+ <TextView
+ android:id="@+id/textView6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/textView7"
+ android:layout_marginLeft="13dp"
+ android:layout_marginTop="19dp"
+ android:text="SEMESTER :"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp"
+ android:textStyle="bold" />
+
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignStart="@+id/button3"
- android:layout_below="@+id/usernamedisplay_id"
- android:layout_marginTop="87dp"
- android:text="TextView" />
+ android:layout_alignBaseline="@+id/textView6"
+ android:layout_alignBottom="@+id/textView6"
+ android:layout_centerHorizontal="true"
+ android:text="TextView"
+ android:textColor="@color/colorPrimaryDark"
+ android:textSize="20dp" />
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/advisor_login_tab.xml b/app/src/main/res/layout/advisor_login_tab.xml
index 1cff5cf8ed18e1812289ab42c96cc01e45dbb216..866b900c028bfc258ae658e9ec743c37cb4e5923 100644
--- a/app/src/main/res/layout/advisor_login_tab.xml
+++ b/app/src/main/res/layout/advisor_login_tab.xml
@@ -2,7 +2,9 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:fitsSystemWindows="true">
+ android:fitsSystemWindows="true"
+ android:background="@drawable/studentlogin">
+
<LinearLayout
android:layout_width="match_parent"
@@ -44,10 +46,14 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/Advisor_btn_login"
- android:layout_width="fill_parent"
+
+ 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:background="@drawable/mybutton"
android:padding="12dp"
android:text="Login"/>
diff --git a/app/src/main/res/layout/representative_login_tab.xml b/app/src/main/res/layout/representative_login_tab.xml
index 2ef2cdc3b41b8a28af6b6a6e4c7b2107f7adeb4e..cd0702c9c231d3adccbf4b5f637d41f67e1d88c8 100644
--- a/app/src/main/res/layout/representative_login_tab.xml
+++ b/app/src/main/res/layout/representative_login_tab.xml
@@ -2,7 +2,10 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:fitsSystemWindows="true">
+
+ android:fitsSystemWindows="true"
+ android:background="@drawable/studentlogin">
+
<LinearLayout
android:layout_width="match_parent"
@@ -44,12 +47,17 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/student_btn_login"
- android:layout_width="fill_parent"
+
+ 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:text="Login"/>
+ android:text="Login"
+ android:textColor="@color/cardcolour"
+ android:background="@drawable/mybutton"/>
+
<TextView android:id="@+id/student_link_signup"
android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/splash_screen.xml b/app/src/main/res/layout/splash_screen.xml
index 4dd80cab252f4f1ed1cc15abc189166079273466..31b2053067e844927208775910678623086c08fd 100644
--- a/app/src/main/res/layout/splash_screen.xml
+++ b/app/src/main/res/layout/splash_screen.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+
+ android:layout_height="match_parent"
+ android:background="@drawable/studentlogin">
+
<TextView
android:id="@+id/textView4"
diff --git a/app/src/main/res/layout/student_login_tab.xml b/app/src/main/res/layout/student_login_tab.xml
index 2ef2cdc3b41b8a28af6b6a6e4c7b2107f7adeb4e..cb61af311b182168d2559e23098f1da0cc0adf65 100644
--- a/app/src/main/res/layout/student_login_tab.xml
+++ b/app/src/main/res/layout/student_login_tab.xml
@@ -2,7 +2,9 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:fitsSystemWindows="true">
+ android:fitsSystemWindows="true"
+ android:background="@drawable/studentlogin">
+
<LinearLayout
android:layout_width="match_parent"
@@ -23,32 +25,47 @@
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp">
+
<EditText
android:id="@+id/student_input_rollno"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Roll Number"
- android:inputType="textCapCharacters" />
+ android:backgroundTint="@color/colorPrimaryDark"
+ android:textColorHint="@color/colorPrimaryDark"
+ android:inputType="textCapCharacters"
+ android:textColor="@color/colorPrimaryDark"/>
</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">
<EditText android:id="@+id/student_input_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Password"
+
+ android:textColor="@color/colorPrimaryDark"
+
android:inputType="textPassword"/>
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatButton
android:id="@+id/student_btn_login"
- android:layout_width="fill_parent"
+
+ 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:background="@drawable/mybutton"
+
android:text="Login"/>
<TextView android:id="@+id/student_link_signup"
@@ -56,6 +73,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:gravity="center"
+
+ android:textColor="@color/colorPrimaryDark"
+
android:text="No account yet? Create one"
android:textSize="16dip" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c843ee56f7ec74d4ec019311e83978c7ba837771..c683ef646b11c1a1708fb7382403ce794fb8dd9a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="colorPrimary">#f44336</color>
- <color name="colorPrimaryDark">#d32f2f</color>
- <color name="colorAccent">#ff0000</color>
+
+
+ <color name="colorPrimary">#80475E</color>
+ <color name="colorPrimaryDark">#032B43</color>
+ <color name="colorAccent">#CC5A71</color>
<color name="cardcolour">#fafafa</color>
+
+
</resources>