Merge branch 'release/4.8'

BoardGameGeek/.classpath

@@ -5,7 +5,12 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="libs/picasso-2.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/okhttp-1.5.3.jar"/>
+	<classpathentry kind="lib" path="libs/simple-xml-2.7.1.jar"/>
+	<classpathentry kind="lib" path="libs/gson-2.2.4.jar"/>
+	<classpathentry kind="lib" path="libs/okio-1.0.0.jar"/>
+	<classpathentry kind="lib" path="libs/okhttp-2.0.0.jar"/>
+	<classpathentry kind="lib" path="libs/okhttp-urlconnection-2.0.0.jar"/>
+	<classpathentry kind="lib" path="libs/retrofit-1.6.1.jar"/>
+	<classpathentry kind="lib" path="libs/picasso-2.3.3.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

BoardGameGeek/AndroidManifest.xml

@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.boardgamegeek"
 	android:installLocation="auto"
-	android:versionCode="36"
-	android:versionName="4.7.3" >
+	android:versionCode="37"
+	android:versionName="4.8" >
 
 	<uses-sdk
-		android:minSdkVersion="8"
-		android:targetSdkVersion="19" />
+		android:minSdkVersion="9"
+		android:targetSdkVersion="20" />
 
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
@@ -43,14 +43,6 @@
 			android:exported="false"
 			android:label="@string/title_collection"
 			android:uiOptions="splitActionBarWhenNarrow" >
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:mimeType="vnd.android.cursor.dir/vnd.boardgamegeek.collection" />
-			</intent-filter>
-
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".ui.HomeActivity" />
@@ -122,14 +114,6 @@
 			android:name=".ui.BuddiesActivity"
 			android:exported="false"
 			android:label="@string/title_buddies" >
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:mimeType="vnd.android.cursor.dir/vnd.boardgamegeek.buddy" />
-			</intent-filter>
-
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".ui.HomeActivity" />
@@ -138,14 +122,6 @@
 			android:name=".ui.BuddyActivity"
 			android:exported="false"
 			android:label="@string/title_buddy" >
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:mimeType="vnd.android.cursor.item/vnd.boardgamegeek.buddy" />
-			</intent-filter>
-
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".ui.BuddiesActivity" />
@@ -154,42 +130,26 @@
 			android:name=".ui.PlaysActivity"
 			android:exported="false"
 			android:label="@string/title_plays" >
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:mimeType="vnd.android.cursor.dir/vnd.boardgamegeek.play" />
-			</intent-filter>
-
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".ui.HomeActivity" />
 		</activity>
 		<activity
 			android:name=".ui.PlayActivity"
 			android:exported="false"
-			android:label="@string/title_play"
-			android:launchMode="singleTop" >
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:mimeType="vnd.android.cursor.item/vnd.boardgamegeek.play" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.EDIT" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-
-				<data android:mimeType="vnd.android.cursor.item/vnd.boardgamegeek.play" />
-			</intent-filter>
-
+			android:label="@string/title_play" >
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".ui.PlaysActivity" />
 		</activity>
+		<activity
+			android:name=".ui.PlayerActivity"
+			android:exported="false"
+			android:label="@string/title_player" >
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value=".ui.BuddiesActivity" />
+		</activity>
 		<activity
 			android:name=".ui.SearchResultsActivity"
 			android:configChanges="keyboardHidden|orientation"

BoardGameGeek/res/layout/actionbar_done_cancel.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/ActionBar"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent" >
+
+	<LinearLayout
+		android:id="@+id/menu_cancel"
+		style="@style/ActionBarButton" >
+
+		<ImageView
+			style="@style/ActionBarButtonImage"
+			android:src="@drawable/ic_action_cancel_light" />
+
+		<TextView
+			style="@style/ActionBarButtonText"
+			android:text="@string/cancel" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/menu_done"
+		style="@style/ActionBarButton" >
+
+		<ImageView
+			style="@style/ActionBarButtonImage"
+			android:src="@drawable/ic_action_accept_light" />
+
+		<TextView
+			style="@style/ActionBarButtonText"
+			android:text="@string/done" />
+	</LinearLayout>
+
+</LinearLayout>

BoardGameGeek/res/layout/activity_logplay.xml

@@ -1,16 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mobeta.android.dslv.DragSortListView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:dslv="http://schemas.android.com/apk/res-auto"
-	android:id="@android:id/list"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:headerDividersEnabled="false"
-	android:padding="@dimen/padding_standard"
-	dslv:collapsed_height="@dimen/padding_standard"
-	dslv:drag_handle_id="@+id/drag_handle"
-	dslv:drag_start_mode="onDown"
-	dslv:float_alpha="0.75"
-	dslv:float_background_color="@color/abs__background_holo_light"
-	dslv:remove_enabled="false"
-	dslv:sort_enabled="true"
-	dslv:use_default_controller="true" />
+	android:layout_height="match_parent" >
+
+	<ProgressBar
+		android:id="@+id/progress"
+		style="?android:attr/progressBarStyleLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center" />
+
+	<LinearLayout
+		android:id="@+id/form"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:visibility="gone" >
+
+		<com.mobeta.android.dslv.DragSortListView
+			xmlns:dslv="http://schemas.android.com/apk/res-auto"
+			android:id="@android:id/list"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1"
+			android:footerDividersEnabled="false"
+			android:headerDividersEnabled="false"
+			dslv:collapsed_height="@dimen/padding_standard"
+			dslv:drag_handle_id="@+id/drag_handle"
+			dslv:drag_start_mode="onDown"
+			dslv:float_alpha="0.75"
+			dslv:float_background_color="@color/abs__background_holo_light"
+			dslv:remove_enabled="false"
+			dslv:sort_enabled="true"
+			dslv:use_default_controller="true" />
+
+		<View style="@style/BottomButtonDivider" />
+
+		<LinearLayout
+			style="@style/BottomButtonBar"
+			android:animateLayoutChanges="true" >
+
+			<Button
+				android:id="@+id/add_field"
+				style="@style/BottomButton"
+				android:gravity="center"
+				android:onClick="addField"
+				android:text="@string/add_field" />
+
+			<Button
+				android:id="@+id/add_player"
+				style="@style/BottomButton"
+				android:gravity="center"
+				android:onClick="addPlayer"
+				android:text="@string/add_player" />
+		</LinearLayout>
+	</LinearLayout>
+
+</FrameLayout>