Merge pull request #267 from rpandey1234/login

Login fix

AndroidManifest.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.additt.maple_android"
-    android:versionCode="8"
-    android:versionName="1.8" >
+    android:versionCode="9"
+    android:versionName="1.9" >
 
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -45,6 +47,7 @@
             android:label="@string/title_activity_login" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -86,6 +89,10 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_full_image" >
         </activity>
+        <activity
+            android:name="com.additt.maple_android.MainActivity"
+            android:label="@string/title_activity_main" >
+        </activity>
     </application>
 
 </manifest>

README.md

@@ -1,6 +1,11 @@
-Nudge Android
+Additt Android
 ----
 
-Ben Rudpolph
-Rahul Pandey
-Eli Hart
+Created by: Ben Rudpolph, Rahul Pandey, Eli Hart
+
+Contact info: [email protected]
+
+Additt is crowd-sourced advertising that you'll love. We make it easy, fun, and addicting for you to create ads for companies and brands. Our app seamlessly connects to our website where you can browse other published ads, see different campaigns, and vote on ads. High quality ads get exciting rewards from Additt or the sponsoring organization!
+Log in with Facebook to enjoy the full experience. Check out the full platform at additt.co!
+
+Download the Android app on the [Play store](https://play.google.com/store/apps/details?id=com.additt.maple_android)

res/layout/activity_login.xml

@@ -1,25 +1,16 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".LoginActivity"
-    android:background="#191919" >
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
-    <ImageView
-        android:id="@+id/additt_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/additt_logo"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="62dp" />
-
-    <Button
-        android:id="@+id/loginB"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@layout/button_sign_in"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"/>
-
-</RelativeLayout>
+    <fragment android:name="com.additt.maple_android.SelectionFragment"
+          android:id="@+id/selectionFragment"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent" />
+    <fragment android:name="com.additt.maple_android.SplashFragment"
+          android:id="@+id/splashFragment"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent" />
+</LinearLayout>

res/layout/selection.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+	<TextView
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_marginLeft="10dp"
+	    android:layout_gravity="center"
+	    android:textColor="#333"
+	    android:textSize="18sp"
+	    android:text="Welcome, you are now logged in."  />
+
+</LinearLayout>

res/layout/splash.xml

@@ -0,0 +1,38 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".LoginActivity"
+    android:background="#191919" >
+
+    <ImageView
+        android:id="@+id/additt_logo"
+        android:layout_width="wrap_content"
+        android:contentDescription="Additt logo"
+        android:layout_height="wrap_content"
+        android:src="@drawable/additt_logo"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp" />
+
+ 	<TextView
+            android:id="@+id/profile_name"
+            android:layout_width="174dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="35dp"
+            android:lines="2"
+            android:textSize="17sp"
+            android:textColor="#FFFFFF"
+            android:text="To get started, log in using Facebook"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"/>
+
+    <com.facebook.widget.LoginButton
+            android:id="@+id/login_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="30dp" />
+
+</LinearLayout>

res/values/strings.xml

@@ -34,5 +34,6 @@
     <string name="title_activity_full_image">FullImageActivity</string>
     <string name="dummy_button">Dummy Button</string>
     <string name="dummy_content">DUMMY\nCONTENT</string>
+    <string name="title_activity_main">MainActivity</string>
 
 </resources>