From f650914386781772b13fa4ff22c84910c26e23e2 Mon Sep 17 00:00:00 2001
From: Niharika K <Niharika K>
Date: Mon, 27 Mar 2017 13:10:35 +0530
Subject: [PATCH] Login and register UI done

---
 .../chan24/smartplanner/LoginActivity.java    | 19 +++++++++++++++++++
 .../chan24/smartplanner/RegisterActivity.java |  7 +++++++
 .../main/res/layout/activity_user_area.xml    |  9 ---------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
index b1dcad6..cc736db 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
@@ -1,8 +1,15 @@
 
 package com.example.chan24.smartplanner;
 
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.w3c.dom.Text;
 
 public class LoginActivity extends AppCompatActivity {
 
@@ -10,5 +17,17 @@ public class LoginActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
+        final EditText name = (EditText)findViewById(R.id.name);
+        final EditText password = (EditText)findViewById(R.id.password);
+        final Button login = (Button)findViewById(R.id.login);
+        final TextView register = (TextView)findViewById(R.id.reg);
+        register.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent regintent = new Intent(getApplicationContext(),RegisterActivity.class);
+                startActivity(regintent);
+
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java b/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
index e936149..18cb7f5 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
@@ -2,6 +2,8 @@ package com.example.chan24.smartplanner;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
 
 public class RegisterActivity extends AppCompatActivity {
 
@@ -9,5 +11,10 @@ public class RegisterActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register);
+        final EditText user = (EditText)findViewById(R.id.user);
+        final EditText pass = (EditText)findViewById(R.id.pass);
+        final EditText mail = (EditText)findViewById(R.id.mail);
+        final Button signup =(Button)findViewById(R.id.signup);
+
     }
 }
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 44f99cc..40c035d 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -10,13 +10,4 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.example.chan24.smartplanner.UserArea">
 
-    <TextView
-        android:text="TextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="134dp"
-        android:layout_marginTop="17dp"
-        android:id="@+id/textView" />
 </RelativeLayout>
-- 
GitLab