Merge branch 'fix-9.1'

CHANGELOG.md

@@ -5,6 +5,24 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 9.1 *(in testing)*
+--------------------------
+
+Resolved crashes and layout issues. Latest translations.
+
+### Detailed changes:
+
+* TWEAK Highlight currently active navigation drawer item. Only available on Android 3.0 (Honeycomb) and up.
+* TWEAK Reorganize settings. Notably extracted notification related settings to their own page. Notify about all shows by default (previously only favorites).
+* TWEAK Updated shouts screen to be more in line with the rest of the app, e.g. added action bar.
+* TWEAK Removed navigation drawer from some not directly content related screens (e.g. help, tools).
+* FIX Screen partially blacks out on certain Nexus devices. Also see #309.
+* FIX Crashes when connecting to trakt, showing manage lists dialog.
+* FIX Crash in full screen mode on Android 3.x (Honeycomb) devices.
+* FIX Slow-down in add activity when trakt was offline, crash when trakt was disconnected.
+* FIX In some cases the subscription check crashes if the user leaves the app in the meantime.
+* NOTICE Latest translations from crowdin.
+
 Version 9 *(2013-11-08)*
 ----------------------------
 

SeriesGuide/build.gradle

@@ -19,8 +19,8 @@ android {
     productFlavors {
         free {
             packageName "com.battlelancer.seriesguide"
-            versionCode 187
-            versionName "9"
+            versionCode 190
+            versionName "9.1"
         }
         beta {
             packageName "com.battlelancer.seriesguide.beta"
@@ -44,7 +44,6 @@ android {
 
 dependencies {
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile 'net.simonvt.menudrawer:menudrawer:3.0.4@aar'
     compile project(':libraries:androidutils')
     compile project(':libraries:pagerslidingtabstrip')
     compile project(':libraries:stickygridheaders')

SeriesGuide/src/main/java/com/battlelancer/seriesguide/SeriesGuideApplication.java

@@ -20,7 +20,7 @@
 import com.google.analytics.tracking.android.GoogleAnalytics;
 
 import com.battlelancer.seriesguide.settings.AppSettings;
-import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.util.ImageProvider;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.androidutils.AndroidUtils;
@@ -30,7 +30,6 @@
 import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.ContentProvider;
-import android.content.SharedPreferences;
 import android.os.StrictMode;
 import android.os.StrictMode.ThreadPolicy;
 import android.os.StrictMode.VmPolicy;
@@ -62,9 +61,7 @@ public void onCreate() {
         PreferenceManager.setDefaultValues(this, R.xml.settings_advanced, false);
 
         // Load the current theme into a global variable
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        final String theme = prefs.getString(SeriesGuidePreferences.KEY_THEME, "0");
-        Utils.updateTheme(theme);
+        Utils.updateTheme(DisplaySettings.getThemeIndex(this));
 
         // Ensure GA opt-out
         GoogleAnalytics.getInstance(this).setAppOptOut(AppSettings.isGaAppOptOut(this));

SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/SearchResultsAdapter.java

@@ -1,6 +1,12 @@
 
 package com.battlelancer.seriesguide.adapters;
 
+import com.battlelancer.seriesguide.ui.SearchFragment;
+import com.battlelancer.seriesguide.ui.SearchFragment.SearchQuery;
+import com.battlelancer.seriesguide.util.EpisodeTools;
+import com.battlelancer.seriesguide.util.Utils;
+import com.uwetrottmann.seriesguide.R;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -13,15 +19,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.battlelancer.seriesguide.ui.SearchFragment;
-import com.battlelancer.seriesguide.ui.SearchFragment.SearchQuery;
-import com.battlelancer.seriesguide.util.EpisodeTools;
-import com.battlelancer.seriesguide.util.Utils;
-import com.uwetrottmann.seriesguide.R;
-
 /**
- * {@link CursorAdapter} displaying episode search results inside the
- * {@link SearchFragment}.
+ * {@link CursorAdapter} displaying episode search results inside the {@link SearchFragment}.
  */
 public class SearchResultsAdapter extends CursorAdapter {
 
@@ -69,8 +68,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
         viewHolder.showTitle.setText(mCursor.getString(SearchQuery.SHOW_TITLE));
         viewHolder.watchedStatus.setImageResource(
                 EpisodeTools.isWatched(mCursor.getInt(SearchQuery.WATCHED))
-                ? R.drawable.ic_ticked
-                : Utils.resolveAttributeToResourceId(mContext.getTheme(), R.attr.drawableWatch));
+                        ? R.drawable.ic_ticked
+                        : Utils.resolveAttributeToResourceId(mContext.getTheme(),
+                                R.attr.drawableWatch));
 
         // ensure matched term is bold
         viewHolder.searchSnippet.setText(Html.fromHtml(mCursor.getString(SearchQuery.OVERVIEW)));
@@ -79,7 +79,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
         int number = mCursor.getInt(SearchQuery.NUMBER);
         int season = mCursor.getInt(SearchQuery.SEASON);
         String title = mCursor.getString(SearchQuery.TITLE);
-        viewHolder.episodeTitle.setText(Utils.getNextEpisodeString(mPrefs, season, number, title));
+        viewHolder.episodeTitle
+                .setText(Utils.getNextEpisodeString(mContext, season, number, title));
 
         return convertView;
     }
@@ -94,9 +95,13 @@ public View newView(Context context, Cursor cursor, ViewGroup parent) {
     }
 
     static class ViewHolder {
+
         TextView showTitle;
+
         TextView episodeTitle;
+
         TextView searchSnippet;
+
         ImageView watchedStatus;
     }
 }