Skip to content
Snippets Groups Projects
Commit 851e50ee authored by Shubham Maheshwari's avatar Shubham Maheshwari
Browse files

Changed the colour scheme

parent a2870e6a
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
android:name=".Dashboard" android:name=".Dashboard"
android:label="DashBoard" android:label="DashBoard"
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".LoginActivity"> <activity android:name=".LoginActivity"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:background="@color/colorPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.example.taskboxx.LoginActivity"> tools:context="com.example.taskboxx.LoginActivity">
...@@ -11,15 +12,16 @@ ...@@ -11,15 +12,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_below="@+id/LoginPass_textLayout" android:layout_below="@+id/LoginPass_textLayout"
android:paddingLeft="125dp" android:paddingLeft="12dp"
android:paddingRight="125dp" android:paddingRight="12dp"
android:layout_marginTop="42.5dp"> android:layout_marginTop="42.5dp"
android:id="@+id/linearLayout">
<Button <Button
android:id="@+id/login" android:id="@+id/login"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#EEEEEE" android:background="@color/colorAccent"
android:onClick="Login" android:onClick="Login"
android:text="Login" /> android:text="Login" />
</LinearLayout> </LinearLayout>
...@@ -27,10 +29,10 @@ ...@@ -27,10 +29,10 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColorHint="#000000"
android:layout_marginTop="20dp"
android:id="@+id/LoginUname_textLayout" android:id="@+id/LoginUname_textLayout"
android:layout_centerInParent="true" android:layout_below="@+id/Logo">
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<EditText android:id="@+id/input_uname_login" <EditText android:id="@+id/input_uname_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -43,7 +45,8 @@ ...@@ -43,7 +45,8 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:textColorHint="#000000"
android:layout_marginTop="20dp"
android:id="@+id/LoginPass_textLayout" android:id="@+id/LoginPass_textLayout"
android:layout_below="@+id/LoginUname_textLayout" android:layout_below="@+id/LoginUname_textLayout"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -58,19 +61,20 @@ ...@@ -58,19 +61,20 @@
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<ImageView <ImageView
android:id="@+id/Amrita_Logo" android:id="@+id/Logo"
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="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_centerHorizontal="true"
android:layout_marginBottom="30dp" android:layout_marginTop="35dp" />
app:srcCompat="@mipmap/ic_launcher" />
<TextView <TextView
android:id="@+id/launch_signup" android:id="@+id/launch_signup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="25dp" android:layout_height="25dp"
android:gravity="center" android:gravity="center"
android:textColor="@color/colorAccent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="35dp" android:layout_marginBottom="35dp"
...@@ -82,8 +86,9 @@ ...@@ -82,8 +86,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="25dp" android:layout_height="25dp"
android:text="Forgot Password?" android:text="Forgot Password?"
android:textColor="@color/colorAccent"
android:onClick="forgotPass" android:onClick="forgotPass"
android:layout_below="@+id/LoginPass_textLayout" android:layout_above="@+id/launch_signup"
android:layout_alignRight="@+id/LoginPass_textLayout" android:layout_centerHorizontal="true"
android:layout_marginRight="30dp"/> android:layout_marginBottom="25dp" />
</RelativeLayout> </RelativeLayout>
...@@ -3,15 +3,16 @@ ...@@ -3,15 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" 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"> tools:context="com.example.taskboxx.SignUpActivity">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/Explanation" android:id="@+id/Explanation"
android:textColor="#AA000000" android:textColor="@color/colorAccent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SignUpName_textLayout" android:id="@+id/SignUpName_textLayout"
android:textColorHint="#000000"
android:layout_below="@+id/Explanation" android:layout_below="@+id/Explanation"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -43,6 +45,8 @@ ...@@ -43,6 +45,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SignUpUsername_textLayout" android:id="@+id/SignUpUsername_textLayout"
android:textColorHint="#000000"
android:layout_marginTop="20dp"
android:layout_below="@+id/SignUpName_textLayout" android:layout_below="@+id/SignUpName_textLayout"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
...@@ -59,6 +63,8 @@ ...@@ -59,6 +63,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SignUpemail_textLayout" android:id="@+id/SignUpemail_textLayout"
android:textColorHint="#000000"
android:layout_marginTop="20dp"
android:layout_below="@+id/SignUpUsername_textLayout" android:layout_below="@+id/SignUpUsername_textLayout"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
...@@ -75,6 +81,8 @@ ...@@ -75,6 +81,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SignUpNewPass_textLayout" android:id="@+id/SignUpNewPass_textLayout"
android:textColorHint="#000000"
android:layout_marginTop="20dp"
android:layout_below="@+id/SignUpemail_textLayout" android:layout_below="@+id/SignUpemail_textLayout"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
...@@ -91,6 +99,8 @@ ...@@ -91,6 +99,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SignUpRePass_textLayout" android:id="@+id/SignUpRePass_textLayout"
android:textColorHint="#000000"
android:layout_marginTop="20dp"
android:layout_below="@+id/SignUpNewPass_textLayout" android:layout_below="@+id/SignUpNewPass_textLayout"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
...@@ -110,7 +120,7 @@ ...@@ -110,7 +120,7 @@
android:layout_below="@+id/SignUpRePass_textLayout" android:layout_below="@+id/SignUpRePass_textLayout"
android:paddingLeft="125dp" android:paddingLeft="125dp"
android:paddingRight="125dp" android:paddingRight="125dp"
android:layout_marginTop="20dp"> android:layout_marginTop="45dp">
<Button <Button
android:id="@+id/SignUp" android:id="@+id/SignUp"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<resources> <resources>
<color name="colorPrimary">#795548</color> <color name="colorPrimary">#795548</color>
<color name="colorPrimaryDark">#5D4037</color> <color name="colorPrimaryDark">#5D4037</color>
<color name="colorAccent">#FF4081</color> <color name="colorAccent">#EEEEEE</color>
</resources> </resources>
...@@ -17,4 +17,5 @@ ...@@ -17,4 +17,5 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources> </resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment