-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #51 from mnprtpsingh/master
Login Activity Modified
- Loading branch information
Showing
8 changed files
with
69 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,51 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:orientation="vertical" android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
<ImageView | ||
android:layout_width="220dp" | ||
android:layout_height="220dp" | ||
android:layout_centerHorizontal="true" | ||
android:layout_marginTop="40dp" | ||
android:src="@drawable/nimbuslogo" | ||
android:id="@+id/ivAppLogo" | ||
/> | ||
<ImageView | ||
android:id="@+id/ivAppLogo" | ||
android:layout_width="320dp" | ||
android:layout_height="320dp" | ||
android:layout_centerHorizontal="true" | ||
android:layout_marginTop="54dp" | ||
android:src="@drawable/nimbuslogo" /> | ||
|
||
<com.facebook.login.widget.LoginButton | ||
android:layout_width="250dp" | ||
android:layout_height="50dp" | ||
android:layout_centerHorizontal="true" | ||
android:layout_below="@+id/ivAppLogo" | ||
android:paddingBottom="15dp" | ||
android:paddingTop="15dp" | ||
android:textSize="15dp" | ||
android:id="@+id/btnLogin" | ||
android:layout_marginTop="50dp"/> | ||
<ProgressBar | ||
android:id="@+id/pbLogin" | ||
android:layout_width="120dp" | ||
android:layout_height="120dp" | ||
android:visibility="gone" | ||
android:layout_alignParentBottom="true" | ||
android:layout_centerHorizontal="true" | ||
android:layout_marginBottom="54dp" /> | ||
|
||
<ProgressBar | ||
android:layout_width="60dp" | ||
android:layout_height="60dp" | ||
android:layout_below="@+id/btnLogin" | ||
android:layout_centerHorizontal="true" | ||
android:layout_marginTop="100dp" | ||
android:visibility="gone" | ||
android:id="@+id/pbLogin"/> | ||
|
||
</RelativeLayout> | ||
<TextView | ||
android:id="@+id/tvSkip" | ||
android:layout_width="60dp" | ||
android:layout_height="60dp" | ||
android:background="@drawable/ic_skip" | ||
android:gravity="center_vertical" | ||
android:paddingLeft="12dp" | ||
android:text="SKIP" | ||
android:textSize="14dp" | ||
android:textStyle="bold" | ||
android:visibility="visible" | ||
android:layout_alignParentBottom="true" | ||
android:layout_alignParentRight="true" | ||
android:layout_marginBottom="8dp" | ||
android:layout_marginRight="8dp"/> | ||
|
||
<com.facebook.login.widget.LoginButton | ||
android:id="@+id/btnLogin" | ||
android:layout_width="wrap_content" | ||
android:layout_height="32dp" | ||
android:paddingBottom="16dp" | ||
android:paddingTop="16dp" | ||
android:textSize="16dp" | ||
android:layout_alignParentBottom="true" | ||
android:layout_centerHorizontal="true" | ||
android:layout_marginBottom="100dp" /> | ||
|
||
</RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#Mon Dec 28 10:00:20 PST 2015 | ||
#Fri Mar 03 19:49:20 IST 2017 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip |