Skip to content
Snippets Groups Projects
Commit 6e59a1a0 authored by Niharika K's avatar Niharika K
Browse files

Added activities

parent 1f5e7795
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 181 additions and 7 deletions
.idea/misc.xml
+ 28
− 1
View file @ 6e59a1a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
......@@ -10,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="true" assert-keyword="false" jdk-15="false">
<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">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
.idea/modules.xml 0 → 100644
+ 9
− 0
View file @ 6e59a1a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Smart Planner.iml" filepath="$PROJECT_DIR$/Smart Planner.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/runConfigurations.xml 0 → 100644
+ 12
− 0
View file @ 6e59a1a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
app/build.gradle
+ 1
− 0
View file @ 6e59a1a0
......@@ -26,4 +26,5 @@ dependencies {
})
compile 'com.android.support:appcompat-v7:25.1.0'
testCompile 'junit:junit:4.12'
compile 'com.android.volley:volley:1.0.0'
}
app/src/main/AndroidManifest.xml
+ 2
− 0
View file @ 6e59a1a0
......@@ -15,6 +15,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".RegisterActivity" />
<activity android:name=".UserArea"></activity>
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java 0 → 100644
+ 13
− 0
View file @ 6e59a1a0
package com.example.chan24.smartplanner;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class RegisterActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_register);
}
}
app/src/main/java/com/example/chan24/smartplanner/UserArea.java 0 → 100644
+ 13
− 0
View file @ 6e59a1a0
package com.example.chan24.smartplanner;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class UserArea extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_area);
}
}
app/src/main/res/layout/activity_login.xml
+ 37
− 6
View file @ 6e59a1a0
......@@ -10,13 +10,44 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.example.chan24.smartplanner.LoginActivity">
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="59dp"
android:id="@+id/name"
android:hint="Username" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:layout_below="@+id/name"
android:layout_alignEnd="@+id/name"
android:layout_marginTop="52dp"
android:id="@+id/password"
android:hint="Password" />
<Button
android:text="login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/password"
android:layout_centerHorizontal="true"
android:layout_marginTop="49dp"
android:id="@+id/login" />
<TextView
android:text="Pickho"
android:text="Not a member ? Register now!"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView"
android:layout_toEndOf="@+id/textView"
android:layout_marginStart="39dp"
android:layout_marginTop="84dp"
android:id="@+id/text" />
android:layout_below="@+id/login"
android:layout_centerHorizontal="true"
android:layout_marginTop="81dp"
android:id="@+id/reg"
android:textStyle="normal|bold" />
</RelativeLayout>
app/src/main/res/layout/activity_register.xml 0 → 100644
+ 53
− 0
View file @ 6e59a1a0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_register"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.example.chan24.smartplanner.RegisterActivity">
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="48dp"
android:id="@+id/user"
android:hint="Username" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:layout_below="@+id/user"
android:layout_alignEnd="@+id/user"
android:layout_marginTop="46dp"
android:id="@+id/pass"
android:hint="Password" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:ems="10"
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/pass"
android:id="@+id/editText3"
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_centerHorizontal="true"
android:layout_marginTop="50dp"
android:id="@+id/button" />
</RelativeLayout>
app/src/main/res/layout/activity_user_area.xml 0 → 100644
+ 13
− 0
View file @ 6e59a1a0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_user_area"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.example.chan24.smartplanner.UserArea">
</RelativeLayout>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment