Merge pull request #2 from puntubabu/pradeep

Pradeep

Quizdom/.classpath

@@ -3,8 +3,8 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/sqladmin-v1beta3r17lv1.18.0-rc"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/sqladmin-v1beta3r17lv1.18.0-rc"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

Quizdom/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.breanawiggins.quizdom">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
+    <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="19"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
    <permission android:name="com.breanawiggins.quizdom.permission.C2D_MESSAGE" android:protectionLevel="signature"/>

Quizdom/bin/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.breanawiggins.quizdom">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
+    <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="19"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
    <permission android:name="com.breanawiggins.quizdom.permission.C2D_MESSAGE" android:protectionLevel="signature"/>

Quizdom/bin/R.txt

@@ -4,6 +4,7 @@ int anim abc_slide_in_bottom 0x7f040002
 int anim abc_slide_in_top 0x7f040003
 int anim abc_slide_out_bottom 0x7f040004
 int anim abc_slide_out_top 0x7f040005
+int anim anim_scale 0x7f040006
 int attr actionBarDivider 0x7f01000f
 int attr actionBarItemBackground 0x7f010010
 int attr actionBarSize 0x7f01000e
@@ -255,54 +256,57 @@ int id action_context_bar 0x7f05001d
 int id action_menu_divider 0x7f050016
 int id action_menu_presenter 0x7f050017
 int id action_mode_close_button 0x7f050024
-int id action_settings 0x7f050051
+int id action_settings 0x7f050054
 int id activity_chooser_view_content 0x7f050025
 int id always 0x7f05000b
 int id beginning 0x7f050011
-int id btnAddFriend 0x7f05003e
-int id buttonCreate 0x7f05004f
-int id buttonSignIn 0x7f050049
-int id buttonSignUp 0x7f050048
+int id btnAddFriend 0x7f05003d
+int id btnDeleteFriend 0x7f050053
+int id btnRequest 0x7f050045
+int id btnSignOut 0x7f050044
+int id buttonCreate 0x7f050050
+int id buttonSignIn 0x7f05004a
+int id buttonSignUp 0x7f050049
 int id checkbox 0x7f05002d
 int id collapseActionView 0x7f05000d
 int id container 0x7f05003c
 int id default_activity_button 0x7f050028
 int id dialog 0x7f05000e
 int id disableHome 0x7f050008
 int id dropdown 0x7f05000f
-int id editTextConfirmPassword 0x7f05004c
-int id editTextPassword 0x7f05004d
-int id editTextPasswordToLogin 0x7f050046
-int id editTextUserName 0x7f05004e
-int id editTextUserNameToLogin 0x7f050047
+int id editTextConfirmPassword 0x7f05004d
+int id editTextPassword 0x7f05004e
+int id editTextPasswordToLogin 0x7f050047
+int id editTextUserName 0x7f05004f
+int id editTextUserNameToLogin 0x7f050048
 int id edit_query 0x7f050030
 int id end 0x7f050013
-int id etFriend 0x7f05003f
+int id etFriend 0x7f05003e
 int id expand_activities_button 0x7f050026
 int id expanded_menu 0x7f05002c
+int id friendname 0x7f050052
 int id home 0x7f050014
 int id homeAsUp 0x7f050005
 int id icon 0x7f05002a
 int id ifRoom 0x7f05000a
-int id imFriends 0x7f050043
+int id imFriends 0x7f050042
 int id image 0x7f050027
-int id imageButton1 0x7f050041
-int id imageButton3 0x7f050040
-int id imageButton4 0x7f050042
-int id imgLogo 0x7f050050
+int id imageButton1 0x7f050040
+int id imageButton3 0x7f05003f
+int id imageButton4 0x7f050041
+int id imgLogo 0x7f050051
 int id listMode 0x7f050001
 int id list_item 0x7f050029
-int id loginbutton 0x7f050045
-int id lvFriends 0x7f05003d
+int id loginbutton 0x7f050046
 int id middle 0x7f050012
-int id msgView 0x7f05004a
+int id msgView 0x7f05004b
 int id never 0x7f050009
 int id none 0x7f050010
 int id normal 0x7f050000
 int id progress_circular 0x7f050018
 int id progress_horizontal 0x7f050019
 int id radio 0x7f05002f
-int id regButton 0x7f05004b
+int id regButton 0x7f05004c
 int id search_badge 0x7f050032
 int id search_bar 0x7f050031
 int id search_button 0x7f050033
@@ -322,7 +326,7 @@ int id submit_area 0x7f050039
 int id tabMode 0x7f050002
 int id title 0x7f05002b
 int id top_action_bar 0x7f050020
-int id tvCurrentUser 0x7f050044
+int id tvCurrentUser 0x7f050043
 int id up 0x7f050021
 int id useLogo 0x7f050003
 int id withText 0x7f05000c
@@ -361,7 +365,8 @@ int layout activity_signup 0x7f03001e
 int layout activity_splash 0x7f03001f
 int layout fragment_friends_list 0x7f030020
 int layout fragment_main 0x7f030021
-int layout support_simple_spinner_dropdown_item 0x7f030022
+int layout single_friend 0x7f030022
+int layout support_simple_spinner_dropdown_item 0x7f030023
 int menu friends_list 0x7f0c0000
 int menu main 0x7f0c0001
 int string abc_action_bar_home_description 0x7f0a0001
@@ -380,7 +385,10 @@ int string abc_shareactionprovider_share_with_application 0x7f0a000b
 int string action_settings 0x7f0a000f
 int string addfriend 0x7f0a0011
 int string app_name 0x7f0a000d
+int string deleteFriend 0x7f0a0012
 int string hello_world 0x7f0a000e
+int string request 0x7f0a0014
+int string signOut 0x7f0a0013
 int string title_activity_friends_list 0x7f0a0010
 int style AppBaseTheme 0x7f0b008b
 int style AppTheme 0x7f0b008c

Quizdom/bin/jarlist.cache

@@ -1,5 +1,5 @@
 # cache for current jar dependency. DO NOT EDIT.
 # format is <lastModified> <length> <SHA-1> <path>
 # Encoding is UTF-8
-1402412940000 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd /Users/puntubabu/Desktop/MobileAppsClass/Quizdom/libs/android-support-v4.jar
-1400176823000 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd /Users/puntubabu/Desktop/MobileAppsClass/appcompat_v7/libs/android-support-v4.jar
+1400176823000 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd /Users/puntubabu/Downloads/capstone/android-support-v7-appcompat/libs/android-support-v4.jar
+1402412940000 648327 ded9acc6a9792b8f1afc470f0c9cd36d178914cd /Users/puntubabu/Downloads/Quizdom 2/Quizdom/libs/android-support-v4.jar

Quizdom/bin/proguard.txt

@@ -73,6 +73,8 @@
 # view AndroidManifest.xml #generated:36
 -keep class com.google.android.gcm.GCMBroadcastReceiver { <init>(...); }
 
+# onClick res/layout/activity_friends_list.xml #generated:21
 # onClick res/layout/activity_home.xml #generated:37
+# onClick res/layout/activity_home.xml #generated:57
 -keepclassmembers class * { *** onClick(...); }
 

Quizdom/gen/android/support/v7/appcompat/R.java

@@ -343,7 +343,7 @@ public static final class layout {
 		public static final int abc_search_dropdown_item_icons_2line = 0x7f030015;
 		public static final int abc_search_view = 0x7f030016;
 		public static final int abc_simple_decor = 0x7f030017;
-		public static final int support_simple_spinner_dropdown_item = 0x7f030022;
+		public static final int support_simple_spinner_dropdown_item = 0x7f030023;
 	}
 	public static final class string {
 		public static final int abc_action_bar_home_description = 0x7f0a0001;

Quizdom/gen/com/breanawiggins/quizdom/R.java

@@ -15,6 +15,7 @@ public static final class anim {
         public static final int abc_slide_in_top=0x7f040003;
         public static final int abc_slide_out_bottom=0x7f040004;
         public static final int abc_slide_out_top=0x7f040005;
+        public static final int anim_scale=0x7f040006;
     }
     public static final class attr {
         /**  Custom divider drawable to use for elements in the action bar. 
@@ -1100,54 +1101,57 @@ public static final class id {
         public static final int action_menu_divider=0x7f050016;
         public static final int action_menu_presenter=0x7f050017;
         public static final int action_mode_close_button=0x7f050024;
-        public static final int action_settings=0x7f050051;
+        public static final int action_settings=0x7f050054;
         public static final int activity_chooser_view_content=0x7f050025;
         public static final int always=0x7f05000b;
         public static final int beginning=0x7f050011;
-        public static final int btnAddFriend=0x7f05003e;
-        public static final int buttonCreate=0x7f05004f;
-        public static final int buttonSignIn=0x7f050049;
-        public static final int buttonSignUp=0x7f050048;
+        public static final int btnAddFriend=0x7f05003d;
+        public static final int btnDeleteFriend=0x7f050053;
+        public static final int btnRequest=0x7f050045;
+        public static final int btnSignOut=0x7f050044;
+        public static final int buttonCreate=0x7f050050;
+        public static final int buttonSignIn=0x7f05004a;
+        public static final int buttonSignUp=0x7f050049;
         public static final int checkbox=0x7f05002d;
         public static final int collapseActionView=0x7f05000d;
         public static final int container=0x7f05003c;
         public static final int default_activity_button=0x7f050028;
         public static final int dialog=0x7f05000e;
         public static final int disableHome=0x7f050008;
         public static final int dropdown=0x7f05000f;
-        public static final int editTextConfirmPassword=0x7f05004c;
-        public static final int editTextPassword=0x7f05004d;
-        public static final int editTextPasswordToLogin=0x7f050046;
-        public static final int editTextUserName=0x7f05004e;
-        public static final int editTextUserNameToLogin=0x7f050047;
+        public static final int editTextConfirmPassword=0x7f05004d;
+        public static final int editTextPassword=0x7f05004e;
+        public static final int editTextPasswordToLogin=0x7f050047;
+        public static final int editTextUserName=0x7f05004f;
+        public static final int editTextUserNameToLogin=0x7f050048;
         public static final int edit_query=0x7f050030;
         public static final int end=0x7f050013;
-        public static final int etFriend=0x7f05003f;
+        public static final int etFriend=0x7f05003e;
         public static final int expand_activities_button=0x7f050026;
         public static final int expanded_menu=0x7f05002c;
+        public static final int friendname=0x7f050052;
         public static final int home=0x7f050014;
         public static final int homeAsUp=0x7f050005;
         public static final int icon=0x7f05002a;
         public static final int ifRoom=0x7f05000a;
-        public static final int imFriends=0x7f050043;
+        public static final int imFriends=0x7f050042;
         public static final int image=0x7f050027;
-        public static final int imageButton1=0x7f050041;
-        public static final int imageButton3=0x7f050040;
-        public static final int imageButton4=0x7f050042;
-        public static final int imgLogo=0x7f050050;
+        public static final int imageButton1=0x7f050040;
+        public static final int imageButton3=0x7f05003f;
+        public static final int imageButton4=0x7f050041;
+        public static final int imgLogo=0x7f050051;
         public static final int listMode=0x7f050001;
         public static final int list_item=0x7f050029;
-        public static final int loginbutton=0x7f050045;
-        public static final int lvFriends=0x7f05003d;
+        public static final int loginbutton=0x7f050046;
         public static final int middle=0x7f050012;
-        public static final int msgView=0x7f05004a;
+        public static final int msgView=0x7f05004b;
         public static final int never=0x7f050009;
         public static final int none=0x7f050010;
         public static final int normal=0x7f050000;
         public static final int progress_circular=0x7f050018;
         public static final int progress_horizontal=0x7f050019;
         public static final int radio=0x7f05002f;
-        public static final int regButton=0x7f05004b;
+        public static final int regButton=0x7f05004c;
         public static final int search_badge=0x7f050032;
         public static final int search_bar=0x7f050031;
         public static final int search_button=0x7f050033;
@@ -1167,7 +1171,7 @@ public static final class id {
         public static final int tabMode=0x7f050002;
         public static final int title=0x7f05002b;
         public static final int top_action_bar=0x7f050020;
-        public static final int tvCurrentUser=0x7f050044;
+        public static final int tvCurrentUser=0x7f050043;
         public static final int up=0x7f050021;
         public static final int useLogo=0x7f050003;
         public static final int withText=0x7f05000c;
@@ -1232,7 +1236,8 @@ public static final class layout {
         public static final int activity_splash=0x7f03001f;
         public static final int fragment_friends_list=0x7f030020;
         public static final int fragment_main=0x7f030021;
-        public static final int support_simple_spinner_dropdown_item=0x7f030022;
+        public static final int single_friend=0x7f030022;
+        public static final int support_simple_spinner_dropdown_item=0x7f030023;
     }
     public static final class menu {
         public static final int friends_list=0x7f0c0000;
@@ -1282,7 +1287,10 @@ public static final class string {
         public static final int action_settings=0x7f0a000f;
         public static final int addfriend=0x7f0a0011;
         public static final int app_name=0x7f0a000d;
+        public static final int deleteFriend=0x7f0a0012;
         public static final int hello_world=0x7f0a000e;
+        public static final int request=0x7f0a0014;
+        public static final int signOut=0x7f0a0013;
         public static final int title_activity_friends_list=0x7f0a0010;
     }
     public static final class style {

Quizdom/project.properties

@@ -12,4 +12,4 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.
 
 # Project target.
 target=android-19
-android.library.reference.1=../appcompat_v7
+android.library.reference.1=../../capstone/android-support-v7-appcompat

Quizdom/res/anim/anim_scale.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+   android:interpolator="@android:anim/linear_interpolator">
+   <scale
+       android:fromXScale="1.0"
+       android:toXScale="1.5"
+       android:fromYScale="1.0"
+       android:toYScale="1.5"
+       android:pivotX="50%"
+       android:pivotY="50%"
+       android:duration="500"
+       android:repeatCount="infinite"
+       android:repeatMode="reverse" />
+</set>

Quizdom/res/layout/activity_friends_list.xml

@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:background="@drawable/loginback" >
     <ListView
-        android:id="@+id/lvFriends"
+        android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/btnAddFriend"

Quizdom/res/layout/activity_home.xml

@@ -54,4 +54,24 @@
         android:layout_marginBottom="33dp" 
         />
 
+    <Button
+        android:id="@+id/btnSignOut"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/imageButton3"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="46dp"
+        android:text="@string/signOut" 
+        android:onClick="onClick"/>
+
+    <Button
+        android:id="@+id/btnRequest"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignRight="@+id/imFriends"
+        android:layout_marginTop="16dp"
+        android:text="@string/request" />
+
 </RelativeLayout>

Quizdom/res/layout/friendrow.xml

@@ -0,0 +1,7 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/rowTextView" 
+ android:layout_width="fill_parent" 
+ android:layout_height="wrap_content"
+ android:padding="10dp"
+ android:textSize="16sp" >
+</TextView>

Quizdom/res/layout/single_friend.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" 
+    android:descendantFocusability="blocksDescendants"
+    >
+
+    <TextView
+        android:id="@+id/friendname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="30dp" />
+
+    <Button
+        android:id="@+id/btnDeleteFriend"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/deleteFriend"
+        android:layout_gravity="right" />
+
+</LinearLayout>

Quizdom/res/values/strings.xml

@@ -6,5 +6,8 @@
     <string name="action_settings">Settings</string>
     <string name="title_activity_friends_list">FriendsListActivity</string>
     <string name="addfriend">Add Friend</string>
-
+    <string name="deleteFriend">Delete Friend</string>
+    <string name="signOut">Sign Out</string>
+    <string name="request">!</string>
+
 </resources>