Merge branch 'hotfix/4.7.2'

ccomeaux · Apr 14, 2014 · 057f25e · 057f25e
2 parents 2c1292d + 4919b9f
commit 057f25e
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 147 deletions.
diff --git a/BoardGameGeek/AndroidManifest.xml b/BoardGameGeek/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.boardgamegeek"
 	android:installLocation="auto"
-	android:versionCode="34"
-	android:versionName="4.7.1" >
+	android:versionCode="35"
+	android:versionName="4.7.2" >
 
 	<uses-sdk
 		android:minSdkVersion="8"

diff --git a/BoardGameGeek/res/layout/row_forumthread.xml b/BoardGameGeek/res/layout/row_forumthread.xml
@@ -36,29 +36,20 @@
 			android:gravity="right" />
 	</LinearLayout>
 
-	<LinearLayout
+	<TextView
+		android:id="@+id/thread_postdate"
+		style="@style/Text.Secondary"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal" >
-
-		<TextView
-			android:id="@+id/thread_postdate"
-			style="@style/Text.Secondary"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="left|center_vertical"
-			android:layout_weight="1"
-			android:maxLines="1" />
+		android:layout_gravity="left|center_vertical"
+		android:maxLines="1" />
 
-		<TextView
-			android:id="@+id/thread_lastpostdate"
-			style="@style/Text.Secondary"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="left|center_vertical"
-			android:layout_weight="1"
-			android:gravity="right"
-			android:maxLines="1" />
-	</LinearLayout>
+	<TextView
+		android:id="@+id/thread_lastpostdate"
+		style="@style/Text.Secondary"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left|center_vertical"
+		android:maxLines="1" />
 
 </LinearLayout>
diff --git a/BoardGameGeek/res/layout/row_forumthread_wide.xml b/BoardGameGeek/res/layout/row_forumthread_wide.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/RowContainer"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:paddingBottom="@dimen/padding_small" >
+
+	<TextView
+		android:id="@+id/thread_title"
+		style="@style/Text.Primary"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingBottom="@dimen/padding_small" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal" >
+
+		<TextView
+			android:id="@+id/thread_author"
+			style="@style/Text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="right|center_vertical"
+			android:layout_weight="1" />
+
+		<TextView
+			android:id="@+id/thread_numarticles"
+			style="@style/Text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="right|center_vertical"
+			android:layout_weight="1"
+			android:gravity="right" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal" >
+
+		<TextView
+			android:id="@+id/thread_postdate"
+			style="@style/Text.Secondary"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="left|center_vertical"
+			android:layout_weight="1"
+			android:maxLines="1" />
+
+		<TextView
+			android:id="@+id/thread_lastpostdate"
+			style="@style/Text.Secondary"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="left|center_vertical"
+			android:layout_weight="1"
+			android:gravity="right"
+			android:maxLines="1" />
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/BoardGameGeek/res/values-normal/layout.xml b/BoardGameGeek/res/values-normal/layout.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<item name="row_forumthread" type="layout">@layout/row_forumthread</item>
+
+</resources>
diff --git a/BoardGameGeek/res/values-sw320dp/layout.xml b/BoardGameGeek/res/values-sw320dp/layout.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<item name="row_forumthread" type="layout">@layout/row_forumthread_wide</item>
+
+</resources>
diff --git a/BoardGameGeek/res/values/strings_prefs.xml b/BoardGameGeek/res/values/strings_prefs.xml
@@ -78,7 +78,21 @@
 	<string name="pref_about_version">Version</string>
 	<string name="pref_about_app_name_and_version"><![CDATA[<b>BoardGameGeek</b> <font color="#888888">%s</font>]]></string>
 	<string name="pref_about_body">
-<![CDATA[<b>What\'s New?</b><br/>
+<![CDATA[<h4>What\'s New?</h4>
+<h5>4.7.2</h5>
+<ul>
+<li>Fix crash when viewing buddy collection</li>
+<li>Don\'t allow clicking on forum header</li>
+<li>When saving a view, enable the Save button correctly<li>
+<li>When deleting a view, go back to the default view</li>
+<li>Improve format of forum for narrow screens</li>
+<li>Clicking the h-index notification takes you to a BGG thread</li>
+</ul>
+<h5>4.7.1</h5>
+<ul>
+<li>No more crashes</li>
+</ul>
+<h5>4.7</h5>
 <ul>
 <li>Sticky headers and bigger images in lists</li>
 <li>Set a collection view as the default</li>

diff --git a/BoardGameGeek/src/com/boardgamegeek/service/SyncService.java b/BoardGameGeek/src/com/boardgamegeek/service/SyncService.java
@@ -2,11 +2,13 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
@@ -171,8 +173,11 @@ private static void notifyHIndex(Context context, int hIndex, int oldHIndex) {
 			messageId = R.string.sync_notification_h_index_decrease;
 		}
 		SpannableString ss = StringUtils.boldSecondString(context.getString(messageId), String.valueOf(hIndex));
-		NotificationCompat.Builder builder = NotificationUtils.createNotificationBuilder(context,
-			R.string.sync_notification_title_h_index, PlaysActivity.class).setContentText(ss);
+		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://boardgamegeek.com/thread/953084"));
+		PendingIntent pi = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+		NotificationCompat.Builder builder = NotificationUtils
+			.createNotificationBuilder(context, R.string.sync_notification_title_h_index, PlaysActivity.class)
+			.setContentText(ss).setContentIntent(pi);
 		NotificationUtils.notify(context, NotificationUtils.ID_H_INDEX, builder);
 	}
 }