diff --git a/.idea/misc.xml b/.idea/misc.xml
index 39638799269d0193201b39e5276d8236659f97fe..ba7052b8197ddf8ba8756022d905d03055c7ad60 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="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/modules.xml b/.idea/modules.xml
index b5de344f40ad3c770f4a603c6a0b758f157a80ec..abc31fc679bb491e423c03e7bd677ff03ed00d98 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
- <module fileurl="file://$PROJECT_DIR$/fitness.iml" filepath="$PROJECT_DIR$/fitness.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f4cb416c083d265558da75d457237d671..35eb1ddfbbc029bcab630581847471d7f238ec53 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c4426b90d026cb7162b75db2b31c3be619c534c2..53617ebc984aab474ebd8bda088b0165d794ad86 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity android:name=".LoginActivity"></activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..ada8d12ac73d658ae4c68a0fc2febaf45b16048a
--- /dev/null
+++ b/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java
@@ -0,0 +1,18 @@
+package com.example.leo.fitnessdiy;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+public class LoginActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_login);
+ }
+
+ public void doLogin(View view) {
+
+ }
+}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java
index aae23959f99b4cf7cfd00427201ac064c989c809..05a62f684add4ad279eae9a6b6d7adb574e07c40 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java
@@ -1,5 +1,6 @@
package com.example.leo.fitnessdiy;
+import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cb058486c3cb4ad0c2ff5829add4e2fceada9ad
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context="com.example.leo.fitnessdiy.LoginActivity">
+
+
+ <EditText
+ android:id="@+id/login_email"
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:hint="@string/email"
+ android:inputType="textEmailAddress"
+ android:layout_margin="8dp"/>
+
+ <EditText
+ android:id="@+id/login_password"
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:hint="@string/password"
+ android:inputType="textPassword"
+ android:layout_margin="8dp"/>
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/login"
+ android:layout_margin="8dp"
+ android:onClick="doLogin"/>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26c32629f35e927652a482d123b28cc82080e5f9..ba7bc3b9647401de1fb63604147fdb471a26bd3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
<resources>
<string name="app_name">FitnessDIY</string>
+ <string name="email">Email</string>
+ <string name="password">Password</string>
+ <string name="login">Login</string>
</resources>
diff --git a/gradle.properties b/gradle.properties
index aac7c9b4614ccfde6c721f24994cf30885a791d0..b8a1e028b25c1d2f36efd46349978f03b5ffc69e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,24 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+#Mon Feb 12 14:53:51 ICT 2018
+systemProp.http.proxyPort=8080
+systemProp.http.proxyUser=rizki_halasan
+systemProp.http.proxyPassword=07007831
+org.gradle.jvmargs=-Xmx1536m
+systemProp.https.proxyPassword=07007831
+systemProp.https.proxyHost=cache.itb.ac.id
+systemProp.http.proxyHost=cache.itb.ac.id
+systemProp.https.proxyPort=8080
+systemProp.https.proxyUser=rizki_halasan