Skip to content

Commit

Permalink
Enable google and facebook login, Update LoginActivity layout
Browse files Browse the repository at this point in the history
  • Loading branch information
samirjaiswal committed Jun 30, 2015
1 parent a117252 commit dd543f0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
13 changes: 8 additions & 5 deletions app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:orientation="vertical"
android:gravity="bottom"
android:background="@color/red"
tools:context="com.mac.themac.activity.LoginActivity">

<TextView
Expand All @@ -22,32 +24,33 @@
android:id="@+id/login_with_facebook"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/login_with_facebook"
/>

<com.google.android.gms.common.SignInButton
android:id="@+id/login_with_google"
android:text="@string/login_with_google"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>

<Button
android:id="@+id/login_with_twitter"
android:text="@string/login_with_twitter"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>

<Button
android:id="@+id/login_with_password"
android:text="@string/login_with_password"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:visibility="gone"/>

<Button
android:id="@+id/login_anonymously"
android:text="@string/login_anonymously"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:visibility="gone"/>

</LinearLayout>
4 changes: 4 additions & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="red">#ffff0000</color>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/keys.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- Your Facebook App ID from your app settings on https://developers.facebook.com/ -->
<!-- More details here: https://www.firebase.com/docs/android/guide/login/facebook.html -->
<string name="facebook_app_id">your-facebook-app-id</string>
<string name="facebook_app_id">1604656406485757</string>

<!-- Your Twitter consumer key and secret from your app settings on https://apps.twitter.com/ -->
<!-- More details here: https://www.firebase.com/docs/android/guide/login/twitter.html -->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<style name="AppTheme" parent="android:Theme.NoTitleBar">
<!-- Customize your theme here. -->
</style>

Expand Down
Binary file added themackeystore.jks
Binary file not shown.

0 comments on commit dd543f0

Please sign in to comment.