From 1f79b2ac920049ce4575e03e96b48927f745c98e Mon Sep 17 00:00:00 2001
From: Niharika K <Niharika K>
Date: Mon, 27 Mar 2017 12:43:35 +0530
Subject: [PATCH] textview added
---
.idea/misc.xml | 2 +-
.idea/vcs.xml | 6 ++++++
app/src/main/res/layout/activity_register.xml | 6 +++---
app/src/main/res/layout/activity_user_area.xml | 9 +++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 .idea/vcs.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..5d19981 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_8" 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_7" 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/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index ba7ddb6..b0ab4c4 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -39,15 +39,15 @@
android:ems="10"
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/pass"
- android:id="@+id/editText3"
+ android:id="@+id/mail"
android:hint="Email" />
<Button
android:text="sign up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/editText3"
+ android:layout_below="@+id/mail"
android:layout_centerHorizontal="true"
android:layout_marginTop="50dp"
- android:id="@+id/button" />
+ android:id="@+id/signup" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 40c035d..44f99cc 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -10,4 +10,13 @@
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