diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 92ce7e16e54347a1474b7d58c0a373c198151aac..2d6c50244fb6dcbf2255e9e2b87470609c2fbf95 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,8 @@ android:name=".Dashboard" android:label="DashBoard" android:theme="@style/AppTheme.NoActionBar" /> - <activity android:name=".LoginActivity"> + <activity android:name=".LoginActivity" + android:theme="@style/AppTheme.NoActionBar"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index e1664c07ae3d7208922b683a634b6a4c7f846f83..9f6fd40e5d765a9c83b38996f6d9cec237e219b9 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -2,6 +2,7 @@ <RelativeLayout 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:background="@color/colorPrimary" android:layout_width="match_parent" android:layout_height="match_parent" tools:context="com.example.taskboxx.LoginActivity"> @@ -11,15 +12,16 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:layout_below="@+id/LoginPass_textLayout" - android:paddingLeft="125dp" - android:paddingRight="125dp" - android:layout_marginTop="42.5dp"> + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:layout_marginTop="42.5dp" + android:id="@+id/linearLayout"> <Button android:id="@+id/login" style="@style/Widget.AppCompat.Button.Borderless" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#EEEEEE" + android:background="@color/colorAccent" android:onClick="Login" android:text="Login" /> </LinearLayout> @@ -27,10 +29,10 @@ <android.support.design.widget.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:textColorHint="#000000" + android:layout_marginTop="20dp" android:id="@+id/LoginUname_textLayout" - android:layout_centerInParent="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true"> + android:layout_below="@+id/Logo"> <EditText android:id="@+id/input_uname_login" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -43,7 +45,8 @@ <android.support.design.widget.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" + android:textColorHint="#000000" + android:layout_marginTop="20dp" android:id="@+id/LoginPass_textLayout" android:layout_below="@+id/LoginUname_textLayout" android:layout_alignParentLeft="true" @@ -58,19 +61,20 @@ </android.support.design.widget.TextInputLayout> <ImageView - android:id="@+id/Amrita_Logo" + android:id="@+id/Logo" android:layout_width="160dp" android:layout_height="160dp" - android:layout_above="@+id/LoginUname_textLayout" + app:srcCompat="@mipmap/ic_launcher" + android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="30dp" - app:srcCompat="@mipmap/ic_launcher" /> + android:layout_marginTop="35dp" /> <TextView android:id="@+id/launch_signup" android:layout_width="match_parent" android:layout_height="25dp" android:gravity="center" + android:textColor="@color/colorAccent" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_marginBottom="35dp" @@ -82,8 +86,9 @@ android:layout_width="wrap_content" android:layout_height="25dp" android:text="Forgot Password?" + android:textColor="@color/colorAccent" android:onClick="forgotPass" - android:layout_below="@+id/LoginPass_textLayout" - android:layout_alignRight="@+id/LoginPass_textLayout" - android:layout_marginRight="30dp"/> + android:layout_above="@+id/launch_signup" + android:layout_centerHorizontal="true" + android:layout_marginBottom="25dp" /> </RelativeLayout> diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index ec6041d2c09254265ad422ebad130452987dcd47..fa5b60dcccfd494680aa299be0615bd1b916a355 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -3,15 +3,16 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:background="@color/colorPrimary" tools:context="com.example.taskboxx.SignUpActivity"> <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> <TextView android:id="@+id/Explanation" - android:textColor="#AA000000" + android:textColor="@color/colorAccent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" @@ -26,6 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/SignUpName_textLayout" + android:textColorHint="#000000" android:layout_below="@+id/Explanation" android:layout_marginTop="20dp" android:layout_alignParentLeft="true" @@ -43,6 +45,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/SignUpUsername_textLayout" + android:textColorHint="#000000" + android:layout_marginTop="20dp" android:layout_below="@+id/SignUpName_textLayout" android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> @@ -59,6 +63,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/SignUpemail_textLayout" + android:textColorHint="#000000" + android:layout_marginTop="20dp" android:layout_below="@+id/SignUpUsername_textLayout" android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> @@ -75,6 +81,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/SignUpNewPass_textLayout" + android:textColorHint="#000000" + android:layout_marginTop="20dp" android:layout_below="@+id/SignUpemail_textLayout" android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> @@ -91,6 +99,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/SignUpRePass_textLayout" + android:textColorHint="#000000" + android:layout_marginTop="20dp" android:layout_below="@+id/SignUpNewPass_textLayout" android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> @@ -110,7 +120,7 @@ android:layout_below="@+id/SignUpRePass_textLayout" android:paddingLeft="125dp" android:paddingRight="125dp" - android:layout_marginTop="20dp"> + android:layout_marginTop="45dp"> <Button android:id="@+id/SignUp" style="@style/Widget.AppCompat.Button.Borderless" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3de5bb402c2277ab97bf47b3ad4fc592fb31c3df..1572ad71defe7cbe6242708c10547befcda4792d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,5 +2,5 @@ <resources> <color name="colorPrimary">#795548</color> <color name="colorPrimaryDark">#5D4037</color> - <color name="colorAccent">#FF4081</color> + <color name="colorAccent">#EEEEEE</color> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 545b9c6d2c45df7938f8ffd5ac2d806dec36f122..e11d11a83e136ba3105cb7e5e5f647c50e417b4e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,4 +17,5 @@ <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> + </resources>