From 4b9fc6b9cef31230ec95514591f1a3095f3e8c88 Mon Sep 17 00:00:00 2001
From: Liliya Yankova <ly00240@surrey.ac.uk>
Date: Mon, 1 Apr 2019 21:07:07 +0300
Subject: [PATCH] updated
---
app.iml | 85 ++++++++++---------
.../liliyayankova/unirides/Register.java | 15 ++++
src/main/res/layout/activity_register.xml | 61 +++++++++++--
src/main/res/values/strings.xml | 4 +
4 files changed, 117 insertions(+), 48 deletions(-)
diff --git a/app.iml b/app.iml
index 8bfe4d9..be66456 100644
--- a/app.iml
+++ b/app.iml
@@ -17,7 +17,7 @@
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
- <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+ <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
@@ -28,17 +28,15 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -84,6 +82,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+ <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -91,6 +91,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -123,53 +124,53 @@
</content>
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.0@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:documentfile-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:design-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:print-28.0.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor-1.0.2" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:transition-28.0.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-fragment-28.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Register.java b/src/main/java/com/example/liliyayankova/unirides/Register.java
index 90b90bd..b1b5fb5 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Register.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Register.java
@@ -2,12 +2,27 @@ package com.example.liliyayankova.unirides;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
public class Register extends AppCompatActivity {
+ private EditText forename;
+ private EditText surname;
+ private EditText email;
+ private EditText password;
+ private EditText age;
+ private Button register;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_register);
+
+ this.forename = (EditText) findViewById(R.id.forename);
+ this.surname = (EditText) findViewById(R.id.surname);
+ this.email = (EditText) findViewById(R.id.email);
+ this.password = (EditText) findViewById(R.id.password);
+ this.age = (EditText) findViewById(R.id.age);
+ this.register = (Button) findViewById(R.id.signup);
}
}
diff --git a/src/main/res/layout/activity_register.xml b/src/main/res/layout/activity_register.xml
index 12e299e..ef9fec6 100644
--- a/src/main/res/layout/activity_register.xml
+++ b/src/main/res/layout/activity_register.xml
@@ -1,9 +1,58 @@
<?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"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
- tools:context=".Register">
+ android:layout_width="match_parent"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:padding="10dp" >
+
+ <EditText
+ android:id="@+id/forename"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/name"
+ />
+
+ <EditText
+ android:id="@+id/surname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/lastname"
+ />
+
+ <EditText
+ android:id="@+id/email"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/prompt_email"
+ />
+
+ <EditText
+ android:id="@+id/password"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/prompt_password"
+ />
+
+ <EditText
+ android:id="@+id/age"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/prompt_age"
+ />
+
+ <Button
+ android:id="@+id/signup"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/sign"
+ android:textAllCaps="false"
+ android:layout_marginTop="16dp"
+ android:textStyle="bold"/>
+
+
+</LinearLayout>
+
+
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e71f62c..0df3ddd 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -17,4 +17,8 @@
<string name="permission_rationale">"Contacts permissions are needed for providing email
completions."
</string>
+ <string name="name">First name</string>
+ <string name="lastname">Surname</string>
+ <string name="prompt_age">Age</string>
+ <string name="sign">Sign up</string>
</resources>
--
GitLab