From dd543f0b76a70c015e07f9f5904de56b2a7fd0c7 Mon Sep 17 00:00:00 2001
From: Samir Jaiswal <sjaiswal@hachisoft.com>
Date: Tue, 30 Jun 2015 13:01:16 -0700
Subject: [PATCH] Enable google and facebook login, Update LoginActivity layout

---
 app/src/main/res/layout/activity_login.xml |  13 ++++++++-----
 app/src/main/res/values/colors.xml         |   4 ++++
 app/src/main/res/values/keys.xml           |   2 +-
 app/src/main/res/values/styles.xml         |   2 +-
 themackeystore.jks                         | Bin 0 -> 4140 bytes
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/values/colors.xml
 create mode 100644 themackeystore.jks

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 6b814b0..0c1fbe9 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -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
@@ -22,7 +24,6 @@
         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"
         />
 
@@ -30,24 +31,26 @@
         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>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..6351832
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="red">#ffff0000</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 5e23498..90bae8e 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -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 -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ff6c9d2..ccb41fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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>
 
diff --git a/themackeystore.jks b/themackeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..ae966c584b905c1ba63ee5130e2078d9a3461489
GIT binary patch
literal 4140
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

literal 0
HcmV?d00001