diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4366e47142ca0dfa0c3c5b9986f629cbb991056f..92ce7e16e54347a1474b7d58c0a373c198151aac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,8 +19,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".SignUpActivity"
- android:theme="@style/AppTheme.NoActionBar"/>
+ <activity android:name=".SignUpActivity"/>
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/taskboxx/FacultySignUpFragment.java b/app/src/main/java/com/example/taskboxx/FacultySignUpFragment.java
deleted file mode 100644
index b0b2c17f6655be2d2895a3a0266e51c5066d1a6d..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/example/taskboxx/FacultySignUpFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.taskboxx;
-
-import android.support.v4.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class FacultySignUpFragment extends Fragment {
-
- public FacultySignUpFragment(){}
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- return inflater.inflate(R.layout.fragment_faculty_sign_up, container, false);
- }
-}
diff --git a/app/src/main/java/com/example/taskboxx/LoginActivity.java b/app/src/main/java/com/example/taskboxx/LoginActivity.java
index fb2708651a3c22107ae00cbea99baba9c1e6fb79..ecb6eb1a16b3150e1f10802db873e6e170c51011 100644
--- a/app/src/main/java/com/example/taskboxx/LoginActivity.java
+++ b/app/src/main/java/com/example/taskboxx/LoginActivity.java
@@ -1,17 +1,23 @@
package com.example.taskboxx;
import android.content.Intent;
+import android.graphics.Paint;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
+import android.widget.TextView;
import android.widget.Toast;
public class LoginActivity extends AppCompatActivity {
+ TextView textView;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
+ textView = (TextView) findViewById(R.id.launch_forgotpass);
+ textView.setPaintFlags(textView.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
}
public void Login(View view){
@@ -25,4 +31,9 @@ public class LoginActivity extends AppCompatActivity {
Intent signupintent = new Intent(this,SignUpActivity.class);
startActivity(signupintent);
}
+
+ public void forgotPass(View view){
+ Toast.makeText(this, "No problem!", Toast.LENGTH_SHORT).show();
+ Toast.makeText(this, "But the feature isn't implemented yet", Toast.LENGTH_SHORT).show();
+ }
}
diff --git a/app/src/main/java/com/example/taskboxx/SignUpActivity.java b/app/src/main/java/com/example/taskboxx/SignUpActivity.java
index 959137ce3b07a2d9ada534b67f673479c006f0f3..a8a0414f63d53dd184f333728ad30fb2a1974b93 100644
--- a/app/src/main/java/com/example/taskboxx/SignUpActivity.java
+++ b/app/src/main/java/com/example/taskboxx/SignUpActivity.java
@@ -1,46 +1,26 @@
package com.example.taskboxx;
import android.content.Intent;
+import android.graphics.Paint;
import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.View;
+import android.widget.TextView;
import android.widget.Toast;
public class SignUpActivity extends AppCompatActivity {
- Toolbar toolbar;
- TabLayout tabLayout;
- ViewPager viewPager;
- viewpageradapter viewPagerAdapter;
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up);
- toolbar = (Toolbar) findViewById(R.id.toolBar);
- setSupportActionBar(toolbar);
- tabLayout = (TabLayout) findViewById(R.id.tabLayout);
- viewPager = (ViewPager) findViewById(R.id.viewPager);
- viewPagerAdapter = new viewpageradapter(getSupportFragmentManager());
- viewPagerAdapter.addFragments(new StudentSignUpFragment(),"Student");
- viewPagerAdapter.addFragments(new FacultySignUpFragment(),"Faculty");
- viewPager.setAdapter(viewPagerAdapter);
- tabLayout.setupWithViewPager(viewPager);
-
- }
-
- public void StudentSignUp(View view){
- Toast.makeText(this, "Registered as a Student!", Toast.LENGTH_SHORT).show();
- Toast.makeText(this, "Please Log In to Proceed", Toast.LENGTH_SHORT).show();
- Intent loginintent = new Intent(this,LoginActivity.class);
- startActivity(loginintent);
}
- public void FacultySignUp(View view){
- Toast.makeText(this, "Registered as a Faculty!", Toast.LENGTH_SHORT).show();
+ public void SignUp(View view){
+ Toast.makeText(this, "Registered!", Toast.LENGTH_SHORT).show();
Toast.makeText(this, "Please Log In to Proceed", Toast.LENGTH_SHORT).show();
Intent loginintent = new Intent(this,LoginActivity.class);
startActivity(loginintent);
diff --git a/app/src/main/java/com/example/taskboxx/StudentSignUpFragment.java b/app/src/main/java/com/example/taskboxx/StudentSignUpFragment.java
deleted file mode 100644
index 5644bab1a8859b5b5cd0896be37ed424f97a8193..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/example/taskboxx/StudentSignUpFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.taskboxx;
-
-import android.support.v4.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class StudentSignUpFragment extends Fragment {
-
- public StudentSignUpFragment(){}
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- return inflater.inflate(R.layout.fragment_student_sign_up, container, false);
- }
-}
diff --git a/app/src/main/java/com/example/taskboxx/viewpageradapter.java b/app/src/main/java/com/example/taskboxx/viewpageradapter.java
deleted file mode 100644
index 3e0bb522d004b3a47391a829ce22c61745799c7d..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/example/taskboxx/viewpageradapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.example.taskboxx;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-
-import java.util.ArrayList;
-
-/**
- * Created by Shubham Maheshwari on 13-04-2017.
- */
-
-public class viewpageradapter extends FragmentStatePagerAdapter {
-
-
- ArrayList<Fragment> fragments = new ArrayList<>();
- ArrayList<String>tabTitles = new ArrayList<>();
-
- public void addFragments(Fragment fragments, String tabTitles){
- this.fragments.add(fragments);
- this.tabTitles.add(tabTitles);
- }
-
-
- public viewpageradapter(FragmentManager fragmentManager){
- super(fragmentManager);
-
- }
- @Override
- public Fragment getItem(int position) {
- return fragments.get(position);
- }
-
- @Override
- public int getCount() {
- return fragments.size();
- }
-
- @Override
- public CharSequence getPageTitle(int position){
- return tabTitles.get(position);
- }
-}
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 2b745f1e9f833323e26ba69ece105a76f1eb7022..1988187367bbbd7df08a16df78fb124e40067ca3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -10,10 +10,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_below="@+id/Pass_textLayout"
+ android:layout_below="@+id/LoginPass_textLayout"
android:paddingLeft="125dp"
android:paddingRight="125dp"
- android:layout_marginTop="20dp">
+ android:layout_marginTop="42.5dp">
<Button
android:id="@+id/login"
style="@style/Widget.AppCompat.Button.Borderless"
@@ -27,25 +27,25 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/RollNo_textLayout"
+ android:id="@+id/LoginUname_textLayout"
android:layout_centerInParent="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_RollNo"
+ <EditText android:id="@+id/input_uname_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="30dp"
android:layout_marginLeft="30dp"
android:inputType="text"
- android:hint="College Roll No." />
+ android:hint="Username or Email" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
- android:id="@+id/Pass_textLayout"
- android:layout_below="@+id/RollNo_textLayout"
+ android:id="@+id/LoginPass_textLayout"
+ android:layout_below="@+id/LoginUname_textLayout"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<EditText android:id="@+id/input_password"
@@ -61,7 +61,7 @@
android:id="@+id/Amrita_Logo"
android:layout_width="160dp"
android:layout_height="160dp"
- android:layout_above="@+id/RollNo_textLayout"
+ android:layout_above="@+id/LoginUname_textLayout"
android:layout_centerHorizontal="true"
android:layout_marginBottom="30dp"
app:srcCompat="@mipmap/ic_launcher" />
@@ -72,7 +72,17 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
- android:layout_marginBottom="37dp"
+ android:layout_marginBottom="35dp"
android:text="Don't Have an Account? Create one"
android:onClick="gotoSignUp"/>
+
+ <TextView
+ android:id="@+id/launch_forgotpass"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Forgot Password?"
+ android:onClick="forgotPass"
+ android:layout_below="@+id/LoginPass_textLayout"
+ android:layout_alignRight="@+id/LoginPass_textLayout"
+ android:layout_marginRight="30dp"/>
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 49ca24afea9d23b7f5a27fabc024f1e1887c5d8d..f8122c7ca7424dff58735c19182e41ab6a8ae682 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -1,39 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
+ android:layout_height="wrap_content"
tools:context="com.example.taskboxx.SignUpActivity">
-
- <android.support.design.widget.AppBarLayout
+ <RelativeLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/appBar"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+ android:layout_height="match_parent">
- <include
+ <TextView
+ android:id="@+id/Explanation"
+ android:textColor="#AA000000"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_width="match_parent"
- layout="@layout/toolbar_layout" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="25dp"
+ android:layout_marginRight="25dp"
+ android:layout_marginTop="25dp"
+ android:text="Enter the following details to Sign up!\nOnly your Username will be made public." />
- <android.support.design.widget.TabLayout
+ <android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/tabLayout"
- app:tabMode="fixed"
- app:tabGravity="fill">
+ android:id="@+id/SignUpName_textLayout"
+ android:layout_below="@+id/Explanation"
+ android:layout_marginTop="20dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true">
+ <EditText android:id="@+id/input_Name_SignUp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_marginLeft="30dp"
+ android:inputType="text"
+ android:hint="Name" />
+ </android.support.design.widget.TextInputLayout>
- </android.support.design.widget.TabLayout>
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/SignUpUsername_textLayout"
+ android:layout_below="@+id/SignUpName_textLayout"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true">
+ <EditText android:id="@+id/input_Username_SignUp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_marginLeft="30dp"
+ android:inputType="text"
+ android:hint="Username" />
+ </android.support.design.widget.TextInputLayout>
- </android.support.design.widget.AppBarLayout>
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/SignUpemail_textLayout"
+ android:layout_below="@+id/SignUpUsername_textLayout"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true">
+ <EditText android:id="@+id/input_email_SignUp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_marginLeft="30dp"
+ android:inputType="text"
+ android:hint="Email Address" />
+ </android.support.design.widget.TextInputLayout>
- <android.support.v4.view.ViewPager
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@+id/appBar"
- android:id="@+id/viewPager">
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/SignUpNewPass_textLayout"
+ android:layout_below="@+id/SignUpemail_textLayout"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true">
+ <EditText android:id="@+id/input_NewPass_SignUp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_marginLeft="30dp"
+ android:inputType="text"
+ android:hint="New Password" />
+ </android.support.design.widget.TextInputLayout>
- </android.support.v4.view.ViewPager>
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/SignUpRePass_textLayout"
+ android:layout_below="@+id/SignUpNewPass_textLayout"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true">
+ <EditText android:id="@+id/input_RePass_SignUp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:layout_marginLeft="30dp"
+ android:inputType="text"
+ android:hint="Confirm password" />
+ </android.support.design.widget.TextInputLayout>
-</RelativeLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_below="@+id/SignUpRePass_textLayout"
+ android:paddingLeft="125dp"
+ android:paddingRight="125dp"
+ android:layout_marginTop="20dp">
+ <Button
+ android:id="@+id/SignUp"
+ style="@style/Widget.AppCompat.Button.Borderless"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#EEEEEE"
+ android:onClick="SignUp"
+ android:text="Sign Up" />
+ </LinearLayout>
+ </RelativeLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_faculty_sign_up.xml b/app/src/main/res/layout/fragment_faculty_sign_up.xml
deleted file mode 100644
index 29d24b8e5ffab9c61ddda8e3a3f33f5b93b5da81..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/fragment_faculty_sign_up.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView 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.example.taskboxx.FacultySignUpFragment">
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
-
- <TextView
- android:id="@+id/Explanation"
- android:textColor="#AA000000"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="25dp"
- android:layout_marginRight="25dp"
- android:layout_marginTop="25dp"
- android:text="Enter the following details to Sign up for TaskBoxx, your personal project and task manager!" />
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/FacultySignUpName_textLayout"
- android:layout_below="@+id/Explanation"
- android:layout_marginTop="20dp"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Faculty_Name_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Name" />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="250dp"
- android:layout_height="wrap_content"
- android:id="@+id/FacultySignUpRollNo_textLayout"
- android:layout_below="@+id/FacultySignUpName_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Faculty_RollNo_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Faculty Roll No." />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- android:id="@+id/FacultySignUpDept_textLayout"
- android:layout_below="@+id/FacultySignUpName_textLayout"
- android:layout_toRightOf="@+id/FacultySignUpRollNo_textLayout"
- android:layout_toEndOf="@+id/FacultySignUpRollNo_textLayout">
- <EditText android:id="@+id/input_Faculty_Dept_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:inputType="text"
- android:hint="Dept." />
- </android.support.design.widget.TextInputLayout>
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/FacultySignUpWA_textLayout"
- android:layout_below="@+id/FacultySignUpRollNo_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Faculty_WA_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Working Areas" />
- </android.support.design.widget.TextInputLayout>
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/FacultySignUpemail_textLayout"
- android:layout_below="@+id/FacultySignUpWA_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Faculty_email_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Email ID" />
- </android.support.design.widget.TextInputLayout>
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/FacultySignUpContact_textLayout"
- android:layout_below="@+id/FacultySignUpemail_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Faculty_Contact_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Contact no." />
- </android.support.design.widget.TextInputLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_below="@+id/FacultySignUpContact_textLayout"
- android:paddingLeft="125dp"
- android:paddingRight="125dp"
- android:layout_marginTop="20dp">
- <Button
- android:id="@+id/SignUp"
- style="@style/Widget.AppCompat.Button.Borderless"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#EEEEEE"
- android:onClick="FacultySignUp"
- android:text="Sign Up" />
- </LinearLayout>
-
- </RelativeLayout>
-
-</ScrollView>
diff --git a/app/src/main/res/layout/fragment_student_sign_up.xml b/app/src/main/res/layout/fragment_student_sign_up.xml
deleted file mode 100644
index 9bc4f60ea39789081ee366a41d2592968bcc076b..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/fragment_student_sign_up.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView 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="wrap_content"
- tools:context="com.example.taskboxx.StudentSignUpFragment">
-<RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <TextView
- android:id="@+id/Explanation"
- android:textColor="#AA000000"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="25dp"
- android:layout_marginRight="25dp"
- android:layout_marginTop="25dp"
- android:text="Enter the following details to Sign up for TaskBoxx, your personal project and task manager!" />
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpName_textLayout"
- android:layout_below="@+id/Explanation"
- android:layout_marginTop="20dp"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Student_Name_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Name" />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="250dp"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpRollNo_textLayout"
- android:layout_below="@+id/StudentSignUpName_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Student_RollNo_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Roll No." />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpDept_textLayout"
- android:layout_below="@+id/StudentSignUpRollNo_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Student_Dept_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Department" />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="170dp"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpCGPA_textLayout"
- android:layout_below="@+id/StudentSignUpRollNo_textLayout"
- android:layout_toRightOf="@+id/StudentSignUpDept_textLayout"
- android:layout_toEndOf="@+id/StudentSignUpDept_textLayout">
- <EditText android:id="@+id/input_Student_CGPA_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="10dp"
- android:inputType="text"
- android:hint="CGPA" />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpSem_textLayout"
- android:layout_below="@+id/StudentSignUpName_textLayout"
- android:layout_toEndOf="@+id/StudentSignUpRollNo_textLayout"
- android:layout_toRightOf="@+id/StudentSignUpRollNo_textLayout">
- <EditText android:id="@+id/input_Student_Sem_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="10dp"
- android:inputType="number"
- android:hint="Sem" />
- </android.support.design.widget.TextInputLayout>
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpAOI_textLayout"
- android:layout_below="@+id/StudentSignUpDept_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Student_AOI_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="text"
- android:hint="Areas of Interest" />
- </android.support.design.widget.TextInputLayout>
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpemail_textLayout"
- android:layout_below="@+id/StudentSignUpAOI_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Student_email_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="textEmailAddress"
- android:hint="Contact Email Address" />
- </android.support.design.widget.TextInputLayout>
-
- <android.support.design.widget.TextInputLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/StudentSignUpContact_textLayout"
- android:layout_below="@+id/StudentSignUpemail_textLayout"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
- <EditText android:id="@+id/input_Student_Contact_SignUp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginRight="30dp"
- android:layout_marginLeft="30dp"
- android:inputType="number"
- android:hint="Contact No." />
- </android.support.design.widget.TextInputLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_below="@+id/StudentSignUpContact_textLayout"
- android:paddingLeft="125dp"
- android:paddingRight="125dp"
- android:layout_marginTop="20dp">
- <Button
- android:id="@+id/SignUp"
- style="@style/Widget.AppCompat.Button.Borderless"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#EEEEEE"
- android:onClick="StudentSignUp"
- android:text="Sign Up" />
- </LinearLayout>
-
-</RelativeLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
deleted file mode 100644
index 7f78397f446b26d44ecc99d74942c1fe4591dbda..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/toolbar_layout.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?attr/colorPrimary"
- android:minHeight="?attr/actionBarSize"
- android:fitsSystemWindows="true"
- android:id="@+id/toolBar"
- app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- android:elevation="0dp">
-
-</android.support.v7.widget.Toolbar>
\ No newline at end of file