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 b1dcad6d94f2c675414e003d17e45c76353f5f43..cc736db8b2bfad4735a07582afb54f48342051c1 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 e936149c5926d014bac53d1839f7215d8d3d648f..18cb7f5a8deeb680b589df188589f933b31cc92f 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 44f99cc2ad23dc40888c9ddd17768d489ab1cc7c..40c035d8efc52658a40de813d64cbfbc45dc77d0 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>