Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_email_black_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/light_grey"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_lock_black_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/light_grey"
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>
14 changes: 11 additions & 3 deletions app/src/main/res/layout/fragment_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/email"
android:inputType="textEmailAddress" />
android:drawableLeft="@drawable/ic_email_black_24dp"
android:drawablePadding="@dimen/layout_margin_moderate"
android:inputType="textEmailAddress"
android:drawableStart="@drawable/ic_email_black_24dp" />
</android.support.design.widget.TextInputLayout>

<!-- Password Label -->
Expand All @@ -58,7 +61,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword" />
android:drawableLeft="@drawable/ic_lock_black_24dp"
android:drawablePadding="@dimen/layout_margin_moderate"
android:inputType="textPassword"
android:drawableStart="@drawable/ic_lock_black_24dp" />
</android.support.design.widget.TextInputLayout>

<android.support.v7.widget.AppCompatButton
Expand All @@ -69,6 +75,8 @@
android:layout_marginTop="@dimen/padding_large"
android:layout_marginBottom="@dimen/padding_large"
android:padding="@dimen/padding_medium"
android:textColor="@android:color/white"
android:backgroundTint="@color/colorPrimary"
android:text="@string/login" />

<TextView
Expand Down Expand Up @@ -142,4 +150,4 @@
</LinearLayout>

</LinearLayout>
</ScrollView>
</ScrollView>
17 changes: 14 additions & 3 deletions app/src/main/res/layout/fragment_signup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/email"
android:inputType="textEmailAddress" />
android:drawableLeft="@drawable/ic_email_black_24dp"
android:drawablePadding="@dimen/layout_margin_moderate"
android:inputType="textEmailAddress"
android:drawableStart="@drawable/ic_email_black_24dp" />
</android.support.design.widget.TextInputLayout>

<!-- Password Label -->
Expand All @@ -62,8 +65,11 @@
android:id="@+id/passwordSignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_lock_black_24dp"
android:drawablePadding="@dimen/layout_margin_moderate"
android:hint="@string/password"
android:inputType="textPassword" />
android:inputType="textPassword"
android:drawableStart="@drawable/ic_lock_black_24dp" />
</android.support.design.widget.TextInputLayout>

<android.support.design.widget.TextInputLayout
Expand All @@ -78,6 +84,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/confirm_password"
android:drawablePadding="@dimen/layout_margin_moderate"
android:drawableLeft="@drawable/ic_lock_black_24dp"
android:drawableStart="@drawable/ic_lock_black_24dp"
android:inputType="textPassword" />
</android.support.design.widget.TextInputLayout>

Expand Down Expand Up @@ -114,7 +123,9 @@
android:layout_marginTop="@dimen/padding_large"
android:layout_marginBottom="@dimen/padding_large"
android:padding="@dimen/padding_medium"
android:text="@string/sign_up" />
android:text="@string/sign_up"
android:textColor="@android:color/white"
android:backgroundTint="@color/colorPrimary"/>

</LinearLayout>
</ScrollView>