Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Request for login Page #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pull Request for login Page #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba3f7d
Pull Request for login Page
vipuldcoder May 10, 2018
739e321
Merge branch 'master' into master
vipuldcoder May 10, 2018
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
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/LoginActivity">
<activity android:name=".LoginActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Binary file added app/src/main/res/drawable/audacity_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/dash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="line">

<stroke android:color="@color/editTextBG"
android:width="1dp"
android:dashGap="1.5dp"
android:dashWidth="3dp"/>

</shape>
Binary file added app/src/main/res/drawable/img_authentication.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/img_checkbox_checked.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/img_checkbox_uncheck.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/img_user.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable/logo1.jpg
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/square.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/colorPrimary" />
</shape>
230 changes: 225 additions & 5 deletions app/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,236 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimaryDark"
android:background="@drawable/gradient"
tools:context=".LoginActivity">

<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginBottom="20dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="20dp"
app:cardCornerRadius="10dp"
app:cardElevation="3dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical">

<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="20dp"
android:padding="10dp"
android:src="@drawable/audacity_logo"
android:tint="@color/white" />



<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginTop="10dp"
android:fontFamily="sans-serif-medium"
android:text="@string/name_login"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="22sp" />
</LinearLayout>

<ImageView
android:id="@+id/imageView1"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_below="@+id/linearLayout1"
android:layout_centerHorizontal="true"
android:layout_marginTop="-10dp"
android:rotation="45"
android:src="@drawable/square" />

<RelativeLayout
android:id="@+id/relativeLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp">

<ImageView
android:id="@+id/imageView_userIcon"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="@color/colorPrimary"
android:padding="8dp"
android:src="@drawable/img_user"
android:tint="@color/white" />

<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/imageView_userIcon"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/imageView_userIcon"
android:background="@color/editTextBG"
android:hint="@string/username"
android:paddingLeft="20dp"
android:textSize="15sp" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/relativeLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/relativeLayout1"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="15dp">

<ImageView
android:id="@+id/imageView_passwordIcon"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="@color/colorPrimary"
android:padding="8dp"
android:src="@drawable/img_authentication"
android:tint="@color/white" />

<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/imageView_passwordIcon"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/imageView_passwordIcon"
android:background="@color/editTextBG"
android:hint="@string/password"
android:inputType="textPassword"
android:paddingLeft="20dp"
android:textSize="15sp" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/relativeLayout3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/relativeLayout2"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="10dp">

<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/rememberMe"
android:textColor="@color/textColor" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@color/transparent"
android:text="@string/fpassword"
android:textAllCaps="false"
android:textColor="@color/textColor"
android:textSize="13sp" />

</RelativeLayout>

<Button
android:id="@+id/button_signin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/relativeLayout3"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@color/colorPrimary"
android:fontFamily="sans-serif-medium"
android:text="@string/signIn"
android:textColor="@color/white" />

<ImageView
android:id="@+id/imageView2"
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_below="@+id/button_signin"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="10dp"
android:layerType="software"
android:src="@drawable/dash" />

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/imageView2"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="@string/loginText"
android:textColor="@color/textColor"
android:textSize="12sp" />

<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView1"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp">


<com.google.android.gms.common.SignInButton
android:id="@+id/google_sign_in_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="0.29000002" />

</LinearLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/linearLayout2"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/signUpMarginBottom"
android:layout_marginTop="@dimen/signUpMarginTop"
android:text="@string/signUp" />

</RelativeLayout>


</android.support.v7.widget.CardView>



</RelativeLayout>
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="136dp"
Expand Down
16 changes: 13 additions & 3 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#03a9f4</color>
<color name="colorPrimaryDark">#0288D1</color>
<color name="colorAccent">#448AFF</color>
<color name="colorPrimary">#FFC50C</color>
<color name="colorPrimaryDark">#E5B009</color>
<color name="colorAccent">#FF4081</color>
<color name="facebookBlue">#3F5996</color>
<color name="twitterBlue">#29C5F6</color>
<color name="googleRed">#D03E2F</color>


<color name="white">#FFFFFF</color>
<color name="transparent">#00000000</color>
<color name="editTextBG">#DADADA</color>

<color name="textColor">#6e6e6e</color>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@
<dimen name="dimen_4dp">4dp</dimen>
<dimen name="profile_img_width">64dp</dimen>
<dimen name="profile_img_height">64dp</dimen>

<!-- Logo Design Demin-->
<dimen name="signUpMarginBottom">10dp</dimen>
<dimen name="signUpMarginTop">5dp</dimen>
</resources>
10 changes: 10 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,15 @@
<string name="settings_title">Settings</string>
<string name="login_welcome_title" >Welcome to Audacity</string>
<string name="home">Home</string>

<!-- Login Page String -->
<string name="name_login">AUdacity Login</string>
<string name="username">Username</string>
<string name="password">Password</string>
<string name="rememberMe">Remember Me</string>
<string name="fpassword">Forgot Password?</string>
<string name="signIn">SIGN IN</string>
<string name="loginText">Or Login with</string>
<string name="signUp">Dont have an account? Sign Up</string>
<string name="hello">Hello</string>
</resources>
9 changes: 9 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
<item name="colorAccent">@color/colorAccent</item>
</style>

<style name="LoginActivity" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar" >
<item name="colorControlNormal">@android:color/white</item>
</style>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.google.gms:google-services:3.2.1'


Expand Down