From e63cac574e42f8d3ed39bdecd18de7a567926ab4 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 08:26:44 +0100
Subject: [PATCH 01/74] Add supportsRtl tag to manifest.

---
 SeriesGuide/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeriesGuide/src/main/AndroidManifest.xml b/SeriesGuide/src/main/AndroidManifest.xml
index 970ddbb103..9e0c587059 100644
--- a/SeriesGuide/src/main/AndroidManifest.xml
+++ b/SeriesGuide/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
             android:hardwareAccelerated="true"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
+            android:supportsRtl="true"
             android:theme="@style/SeriesGuideTheme">
 
         <!-- Launch activity -->

From cf1da8706df644f29e263c9de2977d4aed140ed3 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 09:09:17 +0100
Subject: [PATCH 02/74] RTL support for shows screen.

---
 SeriesGuide/src/main/res/layout/shows_row.xml | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/shows_row.xml b/SeriesGuide/src/main/res/layout/shows_row.xml
index e0cf7f0b7e..e28db14477 100644
--- a/SeriesGuide/src/main/res/layout/shows_row.xml
+++ b/SeriesGuide/src/main/res/layout/shows_row.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="wrap_content"
     android:paddingBottom="@dimen/default_padding"
     android:paddingLeft="@dimen/default_padding"
-    android:paddingTop="@dimen/default_padding" >
+    android:paddingStart="@dimen/default_padding"
+    android:paddingTop="@dimen/default_padding">
 
     <ImageView
         android:id="@+id/showposter"
         android:layout_width="68dp"
         android:layout_height="100dp"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
         android:contentDescription="@string/description_poster"
         android:scaleType="centerInside"
@@ -20,8 +24,10 @@
         android:id="@+id/imageViewShowsContextMenu"
         android:layout_width="25dp"
         android:layout_height="25dp"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:background="?attr/custom_list_selector"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="5dp"
         android:paddingRight="@dimen/default_padding"
         android:scaleType="center"
@@ -34,9 +40,11 @@
         android:layout_height="25dp"
         android:layout_alignWithParentIfMissing="true"
         android:layout_toLeftOf="@id/imageViewShowsContextMenu"
+        android:layout_toStartOf="@id/imageViewShowsContextMenu"
         android:background="?attr/custom_list_selector"
         android:contentDescription="@string/favorited"
         android:paddingLeft="5dp"
+        android:paddingStart="5dp"
         android:src="?attr/drawableStar" />
 
     <TextView
@@ -44,52 +52,66 @@
         style="@style/TextAppearance.XSmall.Dim"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_below="@id/favoritedLabel"
-        android:layout_gravity="right"
-        android:gravity="right"
+        android:layout_gravity="right|end"
+        android:gravity="right|end"
         android:lineSpacingExtra="2sp"
         android:maxWidth="90dp"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
         android:paddingTop="@dimen/inline_padding"
-        android:text="@string/norating" />
+        android:text="@string/norating"
+        android:textAlignment="viewEnd" />
 
     <TextView
         android:id="@+id/seriesname"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toLeftOf="@id/favoritedLabel"
         android:layout_toRightOf="@id/showposter"
+        android:layout_toStartOf="@id/favoritedLabel"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingBottom="0dp"
+        android:paddingEnd="@dimen/inline_padding"
         android:paddingRight="@dimen/inline_padding"
         android:paddingTop="2dp"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextAppearance.Medium.Light" />
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Medium.Light"
+        tools:text="@string/show" />
 
     <TextView
         android:id="@+id/TextViewShowListNextEpisode"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/seriesname"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toLeftOf="@id/textViewShowsTimeAndNetwork"
         android:layout_toRightOf="@id/showposter"
+        android:layout_toStartOf="@id/textViewShowsTimeAndNetwork"
         android:ellipsize="end"
         android:maxLines="2"
+        android:paddingEnd="@dimen/inline_padding"
         android:paddingRight="@dimen/inline_padding"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextAppearance.Light" />
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Light"
+        tools:text="@string/episode" />
 
     <TextView
         android:id="@+id/episodetime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/TextViewShowListNextEpisode"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toLeftOf="@id/textViewShowsTimeAndNetwork"
-        android:layout_toRightOf="@id/showposter"
+        android:layout_toStartOf="@id/textViewShowsTimeAndNetwork"
+        android:paddingEnd="@dimen/inline_padding"
         android:paddingRight="@dimen/inline_padding"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextAppearance.XSmall.Dim" />
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.XSmall.Dim"
+        tools:text="@string/episode" />
 
 </RelativeLayout>
\ No newline at end of file

From f8e3625658e63783d1f85b56a9c488581a4e8602 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 09:29:21 +0100
Subject: [PATCH 03/74] Add Jelly Bean MR1 detector to AndroidUtils.

---
 .../src/com/uwetrottmann/androidutils/AndroidUtils.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
index 60eee96691..cd6b6fdc94 100644
--- a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
+++ b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
@@ -44,6 +44,10 @@ public static boolean isKitKatOrHigher() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
     }
 
+    public static boolean isJellyBeanMR1OrHigher() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
+    }
+
     public static boolean isJellyBeanOrHigher() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
     }

From b3a555ad4e1e2d8f77c1e59bb6b025c33cdead03 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 09:30:12 +0100
Subject: [PATCH 04/74] Preliminary RTL support for nav drawer.

- android-navdrawer has true RTL support in the pipeline (e.g. for
indicator), meaning: the up indicator is currently broken.
---
 .../seriesguide/ui/BaseNavDrawerActivity.java | 23 ++++++++++++++++++-
 .../main/res/layout/sliding_menu_row_item.xml | 10 +++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
index 0b11c77231..79c5b28809 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
@@ -17,14 +17,22 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import android.annotation.TargetApi;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.text.TextUtils;
+import android.view.View;
 
+import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.seriesguide.R;
 
 import net.simonvt.menudrawer.MenuDrawer;
 import net.simonvt.menudrawer.MenuDrawer.OnDrawerStateChangeListener;
+import net.simonvt.menudrawer.Position;
+
+import java.util.Locale;
 
 /**
  * Adds onto {@link BaseActivity} by attaching a navigation drawer.
@@ -75,8 +83,21 @@ public void onDrawerSlide(float openRatio, int offsetPixels) {
      * Creates an {@link MenuDrawer} attached to this activity as an overlay.
      * Subclasses may override this to set their own layout and drawer type.
      */
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     protected MenuDrawer getAttachedMenuDrawer() {
-        MenuDrawer menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY);
+        Position drawerPosition = Position.LEFT;
+
+        if (AndroidUtils.isJellyBeanMR1OrHigher()) {
+            // attach drawer to right side if using RTL layout
+            int direction = TextUtils
+                    .getLayoutDirectionFromLocale(Locale.getDefault());
+            if (direction == View.LAYOUT_DIRECTION_RTL) {
+                drawerPosition = Position.RIGHT;
+            }
+        }
+
+        MenuDrawer menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, drawerPosition);
+        menuDrawer.setupUpIndicator(this);
         menuDrawer.setMenuView(R.layout.menu_frame);
         return menuDrawer;
     }
diff --git a/SeriesGuide/src/main/res/layout/sliding_menu_row_item.xml b/SeriesGuide/src/main/res/layout/sliding_menu_row_item.xml
index 3f9111c672..f179c3bdde 100644
--- a/SeriesGuide/src/main/res/layout/sliding_menu_row_item.xml
+++ b/SeriesGuide/src/main/res/layout/sliding_menu_row_item.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="wrap_content" >
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/menu_icon"
@@ -14,11 +15,14 @@
         android:id="@+id/menu_title"
         android:layout_width="match_parent"
         android:layout_height="48dp"
+        android:layout_toEndOf="@+id/menu_icon"
         android:layout_toRightOf="@+id/menu_icon"
         android:gravity="center_vertical"
-        android:text="@string/app_name"
+        android:paddingEnd="@dimen/default_padding"
+        android:paddingRight="@dimen/default_padding"
         android:textAppearance="@style/TextAppearance.Medium.Light"
         android:textColor="@color/text_primary"
-        android:textSize="18sp" />
+        android:textSize="18sp"
+        tools:text="@string/app_name" />
 
 </RelativeLayout>
\ No newline at end of file

From a7c3a8afc99a6da2f2619b269abc61b302c0507e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 10:31:19 +0100
Subject: [PATCH 05/74] RTL support for search result items, add dialog.

---
 SeriesGuide/src/main/res/layout/add_dialog.xml  | 17 ++++++++++++-----
 .../src/main/res/layout/add_searchresult.xml    | 11 +++++++++--
 .../main/res/layout/add_searchresult_wide.xml   | 14 ++++++++++----
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/add_dialog.xml b/SeriesGuide/src/main/res/layout/add_dialog.xml
index 38ddd81c39..02e56e72a7 100644
--- a/SeriesGuide/src/main/res/layout/add_dialog.xml
+++ b/SeriesGuide/src/main/res/layout/add_dialog.xml
@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+<LinearLayout android:id="@+id/root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" >
+        android:layout_weight="1">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="@dimen/default_padding" >
+            android:padding="@dimen/default_padding">
 
             <TextView
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:layout_toLeftOf="@+id/poster"
+                android:layout_toStartOf="@+id/poster"
                 android:paddingBottom="@dimen/default_padding"
+                android:paddingEnd="@dimen/default_padding"
                 android:paddingLeft="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
+                android:paddingStart="@dimen/default_padding"
                 android:text="@string/action_shows_add"
                 android:textAppearance="@style/TextAppearance.Large.Light"
                 android:textIsSelectable="true" />
@@ -35,8 +39,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_below="@+id/title"
                 android:layout_toLeftOf="@+id/poster"
+                android:layout_toStartOf="@+id/poster"
                 android:text="@string/description_overview"
                 android:textAppearance="@style/TextAppearance.Light"
                 android:textIsSelectable="true" />
@@ -45,6 +51,7 @@
                 android:id="@+id/poster"
                 android:layout_width="116dp"
                 android:layout_height="163dp"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_margin="@dimen/default_padding"
                 android:contentDescription="@string/description_poster"
diff --git a/SeriesGuide/src/main/res/layout/add_searchresult.xml b/SeriesGuide/src/main/res/layout/add_searchresult.xml
index eb3b6d0e10..5e74792259 100644
--- a/SeriesGuide/src/main/res/layout/add_searchresult.xml
+++ b/SeriesGuide/src/main/res/layout/add_searchresult.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <RelativeLayout
         android:id="@+id/details"
@@ -14,13 +14,16 @@
         android:focusable="true"
         android:paddingBottom="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
-        android:paddingTop="@dimen/default_padding" >
+        android:paddingStart="@dimen/default_padding"
+        android:paddingTop="@dimen/default_padding">
 
         <ImageView
             android:id="@+id/poster"
             android:layout_width="60dp"
             android:layout_height="88dp"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
             android:contentDescription="@string/description_poster"
             android:scaleType="centerInside"
@@ -30,10 +33,12 @@
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/poster"
             android:layout_toRightOf="@id/poster"
             android:ellipsize="end"
             android:maxLines="1"
             android:paddingBottom="@dimen/inline_padding"
+            android:paddingEnd="@dimen/default_padding"
             android:paddingRight="@dimen/default_padding"
             android:text="@string/app_name"
             android:textAppearance="@style/TextAppearance.Medium.Light" />
@@ -43,9 +48,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/title"
+            android:layout_toEndOf="@id/poster"
             android:layout_toRightOf="@id/poster"
             android:ellipsize="end"
             android:maxLines="3"
+            android:paddingEnd="@dimen/default_padding"
             android:paddingRight="@dimen/default_padding"
             android:text="@string/app_name"
             android:textAppearance="@style/TextAppearance.Small" />
diff --git a/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml b/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml
index 1835c2fff6..7a0666ac37 100644
--- a/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml
+++ b/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml
@@ -2,13 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <ImageView
         android:id="@+id/poster"
         android:layout_width="100dp"
         android:layout_height="147dp"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
         android:contentDescription="@string/description_poster"
         android:scaleType="fitCenter"
@@ -17,8 +19,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="147dp"
+        android:layout_toEndOf="@id/poster"
         android:layout_toRightOf="@id/poster"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/details"
@@ -29,7 +32,8 @@
             android:clickable="true"
             android:focusable="true"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/default_padding" >
+            android:paddingLeft="@dimen/default_padding"
+            android:paddingStart="@dimen/default_padding">
 
             <TextView
                 android:id="@+id/title"
@@ -38,6 +42,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingBottom="@dimen/inline_padding"
+                android:paddingEnd="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/app_name"
                 android:textAppearance="@style/TextAppearance.Large.Light" />
@@ -49,6 +54,7 @@
                 android:ellipsize="end"
                 android:maxLines="3"
                 android:paddingBottom="@dimen/inline_padding"
+                android:paddingEnd="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/app_name"
                 android:textAppearance="@style/TextAppearance.Small" />
@@ -62,7 +68,7 @@
             android:layout_height="wrap_content"
             android:background="?custom_list_selector"
             android:orientation="horizontal"
-            android:padding="@dimen/inline_padding" >
+            android:padding="@dimen/inline_padding">
 
             <ImageView
                 android:layout_width="32dp"

From 897edf7fbf9d185291f6c364268cb7128a139b8e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 10:31:34 +0100
Subject: [PATCH 06/74] RTL support for GetGlue fixing tool.

---
 SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml b/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml
index cda90b146f..c50b252ed7 100644
--- a/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml
+++ b/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml
@@ -9,8 +9,10 @@
         android:id="@+id/listViewGetGlueResults"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginEnd="@dimen/large_padding"
         android:layout_marginLeft="@dimen/large_padding"
         android:layout_marginRight="@dimen/large_padding"
+        android:layout_marginStart="@dimen/large_padding"
         android:layout_weight="1"
         android:clipToPadding="@bool/gridClipToPadding"
         android:listSelector="?custom_list_selector"

From 39492a1fda796eb0bd2a1583180fc3ce2013437b Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 10:41:09 +0100
Subject: [PATCH 07/74] Fix text paragraphs not correctly aligning.

---
 SeriesGuide/src/main/res/layout/add_dialog.xml            | 4 +++-
 SeriesGuide/src/main/res/layout/add_searchresult.xml      | 1 +
 SeriesGuide/src/main/res/layout/add_searchresult_wide.xml | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeriesGuide/src/main/res/layout/add_dialog.xml b/SeriesGuide/src/main/res/layout/add_dialog.xml
index 02e56e72a7..eefb92d8e0 100644
--- a/SeriesGuide/src/main/res/layout/add_dialog.xml
+++ b/SeriesGuide/src/main/res/layout/add_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@+id/root"
+<LinearLayout
+    android:id="@+id/root"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -44,6 +45,7 @@
                 android:layout_toLeftOf="@+id/poster"
                 android:layout_toStartOf="@+id/poster"
                 android:text="@string/description_overview"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.Light"
                 android:textIsSelectable="true" />
 
diff --git a/SeriesGuide/src/main/res/layout/add_searchresult.xml b/SeriesGuide/src/main/res/layout/add_searchresult.xml
index 5e74792259..7c5acb8813 100644
--- a/SeriesGuide/src/main/res/layout/add_searchresult.xml
+++ b/SeriesGuide/src/main/res/layout/add_searchresult.xml
@@ -55,6 +55,7 @@
             android:paddingEnd="@dimen/default_padding"
             android:paddingRight="@dimen/default_padding"
             android:text="@string/app_name"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Small" />
     </RelativeLayout>
 
diff --git a/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml b/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml
index 7a0666ac37..bd1a3f701b 100644
--- a/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml
+++ b/SeriesGuide/src/main/res/layout/add_searchresult_wide.xml
@@ -57,6 +57,7 @@
                 android:paddingEnd="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/app_name"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.Small" />
         </LinearLayout>
 

From 39a2a54788cdb7011868aeba248f51d0253613f5 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 10:47:41 +0100
Subject: [PATCH 08/74] Add start and end to DefaultPadding styles.

---
 SeriesGuide/src/main/res/values/styles.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeriesGuide/src/main/res/values/styles.xml b/SeriesGuide/src/main/res/values/styles.xml
index 7938483804..438cf74e58 100644
--- a/SeriesGuide/src/main/res/values/styles.xml
+++ b/SeriesGuide/src/main/res/values/styles.xml
@@ -266,18 +266,22 @@
     </style>
 
     <!-- Easy layouting -->
-    <style name="DefaultPadding"></style>
+    <style name="DefaultPadding"/>
 
     <style name="DefaultPadding.Page">
         <item name="android:paddingTop">@dimen/default_padding</item>
         <item name="android:paddingBottom">@dimen/default_padding</item>
         <item name="android:paddingLeft">@dimen/large_padding</item>
+        <item name="android:paddingStart" tools:ignore="NewApi">@dimen/large_padding</item>
         <item name="android:paddingRight">@dimen/large_padding</item>
+        <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/large_padding</item>
     </style>
 
     <style name="DefaultPadding.Blocks">
         <item name="android:paddingLeft">@dimen/default_padding</item>
+        <item name="android:paddingStart" tools:ignore="NewApi">@dimen/default_padding</item>
         <item name="android:paddingRight">@dimen/default_padding</item>
+        <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/default_padding</item>
     </style>
 
     <style name="DefaultPadding.Blocks.WithTopMargin">

From dddb28c2832db164957295b84eb820a4a461a1ac Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 11:25:31 +0100
Subject: [PATCH 09/74] RTL support of overview fragment.

---
 SeriesGuide/src/main/res/layout/buttonbar.xml | 15 ++++-
 .../res/layout/buttonbar_services_stacked.xml | 14 ++--
 .../res/layout/buttonbar_services_wide.xml    | 19 ++++--
 .../src/main/res/layout/overview_fragment.xml | 64 +++++++++++--------
 SeriesGuide/src/main/res/layout/ratingbar.xml | 29 +++++++--
 .../src/main/res/layout/services_more.xml     | 27 ++++++--
 .../src/main/res/layout/services_watch.xml    | 17 +++--
 SeriesGuide/src/main/res/values/styles.xml    |  1 +
 8 files changed, 132 insertions(+), 54 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/buttonbar.xml b/SeriesGuide/src/main/res/layout/buttonbar.xml
index 92821130e8..bbf258e787 100644
--- a/SeriesGuide/src/main/res/layout/buttonbar.xml
+++ b/SeriesGuide/src/main/res/layout/buttonbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Will never be a root layout, overdraw is expected -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout android:id="@+id/buttonbar"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/buttonbar"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:layout_marginBottom="@dimen/default_padding"
@@ -14,8 +14,10 @@
         android:layout_width="56dp"
         android:layout_height="match_parent"
         android:contentDescription="@string/checkin"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:src="?attr/drawableCheckin" />
 
     <ImageButton
@@ -24,8 +26,10 @@
         android:layout_width="@dimen/buttonbar_button_width"
         android:layout_height="match_parent"
         android:contentDescription="@string/togglewatched"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:src="?attr/drawableWatch" />
 
     <ImageButton
@@ -34,8 +38,10 @@
         android:layout_width="@dimen/buttonbar_button_width"
         android:layout_height="match_parent"
         android:contentDescription="@string/collect"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:src="?attr/drawableCollect" />
 
     <ImageButton
@@ -44,7 +50,10 @@
         android:layout_width="@dimen/buttonbar_button_width"
         android:layout_height="match_parent"
         android:contentDescription="@string/action_skip"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
+        android:paddingRight="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:src="?attr/drawableSkip" />
 
     <View
@@ -59,8 +68,10 @@
         style="@style/Widget.SeriesGuide.Button.Borderless"
         android:layout_width="@dimen/buttonbar_button_width"
         android:layout_height="match_parent"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:src="?attr/drawableDropdown" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/buttonbar_services_stacked.xml b/SeriesGuide/src/main/res/layout/buttonbar_services_stacked.xml
index 98b6f7c6d7..16cb6b3e94 100644
--- a/SeriesGuide/src/main/res/layout/buttonbar_services_stacked.xml
+++ b/SeriesGuide/src/main/res/layout/buttonbar_services_stacked.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/buttonbar_services"
+<LinearLayout android:id="@+id/buttonbar_services"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="@dimen/default_padding" >
+    android:paddingTop="@dimen/default_padding">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginLeft="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:text="@string/services_watch"
         android:textAppearance="@style/TextAppearance.Small.Label" />
 
@@ -25,7 +27,7 @@
         android:layout_height="wrap_content"
         android:divider="?attr/drawableDivider"
         android:orientation="vertical"
-        android:showDividers="middle" >
+        android:showDividers="middle">
 
         <include layout="@layout/services_watch" />
     </LinearLayout>
@@ -33,8 +35,10 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginLeft="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:layout_marginTop="@dimen/inline_padding"
         android:text="@string/services_more"
         android:textAppearance="@style/TextAppearance.Small.Label" />
@@ -50,7 +54,7 @@
         android:layout_height="wrap_content"
         android:divider="?attr/drawableDivider"
         android:orientation="vertical"
-        android:showDividers="middle" >
+        android:showDividers="middle">
 
         <include layout="@layout/services_more" />
     </LinearLayout>
diff --git a/SeriesGuide/src/main/res/layout/buttonbar_services_wide.xml b/SeriesGuide/src/main/res/layout/buttonbar_services_wide.xml
index 5251f6ec55..da474ad904 100644
--- a/SeriesGuide/src/main/res/layout/buttonbar_services_wide.xml
+++ b/SeriesGuide/src/main/res/layout/buttonbar_services_wide.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/buttonbar_services"
+<LinearLayout android:id="@+id/buttonbar_services"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:baselineAligned="false"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/default_padding" >
+    android:paddingTop="@dimen/default_padding">
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/inline_padding"
         android:layout_marginRight="@dimen/inline_padding"
         android:layout_weight="1"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginLeft="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
+            android:layout_marginStart="@dimen/default_padding"
             android:text="@string/services_watch"
             android:textAppearance="@style/TextAppearance.Small.Label" />
 
@@ -33,7 +36,7 @@
             android:layout_height="wrap_content"
             android:divider="?attr/drawableDivider"
             android:orientation="vertical"
-            android:showDividers="middle" >
+            android:showDividers="middle">
 
             <include layout="@layout/services_watch" />
         </LinearLayout>
@@ -44,13 +47,15 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/inline_padding"
         android:layout_weight="1"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginLeft="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
+            android:layout_marginStart="@dimen/default_padding"
             android:text="@string/services_more"
             android:textAppearance="@style/TextAppearance.Small.Label" />
 
@@ -65,7 +70,7 @@
             android:layout_height="wrap_content"
             android:divider="?attr/drawableDivider"
             android:orientation="vertical"
-            android:showDividers="middle" >
+            android:showDividers="middle">
 
             <include layout="@layout/services_more" />
         </LinearLayout>
diff --git a/SeriesGuide/src/main/res/layout/overview_fragment.xml b/SeriesGuide/src/main/res/layout/overview_fragment.xml
index cd718ff2ff..5977929ecd 100644
--- a/SeriesGuide/src/main/res/layout/overview_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/overview_fragment.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_root"
+<FrameLayout android:id="@+id/layout_root"
+    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:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:contentDescription="@string/description_poster"
-        android:scaleType="centerCrop" >
-    </ImageView>
+        android:scaleType="centerCrop"></ImageView>
 
     <View
         android:layout_width="2dp"
@@ -26,20 +26,20 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:id="@+id/overview_container"
             style="@style/DefaultPadding.Page"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/containerOverviewShow"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <RelativeLayout
                     android:layout_width="0dp"
@@ -47,27 +47,34 @@
                     android:layout_weight="1"
                     android:focusable="true"
                     android:nextFocusDown="@+id/checkinButton"
-                    android:paddingBottom="@dimen/default_padding" >
+                    android:paddingBottom="@dimen/default_padding">
 
                     <TextView
                         android:id="@+id/seriesname"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="@dimen/default_padding"
                         android:layout_marginLeft="@dimen/default_padding"
                         android:layout_marginRight="@dimen/default_padding"
+                        android:layout_marginStart="@dimen/default_padding"
                         android:ellipsize="marquee"
-                        android:textAppearance="@style/TextAppearance.Large.Light" />
+                        android:textAppearance="@style/TextAppearance.Large.Light"
+                        tools:text="Show title" />
 
                     <TextView
                         android:id="@+id/showStatus"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
                         android:layout_below="@id/seriesname"
+                        android:layout_marginEnd="@dimen/default_padding"
                         android:layout_marginLeft="@dimen/default_padding"
                         android:layout_marginRight="@dimen/default_padding"
+                        android:layout_marginStart="@dimen/default_padding"
                         android:textAllCaps="true"
-                        android:textAppearance="@style/TextAppearance.Small" />
+                        android:textAppearance="@style/TextAppearance.Small"
+                        tools:text="Status" />
 
                     <TextView
                         android:id="@+id/showmeta"
@@ -75,9 +82,12 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/seriesname"
                         android:layout_marginBottom="@dimen/default_padding"
+                        android:layout_marginEnd="@dimen/default_padding"
                         android:layout_marginRight="@dimen/default_padding"
+                        android:layout_toEndOf="@+id/showStatus"
                         android:layout_toRightOf="@+id/showStatus"
-                        android:textAppearance="@style/TextAppearance.Small" />
+                        android:textAppearance="@style/TextAppearance.Small"
+                        tools:text="Show meta" />
                 </RelativeLayout>
 
                 <include layout="@layout/divider_vertical" />
@@ -104,13 +114,13 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content">
 
                 <include
                     android:id="@+id/progress_container"
+                    layout="@layout/progress_container"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    layout="@layout/progress_container"
                     android:visibility="visible" />
 
                 <LinearLayout
@@ -118,18 +128,18 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:visibility="gone" >
+                    android:visibility="gone">
 
                     <FrameLayout
                         android:id="@+id/episode_primary_container"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/imagecontainer_height"
-                        android:foreground="?attr/custom_list_selector" >
+                        android:foreground="?attr/custom_list_selector">
 
                         <FrameLayout
                             android:id="@+id/imageContainer"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent" >
+                            android:layout_height="match_parent">
 
                             <LinearLayout
                                 android:id="@+id/image_progress_container"
@@ -137,7 +147,7 @@
                                 android:layout_height="@dimen/imagecontainer_height"
                                 android:gravity="center"
                                 android:orientation="vertical"
-                                android:visibility="gone" >
+                                android:visibility="gone">
 
                                 <ProgressBar
                                     android:layout_width="wrap_content"
@@ -159,9 +169,11 @@
                             android:layout_gravity="bottom"
                             android:background="?attr/colorOverlay"
                             android:paddingBottom="@dimen/default_padding"
+                            android:paddingEnd="@dimen/default_padding"
                             android:paddingLeft="@dimen/default_padding"
                             android:paddingRight="@dimen/default_padding"
-                            android:paddingTop="@dimen/inline_padding" >
+                            android:paddingStart="@dimen/default_padding"
+                            android:paddingTop="@dimen/inline_padding">
 
                             <TextView
                                 android:id="@+id/episodeTitle"
@@ -169,13 +181,15 @@
                                 android:layout_height="wrap_content"
                                 android:ellipsize="end"
                                 android:maxLines="2"
-                                android:textAppearance="@style/TextAppearance.Large.Light" />
+                                android:textAlignment="viewStart"
+                                android:textAppearance="@style/TextAppearance.Large.Light"/>
 
                             <TextView
                                 android:id="@+id/episodeTime"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_below="@+id/episodeTitle"
+                                android:layout_marginEnd="@dimen/default_padding"
                                 android:layout_marginRight="@dimen/default_padding"
                                 android:textAllCaps="true"
                                 android:textAppearance="@style/TextAppearance.Small" />
@@ -185,6 +199,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_below="@+id/episodeTitle"
+                                android:layout_toEndOf="@+id/episodeTime"
                                 android:layout_toRightOf="@+id/episodeTime"
                                 android:textAllCaps="true"
                                 android:textAppearance="@style/TextAppearance.Small.Dim" />
@@ -203,10 +218,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/default_padding"
-                        android:orientation="vertical" >
+                        android:orientation="vertical">
 
-                        <include layout="@layout/ratingbar" >
-                        </include>
+                        <include layout="@layout/ratingbar" />
 
                         <TextView
                             android:id="@+id/TextViewEpisodeDescription"
@@ -249,9 +263,9 @@
 
                         <include
                             android:id="@+id/buttonbar_ref"
+                            layout="@layout/buttonbar_services"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            layout="@layout/buttonbar_services" />
+                            android:layout_height="wrap_content" />
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
diff --git a/SeriesGuide/src/main/res/layout/ratingbar.xml b/SeriesGuide/src/main/res/layout/ratingbar.xml
index 0b7fca0c34..52717bf7a8 100644
--- a/SeriesGuide/src/main/res/layout/ratingbar.xml
+++ b/SeriesGuide/src/main/res/layout/ratingbar.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/ratingbar"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/default_padding"
+    android:layout_marginEnd="@dimen/default_padding"
     android:layout_marginLeft="@dimen/default_padding"
     android:layout_marginRight="@dimen/default_padding"
-    android:background="?attr/custom_list_selector" >
+    android:layout_marginStart="@dimen/default_padding"
+    android:background="?attr/custom_list_selector">
 
     <ImageView
         android:id="@+id/imageViewRatingsStar"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_gravity="center_vertical"
+        android:layout_marginEnd="@dimen/inline_padding"
         android:layout_marginRight="@dimen/inline_padding"
         android:padding="4dp"
         android:src="?attr/drawableStar" />
@@ -21,7 +25,9 @@
         android:id="@+id/textViewRatingsTvdbValue"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
+        android:layout_toEndOf="@+id/imageViewRatingsStar"
         android:layout_toRightOf="@+id/imageViewRatingsStar"
         android:minWidth="48dp"
         android:text="@string/norating"
@@ -33,6 +39,7 @@
         android:id="@+id/textViewRatingsTvdbLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/textViewRatingsTvdbValue"
         android:layout_toRightOf="@id/textViewRatingsTvdbValue"
         android:text="@string/tvdb"
         android:textAppearance="@style/TextAppearance.Small.Dim" />
@@ -42,6 +49,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textViewRatingsTvdbLabel"
+        android:layout_toEndOf="@id/textViewRatingsTvdbValue"
         android:layout_toRightOf="@id/textViewRatingsTvdbValue"
         android:text="@string/tvdb_range"
         android:textAppearance="@style/TextAppearance.Small.Dim" />
@@ -51,13 +59,14 @@
         android:layout_width="wrap_content"
         android:layout_height="36dp"
         android:layout_below="@id/textViewRatingsTvdbValue"
-        android:layout_marginTop="@dimen/default_padding" >
+        android:layout_marginTop="@dimen/default_padding">
 
         <ImageView
             android:id="@+id/imageViewRatingsLove"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/inline_padding"
             android:layout_marginRight="@dimen/inline_padding"
             android:contentDescription="@string/love"
             android:padding="4dp"
@@ -67,7 +76,9 @@
             android:id="@+id/textViewRatingsTraktValue"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
+            android:layout_toEndOf="@+id/imageViewRatingsLove"
             android:layout_toRightOf="@+id/imageViewRatingsLove"
             android:gravity="center_vertical"
             android:minWidth="48dp"
@@ -80,6 +91,7 @@
             android:id="@+id/textViewRatingsTraktLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toEndOf="@+id/textViewRatingsTraktValue"
             android:layout_toRightOf="@+id/textViewRatingsTraktValue"
             android:text="@string/trakt"
             android:textAppearance="@style/TextAppearance.Small.Dim" />
@@ -90,24 +102,30 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/textViewRatingsTraktLabel"
             android:layout_gravity="center_vertical"
+            android:layout_toEndOf="@+id/textViewRatingsTraktValue"
             android:layout_toRightOf="@+id/textViewRatingsTraktValue"
             android:minWidth="30dp"
             android:text="@string/norating"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Small.Dim" />
 
         <include
             android:id="@+id/dividerRatingsVertical"
+            layout="@layout/divider_vertical"
             android:layout_width="1dp"
             android:layout_height="match_parent"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginLeft="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
-            android:layout_toRightOf="@+id/textViewRatingsTraktVotes"
-            layout="@layout/divider_vertical" />
+            android:layout_marginStart="@dimen/default_padding"
+            android:layout_toEndOf="@+id/textViewRatingsTraktVotes"
+            android:layout_toRightOf="@+id/textViewRatingsTraktVotes" />
 
         <TextView
             android:id="@+id/textViewRatingsTraktUserLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toEndOf="@+id/dividerRatingsVertical"
             android:layout_toRightOf="@+id/dividerRatingsVertical"
             android:text="@string/your_rating"
             android:textAppearance="@style/TextAppearance.Small" />
@@ -117,6 +135,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/textViewRatingsTraktUserLabel"
+            android:layout_toEndOf="@+id/dividerRatingsVertical"
             android:layout_toRightOf="@+id/dividerRatingsVertical"
             android:text="@string/norating"
             android:textAppearance="@style/TextAppearance.Small" />
diff --git a/SeriesGuide/src/main/res/layout/services_more.xml b/SeriesGuide/src/main/res/layout/services_more.xml
index a1489adf07..c65a7c1a84 100644
--- a/SeriesGuide/src/main/res/layout/services_more.xml
+++ b/SeriesGuide/src/main/res/layout/services_more.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Button
         android:id="@+id/buttonShowInfoIMDB"
@@ -7,9 +7,12 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/imdb" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/imdb"
+        android:textAlignment="viewStart" />
 
     <Button
         android:id="@+id/buttonTVDB"
@@ -17,9 +20,12 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/tvdb" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/tvdb"
+        android:textAlignment="viewStart" />
 
     <Button
         android:id="@+id/buttonTrakt"
@@ -27,9 +33,12 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/trakt" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/trakt"
+        android:textAlignment="viewStart" />
 
     <Button
         android:id="@+id/buttonWebSearch"
@@ -37,9 +46,12 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/web_search" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/web_search"
+        android:textAlignment="viewStart" />
 
     <Button
         android:id="@+id/buttonShouts"
@@ -47,8 +59,11 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/comments" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/comments"
+        android:textAlignment="viewStart" />
 
 </merge>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/services_watch.xml b/SeriesGuide/src/main/res/layout/services_watch.xml
index 63847c5851..c14ac5b3cb 100644
--- a/SeriesGuide/src/main/res/layout/services_watch.xml
+++ b/SeriesGuide/src/main/res/layout/services_watch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Button
         android:id="@+id/buttonGooglePlay"
@@ -7,9 +7,12 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/googleplay" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/googleplay"
+        android:textAlignment="viewStart" />
 
     <Button
         android:id="@+id/buttonAmazon"
@@ -17,9 +20,12 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/amazon" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/amazon"
+        android:textAlignment="viewStart" />
 
     <Button
         android:id="@+id/buttonYouTube"
@@ -27,8 +33,11 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical|left"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
-        android:text="@string/youtube" />
+        android:paddingStart="@dimen/default_padding"
+        android:text="@string/youtube"
+        android:textAlignment="viewStart" />
 
 </merge>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/values/styles.xml b/SeriesGuide/src/main/res/values/styles.xml
index 438cf74e58..c5a0a3d964 100644
--- a/SeriesGuide/src/main/res/values/styles.xml
+++ b/SeriesGuide/src/main/res/values/styles.xml
@@ -290,6 +290,7 @@
 
     <style name="DefaultPadding.Blocks.WithBottomMargin">
         <item name="android:layout_marginBottom">@dimen/default_padding</item>
+        <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
     </style>
 
     <style name="DefaultPadding.Blocks.WithBottomMargin.FlowText">

From 8377c48df5744f0fc1ce6721ad31499c31f9ebb2 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 11:33:48 +0100
Subject: [PATCH 10/74] RTL support for episode detail fragment.

---
 .../src/main/res/layout/episodedetails.xml    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/episodedetails.xml b/SeriesGuide/src/main/res/layout/episodedetails.xml
index a042b18fbf..4fde21b67d 100644
--- a/SeriesGuide/src/main/res/layout/episodedetails.xml
+++ b/SeriesGuide/src/main/res/layout/episodedetails.xml
@@ -4,14 +4,16 @@
     style="@style/DefaultPadding.Page"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/showTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginLeft="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:background="?custom_list_selector"
         android:clickable="true"
         android:focusable="true"
@@ -19,20 +21,23 @@
         android:nextFocusLeft="@+id/showTitle"
         android:nextFocusRight="@+id/showTitle"
         android:paddingBottom="@dimen/default_padding"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
         android:paddingTop="@dimen/default_padding"
         android:text="@string/app_name"
         android:textAllCaps="true"
-        android:textStyle="bold" >
-    </TextView>
+        android:textStyle="bold"/>
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginLeft="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:text="@string/app_name"
+        android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Large.Light"
         android:textIsSelectable="true" />
 
@@ -46,9 +51,9 @@
         android:textIsSelectable="true" />
 
     <include
+        layout="@layout/imagecontainer"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/imagecontainer" />
+        android:layout_height="wrap_content" />
 
     <View
         android:layout_width="match_parent"
@@ -165,8 +170,8 @@
 
     <include
         android:id="@+id/buttonbar_ref"
+        layout="@layout/buttonbar_services"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/buttonbar_services" />
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file

From de40f89a36f16c4c017074a275c54d900a8a3985 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 11:46:12 +0100
Subject: [PATCH 11/74] RTL support for show info.

---
 .../src/main/res/layout/show_info_narrow.xml  | 26 +++++++++-----
 .../src/main/res/layout/show_info_regular.xml | 34 +++++++++++--------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/show_info_narrow.xml b/SeriesGuide/src/main/res/layout/show_info_narrow.xml
index 03522c8497..ff5743d6eb 100644
--- a/SeriesGuide/src/main/res/layout/show_info_narrow.xml
+++ b/SeriesGuide/src/main/res/layout/show_info_narrow.xml
@@ -8,7 +8,7 @@
         android:id="@+id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"></ImageView>
+        android:scaleType="centerCrop" />
 
     <ScrollView
         android:id="@+id/showinfo_container"
@@ -30,8 +30,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/default_padding"
                 android:layout_marginRight="@dimen/default_padding"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.Large.Light"
-                android:textIsSelectable="true" />
+                android:textIsSelectable="true"
+                tools:text="Show title" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -40,8 +42,8 @@
 
                 <FrameLayout
                     android:id="@+id/containerShowInfoPoster"
-                    android:layout_height="123dp"
                     android:layout_width="84dp"
+                    android:layout_height="123dp"
                     android:foreground="?attr/custom_list_selector">
 
                     <ImageView
@@ -57,11 +59,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/default_padding"
+                    android:layout_marginStart="@dimen/default_padding"
                     android:layout_marginTop="@dimen/inline_padding"
+                    android:layout_toEndOf="@+id/containerShowInfoPoster"
                     android:layout_toRightOf="@+id/containerShowInfoPoster"
                     android:textAllCaps="true"
                     android:textAppearance="@style/TextAppearance.Light"
-                    android:textIsSelectable="true" />
+                    android:textIsSelectable="true"
+                    tools:text="Status" />
 
                 <TextView
                     android:id="@+id/showInfo"
@@ -69,21 +74,24 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/showStatus"
                     android:layout_marginLeft="@dimen/default_padding"
+                    android:layout_marginStart="@dimen/default_padding"
                     android:layout_marginTop="@dimen/default_padding"
+                    android:layout_toEndOf="@+id/containerShowInfoPoster"
                     android:layout_toRightOf="@+id/containerShowInfoPoster"
                     android:textAppearance="@style/TextAppearance.Light"
-                    android:textIsSelectable="true" />
+                    android:textIsSelectable="true"
+                    tools:text="Show Info" />
             </RelativeLayout>
 
-            <include layout="@layout/ratingbar_narrow"></include>
+            <include layout="@layout/ratingbar_narrow" />
 
-            <include layout="@layout/show_info_metamore"></include>
+            <include layout="@layout/show_info_metamore" />
 
             <include
                 android:id="@+id/buttonbar_ref"
+                layout="@layout/buttonbar_services_stacked"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                layout="@layout/buttonbar_services_stacked" />
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </ScrollView>
 
diff --git a/SeriesGuide/src/main/res/layout/show_info_regular.xml b/SeriesGuide/src/main/res/layout/show_info_regular.xml
index f3c6d97490..9e2447b7af 100644
--- a/SeriesGuide/src/main/res/layout/show_info_regular.xml
+++ b/SeriesGuide/src/main/res/layout/show_info_regular.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" >
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" >
-    </ImageView>
+        android:scaleType="centerCrop" />
 
     <ScrollView
         android:id="@+id/showinfo_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true" >
+        android:layout_alignParentTop="true">
 
         <LinearLayout
             style="@style/DefaultPadding.Page"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/title"
@@ -35,12 +35,12 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/default_padding" >
+                android:layout_margin="@dimen/default_padding">
 
                 <FrameLayout
                     android:id="@+id/containerShowInfoPoster"
-                    android:layout_height="205dp"
                     android:layout_width="140dp"
+                    android:layout_height="205dp"
                     android:foreground="?attr/custom_list_selector">
 
                     <ImageView
@@ -56,11 +56,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/default_padding"
+                    android:layout_marginStart="@dimen/default_padding"
                     android:layout_marginTop="@dimen/inline_padding"
+                    android:layout_toEndOf="@+id/containerShowInfoPoster"
                     android:layout_toRightOf="@+id/containerShowInfoPoster"
                     android:textAllCaps="true"
                     android:textAppearance="@style/TextAppearance.Light"
-                    android:textIsSelectable="true" />
+                    android:textIsSelectable="true"
+                    tools:text="Status" />
 
                 <TextView
                     android:id="@+id/showInfo"
@@ -68,23 +71,24 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/showStatus"
                     android:layout_marginLeft="@dimen/default_padding"
+                    android:layout_marginStart="@dimen/default_padding"
                     android:layout_marginTop="@dimen/default_padding"
+                    android:layout_toEndOf="@+id/containerShowInfoPoster"
                     android:layout_toRightOf="@+id/containerShowInfoPoster"
                     android:textAppearance="@style/TextAppearance.Light"
-                    android:textIsSelectable="true" />
+                    android:textIsSelectable="true"
+                    tools:text="Show info" />
             </RelativeLayout>
 
-            <include layout="@layout/ratingbar" >
-            </include>
+            <include layout="@layout/ratingbar" />
 
-            <include layout="@layout/show_info_metamore" >
-            </include>
+            <include layout="@layout/show_info_metamore" />
 
             <include
                 android:id="@+id/buttonbar_ref"
+                layout="@layout/buttonbar_services_stacked"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                layout="@layout/buttonbar_services_stacked" />
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </ScrollView>
 

From 574f5bc936f26ac81dfe377ec74c9efafa3df44d Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 11:56:16 +0100
Subject: [PATCH 12/74] RTL support for seasons list.

---
 .../src/main/res/layout/season_row.xml        | 26 ++++++++++------
 .../src/main/res/layout/seasons_fragment.xml  | 30 +++++++++++--------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/season_row.xml b/SeriesGuide/src/main/res/layout/season_row.xml
index 4a636578a7..5c80758829 100644
--- a/SeriesGuide/src/main/res/layout/season_row.xml
+++ b/SeriesGuide/src/main/res/layout/season_row.xml
@@ -3,23 +3,28 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/default_padding" >
+    android:paddingLeft="@dimen/default_padding"
+    android:paddingStart="@dimen/default_padding">
 
     <TextView
         android:id="@+id/textViewSeasonTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_toLeftOf="@+id/textViewSeasonProgress"
+        android:layout_toStartOf="@+id/textViewSeasonProgress"
         android:paddingTop="@dimen/default_padding"
-        tools:text="@string/season_number"
-        android:textAppearance="@style/TextAppearance.Medium.Light" />
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Medium.Light"
+        tools:text="@string/season_number" />
 
     <ImageView
         android:id="@+id/imageViewContextMenu"
         android:layout_width="40dp"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/textViewSeasonWatchCount"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignTop="@+id/textViewSeasonTitle"
         android:background="?attr/custom_list_selector"
@@ -31,11 +36,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:layout_toLeftOf="@id/imageViewContextMenu"
+        android:layout_toStartOf="@id/imageViewContextMenu"
         android:paddingTop="@dimen/default_padding"
         android:text="@string/norating"
-        android:textAppearance="@style/TextAppearance.Medium.Light.Dim" >
-    </TextView>
+        android:textAppearance="@style/TextAppearance.Medium.Light.Dim" />
 
     <ProgressBar
         android:id="@+id/progressBarSeason"
@@ -43,8 +49,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/textViewSeasonTitle"
-        android:layout_toLeftOf="@id/imageViewContextMenu" >
-    </ProgressBar>
+        android:layout_toLeftOf="@id/imageViewContextMenu"
+        android:layout_toStartOf="@id/imageViewContextMenu" />
 
     <TextView
         android:id="@+id/textViewSeasonWatchCount"
@@ -52,9 +58,11 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/progressBarSeason"
         android:layout_toLeftOf="@id/imageViewContextMenu"
+        android:layout_toStartOf="@id/imageViewContextMenu"
         android:paddingBottom="@dimen/default_padding"
+        android:textAlignment="viewStart"
         android:textAllCaps="true"
-        tools:text="10 episodes not watched yet"
-        android:textAppearance="@style/TextAppearance.XSmall" />
+        android:textAppearance="@style/TextAppearance.XSmall"
+        tools:text="10 episodes not watched yet" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/seasons_fragment.xml b/SeriesGuide/src/main/res/layout/seasons_fragment.xml
index 8275c2266f..7429236d71 100644
--- a/SeriesGuide/src/main/res/layout/seasons_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/seasons_fragment.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     style="@style/DefaultPadding.Page"
+    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:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/imageViewSeasonsWatchedToggle"
@@ -14,15 +16,17 @@
 
     <include
         android:id="@+id/dividerSeasons1"
+        layout="@layout/divider_vertical"
         android:layout_width="1dp"
         android:layout_height="48dp"
-        android:layout_toRightOf="@+id/imageViewSeasonsWatchedToggle"
-        layout="@layout/divider_vertical" />
+        android:layout_toEndOf="@+id/imageViewSeasonsWatchedToggle"
+        android:layout_toRightOf="@+id/imageViewSeasonsWatchedToggle" />
 
     <ImageView
         android:id="@+id/imageViewSeasonsCollectedToggle"
         android:layout_width="48dp"
         android:layout_height="48dp"
+        android:layout_toEndOf="@+id/dividerSeasons1"
         android:layout_toRightOf="@+id/dividerSeasons1"
         android:background="?custom_list_selector"
         android:padding="@dimen/default_padding"
@@ -30,15 +34,17 @@
 
     <include
         android:id="@+id/dividerSeasons2"
+        layout="@layout/divider_vertical"
         android:layout_width="1dp"
         android:layout_height="48dp"
-        android:layout_toRightOf="@+id/imageViewSeasonsCollectedToggle"
-        layout="@layout/divider_vertical" />
+        android:layout_toEndOf="@+id/imageViewSeasonsCollectedToggle"
+        android:layout_toRightOf="@+id/imageViewSeasonsCollectedToggle" />
 
     <TextView
         android:id="@+id/textViewSeasonsRemaining"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
+        android:layout_toEndOf="@+id/dividerSeasons2"
         android:layout_toRightOf="@+id/dividerSeasons2"
         android:ellipsize="end"
         android:gravity="center_vertical"
@@ -46,19 +52,20 @@
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
         android:text="@string/norating"
-        android:textAppearance="@style/TextAppearance.Light" />
+        android:textAppearance="@style/TextAppearance.Light"
+        tools:text="199 episodes remaining" />
 
     <include
         android:id="@+id/dividerSeasonsHorizontal"
+        layout="@layout/divider_horizontal"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_below="@+id/textViewSeasonsRemaining"
-        layout="@layout/divider_horizontal" />
+        android:layout_below="@+id/textViewSeasonsRemaining" />
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/imageViewSeasonsWatchedToggle" >
+        android:layout_below="@+id/imageViewSeasonsWatchedToggle">
 
         <ListView
             android:id="@+android:id/list"
@@ -66,8 +73,7 @@
             android:layout_height="match_parent"
             android:clipToPadding="@bool/gridClipToPadding"
             android:fastScrollEnabled="true"
-            android:listSelector="?custom_list_selector" >
-        </ListView>
+            android:listSelector="?custom_list_selector"></ListView>
 
         <TextView
             android:id="@+android:id/empty"

From 881a636cb4de2ab3fa52506b35a8e44e4d7db292 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 12:04:53 +0100
Subject: [PATCH 13/74] RTL support for episodes list.

---
 .../src/main/res/layout/episode_row.xml       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/episode_row.xml b/SeriesGuide/src/main/res/layout/episode_row.xml
index 63040d503d..ee3ccda64d 100644
--- a/SeriesGuide/src/main/res/layout/episode_row.xml
+++ b/SeriesGuide/src/main/res/layout/episode_row.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.battlelancer.seriesguide.CheckableFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="48dp" >
+        android:minHeight="48dp">
 
         <com.battlelancer.seriesguide.WatchedBox
             android:id="@+id/watchedBoxEpisode"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:background="?custom_list_selector"
             android:padding="16dp"
@@ -23,18 +25,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/default_padding"
+            android:layout_toEndOf="@id/watchedBoxEpisode"
             android:layout_toLeftOf="@+id/textViewEpisodeNumber"
             android:layout_toRightOf="@id/watchedBoxEpisode"
-            android:text="@string/app_name"
-            android:textAppearance="@style/TextAppearance.Medium.Light" />
+            android:layout_toStartOf="@+id/textViewEpisodeNumber"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/TextAppearance.Medium.Light"
+            tools:text="Episode Title" />
 
         <TextView
             android:id="@+id/textViewEpisodeNumber"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:layout_marginEnd="24dp"
             android:layout_marginLeft="@dimen/default_padding"
             android:layout_marginRight="24dp"
+            android:layout_marginStart="@dimen/default_padding"
             android:layout_marginTop="@dimen/default_padding"
             android:text="@string/norating"
             android:textAppearance="@style/TextAppearance.Medium.Light.Dim" />
@@ -44,35 +52,43 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/textViewEpisodeTitle"
+            android:layout_toEndOf="@id/watchedBoxEpisode"
             android:layout_toRightOf="@id/watchedBoxEpisode"
-            android:textAppearance="@style/TextAppearance.Small.Light" />
+            android:textAppearance="@style/TextAppearance.Small.Light"
+            tools:text="in 2 days" />
 
         <include
             android:id="@+id/divider"
+            layout="@layout/divider_horizontal"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@+id/textViewEpisodeAirdate"
             android:layout_marginBottom="@dimen/inline_padding"
             android:layout_marginTop="@dimen/inline_padding"
+            android:layout_toEndOf="@id/watchedBoxEpisode"
             android:layout_toLeftOf="@+id/textViewEpisodeNumber"
             android:layout_toRightOf="@id/watchedBoxEpisode"
-            layout="@layout/divider_horizontal" />
+            android:layout_toStartOf="@+id/textViewEpisodeNumber" />
 
         <TextView
             android:id="@+id/textViewEpisodeAlternativeNumbers"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/divider"
+            android:layout_toEndOf="@id/watchedBoxEpisode"
             android:layout_toLeftOf="@+id/textViewEpisodeNumber"
             android:layout_toRightOf="@id/watchedBoxEpisode"
+            android:layout_toStartOf="@+id/textViewEpisodeNumber"
             android:paddingBottom="@dimen/default_padding"
             android:text="@string/episode_number_absolute"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.XSmall.Dim" />
 
         <ImageView
             android:id="@+id/imageViewCollected"
             android:layout_width="16dp"
             android:layout_height="16dp"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:layout_marginTop="12dp"
@@ -85,6 +101,7 @@
             android:layout_width="40dp"
             android:layout_height="48dp"
             android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:background="?attr/custom_list_selector"

From 89607f33812ad893d74c6b81f8286dda697460d8 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 12:10:14 +0100
Subject: [PATCH 14/74] Move nav drawer to right in episode activity, too.

---
 .../ui/EpisodeDetailsActivity.java            | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
index cc9cd5509b..c5407c75cd 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
@@ -17,9 +17,11 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
@@ -28,6 +30,8 @@
 import android.support.v4.app.NavUtils;
 import android.support.v4.app.TaskStackBuilder;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -41,11 +45,15 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.util.Utils;
 import com.google.analytics.tracking.android.EasyTracker;
+
+import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.seriesguide.R;
 
 import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 /**
  * Hosts a {@link ViewPager} displaying an episode per fragment of a complete
@@ -149,9 +157,22 @@ protected void onCreate(Bundle savedInstanceState) {
         mPager.setCurrentItem(startPosition, false);
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     @Override
     protected MenuDrawer getAttachedMenuDrawer() {
-        MenuDrawer menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY);
+        Position drawerPosition = Position.LEFT;
+
+        if (AndroidUtils.isJellyBeanMR1OrHigher()) {
+            // attach drawer to right side if using RTL layout
+            int direction = TextUtils
+                    .getLayoutDirectionFromLocale(Locale.getDefault());
+            if (direction == View.LAYOUT_DIRECTION_RTL) {
+                drawerPosition = Position.RIGHT;
+            }
+        }
+
+        MenuDrawer menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, drawerPosition);
+        menuDrawer.setupUpIndicator(this);
         menuDrawer.setMenuView(R.layout.menu_frame_with_spacer);
         return menuDrawer;
     }

From 2a372e2eead12bcb980bf4eacedd183cd004fd77 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 12:20:48 +0100
Subject: [PATCH 15/74] RTL support for shouts.

---
 SeriesGuide/src/main/res/layout/shout.xml     | 13 ++++++++---
 .../src/main/res/layout/shouts_fragment.xml   | 22 +++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/shout.xml b/SeriesGuide/src/main/res/layout/shout.xml
index 901a39812e..f99ef2ada7 100644
--- a/SeriesGuide/src/main/res/layout/shout.xml
+++ b/SeriesGuide/src/main/res/layout/shout.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/shout_root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <ImageView
         android:id="@+id/avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
         android:src="@drawable/ic_launcher" />
 
@@ -18,7 +21,8 @@
         android:id="@+id/userstrip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/avatar" >
+        android:layout_toEndOf="@+id/avatar"
+        android:layout_toRightOf="@+id/avatar">
 
         <TextView
             android:id="@+id/name"
@@ -27,6 +31,7 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/app_name"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.XSmall.Dim" />
 
         <TextView
@@ -35,6 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/norating"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.XSmall.Dim" />
     </LinearLayout>
 
@@ -43,6 +49,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/userstrip"
+        android:layout_toEndOf="@+id/avatar"
         android:layout_toRightOf="@+id/avatar"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.Small" />
diff --git a/SeriesGuide/src/main/res/layout/shouts_fragment.xml b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
index 7c93883158..9c7a7cae63 100644
--- a/SeriesGuide/src/main/res/layout/shouts_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/shouts_title"
@@ -12,6 +12,7 @@
         android:layout_marginRight="@dimen/layout_padding"
         android:layout_marginTop="@dimen/layout_padding"
         android:text="@string/shouts"
+        android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Large.Light" />
 
     <TextView
@@ -21,13 +22,14 @@
         android:layout_marginLeft="@dimen/layout_padding"
         android:layout_marginRight="@dimen/layout_padding"
         android:text="@string/shouts_for"
+        android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Small.Primary" />
 
     <FrameLayout
         android:id="@+id/shouts_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" >
+        android:layout_weight="1">
 
         <LinearLayout
             android:id="@+id/progress_container"
@@ -35,7 +37,7 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:orientation="vertical"
-            android:visibility="gone" >
+            android:visibility="gone">
 
             <ProgressBar
                 android:layout_width="wrap_content"
@@ -45,7 +47,7 @@
         <FrameLayout
             android:id="@+id/list_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent">
 
             <ListView
                 android:id="@+android:id/list"
@@ -54,8 +56,7 @@
                 android:layout_height="match_parent"
                 android:clipToPadding="@bool/gridClipToPadding"
                 android:divider="?attr/drawableDivider"
-                android:listSelector="?attr/custom_list_selector" >
-            </ListView>
+                android:listSelector="?attr/custom_list_selector"/>
 
             <TextView
                 android:id="@+android:id/empty"
@@ -78,21 +79,23 @@
 
     <include
         android:id="@+id/divider"
+        layout="@layout/divider_horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/divider_horizontal" />
+        android:layout_height="wrap_content" />
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/layout_padding" >
+        android:layout_margin="@dimen/layout_padding">
 
         <EditText
             android:id="@+id/shouttext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/inline_padding"
             android:layout_marginRight="@dimen/inline_padding"
             android:layout_toLeftOf="@+id/shoutbutton"
+            android:layout_toStartOf="@+id/shoutbutton"
             android:gravity="top"
             android:hint="@string/shout_hint"
             android:maxLength="2000"
@@ -102,6 +105,7 @@
             android:id="@+id/shoutbutton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@+id/shouttext"
             android:contentDescription="@string/shout"

From 900834635b8fdd2cb1b5c9c51386ab9b63850c29 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 15:47:11 +0100
Subject: [PATCH 16/74] RTL support for check in screen.

---
 SeriesGuide/src/main/res/layout/checkin.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/checkin.xml b/SeriesGuide/src/main/res/layout/checkin.xml
index be7166dfe6..23228f1296 100644
--- a/SeriesGuide/src/main/res/layout/checkin.xml
+++ b/SeriesGuide/src/main/res/layout/checkin.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <EditText
         android:id="@+id/editTextCheckinSearch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/large_padding"
+        android:layout_marginStart="@dimen/large_padding"
         android:layout_marginTop="@dimen/large_padding"
         android:layout_toLeftOf="@+id/imageButtonClearSearch"
+        android:layout_toStartOf="@+id/imageButtonClearSearch"
         android:ems="10"
         android:hint="@string/checkin_searchhint"
         android:inputType="text"
-        android:paddingBottom="@dimen/default_padding" >
+        android:paddingBottom="@dimen/default_padding">
 
         <requestFocus />
     </EditText>
@@ -37,7 +41,6 @@
         android:id="@+id/gridViewCheckinShows"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
         android:layout_below="@+id/empty"
         android:clipToPadding="@bool/gridClipToPadding"
         android:columnWidth="@dimen/showgrid_columnWidth"
@@ -47,17 +50,18 @@
         android:numColumns="auto_fit"
         android:padding="@dimen/showgrid_padding"
         android:stretchMode="columnWidth"
-        android:verticalSpacing="@dimen/showgrid_spacing" >
-    </GridView>
+        android:verticalSpacing="@dimen/showgrid_spacing"/>
 
     <ImageButton
         android:id="@+id/imageButtonClearSearch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/editTextCheckinSearch"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_alignTop="@+id/editTextCheckinSearch"
+        android:layout_marginEnd="@dimen/large_padding"
         android:layout_marginRight="@dimen/large_padding"
         android:layout_marginTop="@dimen/large_padding"
         android:background="?custom_list_selector"

From adcd0cabc3621047324fd01a3c6c82b5388d62df Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 18:51:35 +0100
Subject: [PATCH 17/74] Fix show title overlapping time and network.

---
 SeriesGuide/src/main/res/layout/shows_row.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/shows_row.xml b/SeriesGuide/src/main/res/layout/shows_row.xml
index e28db14477..5557365d0c 100644
--- a/SeriesGuide/src/main/res/layout/shows_row.xml
+++ b/SeriesGuide/src/main/res/layout/shows_row.xml
@@ -70,9 +70,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/showposter"
-        android:layout_toLeftOf="@id/favoritedLabel"
+        android:layout_toLeftOf="@id/textViewShowsTimeAndNetwork"
         android:layout_toRightOf="@id/showposter"
-        android:layout_toStartOf="@id/favoritedLabel"
+        android:layout_toStartOf="@id/textViewShowsTimeAndNetwork"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingBottom="0dp"
@@ -107,6 +107,7 @@
         android:layout_below="@id/TextViewShowListNextEpisode"
         android:layout_toEndOf="@id/showposter"
         android:layout_toLeftOf="@id/textViewShowsTimeAndNetwork"
+        android:layout_toRightOf="@id/showposter"
         android:layout_toStartOf="@id/textViewShowsTimeAndNetwork"
         android:paddingEnd="@dimen/inline_padding"
         android:paddingRight="@dimen/inline_padding"

From a7cd67f6a87dfc588d14c43ba9d20c916726074c Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 19:07:01 +0100
Subject: [PATCH 18/74] RTL support for list widget.

---
 .../src/main/res/layout-v11/appwidget_v11.xml | 14 ++++-----
 .../src/main/res/layout/appwidget_row.xml     | 31 ++++++++++++-------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout-v11/appwidget_v11.xml b/SeriesGuide/src/main/res/layout-v11/appwidget_v11.xml
index 7616c4fd2f..77e8cac6f5 100644
--- a/SeriesGuide/src/main/res/layout-v11/appwidget_v11.xml
+++ b/SeriesGuide/src/main/res/layout-v11/appwidget_v11.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/widget_margin" >
+    android:padding="@dimen/widget_margin">
 
     <!-- Need parent FrameLayout for padding backwards compatibility -->
 
@@ -13,13 +13,13 @@
         android:layout_height="match_parent"
         android:background="@color/widget_default_background"
         android:orientation="vertical"
-        tools:ignore="UselessParent" >
+        tools:ignore="UselessParent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:baselineAligned="false"
-            android:orientation="horizontal" >
+            android:orientation="horizontal">
 
             <FrameLayout
                 android:id="@+id/widget_title"
@@ -31,13 +31,13 @@
                 android:paddingBottom="@dimen/inline_padding"
                 android:paddingLeft="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
-                android:paddingTop="@dimen/inline_padding" >
+                android:paddingTop="@dimen/inline_padding">
 
                 <TextView
                     android:id="@+id/widgetTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="center_vertical|start"
                     android:fontFamily="sans-serif-light"
                     android:text="@string/upcoming"
                     android:textAllCaps="true"
@@ -54,7 +54,7 @@
                 android:paddingBottom="@dimen/inline_padding"
                 android:paddingLeft="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
-                android:paddingTop="@dimen/inline_padding" >
+                android:paddingTop="@dimen/inline_padding">
 
                 <ImageView
                     android:id="@+id/imageViewSettings"
@@ -74,7 +74,7 @@
                 android:paddingBottom="@dimen/inline_padding"
                 android:paddingLeft="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
-                android:paddingTop="@dimen/inline_padding" >
+                android:paddingTop="@dimen/inline_padding">
 
                 <ImageView
                     android:id="@+id/imageViewLauncher"
diff --git a/SeriesGuide/src/main/res/layout/appwidget_row.xml b/SeriesGuide/src/main/res/layout/appwidget_row.xml
index 0802df14b8..5276ed8694 100644
--- a/SeriesGuide/src/main/res/layout/appwidget_row.xml
+++ b/SeriesGuide/src/main/res/layout/appwidget_row.xml
@@ -1,59 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/appwidget_row"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/inline_padding" >
+    android:padding="@dimen/inline_padding">
 
     <ImageView
         android:id="@+id/widgetPoster"
         android:layout_width="@dimen/widget_item_width"
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"
+        android:paddingEnd="@dimen/inline_padding"
         android:paddingRight="@dimen/inline_padding"
-        android:src="@drawable/show_generic" >
-    </ImageView>
+        android:src="@drawable/appwidget_bg" />
 
     <TextView
         android:id="@+id/textViewWidgetShow"
         style="@style/WidgetTextView"
         android:layout_alignParentTop="true"
+        android:layout_marginEnd="5dp"
         android:layout_marginRight="5dp"
+        android:layout_toEndOf="@+id/widgetPoster"
         android:layout_toLeftOf="@+id/widgetAirtime"
         android:layout_toRightOf="@+id/widgetPoster"
+        android:layout_toStartOf="@+id/widgetAirtime"
         android:fontFamily="sans-serif-light"
         android:text="@string/app_name"
+        android:textAlignment="viewStart"
         android:textColor="@color/text_primary"
-        android:textSize="@dimen/widget_text_large" >
-    </TextView>
+        android:textSize="@dimen/widget_text_large" />
 
     <TextView
         android:id="@+id/textViewWidgetEpisode"
         style="@style/WidgetTextView"
         android:layout_alignLeft="@+id/textViewWidgetShow"
+        android:layout_alignStart="@+id/textViewWidgetShow"
         android:layout_below="@+id/textViewWidgetShow"
+        android:layout_marginEnd="5dp"
         android:layout_marginRight="5dp"
         android:layout_toLeftOf="@+id/widgetNetwork"
+        android:layout_toStartOf="@+id/widgetNetwork"
         android:text="@string/no_nextepisode"
-        android:textSize="@dimen/widget_text_middle" >
-    </TextView>
+        android:textAlignment="viewStart"
+        android:textSize="@dimen/widget_text_middle" />
 
     <TextView
         android:id="@+id/widgetAirtime"
         style="@style/WidgetTextView"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:text="@string/norating"
-        android:textSize="@dimen/widget_text_small" >
-    </TextView>
+        android:textSize="@dimen/widget_text_small" />
 
     <TextView
         android:id="@+id/widgetNetwork"
         style="@style/WidgetTextView"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/widgetAirtime"
         android:text="@string/norating"
-        android:textSize="@dimen/widget_text_small" >
-    </TextView>
+        android:textSize="@dimen/widget_text_small" />
 
 </RelativeLayout>
\ No newline at end of file

From 007e06d5c232f1309de7b5ee6e97f9a2e7af03c3 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 19:15:38 +0100
Subject: [PATCH 19/74] RTL support for friends.

---
 SeriesGuide/src/main/res/layout/friend.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/friend.xml b/SeriesGuide/src/main/res/layout/friend.xml
index 626a6367dd..2180d91b04 100644
--- a/SeriesGuide/src/main/res/layout/friend.xml
+++ b/SeriesGuide/src/main/res/layout/friend.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/friend_root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <ImageView
         android:id="@+id/avatar"
         android:layout_width="60dp"
         android:layout_height="60dp"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
         android:src="@drawable/ic_launcher" />
 
@@ -18,7 +21,8 @@
         android:id="@+id/userstrip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/avatar" >
+        android:layout_toEndOf="@+id/avatar"
+        android:layout_toRightOf="@+id/avatar">
 
         <TextView
             android:id="@+id/name"
@@ -27,6 +31,7 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/app_name"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.XSmall.Dim" />
 
         <TextView
@@ -43,6 +48,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/userstrip"
+        android:layout_toEndOf="@+id/avatar"
         android:layout_toRightOf="@+id/avatar"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.Medium.Light" />
@@ -52,6 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/show"
+        android:layout_toEndOf="@+id/avatar"
         android:layout_toRightOf="@+id/avatar"
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceSmall" />

From 042c786fe2a10a14d2bf6e3f116c7927f18c877e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 19:34:51 +0100
Subject: [PATCH 20/74] RTL support for check-in dialog, GetGlue fixer.

---
 .../src/main/res/layout/activity_fix_get_glue.xml |  2 --
 .../src/main/res/layout/checkin_dialog.xml        | 10 ++++++----
 .../src/main/res/layout/getglue_footer.xml        |  1 +
 .../src/main/res/layout/getglue_header.xml        | 15 ++++++++++-----
 SeriesGuide/src/main/res/layout/getglue_item.xml  | 12 ++++++++----
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml b/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml
index c50b252ed7..cda90b146f 100644
--- a/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml
+++ b/SeriesGuide/src/main/res/layout/activity_fix_get_glue.xml
@@ -9,10 +9,8 @@
         android:id="@+id/listViewGetGlueResults"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/large_padding"
         android:layout_marginLeft="@dimen/large_padding"
         android:layout_marginRight="@dimen/large_padding"
-        android:layout_marginStart="@dimen/large_padding"
         android:layout_weight="1"
         android:clipToPadding="@bool/gridClipToPadding"
         android:listSelector="?custom_list_selector"
diff --git a/SeriesGuide/src/main/res/layout/checkin_dialog.xml b/SeriesGuide/src/main/res/layout/checkin_dialog.xml
index 1d2078c379..14940fe7e5 100644
--- a/SeriesGuide/src/main/res/layout/checkin_dialog.xml
+++ b/SeriesGuide/src/main/res/layout/checkin_dialog.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingLeft="@dimen/layout_padding"
-    android:paddingRight="@dimen/layout_padding" >
+    android:paddingRight="@dimen/layout_padding">
 
     <Button
         android:id="@+id/pasteTitle"
@@ -18,6 +18,7 @@
         style="@style/Widget.SeriesGuide.Button.Borderless.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/pasteTitle"
         android:layout_toRightOf="@+id/pasteTitle"
         android:padding="@dimen/default_padding"
         android:text="@string/clear" />
@@ -31,7 +32,7 @@
         android:hint="@string/checkin_hint"
         android:inputType="textMultiLine"
         android:lines="3"
-        android:maxLength="100" >
+        android:maxLength="100">
 
         <requestFocus />
     </EditText>
@@ -61,16 +62,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/toggleGetGlue"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginBottom="@dimen/default_padding"
         android:text="@string/checkin" />
 
     <include
         android:id="@+id/divider"
+        layout="@layout/divider_horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/toggleGetGlue"
-        layout="@layout/divider_horizontal" />
+        android:layout_below="@+id/toggleGetGlue" />
 
     <Button
         android:id="@+id/buttonFixGetGlue"
diff --git a/SeriesGuide/src/main/res/layout/getglue_footer.xml b/SeriesGuide/src/main/res/layout/getglue_footer.xml
index 12ecf7f639..26ded38437 100644
--- a/SeriesGuide/src/main/res/layout/getglue_footer.xml
+++ b/SeriesGuide/src/main/res/layout/getglue_footer.xml
@@ -16,6 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/inline_padding"
+        android:layout_marginStart="@dimen/inline_padding"
         android:text="@string/looking_for_something_else" />
 
     <EditText
diff --git a/SeriesGuide/src/main/res/layout/getglue_header.xml b/SeriesGuide/src/main/res/layout/getglue_header.xml
index 783328adb6..768fbb1655 100644
--- a/SeriesGuide/src/main/res/layout/getglue_header.xml
+++ b/SeriesGuide/src/main/res/layout/getglue_header.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/headerGetGlueObjects"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/large_padding" >
+    android:paddingTop="@dimen/large_padding">
 
     <TextView
         android:id="@+id/textViewFixGetGlueHeader"
@@ -13,6 +14,7 @@
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
         android:text="@string/select_show"
+        android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Large.Light" />
 
     <TextView
@@ -20,9 +22,11 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textViewFixGetGlueHeader"
+        android:layout_marginEnd="@dimen/large_padding"
         android:layout_marginRight="@dimen/large_padding"
         android:ellipsize="end"
         android:paddingLeft="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:text="@string/check_into"
         android:textAllCaps="true"
         android:textStyle="bold" />
@@ -32,17 +36,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textViewFixGetGlueHeader"
+        android:layout_toEndOf="@+id/textViewSelectedShowHeader"
         android:layout_toRightOf="@+id/textViewSelectedShowHeader"
+        android:paddingEnd="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
         android:text="@string/no_selection" />
 
     <include
         android:id="@+id/divider1"
+        layout="@layout/divider_horizontal"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_below="@+id/textViewSelectedShowValue"
-        android:layout_marginTop="@dimen/large_padding"
-        layout="@layout/divider_horizontal" >
-    </include>
+        android:layout_marginTop="@dimen/large_padding" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/getglue_item.xml b/SeriesGuide/src/main/res/layout/getglue_item.xml
index b2aba8a293..77d40ec4a6 100644
--- a/SeriesGuide/src/main/res/layout/getglue_item.xml
+++ b/SeriesGuide/src/main/res/layout/getglue_item.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <TextView
         android:id="@+id/textViewGetGlueShowTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Small" >
-    </TextView>
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Small"
+        tools:text="Homeland" />
 
     <TextView
         android:id="@+id/textViewGetGlueShowId"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Small.Dim" />
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Small.Dim"
+        tools:text="tv_shows/homeland" />
 
 </LinearLayout>
\ No newline at end of file

From fcccf5455abedacfb317027bb1653317d5bf75b2 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 20:13:26 +0100
Subject: [PATCH 21/74] RTL support for movies section.

- Grid views stink, had to revert to columnWidth spacing.
---
 .../res/layout/movie_details_fragment.xml     | 27 +++++++++++++------
 .../src/main/res/layout/movie_item.xml        | 19 ++++++++-----
 .../src/main/res/layout/movies_fragment.xml   | 16 +++++++----
 .../res/layout/movies_watchlist_fragment.xml  |  3 ++-
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/movie_details_fragment.xml b/SeriesGuide/src/main/res/layout/movie_details_fragment.xml
index 1adea96fc0..2afc8e6862 100644
--- a/SeriesGuide/src/main/res/layout/movie_details_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/movie_details_fragment.xml
@@ -2,7 +2,7 @@
 <FrameLayout 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:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/imageViewMoviePoster"
@@ -20,13 +20,13 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <RelativeLayout
             style="@style/DefaultPadding.Page"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:animateLayoutChanges="true" >
+            android:animateLayoutChanges="true">
 
             <TextView
                 android:id="@+id/textViewMovieTitle"
@@ -34,10 +34,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:textAppearance="@style/TextAppearance.Large.Light"
                 android:textIsSelectable="true"
-                android:textSize="@dimen/text_size_ultralarge" />
+                android:textSize="@dimen/text_size_ultralarge"
+                tools:text="Awesome Movie Title"
+                android:textAlignment="viewStart" />
 
             <TextView
                 android:id="@+id/textViewMovieDate"
@@ -45,18 +48,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_below="@+id/textViewMovieTitle"
                 android:layout_marginBottom="@dimen/large_padding"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textAppearance="@style/TextAppearance.Small"
-                android:textIsSelectable="true" />
+                android:textIsSelectable="true"
+                tools:text="20 Oct 2013" />
 
             <Button
                 android:id="@+id/buttonMovieCheckIn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_below="@+id/textViewMovieDate"
                 android:layout_marginBottom="@dimen/large_padding"
                 android:text="@string/checkin"
@@ -68,19 +74,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_below="@+id/buttonMovieCheckIn"
                 android:maxWidth="400dp"
                 android:textAppearance="@style/TextAppearance.Light"
-                android:textIsSelectable="true" />
+                android:textIsSelectable="true"
+                tools:text="Description for a super awesome movie..." />
 
             <include
                 android:id="@+id/dividerHorizontalMovieDetails"
+                layout="@layout/divider_horizontal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignEnd="@+id/textViewMovieDescription"
                 android:layout_alignLeft="@+id/textViewMovieDescription"
                 android:layout_alignRight="@+id/textViewMovieDescription"
+                android:layout_alignStart="@+id/textViewMovieDescription"
                 android:layout_below="@+id/textViewMovieDescription"
-                layout="@layout/divider_horizontal"
                 android:visibility="gone" />
 
             <LinearLayout
@@ -88,10 +98,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_below="@+id/dividerHorizontalMovieDetails"
                 android:baselineAligned="false"
                 android:gravity="center_vertical"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <Button
                     android:id="@+id/buttonMovieComments"
diff --git a/SeriesGuide/src/main/res/layout/movie_item.xml b/SeriesGuide/src/main/res/layout/movie_item.xml
index 681ab7afc6..e16d58cc93 100644
--- a/SeriesGuide/src/main/res/layout/movie_item.xml
+++ b/SeriesGuide/src/main/res/layout/movie_item.xml
@@ -3,14 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:foreground="?custom_list_selector" >
+    android:foreground="?custom_list_selector">
 
     <!-- Added FrameLayout wrapper to avoid grid view layout issues -->
 
     <RelativeLayout
         android:layout_width="@dimen/movie_item_width"
         android:layout_height="@dimen/movie_item_height"
-        tools:ignore="UselessParent" >
+        tools:ignore="UselessParent">
 
         <ImageView
             android:id="@+id/imageViewMoviePoster"
@@ -22,6 +22,7 @@
             android:id="@+id/imageViewMovieItemContextMenu"
             android:layout_width="16dp"
             android:layout_height="32dp"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_below="@+id/imageViewMoviePoster"
             android:background="?attr/custom_list_selector"
@@ -34,28 +35,34 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@+id/imageViewMoviePoster"
+            android:layout_alignStart="@+id/imageViewMoviePoster"
             android:layout_below="@+id/imageViewMoviePoster"
             android:layout_toLeftOf="@id/imageViewMovieItemContextMenu"
+            android:layout_toStartOf="@id/imageViewMovieItemContextMenu"
             android:ellipsize="end"
             android:maxLines="2"
             android:paddingLeft="@dimen/inline_padding"
             android:paddingRight="@dimen/inline_padding"
-            android:textAppearance="@style/TextAppearance.Primary" >
-        </TextView>
+            android:textAppearance="@style/TextAppearance.Primary"
+            tools:text="Awesome Movie Title"
+            android:textAlignment="viewStart" />
 
         <TextView
             android:id="@+id/textViewMovieDate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignEnd="@+id/imageViewMoviePoster"
             android:layout_alignLeft="@+id/imageViewMoviePoster"
             android:layout_alignRight="@+id/imageViewMoviePoster"
+            android:layout_alignStart="@+id/imageViewMoviePoster"
             android:layout_below="@+id/textViewMovieTitle"
             android:ellipsize="end"
             android:maxLines="1"
             android:paddingLeft="@dimen/inline_padding"
             android:paddingRight="@dimen/inline_padding"
-            android:textAppearance="@style/TextAppearance.XSmall" >
-        </TextView>
+            android:textAppearance="@style/TextAppearance.XSmall"
+            tools:text="20 Oct 2013"
+            android:textAlignment="viewStart" />
     </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/movies_fragment.xml b/SeriesGuide/src/main/res/layout/movies_fragment.xml
index 9cb7c224a2..90175449a2 100644
--- a/SeriesGuide/src/main/res/layout/movies_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/movies_fragment.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:id="@+id/root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <EditText
         android:id="@+id/editTextCheckinSearch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/large_padding"
+        android:layout_marginStart="@dimen/large_padding"
         android:layout_marginTop="@dimen/large_padding"
         android:layout_toLeftOf="@+id/imageButtonClearSearch"
+        android:layout_toStartOf="@+id/imageButtonClearSearch"
         android:ems="10"
         android:hint="@string/movies_search_hint"
         android:imeOptions="actionSearch"
@@ -25,9 +29,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/editTextCheckinSearch"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_alignTop="@+id/editTextCheckinSearch"
+        android:layout_marginEnd="@dimen/large_padding"
         android:layout_marginRight="@dimen/large_padding"
         android:layout_marginTop="@dimen/large_padding"
         android:background="?custom_list_selector"
@@ -58,15 +64,15 @@
         android:listSelector="@color/transparent"
         android:numColumns="auto_fit"
         android:padding="@dimen/default_padding"
-        android:stretchMode="spacingWidthUniform"
-        android:verticalSpacing="@dimen/default_padding" >
-    </GridView>
+        android:stretchMode="columnWidth"
+        android:verticalSpacing="@dimen/default_padding" />
 
     <TextView
         android:id="@+id/poweredby"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:background="#bf000000"
         android:padding="@dimen/default_padding"
diff --git a/SeriesGuide/src/main/res/layout/movies_watchlist_fragment.xml b/SeriesGuide/src/main/res/layout/movies_watchlist_fragment.xml
index 4c822d3b83..c22425535e 100644
--- a/SeriesGuide/src/main/res/layout/movies_watchlist_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/movies_watchlist_fragment.xml
@@ -26,7 +26,7 @@
         android:listSelector="@color/transparent"
         android:numColumns="auto_fit"
         android:padding="@dimen/default_padding"
-        android:stretchMode="spacingWidthUniform"
+        android:stretchMode="columnWidth"
         android:verticalSpacing="@dimen/default_padding" >
     </GridView>
 
@@ -35,6 +35,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:background="#bf000000"
         android:padding="@dimen/default_padding"

From ebf5aab8e91288cabf9f87b2a268c38099badc96 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 20:31:21 +0100
Subject: [PATCH 22/74] RTL support for activity stream.

---
 .../src/main/res/layout/upcoming_header.xml     |  1 +
 .../src/main/res/layout/upcoming_multipane.xml  |  9 ++++++---
 .../src/main/res/layout/upcoming_row.xml        | 17 +++++++++++++----
 .../src/main/res/layout/upcoming_row_wide.xml   | 17 +++++++++++++----
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/upcoming_header.xml b/SeriesGuide/src/main/res/layout/upcoming_header.xml
index 0563776367..6e4de321fd 100644
--- a/SeriesGuide/src/main/res/layout/upcoming_header.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming_header.xml
@@ -11,6 +11,7 @@
         android:layout_marginTop="@dimen/default_padding"
         android:gravity="center_vertical"
         android:paddingLeft="@dimen/default_padding"
+        android:paddingStart="@dimen/default_padding"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.Small.Label" />
 
diff --git a/SeriesGuide/src/main/res/layout/upcoming_multipane.xml b/SeriesGuide/src/main/res/layout/upcoming_multipane.xml
index 78b60adbcf..5de950f3e9 100644
--- a/SeriesGuide/src/main/res/layout/upcoming_multipane.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming_multipane.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <View
         android:id="@+id/separatorUpcoming"
@@ -15,19 +15,22 @@
         style="@style/TabStrip"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_strip_height"
-        android:layout_toLeftOf="@id/separatorUpcoming" />
+        android:layout_toLeftOf="@id/separatorUpcoming"
+        android:layout_toStartOf="@id/separatorUpcoming" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pagerUpcoming"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/tabsUpcoming"
-        android:layout_toLeftOf="@id/separatorUpcoming" />
+        android:layout_toLeftOf="@id/separatorUpcoming"
+        android:layout_toStartOf="@id/separatorUpcoming" />
 
     <FrameLayout
         android:id="@+id/fragment_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_toEndOf="@id/separatorUpcoming"
         android:layout_toRightOf="@id/separatorUpcoming" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/upcoming_row.xml b/SeriesGuide/src/main/res/layout/upcoming_row.xml
index 879eb618cb..2a7fdd7a7c 100644
--- a/SeriesGuide/src/main/res/layout/upcoming_row.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming_row.xml
@@ -2,33 +2,38 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingRight="@dimen/default_padding" >
+        android:paddingEnd="@dimen/default_padding"
+        android:paddingRight="@dimen/default_padding">
 
         <ImageView
             android:id="@+id/poster"
             android:layout_width="68dp"
             android:layout_height="100dp"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
             android:contentDescription="@string/description_poster"
-            android:scaleType="fitCenter"
-            android:src="@drawable/show_generic" />
+            android:scaleType="centerCrop"
+            android:src="@drawable/appwidget_bg" />
 
         <TextView
             android:id="@+id/textViewUpcomingShow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:layout_toEndOf="@+id/poster"
             android:layout_toRightOf="@+id/poster"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@string/app_name"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Small.Dim" />
 
         <TextView
@@ -36,10 +41,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/textViewUpcomingShow"
+            android:layout_toEndOf="@+id/poster"
             android:layout_toRightOf="@+id/poster"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@string/no_nextepisode"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Medium.Light" />
 
         <TextView
@@ -48,10 +55,12 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/textViewUpcomingEpisode"
             android:layout_marginTop="2dp"
+            android:layout_toEndOf="@+id/poster"
             android:layout_toRightOf="@+id/poster"
             android:ellipsize="end"
             android:maxLines="2"
             android:text="@string/norating"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Small.Light" />
     </RelativeLayout>
 
diff --git a/SeriesGuide/src/main/res/layout/upcoming_row_wide.xml b/SeriesGuide/src/main/res/layout/upcoming_row_wide.xml
index a366af6b0c..b3cf434453 100644
--- a/SeriesGuide/src/main/res/layout/upcoming_row_wide.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming_row_wide.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <com.battlelancer.seriesguide.WatchedBox
         android:id="@+id/watchedBoxUpcoming"
@@ -17,27 +17,32 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingRight="@dimen/default_padding" >
+        android:paddingEnd="@dimen/default_padding"
+        android:paddingRight="@dimen/default_padding">
 
         <ImageView
             android:id="@+id/poster"
             android:layout_width="68dp"
             android:layout_height="100dp"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
             android:contentDescription="@string/description_poster"
-            android:scaleType="fitCenter"
-            android:src="@drawable/show_generic" />
+            android:scaleType="centerCrop"
+            android:src="@drawable/appwidget_bg" />
 
         <TextView
             android:id="@+id/textViewUpcomingShow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:layout_toEndOf="@+id/poster"
             android:layout_toRightOf="@+id/poster"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@string/app_name"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Small.Dim" />
 
         <TextView
@@ -45,10 +50,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/textViewUpcomingShow"
+            android:layout_toEndOf="@+id/poster"
             android:layout_toRightOf="@+id/poster"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@string/no_nextepisode"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Medium.Light" />
 
         <TextView
@@ -57,10 +64,12 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/textViewUpcomingEpisode"
             android:layout_marginTop="2dp"
+            android:layout_toEndOf="@+id/poster"
             android:layout_toRightOf="@+id/poster"
             android:ellipsize="end"
             android:maxLines="2"
             android:text="@string/norating"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.Small.Light" />
     </RelativeLayout>
 

From d14f16630762ef3f5d12f6a2e4c4d898f5309aa0 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Tue, 5 Nov 2013 20:31:32 +0100
Subject: [PATCH 23/74] RTL support for trakt connect fragment.

---
 .../src/main/res/layout/connect_trakt_fragment.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/connect_trakt_fragment.xml b/SeriesGuide/src/main/res/layout/connect_trakt_fragment.xml
index 40fa2cecbc..0cb1ce934c 100644
--- a/SeriesGuide/src/main/res/layout/connect_trakt_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/connect_trakt_fragment.xml
@@ -2,19 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" >
+        android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/large_padding" >
+            android:padding="@dimen/large_padding">
 
             <TextView
                 android:id="@+id/textViewTitle"
@@ -32,6 +32,7 @@
                 android:layout_marginTop="@dimen/default_padding"
                 android:linksClickable="true"
                 android:text="@string/about_trakt"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.Small" />
 
             <TextView
@@ -44,6 +45,7 @@
                 android:layout_marginRight="@dimen/default_padding"
                 android:layout_marginTop="16dp"
                 android:text="@string/integration_trakt_items"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.Small.Primary" />
         </LinearLayout>
     </ScrollView>
@@ -51,7 +53,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/buttonDiscard"
@@ -62,9 +64,9 @@
             android:text="@string/discard" />
 
         <include
+            layout="@layout/divider_vertical"
             android:layout_width="1dp"
-            android:layout_height="match_parent"
-            layout="@layout/divider_vertical" />
+            android:layout_height="match_parent" />
 
         <Button
             android:id="@+id/buttonConnectTrakt"

From b2dc1cfed742c674629b799a31391ad6ca9525fb Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Fri, 8 Nov 2013 11:00:17 +0100
Subject: [PATCH 24/74] Fix crash if activity was finished, but Iab purchase
 check was not.

- Fixes java.lang.NullPointerException in
com.battlelancer.seriesguide.billing.IabHelper.queryPurchases.
---
 .../java/com/battlelancer/seriesguide/billing/IabHelper.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/billing/IabHelper.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/billing/IabHelper.java
index 25056681b9..a5a408e10a 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/billing/IabHelper.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/billing/IabHelper.java
@@ -835,6 +835,11 @@ void flagEndAsync() {
 
 
     int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteException {
+        // null check, helper could have gotten disposed
+        if (mDisposed) {
+            return IABHELPER_VERIFICATION_FAILED;
+        }
+
         // Query purchases
         logDebug("Querying owned items, item type: " + itemType);
         logDebug("Package name: " + mContext.getPackageName());

From aeb92041ffecc6912c9832361c5369d4fff3b26e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 10:23:27 +0100
Subject: [PATCH 25/74] Drop android-menudrawer from deps.

---
 SeriesGuide/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeriesGuide/build.gradle b/SeriesGuide/build.gradle
index 9b8981d3e5..3fae08670e 100644
--- a/SeriesGuide/build.gradle
+++ b/SeriesGuide/build.gradle
@@ -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')

From f891585af5c129cd3dc7391e694e21e4c895351b Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 10:25:00 +0100
Subject: [PATCH 26/74] Rewrite navdrawer base activities, change layouts.

- Remove old sliding menu fragment, unused layouts.
---
 .../seriesguide/ui/BaseNavDrawerActivity.java | 296 ++++++++++++++----
 .../seriesguide/ui/BaseTopActivity.java       |  22 +-
 .../seriesguide/ui/BaseTopShowsActivity.java  |   6 +-
 .../seriesguide/ui/SlidingMenuFragment.java   | 241 --------------
 ...u_row_category.xml => drawer_category.xml} |   0
 ...ding_menu_row_item.xml => drawer_item.xml} |   0
 .../src/main/res/layout/drawer_left.xml       |  14 +
 .../src/main/res/layout/menu_fragment.xml     |  16 -
 .../src/main/res/layout/menu_frame.xml        |   8 -
 .../res/layout/menu_frame_with_spacer.xml     |   9 -
 SeriesGuide/src/main/res/values/strings.xml   |   2 +
 11 files changed, 272 insertions(+), 342 deletions(-)
 delete mode 100644 SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SlidingMenuFragment.java
 rename SeriesGuide/src/main/res/layout/{sliding_menu_row_category.xml => drawer_category.xml} (100%)
 rename SeriesGuide/src/main/res/layout/{sliding_menu_row_item.xml => drawer_item.xml} (100%)
 create mode 100644 SeriesGuide/src/main/res/layout/drawer_left.xml
 delete mode 100644 SeriesGuide/src/main/res/layout/menu_fragment.xml
 delete mode 100644 SeriesGuide/src/main/res/layout/menu_frame.xml
 delete mode 100644 SeriesGuide/src/main/res/layout/menu_frame_with_spacer.xml

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
index 0b11c77231..374408cccb 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
@@ -17,96 +17,278 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-
+import com.actionbarsherlock.view.MenuItem;
+import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.MenuDrawer.OnDrawerStateChangeListener;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
 
 /**
  * Adds onto {@link BaseActivity} by attaching a navigation drawer.
  */
-public abstract class BaseNavDrawerActivity extends BaseActivity {
+public abstract class BaseNavDrawerActivity extends BaseActivity
+        implements AdapterView.OnItemClickListener {
+
+    private static final String TAG_NAV_DRAWER = "Navigation Drawer";
+
+    private DrawerLayout mDrawerLayout;
+
+    private ListView mDrawerList;
+
+    private ActionBarDrawerToggle mDrawerToggle;
+
+    private DrawerAdapter mDrawerAdapter;
+
+    private static final int MENU_ITEM_SHOWS_ID = 0;
 
-    private MenuDrawer mMenuDrawer;
+    private static final int MENU_ITEM_LISTS_ID = 1;
+
+    private static final int MENU_ITEM_ACTIVITY_ID = 3;
+
+    private static final int MENU_ITEM_SEARCH_ID = 4;
+
+    private static final int MENU_ITEM_MOVIES_ID = 5;
+
+    private static final int MENU_ITEM_STATS_ID = 6;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // set a theme based on user preference
         setTheme(SeriesGuidePreferences.THEME);
         super.onCreate(savedInstanceState);
+    }
 
-        mMenuDrawer = getAttachedMenuDrawer();
+    /**
+     * Initializes the navigation drawer. Overriding activities should call this in their {@link
+     * #onCreate(android.os.Bundle)} after {@link #setContentView(int)}.
+     */
+    public void setupNavDrawer() {
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        mDrawerList = (ListView) findViewById(R.id.left_drawer);
 
-        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_BEZEL);
-        // setting size in pixels, oh come on...
-        int menuSize = (int) getResources().getDimension(R.dimen.slidingmenu_width);
-        mMenuDrawer.setMenuSize(menuSize);
-        mMenuDrawer.setOnDrawerStateChangeListener(new OnDrawerStateChangeListener() {
-            @Override
-            public void onDrawerStateChange(int oldState, int newState) {
-                // helps hiding actions when the drawer is opening
-                if (newState == MenuDrawer.STATE_CLOSED
-                        || (oldState == MenuDrawer.STATE_CLOSED &&
-                        (newState == MenuDrawer.STATE_OPENING || newState == MenuDrawer.STATE_DRAGGING))) {
-                    supportInvalidateOptionsMenu();
-                }
+        // setup menu adapter
+        mDrawerAdapter = new DrawerAdapter(this);
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.shows), R.drawable.ic_action_tv,
+                MENU_ITEM_SHOWS_ID));
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.lists), R.drawable.ic_action_list,
+                MENU_ITEM_LISTS_ID));
+        mDrawerAdapter
+                .add(new DrawerItem(getString(R.string.activity), R.drawable.ic_action_upcoming,
+                        MENU_ITEM_ACTIVITY_ID));
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.movies), R.drawable.ic_action_movie,
+                MENU_ITEM_MOVIES_ID));
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.statistics),
+                R.drawable.ic_action_bargraph, MENU_ITEM_STATS_ID));
+        mDrawerAdapter.add(new DrawerCategory());
+        mDrawerAdapter
+                .add(new DrawerItem(getString(R.string.search_hint), R.drawable.ic_action_search,
+                        MENU_ITEM_SEARCH_ID));
+
+        mDrawerList.setAdapter(mDrawerAdapter);
+        mDrawerList.setOnItemClickListener(this);
+
+        // setup drawer indicator
+        mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.drawable.ic_drawer,
+                R.string.drawer_open, R.string.drawer_close) {
+            public void onDrawerClosed(View view) {
+                invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
             }
 
+            public void onDrawerOpened(View drawerView) {
+                invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
+            }
+        };
+        // don't show the indicator by default
+        mDrawerToggle.setDrawerIndicatorEnabled(false);
+        mDrawerLayout.setDrawerListener(mDrawerToggle);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        mDrawerToggle.syncState();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        mDrawerToggle.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        // close menu any way
+        Handler h = new Handler();
+        h.postDelayed(new Runnable() {
             @Override
-            public void onDrawerSlide(float openRatio, int offsetPixels) {
-                // Nothing to do
+            public void run() {
+                mDrawerLayout.closeDrawer(mDrawerList);
             }
-        });
-
-        // Don't recreate the MenuDrawer content on orientation changes
-        if (savedInstanceState == null) {
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            Fragment f = new SlidingMenuFragment();
-            ft.add(R.id.menu_frame, f);
-            ft.commit();
+        }, 200);
+
+        int menuId = ((DrawerItem) mDrawerAdapter.getItem(position)).mId;
+        switch (menuId) {
+            case MENU_ITEM_SHOWS_ID:
+                startActivity(new Intent(this, ShowsActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
+                                | Intent.FLAG_ACTIVITY_SINGLE_TOP));
+                Utils.trackAction(this, TAG_NAV_DRAWER, "Shows");
+                break;
+            case MENU_ITEM_LISTS_ID:
+                startActivity(new Intent(this, ListsActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
+                Utils.trackAction(this, TAG_NAV_DRAWER, "Lists");
+                break;
+            case MENU_ITEM_ACTIVITY_ID:
+                startActivity(new Intent(this, UpcomingRecentActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
+                Utils.trackAction(this, TAG_NAV_DRAWER, "Activity");
+                break;
+            case MENU_ITEM_MOVIES_ID:
+                startActivity(new Intent(this, MoviesActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
+                Utils.trackAction(this, TAG_NAV_DRAWER, "Movies");
+                break;
+            case MENU_ITEM_STATS_ID:
+                startActivity(new Intent(this, StatsActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
+                Utils.trackAction(this, TAG_NAV_DRAWER, "Statistics");
+                break;
+            case MENU_ITEM_SEARCH_ID:
+                startActivity(new Intent(this, SearchActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
+                Utils.trackAction(this, TAG_NAV_DRAWER, "Search");
+                break;
         }
+
+        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
     }
 
-    /*
-     * Creates an {@link MenuDrawer} attached to this activity as an overlay.
-     * Subclasses may override this to set their own layout and drawer type.
+    /**
+     * Returns true if the navigation drawer is open.
      */
-    protected MenuDrawer getAttachedMenuDrawer() {
-        MenuDrawer menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY);
-        menuDrawer.setMenuView(R.layout.menu_frame);
-        return menuDrawer;
+    protected boolean isDrawerOpen() {
+        return mDrawerLayout.isDrawerOpen(mDrawerList);
     }
 
-    @Override
-    public void onBackPressed() {
-        // close an open menu first
-        final int drawerState = mMenuDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-            mMenuDrawer.closeMenu();
-            return;
+    public void setDrawerIndicatorEnabled(boolean isEnabled) {
+        mDrawerToggle.setDrawerIndicatorEnabled(isEnabled);
+    }
+
+    public boolean toggleDrawer(MenuItem item) {
+        if (item != null && item.getItemId() == android.R.id.home && mDrawerToggle
+                .isDrawerIndicatorEnabled()) {
+            if (mDrawerLayout.isDrawerVisible(GravityCompat.START)) {
+                mDrawerLayout.closeDrawer(GravityCompat.START);
+            } else {
+                mDrawerLayout.openDrawer(GravityCompat.START);
+            }
+            return true;
         }
+        return false;
+    }
+
+    private class DrawerItem {
+
+        String mTitle;
 
-        super.onBackPressed();
+        int mIconRes;
+
+        int mId;
+
+        public DrawerItem(String title, int iconRes, int id) {
+            mTitle = title;
+            mIconRes = iconRes;
+            mId = id;
+        }
     }
 
-    protected MenuDrawer getMenu() {
-        return mMenuDrawer;
+    private class DrawerCategory {
+
+        public DrawerCategory() {
+        }
     }
 
-    /**
-     * Returns true if the navigation drawer is visible in any way (opening,
-     * closing, peeking, open).
-     */
-    protected boolean isMenuDrawerOpen() {
-        return getMenu().getDrawerState() != MenuDrawer.STATE_CLOSED;
+    public class DrawerAdapter extends ArrayAdapter<Object> {
+
+        public DrawerAdapter(Context context) {
+            super(context, 0);
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return getItem(position) instanceof DrawerItem ? 0 : 1;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return getItem(position) instanceof DrawerItem;
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            Object item = getItem(position);
+
+            if (item instanceof DrawerItem) {
+                ViewHolder holder;
+                if (convertView == null) {
+                    convertView = LayoutInflater.from(getContext()).inflate(
+                            R.layout.drawer_item, parent, false);
+                    holder = new ViewHolder();
+                    holder.attach(convertView);
+                    convertView.setTag(holder);
+                } else {
+                    holder = (ViewHolder) convertView.getTag();
+                }
+
+                DrawerItem menuItem = (DrawerItem) item;
+                holder.icon.setImageResource(menuItem.mIconRes);
+                holder.title.setText(menuItem.mTitle);
+            } else {
+                if (convertView == null) {
+                    convertView = LayoutInflater.from(getContext()).inflate(
+                            R.layout.drawer_category, parent, false);
+                }
+            }
+
+            return convertView;
+        }
     }
 
-    protected void toggleMenu() {
-        mMenuDrawer.toggleMenu();
+    private static class ViewHolder {
+
+        public TextView title;
+
+        public ImageView icon;
+
+        public void attach(View v) {
+            icon = (ImageView) v.findViewById(R.id.menu_icon);
+            title = (TextView) v.findViewById(R.id.menu_title);
+        }
     }
 
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopActivity.java
index 4c591e8a91..76c07cacce 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopActivity.java
@@ -24,9 +24,6 @@ protected void onCreate(Bundle arg0) {
 
         setupActionBar();
 
-        // setup nav drawer to show special indicator
-        getMenu().setSlideDrawable(R.drawable.ic_drawer);
-        getMenu().setDrawerIndicatorEnabled(true);
     }
 
     private void setupActionBar() {
@@ -35,6 +32,14 @@ private void setupActionBar() {
         actionBar.setDisplayHomeAsUpEnabled(true);
     }
 
+    @Override
+    public void setupNavDrawer() {
+        super.setupNavDrawer();
+
+        // show a drawer indicator
+        setDrawerIndicatorEnabled(true);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getSupportMenuInflater().inflate(R.menu.base_menu, menu);
@@ -52,11 +57,13 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        int itemId = item.getItemId();
-        if (itemId == android.R.id.home) {
-            toggleMenu();
+        // check if we should toggle the navigation drawer (app icon was touched)
+        if (toggleDrawer(item)) {
             return true;
-        } else if (itemId == R.id.menu_subscribe) {
+        }
+
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_subscribe) {
             startActivity(new Intent(this, BillingActivity.class));
 
             fireTrackerEvent("Subscribe");
@@ -73,6 +80,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             fireTrackerEvent("Help");
             return true;
         }
+
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopShowsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopShowsActivity.java
index 38c2f0aea0..63fd7dea83 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopShowsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseTopShowsActivity.java
@@ -1,13 +1,11 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.content.Intent;
-
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.uwetrottmann.seriesguide.R;
 
-import net.simonvt.menudrawer.MenuDrawer;
+import android.content.Intent;
 
 /**
  * Adds action items specific to top show activities.
@@ -36,7 +34,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public boolean onPrepareOptionsMenu(Menu menu) {
         // If the nav drawer is open, hide action items related to the content
         // view
-        boolean isDrawerOpen = getMenu().getDrawerState() != MenuDrawer.STATE_CLOSED;
+        boolean isDrawerOpen = isDrawerOpen();
         menu.findItem(R.id.menu_checkin).setVisible(!isDrawerOpen);
 
         return super.onPrepareOptionsMenu(menu);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SlidingMenuFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SlidingMenuFragment.java
deleted file mode 100644
index 762e956b8f..0000000000
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SlidingMenuFragment.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright 2012 Uwe Trottmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
-package com.battlelancer.seriesguide.ui;
-
-import com.battlelancer.seriesguide.util.Utils;
-import com.uwetrottmann.seriesguide.R;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.v4.app.ListFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-/**
- * Displays a menu to allow quick navigation within the app.
- */
-public class SlidingMenuFragment extends ListFragment {
-
-    private MenuAdapter mAdapter;
-
-    private SharedPreferences mPrefs;
-
-    private static final int MENU_ITEM_SHOWS_ID = 0;
-    private static final int MENU_ITEM_LISTS_ID = 1;
-    private static final int MENU_ITEM_ACTIVITY_ID = 3;
-    private static final int MENU_ITEM_SEARCH_ID = 4;
-    private static final int MENU_ITEM_MOVIES_ID = 5;
-    private static final int MENU_ITEM_STATS_ID = 6;
-
-    private static final int PAGE_SHOWS = 0;
-    private static final int PAGE_LISTS = 1;
-    private static final int PAGE_ACTIVITY = 2;
-
-    private static final String TAG = "Navigation Drawer";
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.menu_fragment, container, false);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-
-        // main views
-        mAdapter = new MenuAdapter(getActivity());
-        mAdapter.add(new MenuItem(getString(R.string.shows), R.drawable.ic_action_tv,
-                MENU_ITEM_SHOWS_ID));
-        mAdapter.add(new MenuItem(getString(R.string.lists), R.drawable.ic_action_list,
-                MENU_ITEM_LISTS_ID));
-        mAdapter.add(new MenuItem(getString(R.string.activity), R.drawable.ic_action_upcoming,
-                MENU_ITEM_ACTIVITY_ID));
-        mAdapter.add(new MenuItem(getString(R.string.movies), R.drawable.ic_action_movie,
-                MENU_ITEM_MOVIES_ID));
-        mAdapter.add(new MenuItem(getString(R.string.statistics), R.drawable.ic_action_bargraph,
-                MENU_ITEM_STATS_ID));
-
-        // actions
-        mAdapter.add(new MenuCategory());
-        mAdapter.add(new MenuItem(getString(R.string.search_hint), R.drawable.ic_action_search,
-                MENU_ITEM_SEARCH_ID));
-
-        setListAdapter(mAdapter);
-    }
-
-    @Override
-    public void onListItemClick(ListView l, View v, int position, long id) {
-        // close menu any way
-        if (getActivity() instanceof BaseNavDrawerActivity) {
-            final BaseNavDrawerActivity activity = (BaseNavDrawerActivity) getActivity();
-            Handler h = new Handler();
-            h.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    activity.getMenu().closeMenu();
-                }
-            }, 200);
-        }
-
-        int itemId = ((MenuItem) mAdapter.getItem(position)).mId;
-        switch (itemId) {
-            case MENU_ITEM_SHOWS_ID:
-                startActivity(new Intent(getActivity(), ShowsActivity.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
-                                | Intent.FLAG_ACTIVITY_SINGLE_TOP));
-                storeSelectedPage(PAGE_SHOWS);
-                fireTrackerEvent("Shows");
-                break;
-            case MENU_ITEM_LISTS_ID:
-                startActivity(new Intent(getActivity(), ListsActivity.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
-                storeSelectedPage(PAGE_LISTS);
-                fireTrackerEvent("Lists");
-                break;
-            case MENU_ITEM_ACTIVITY_ID:
-                startActivity(new Intent(getActivity(), UpcomingRecentActivity.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
-                storeSelectedPage(PAGE_ACTIVITY);
-                fireTrackerEvent("Activity");
-                break;
-            case MENU_ITEM_MOVIES_ID:
-                startActivity(new Intent(getActivity(), MoviesActivity.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
-                fireTrackerEvent("Movies");
-                break;
-            case MENU_ITEM_STATS_ID:
-                startActivity(new Intent(getActivity(), StatsActivity.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
-                fireTrackerEvent("Statistics");
-                break;
-            case MENU_ITEM_SEARCH_ID:
-                startActivity(new Intent(getActivity(), SearchActivity.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
-                fireTrackerEvent("Search");
-                break;
-        }
-
-        getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-    }
-
-    private void storeSelectedPage(int page) {
-        mPrefs.edit().putInt(SeriesGuidePreferences.KEY_SELECTED_PAGE, page).commit();
-    }
-
-    private class MenuItem {
-
-        String mTitle;
-        int mIconRes;
-        int mId;
-
-        public MenuItem(String title, int iconRes, int id) {
-            mTitle = title;
-            mIconRes = iconRes;
-            mId = id;
-        }
-    }
-
-    private class MenuCategory {
-
-        public MenuCategory() {
-        }
-    }
-
-    public class MenuAdapter extends ArrayAdapter<Object> {
-
-        public MenuAdapter(Context context) {
-            super(context, 0);
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position) instanceof MenuItem ? 0 : 1;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItem(position) instanceof MenuItem;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            Object item = getItem(position);
-
-            if (item instanceof MenuItem) {
-                ViewHolder holder;
-                if (convertView == null) {
-                    convertView = LayoutInflater.from(getContext()).inflate(
-                            R.layout.sliding_menu_row_item, parent, false);
-                    holder = new ViewHolder();
-                    holder.attach(convertView);
-                    convertView.setTag(holder);
-                } else {
-                    holder = (ViewHolder) convertView.getTag();
-                }
-
-                MenuItem menuItem = (MenuItem) item;
-                holder.icon.setImageResource(menuItem.mIconRes);
-                holder.title.setText(menuItem.mTitle);
-            } else {
-                if (convertView == null) {
-                    convertView = LayoutInflater.from(getContext()).inflate(
-                            R.layout.sliding_menu_row_category, parent, false);
-                }
-            }
-
-            return convertView;
-        }
-    }
-
-    static class ViewHolder {
-
-        public TextView title;
-
-        public ImageView icon;
-
-        public void attach(View v) {
-            icon = (ImageView) v.findViewById(R.id.menu_icon);
-            title = (TextView) v.findViewById(R.id.menu_title);
-        }
-    }
-
-    private void fireTrackerEvent(String label) {
-        Utils.trackAction(getActivity(), TAG, label);
-    }
-
-}
diff --git a/SeriesGuide/src/main/res/layout/sliding_menu_row_category.xml b/SeriesGuide/src/main/res/layout/drawer_category.xml
similarity index 100%
rename from SeriesGuide/src/main/res/layout/sliding_menu_row_category.xml
rename to SeriesGuide/src/main/res/layout/drawer_category.xml
diff --git a/SeriesGuide/src/main/res/layout/sliding_menu_row_item.xml b/SeriesGuide/src/main/res/layout/drawer_item.xml
similarity index 100%
rename from SeriesGuide/src/main/res/layout/sliding_menu_row_item.xml
rename to SeriesGuide/src/main/res/layout/drawer_item.xml
diff --git a/SeriesGuide/src/main/res/layout/drawer_left.xml b/SeriesGuide/src/main/res/layout/drawer_left.xml
new file mode 100644
index 0000000000..0554e37cbb
--- /dev/null
+++ b/SeriesGuide/src/main/res/layout/drawer_left.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?><!-- The navigation drawer -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ListView
+        android:id="@+id/left_drawer"
+        android:layout_width="@dimen/slidingmenu_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="left|start"
+        android:background="@color/background_lighter"
+        android:choiceMode="singleChoice"
+        android:clipToPadding="@bool/gridClipToPadding"
+        android:listSelector="?attr/custom_list_selector" />
+
+</merge>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/menu_fragment.xml b/SeriesGuide/src/main/res/layout/menu_fragment.xml
deleted file mode 100644
index 61e10efcd9..0000000000
--- a/SeriesGuide/src/main/res/layout/menu_fragment.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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" >
-
-    <ListView
-        android:id="@+android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="@bool/gridClipToPadding"
-        android:gravity="center"
-        android:listSelector="?attr/custom_list_selector" >
-    </ListView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/menu_frame.xml b/SeriesGuide/src/main/res/layout/menu_frame.xml
deleted file mode 100644
index c817986839..0000000000
--- a/SeriesGuide/src/main/res/layout/menu_frame.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/menu_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_lighter" >
-
-</FrameLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/menu_frame_with_spacer.xml b/SeriesGuide/src/main/res/layout/menu_frame_with_spacer.xml
deleted file mode 100644
index d041d8985e..0000000000
--- a/SeriesGuide/src/main/res/layout/menu_frame_with_spacer.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/menu_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_lighter"
-    android:paddingTop="?actionBarSize" >
-
-</FrameLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/values/strings.xml b/SeriesGuide/src/main/res/values/strings.xml
index 0e452b085c..31e49a6ea6 100644
--- a/SeriesGuide/src/main/res/values/strings.xml
+++ b/SeriesGuide/src/main/res/values/strings.xml
@@ -10,6 +10,8 @@
     <string name="search">Search</string>
     <string name="preferences">Settings</string>
     <string name="help">Help</string>
+    <string name="drawer_open">Open navigation drawer</string>
+    <string name="drawer_close">Close navigation drawer</string>
 
     <!-- Media items -->
     <string name="show">Show</string>

From 91ca33c2a8e7ab38d1cfcbdb90941a546addeb6f Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 12:06:00 +0100
Subject: [PATCH 27/74] Add nav drawer where applicable, modify layouts.

- Call setupNavDrawer() and add DrawerLayout to layouts.
---
 .../getglueapi/GetGlueAuthActivity.java       |   6 +-
 .../seriesguide/ui/AddActivity.java           |  26 ++--
 .../seriesguide/ui/CheckinActivity.java       |  24 ++--
 .../ui/EpisodeDetailsActivity.java            |  12 +-
 .../ui/EpisodeDetailsFragment.java            |   2 +-
 .../seriesguide/ui/EpisodesActivity.java      |  32 +++--
 .../seriesguide/ui/FirstRunFragment.java      |   3 -
 .../ui/FixGetGlueCheckInActivity.java         |  21 +--
 .../seriesguide/ui/HelpActivity.java          |  17 ++-
 .../seriesguide/ui/ListsActivity.java         |   5 +-
 .../seriesguide/ui/MovieDetailsActivity.java  |   9 +-
 .../seriesguide/ui/MovieDetailsFragment.java  |   2 +-
 .../seriesguide/ui/MoviesActivity.java        |   3 +-
 .../seriesguide/ui/OverviewActivity.java      |   5 +-
 .../seriesguide/ui/OverviewFragment.java      |   2 +-
 .../seriesguide/ui/SearchActivity.java        |  20 +--
 .../seriesguide/ui/ShowInfoFragment.java      |   2 +-
 .../seriesguide/ui/ShowsActivity.java         |   5 +-
 .../seriesguide/ui/ShowsFragment.java         |   2 +-
 .../seriesguide/ui/StatsActivity.java         |  12 +-
 .../seriesguide/ui/TraktShoutsActivity.java   |   7 +-
 .../ui/UpcomingRecentActivity.java            |   3 +-
 .../res/layout/activity_singlepane_empty.xml  |  16 ++-
 .../src/main/res/layout/addactivity_pager.xml |  35 +++--
 SeriesGuide/src/main/res/layout/checkin.xml   | 128 ++++++++++--------
 .../src/main/res/layout/episode_pager.xml     |  54 +++++---
 .../main/res/layout/episode_pager_wide.xml    |  77 ++++++-----
 SeriesGuide/src/main/res/layout/episodes.xml  |  15 +-
 .../main/res/layout/episodes_multipane.xml    |  92 +++++++------
 .../res/layout/episodes_multipane_wide.xml    | 114 ++++++++--------
 SeriesGuide/src/main/res/layout/lists.xml     |   7 +-
 SeriesGuide/src/main/res/layout/movies.xml    |  35 +++--
 SeriesGuide/src/main/res/layout/overview.xml  |  37 +++--
 .../main/res/layout/overview_multipane.xml    |  61 +++++----
 .../res/layout/overview_multipane_wide.xml    |  47 ++++---
 SeriesGuide/src/main/res/layout/search.xml    |  15 +-
 .../src/main/res/layout/search_wide.xml       |  22 +--
 SeriesGuide/src/main/res/layout/shows.xml     |  34 +++--
 SeriesGuide/src/main/res/layout/upcoming.xml  |  37 +++--
 .../src/main/res/values-large/dimens.xml      |   1 -
 .../src/main/res/values-w590dp/dimens.xml     |   1 -
 SeriesGuide/src/main/res/values/dimens.xml    |   1 +
 42 files changed, 594 insertions(+), 455 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/getglueapi/GetGlueAuthActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/getglueapi/GetGlueAuthActivity.java
index f3970f30b2..7925686fc0 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/getglueapi/GetGlueAuthActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/getglueapi/GetGlueAuthActivity.java
@@ -21,7 +21,7 @@
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Window;
 import com.battlelancer.seriesguide.settings.GetGlueSettings;
-import com.battlelancer.seriesguide.ui.BaseNavDrawerActivity;
+import com.battlelancer.seriesguide.ui.BaseActivity;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.getglue.GetGlue;
 import com.uwetrottmann.seriesguide.R;
@@ -47,7 +47,7 @@
 /**
  * Starts an OAuth 2.0 authentication flow via an {@link android.webkit.WebView}.
  */
-public class GetGlueAuthActivity extends BaseNavDrawerActivity {
+public class GetGlueAuthActivity extends BaseActivity {
 
     static final String TAG = "GetGlueAuthActivity";
 
@@ -61,7 +61,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         mWebview = new WebView(this);
-        getMenu().setContentView(mWebview);
+        setContentView(mWebview);
 
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setTitle(getString(R.string.getglue_authentication));
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
index 1eaf342275..bc485e2449 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
@@ -17,6 +17,17 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.Window;
+import com.astuetz.viewpager.extensions.PagerSlidingTabStrip;
+import com.battlelancer.seriesguide.items.SearchResult;
+import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment;
+import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment.OnAddShowListener;
+import com.battlelancer.seriesguide.util.ServiceUtils;
+import com.battlelancer.seriesguide.util.TaskManager;
+import com.uwetrottmann.androidutils.AndroidUtils;
+import com.uwetrottmann.seriesguide.R;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ -31,17 +42,6 @@
 import android.support.v4.view.ViewPager;
 import android.widget.EditText;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.view.Window;
-import com.astuetz.viewpager.extensions.PagerSlidingTabStrip;
-import com.battlelancer.seriesguide.items.SearchResult;
-import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment;
-import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment.OnAddShowListener;
-import com.battlelancer.seriesguide.util.ServiceUtils;
-import com.battlelancer.seriesguide.util.TaskManager;
-import com.uwetrottmann.androidutils.AndroidUtils;
-import com.uwetrottmann.seriesguide.R;
-
 import java.util.Locale;
 
 /**
@@ -66,8 +66,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // The TvdbAddFragment uses a progress bar
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         super.onCreate(savedInstanceState);
-
-        getMenu().setContentView(R.layout.addactivity_pager);
+        setContentView(R.layout.addactivity_pager);
+        setupNavDrawer();
 
         setupActionBar();
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/CheckinActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/CheckinActivity.java
index 3bc18324c4..d540d39a83 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/CheckinActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/CheckinActivity.java
@@ -17,6 +17,17 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import com.google.analytics.tracking.android.EasyTracker;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.ShowsDistillationSettings;
+import com.battlelancer.seriesguide.ui.ShowsFragment.ViewHolder;
+import com.battlelancer.seriesguide.ui.dialogs.CheckInDialogFragment;
+import com.battlelancer.seriesguide.util.ImageProvider;
+import com.battlelancer.seriesguide.util.Utils;
+import com.uwetrottmann.seriesguide.R;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -42,16 +53,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.battlelancer.seriesguide.settings.ShowsDistillationSettings;
-import com.battlelancer.seriesguide.ui.ShowsFragment.ViewHolder;
-import com.battlelancer.seriesguide.ui.dialogs.CheckInDialogFragment;
-import com.battlelancer.seriesguide.util.ImageProvider;
-import com.battlelancer.seriesguide.util.Utils;
-import com.google.analytics.tracking.android.EasyTracker;
-import com.uwetrottmann.seriesguide.R;
-
 /**
  * Displays a searchable list of shows to allow quickly checking into a shows
  * next episode.
@@ -70,7 +71,8 @@ public class CheckinActivity extends BaseNavDrawerActivity implements LoaderCall
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
 
-        getMenu().setContentView(R.layout.checkin);
+        setContentView(R.layout.checkin);
+        setupNavDrawer();
 
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setTitle(getString(R.string.checkin));
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
index 7cfc1c139e..7eb01592fb 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
@@ -31,8 +31,6 @@
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
-import net.simonvt.menudrawer.MenuDrawer;
-
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -76,7 +74,8 @@ public interface InitBundle {
     protected void onCreate(Bundle savedInstanceState) {
         requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.episode_pager);
+        setContentView(R.layout.episode_pager);
+        setupNavDrawer();
 
         setupActionBar();
 
@@ -162,13 +161,6 @@ protected void setCustomTheme() {
         }
     }
 
-    @Override
-    protected MenuDrawer getAttachedMenuDrawer() {
-        MenuDrawer menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY);
-        menuDrawer.setMenuView(R.layout.menu_frame_with_spacer);
-        return menuDrawer;
-    }
-
     private void setupActionBar() {
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(false);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsFragment.java
index ad6af45ff9..dbd7006047 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsFragment.java
@@ -218,7 +218,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     public void onPrepareOptionsMenu(Menu menu) {
         // If the nav drawer is open, hide action items related to the content
         // view
-        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isMenuDrawerOpen();
+        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isDrawerOpen();
         menu.findItem(R.id.menu_manage_lists).setVisible(!isDrawerOpen);
         menu.findItem(R.id.menu_share).setVisible(!isDrawerOpen);
         super.onPrepareOptionsMenu(menu);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java
index f92a0e7b64..02275e7098 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java
@@ -17,19 +17,7 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
+import com.google.analytics.tracking.android.EasyTracker;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
@@ -44,9 +32,22 @@
 import com.battlelancer.seriesguide.ui.EpisodeDetailsActivity.EpisodePagerAdapter;
 import com.battlelancer.seriesguide.util.DBUtils;
 import com.battlelancer.seriesguide.util.Utils;
-import com.google.analytics.tracking.android.EasyTracker;
 import com.uwetrottmann.seriesguide.R;
 
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
@@ -88,7 +89,8 @@ public interface InitBundle {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.episodes);
+        setContentView(R.layout.episodes);
+        setupNavDrawer();
 
         // if coming from a notification, set last cleared time
         NotificationService.handleDeleteIntent(this, getIntent());
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java
index 439d80a69c..d7aec19f71 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java
@@ -135,9 +135,6 @@ public void onClick(View v) {
                 setFirstRunDismissed();
             }
         });
-
-        // peek menu
-        ((BaseNavDrawerActivity) getActivity()).getMenu().peekDrawer();
     }
 
     @Override
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FixGetGlueCheckInActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FixGetGlueCheckInActivity.java
index cebc9b86f7..18f802cc8d 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FixGetGlueCheckInActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FixGetGlueCheckInActivity.java
@@ -1,6 +1,15 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import com.google.analytics.tracking.android.EasyTracker;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.battlelancer.seriesguide.adapters.GetGlueObjectAdapter;
+import com.battlelancer.seriesguide.loaders.GetGlueObjectLoader;
+import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.uwetrottmann.getglue.entities.GetGlueObject;
+import com.uwetrottmann.seriesguide.R;
+
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.Bundle;
@@ -17,21 +26,13 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.battlelancer.seriesguide.adapters.GetGlueObjectAdapter;
-import com.battlelancer.seriesguide.loaders.GetGlueObjectLoader;
-import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.google.analytics.tracking.android.EasyTracker;
-import com.uwetrottmann.getglue.entities.GetGlueObject;
-import com.uwetrottmann.seriesguide.R;
-
 import java.util.List;
 
 /**
  * Displays a list of GetGlue search results to choose from which are used to
  * provide object ids for GetGlue check ins.
  */
-public class FixGetGlueCheckInActivity extends BaseNavDrawerActivity implements
+public class FixGetGlueCheckInActivity extends BaseActivity implements
         LoaderManager.LoaderCallbacks<List<GetGlueObject>>, OnItemClickListener {
 
     public interface InitBundle {
@@ -50,7 +51,7 @@ public interface InitBundle {
     @Override
     protected void onCreate(Bundle args) {
         super.onCreate(args);
-        getMenu().setContentView(R.layout.activity_fix_get_glue);
+        setContentView(R.layout.activity_fix_get_glue);
 
         setTitle(R.string.checkin_fixgetglue);
         
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java
index ca49140ecd..aec1ccaea0 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java
@@ -14,12 +14,11 @@
 import android.webkit.WebView;
 
 /**
- * Displays the seriesguide online help page.
+ * Displays the SeriesGuide online help page.
  */
-public class HelpActivity extends BaseNavDrawerActivity {
+public class HelpActivity extends BaseActivity {
 
     private static final String TAG = "Help";
-    private WebView mWebview;
 
     @SuppressLint("SetJavaScriptEnabled")
     @Override
@@ -29,8 +28,8 @@ protected void onCreate(Bundle arg0) {
 
         super.onCreate(arg0);
 
-        mWebview = new WebView(this);
-        getMenu().setContentView(mWebview);
+        WebView webview = new WebView(this);
+        setContentView(webview);
 
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setHomeButtonEnabled(true);
@@ -38,8 +37,8 @@ protected void onCreate(Bundle arg0) {
 
         setSupportProgressBarVisibility(true);
 
-        final BaseNavDrawerActivity activity = this;
-        mWebview.setWebChromeClient(new WebChromeClient() {
+        final BaseActivity activity = this;
+        webview.setWebChromeClient(new WebChromeClient() {
             public void onProgressChanged(WebView view, int progress) {
                 /*
                  * Activities and WebViews measure progress with different
@@ -49,8 +48,8 @@ public void onProgressChanged(WebView view, int progress) {
                 activity.setSupportProgress(progress * 1000);
             }
         });
-        mWebview.getSettings().setJavaScriptEnabled(true);
-        mWebview.loadUrl(getString(R.string.help_url));
+        webview.getSettings().setJavaScriptEnabled(true);
+        webview.loadUrl(getString(R.string.help_url));
     }
 
     @Override
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java
index 10fe0944d5..25058ab361 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java
@@ -32,7 +32,8 @@ public class ListsActivity extends BaseTopShowsActivity implements OnListsChange
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.lists);
+        setContentView(R.layout.lists);
+        setupNavDrawer();
 
         setupActionBar();
 
@@ -93,7 +94,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onPrepareOptionsMenu(Menu menu) {
         // If the nav drawer is open, hide action items related to the content
         // view
-        boolean isDrawerOpen = isMenuDrawerOpen();
+        boolean isDrawerOpen = isDrawerOpen();
         menu.findItem(R.id.menu_list_add).setVisible(!isDrawerOpen);
 
         return super.onPrepareOptionsMenu(menu);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java
index e55956d6ce..ce3f30d1d7 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java
@@ -17,13 +17,13 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.content.Intent;
-import android.os.Bundle;
-
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
 import com.uwetrottmann.seriesguide.R;
 
+import android.content.Intent;
+import android.os.Bundle;
+
 /**
  * Hosts a {@link MovieDetailsFragment} displaying details about the movie
  * defined by the given TMDb id intent extra.
@@ -33,7 +33,8 @@ public class MovieDetailsActivity extends BaseNavDrawerActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.activity_singlepane_empty);
+        setContentView(R.layout.activity_singlepane_empty);
+        setupNavDrawer();
 
         if (getIntent().getExtras() == null) {
             finish();
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsFragment.java
index 5337e277e3..e99da2a421 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsFragment.java
@@ -124,7 +124,7 @@ public void onPrepareOptionsMenu(Menu menu) {
         if (mMovieDetails != null) {
             // If the nav drawer is open, hide action items related to the
             // content view
-            boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isMenuDrawerOpen();
+            boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isDrawerOpen();
 
             boolean isEnableImdb = mMovieDetails.movie() != null
                     && !TextUtils.isEmpty(mMovieDetails.movie().imdb_id);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
index bf142f8222..e8a15a6fd4 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
@@ -43,7 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportProgressBarIndeterminateVisibility(false);
 
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.movies);
+        setContentView(R.layout.movies);
+        setupNavDrawer();
 
         setupActionBar();
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewActivity.java
index b7f1893291..7f82191188 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewActivity.java
@@ -68,7 +68,8 @@ public class OverviewActivity extends BaseNavDrawerActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.overview);
+        setContentView(R.layout.overview);
+        setupNavDrawer();
 
         mShowId = getIntent().getIntExtra(OverviewFragment.InitBundle.SHOW_TVDBID, -1);
         if (mShowId == -1) {
@@ -252,7 +253,7 @@ public void onBackPressed() {
     public boolean onPrepareOptionsMenu(Menu menu) {
         // If the nav drawer is open, hide action items related to the content
         // view
-        menu.findItem(R.id.menu_overview_search).setVisible(!isMenuDrawerOpen());
+        menu.findItem(R.id.menu_overview_search).setVisible(!isDrawerOpen());
         return super.onPrepareOptionsMenu(menu);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
index 3e78e052f4..23ec4d10a6 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
@@ -231,7 +231,7 @@ public void onPrepareOptionsMenu(Menu menu) {
 
         // If the nav drawer is open, hide action items related to the content
         // view
-        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isMenuDrawerOpen();
+        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isDrawerOpen();
         menu.findItem(R.id.menu_overview_manage_lists).setVisible(!isDrawerOpen);
         menu.findItem(R.id.menu_overview_share).setVisible(!isDrawerOpen);
         menu.findItem(R.id.menu_overview_search).setVisible(!isDrawerOpen);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
index 177702950e..0100497432 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
@@ -17,23 +17,22 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.app.SearchManager;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
+import com.google.analytics.tracking.android.EasyTracker;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.widget.SearchView;
-import com.google.analytics.tracking.android.EasyTracker;
-import com.google.analytics.tracking.android.MapBuilder;
-
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+
 /**
  * Handles search intents and displays a {@link SearchFragment} when needed or
  * redirects directly to an {@link EpisodeDetailsActivity}.
@@ -45,7 +44,8 @@ public class SearchActivity extends BaseTopActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.search);
+        setContentView(R.layout.search);
+        setupNavDrawer();
 
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setTitle(R.string.search_hint);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowInfoFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowInfoFragment.java
index 9b9f7e1afd..6a0c0fc528 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowInfoFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowInfoFragment.java
@@ -100,7 +100,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
-        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isMenuDrawerOpen();
+        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isDrawerOpen();
         menu.findItem(R.id.menu_show_manage_lists).setVisible(!isDrawerOpen);
         menu.findItem(R.id.menu_show_share).setVisible(!isDrawerOpen);
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
index e5a45796c5..21f74c4978 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
@@ -96,7 +96,8 @@ public class ShowsActivity extends BaseTopShowsActivity implements OnFirstRunDis
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.shows);
+        setContentView(R.layout.shows);
+        setupNavDrawer();
 
         // Set up a sync account if needed
         SyncUtils.createSyncAccount(this);
@@ -256,7 +257,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
         // If the nav drawer is open, hide action items related to the content
         // view
-        boolean isDrawerOpen = isMenuDrawerOpen();
+        boolean isDrawerOpen = isDrawerOpen();
         menu.findItem(R.id.menu_add_show).setVisible(!isDrawerOpen);
 
         return super.onPrepareOptionsMenu(menu);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsFragment.java
index 3b4fd4d8b5..ac883d621b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsFragment.java
@@ -361,7 +361,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         // If the nav drawer is open, hide action items related to the content view
-        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isMenuDrawerOpen();
+        boolean isDrawerOpen = ((BaseNavDrawerActivity) getActivity()).isDrawerOpen();
         MenuItem filter = menu.findItem(R.id.menu_action_shows_filter);
         filter.setVisible(!isDrawerOpen);
         filter.setIcon(mIsFilterFavorites || mIsFilterUnwatched || mIsFilterUpcoming
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
index 5b289a12a8..93f7210afa 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
@@ -17,16 +17,15 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-
-import com.actionbarsherlock.app.ActionBar;
 import com.google.analytics.tracking.android.EasyTracker;
-import com.google.analytics.tracking.android.MapBuilder;
 
+import com.actionbarsherlock.app.ActionBar;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+
 /**
  * Hosts fragments displaying statistics.
  */
@@ -37,7 +36,8 @@ public class StatsActivity extends BaseTopActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.activity_singlepane_empty);
+        setContentView(R.layout.activity_singlepane_empty);
+        setupNavDrawer();
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setTitle(R.string.statistics);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
index ecaa5c1e6e..6df90c2fe9 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
@@ -17,14 +17,15 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.os.Bundle;
+import com.google.analytics.tracking.android.EasyTracker;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragment;
 import com.battlelancer.seriesguide.util.ShareUtils.ShareItems;
-import com.google.analytics.tracking.android.EasyTracker;
 
-public class TraktShoutsActivity extends BaseNavDrawerActivity {
+import android.os.Bundle;
+
+public class TraktShoutsActivity extends BaseActivity {
 
     public static Bundle createInitBundleEpisode(int showTvdbid, int seasonNumber,
             int episodeNumber, String title) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
index f74af6d541..3dadb70809 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
@@ -51,7 +51,8 @@ public interface InitBundle {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getMenu().setContentView(R.layout.upcoming);
+        setContentView(R.layout.upcoming);
+        setupNavDrawer();
 
         // if coming from a notification, set last cleared time
         NotificationService.handleDeleteIntent(this, getIntent());
diff --git a/SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml b/SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml
index 1ea95b8b3d..f186881b4d 100644
--- a/SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml
+++ b/SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root_container"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-</LinearLayout>
\ No newline at end of file
+    <FrameLayout
+        android:id="@+id/root_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include layout="@layout/drawer_left" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/addactivity_pager.xml b/SeriesGuide/src/main/res/layout/addactivity_pager.xml
index 83581bc7d9..ae9718ec26 100644
--- a/SeriesGuide/src/main/res/layout/addactivity_pager.xml
+++ b/SeriesGuide/src/main/res/layout/addactivity_pager.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-        android:id="@+id/tabsAddShows"
-        style="@style/TabStrip"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_strip_height" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pagerAddShows"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+            android:id="@+id/tabsAddShows"
+            style="@style/TabStrip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_strip_height" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pagerAddShows"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/checkin.xml b/SeriesGuide/src/main/res/layout/checkin.xml
index be7166dfe6..f8ed9a060e 100644
--- a/SeriesGuide/src/main/res/layout/checkin.xml
+++ b/SeriesGuide/src/main/res/layout/checkin.xml
@@ -1,69 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <EditText
-        android:id="@+id/editTextCheckinSearch"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="@dimen/large_padding"
-        android:layout_marginTop="@dimen/large_padding"
-        android:layout_toLeftOf="@+id/imageButtonClearSearch"
-        android:ems="10"
-        android:hint="@string/checkin_searchhint"
-        android:inputType="text"
-        android:paddingBottom="@dimen/default_padding" >
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <requestFocus />
-    </EditText>
+        <EditText
+            android:id="@+id/editTextCheckinSearch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="@dimen/large_padding"
+            android:layout_marginTop="@dimen/large_padding"
+            android:layout_toLeftOf="@+id/imageButtonClearSearch"
+            android:ems="10"
+            android:hint="@string/checkin_searchhint"
+            android:inputType="text"
+            android:paddingBottom="@dimen/default_padding">
 
-    <TextView
-        android:id="@+id/empty"
-        android:layout_width="250dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/editTextCheckinSearch"
-        android:layout_centerInParent="true"
-        android:layout_gravity="center"
-        android:padding="10dp"
-        android:text="@string/checkin_empty"
-        android:visibility="gone" />
+            <requestFocus />
+        </EditText>
 
-    <GridView
-        android:id="@+id/gridViewCheckinShows"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/empty"
-        android:clipToPadding="@bool/gridClipToPadding"
-        android:columnWidth="@dimen/showgrid_columnWidth"
-        android:gravity="center"
-        android:horizontalSpacing="@dimen/showgrid_spacing"
-        android:listSelector="?custom_list_selector"
-        android:numColumns="auto_fit"
-        android:padding="@dimen/showgrid_padding"
-        android:stretchMode="columnWidth"
-        android:verticalSpacing="@dimen/showgrid_spacing" >
-    </GridView>
+        <TextView
+            android:id="@+id/empty"
+            android:layout_width="250dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/editTextCheckinSearch"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:padding="10dp"
+            android:text="@string/checkin_empty"
+            android:visibility="gone" />
+
+        <GridView
+            android:id="@+id/gridViewCheckinShows"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/empty"
+            android:clipToPadding="@bool/gridClipToPadding"
+            android:columnWidth="@dimen/showgrid_columnWidth"
+            android:gravity="center"
+            android:horizontalSpacing="@dimen/showgrid_spacing"
+            android:listSelector="?custom_list_selector"
+            android:numColumns="auto_fit"
+            android:padding="@dimen/showgrid_padding"
+            android:stretchMode="columnWidth"
+            android:verticalSpacing="@dimen/showgrid_spacing"/>
+
+        <ImageButton
+            android:id="@+id/imageButtonClearSearch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/editTextCheckinSearch"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignTop="@+id/editTextCheckinSearch"
+            android:layout_marginRight="@dimen/large_padding"
+            android:layout_marginTop="@dimen/large_padding"
+            android:background="?custom_list_selector"
+            android:contentDescription="@string/clear"
+            android:paddingLeft="@dimen/inline_padding"
+            android:paddingRight="@dimen/inline_padding"
+            android:src="?attr/drawableCancel" />
+
+    </RelativeLayout>
 
-    <ImageButton
-        android:id="@+id/imageButtonClearSearch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/editTextCheckinSearch"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignTop="@+id/editTextCheckinSearch"
-        android:layout_marginRight="@dimen/large_padding"
-        android:layout_marginTop="@dimen/large_padding"
-        android:background="?custom_list_selector"
-        android:contentDescription="@string/clear"
-        android:paddingLeft="@dimen/inline_padding"
-        android:paddingRight="@dimen/inline_padding"
-        android:src="?attr/drawableCancel" />
+    <include layout="@layout/drawer_left" />
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/episode_pager.xml b/SeriesGuide/src/main/res/layout/episode_pager.xml
index 2499fde02e..c2c655b444 100644
--- a/SeriesGuide/src/main/res/layout/episode_pager.xml
+++ b/SeriesGuide/src/main/res/layout/episode_pager.xml
@@ -1,30 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/background"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" >
-    </ImageView>
+        android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="?actionBarSize" >
+        <ImageView
+            android:id="@+id/background"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"/>
 
-        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-            android:id="@+id/tabsEpisodeDetails"
-            style="@style/TabStrip"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_strip_height" />
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingTop="?actionBarSize">
+
+            <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+                android:id="@+id/tabsEpisodeDetails"
+                style="@style/TabStrip"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/tab_strip_height" />
+
+            <android.support.v4.view.ViewPager
+                android:id="@+id/pagerEpisodeDetails"
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+    </FrameLayout>
 
-        <android.support.v4.view.ViewPager
-            android:id="@+id/pagerEpisodeDetails"
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-    </LinearLayout>
+    <include layout="@layout/drawer_left" />
 
-</merge>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/episode_pager_wide.xml b/SeriesGuide/src/main/res/layout/episode_pager_wide.xml
index f1fad8248d..6054c23f55 100644
--- a/SeriesGuide/src/main/res/layout/episode_pager_wide.xml
+++ b/SeriesGuide/src/main/res/layout/episode_pager_wide.xml
@@ -1,48 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/background"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" >
-    </ImageView>
+        android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="?actionBarSize" >
-
-        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-            android:id="@+id/tabsEpisodeDetails"
-            style="@style/TabStrip"
+        <ImageView
+            android:id="@+id/background"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_strip_height" />
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:paddingTop="?actionBarSize">
 
-            <View
-                android:id="@+id/spacer_left"
-                style="@style/EpisodePagerSpacer"
-                android:layout_width="0px"
-                android:layout_height="match_parent" />
+            <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+                android:id="@+id/tabsEpisodeDetails"
+                style="@style/TabStrip"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/tab_strip_height" />
 
-            <android.support.v4.view.ViewPager
-                android:id="@+id/pagerEpisodeDetails"
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="5" />
+                android:orientation="horizontal">
+
+                <View
+                    android:id="@+id/spacer_left"
+                    style="@style/EpisodePagerSpacer"
+                    android:layout_width="0px"
+                    android:layout_height="match_parent" />
+
+                <android.support.v4.view.ViewPager
+                    android:id="@+id/pagerEpisodeDetails"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="5" />
+
+                <View
+                    android:id="@+id/spacer_right"
+                    style="@style/EpisodePagerSpacer"
+                    android:layout_width="0px"
+                    android:layout_height="match_parent" />
+            </LinearLayout>
 
-            <View
-                android:id="@+id/spacer_right"
-                style="@style/EpisodePagerSpacer"
-                android:layout_width="0px"
-                android:layout_height="match_parent" />
         </LinearLayout>
-    </LinearLayout>
 
-</merge>
\ No newline at end of file
+    </FrameLayout>
+
+    <include layout="@layout/drawer_left" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/episodes.xml b/SeriesGuide/src/main/res/layout/episodes.xml
index cf05517e57..9c3a6d8ba6 100644
--- a/SeriesGuide/src/main/res/layout/episodes.xml
+++ b/SeriesGuide/src/main/res/layout/episodes.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_episodes"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/fragment_episodes"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include layout="@layout/drawer_left" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/episodes_multipane.xml b/SeriesGuide/src/main/res/layout/episodes_multipane.xml
index 91a62b0c62..d0bbc87499 100644
--- a/SeriesGuide/src/main/res/layout/episodes_multipane.xml
+++ b/SeriesGuide/src/main/res/layout/episodes_multipane.xml
@@ -1,58 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:layout_height="match_parent">
 
-    <!-- Weight is added through styles depending on screen -->
-
-    <FrameLayout
-        android:id="@+id/fragment_episodes"
-        style="@style/EpisodesPane"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        tools:ignore="Suspicious0dp" />
-
-    <View
-        android:layout_width="2dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSeparator" />
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
-    <!-- Weight is added through styles depending on screen -->
+        <!-- Weight is added through styles depending on screen -->
 
-    <FrameLayout
-        style="@style/DetailsPane"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        tools:ignore="Suspicious0dp" >
+        <FrameLayout
+            android:id="@+id/fragment_episodes"
+            style="@style/EpisodesPane"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            tools:ignore="Suspicious0dp" />
 
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="match_parent"
+        <View
+            android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:contentDescription="@string/description_poster"
-            android:scaleType="centerCrop" >
-        </ImageView>
+            android:background="?attr/colorSeparator" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <!-- Weight is added through styles depending on screen -->
+
+        <FrameLayout
+            style="@style/DetailsPane"
+            android:layout_width="0px"
             android:layout_height="match_parent"
-            android:orientation="vertical" >
+            tools:ignore="Suspicious0dp">
 
-            <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-                android:id="@+id/tabsEpisodes"
-                style="@style/TabStrip"
+            <ImageView
+                android:id="@+id/background"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/tab_strip_height" />
+                android:layout_height="match_parent"
+                android:contentDescription="@string/description_poster"
+                android:scaleType="centerCrop"/>
 
-            <android.support.v4.view.ViewPager
-                android:id="@+id/pagerEpisodes"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </FrameLayout>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+                    android:id="@+id/tabsEpisodes"
+                    style="@style/TabStrip"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/tab_strip_height" />
+
+                <android.support.v4.view.ViewPager
+                    android:id="@+id/pagerEpisodes"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/episodes_multipane_wide.xml b/SeriesGuide/src/main/res/layout/episodes_multipane_wide.xml
index b9fb69ae18..5cfa2ff0b7 100644
--- a/SeriesGuide/src/main/res/layout/episodes_multipane_wide.xml
+++ b/SeriesGuide/src/main/res/layout/episodes_multipane_wide.xml
@@ -1,69 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:layout_height="match_parent">
 
-    <View
-        android:id="@+id/spacer_left"
-        android:layout_width="0px"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1" />
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
-    <FrameLayout
-        android:id="@+id/fragment_episodes"
-        style="@style/EpisodesPane"
-        android:layout_width="0px"
-        android:layout_height="match_parent" />
-
-    <View
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSeparator" />
+        <View
+            android:id="@+id/spacer_left"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
-    <FrameLayout
-        style="@style/DetailsPane"
-        android:layout_width="0px"
-        android:layout_height="match_parent" >
+        <FrameLayout
+            android:id="@+id/fragment_episodes"
+            style="@style/EpisodesPane"
+            android:layout_width="0px"
+            android:layout_height="match_parent" />
 
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="match_parent"
+        <View
+            android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:contentDescription="@string/description_poster"
-            android:scaleType="centerCrop" >
-        </ImageView>
+            android:background="?attr/colorSeparator" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
+        <FrameLayout
+            style="@style/DetailsPane"
+            android:layout_width="0px"
+            android:layout_height="match_parent">
 
-            <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-                android:id="@+id/tabsEpisodes"
-                style="@style/TabStrip"
+            <ImageView
+                android:id="@+id/background"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/tab_strip_height" />
+                android:layout_height="match_parent"
+                android:contentDescription="@string/description_poster"
+                android:scaleType="centerCrop"/>
 
-            <android.support.v4.view.ViewPager
-                android:id="@+id/pagerEpisodes"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </FrameLayout>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-    <View
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="left"
-        android:background="?attr/colorSeparator" />
+                <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+                    android:id="@+id/tabsEpisodes"
+                    style="@style/TabStrip"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/tab_strip_height" />
 
-    <View
-        android:id="@+id/spacer_right"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
+                <android.support.v4.view.ViewPager
+                    android:id="@+id/pagerEpisodes"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <View
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:background="?attr/colorSeparator" />
+
+        <View
+            android:id="@+id/spacer_right"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/lists.xml b/SeriesGuide/src/main/res/layout/lists.xml
index 99c26272c9..317555d4f6 100644
--- a/SeriesGuide/src/main/res/layout/lists.xml
+++ b/SeriesGuide/src/main/res/layout/lists.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -21,4 +22,6 @@
             android:layout_weight="1" />
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+    <include layout="@layout/drawer_left" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/movies.xml b/SeriesGuide/src/main/res/layout/movies.xml
index 25fadd8757..3bd45d610c 100644
--- a/SeriesGuide/src/main/res/layout/movies.xml
+++ b/SeriesGuide/src/main/res/layout/movies.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-        android:id="@+id/tabsMovies"
-        style="@style/TabStrip"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_strip_height" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pagerMovies"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+            android:id="@+id/tabsMovies"
+            style="@style/TabStrip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_strip_height" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pagerMovies"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/overview.xml b/SeriesGuide/src/main/res/layout/overview.xml
index 10356d6164..1a2cecccdc 100644
--- a/SeriesGuide/src/main/res/layout/overview.xml
+++ b/SeriesGuide/src/main/res/layout/overview.xml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wrapper"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-        android:id="@+id/tabsOverview"
-        style="@style/TabStrip"
+    <LinearLayout
+        android:id="@+id/wrapper"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_strip_height" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pagerOverview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+            android:id="@+id/tabsOverview"
+            style="@style/TabStrip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_strip_height" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pagerOverview"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/overview_multipane.xml b/SeriesGuide/src/main/res/layout/overview_multipane.xml
index 5a6de3beaa..44faf7f0b8 100644
--- a/SeriesGuide/src/main/res/layout/overview_multipane.xml
+++ b/SeriesGuide/src/main/res/layout/overview_multipane.xml
@@ -1,38 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:layout_width="0px"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="2"
-        android:orientation="vertical" >
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
-        <FrameLayout
-            android:id="@+id/fragment_show"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="1" />
+        <LinearLayout
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/fragment_show"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/accent_primary" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/accent_primary" />
+            <FrameLayout
+                android:id="@+id/fragment_seasons"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1" />
+        </LinearLayout>
 
         <FrameLayout
-            android:id="@+id/fragment_seasons"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="1" />
+            android:id="@+id/fragment_overview"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="3" />
+
     </LinearLayout>
 
-    <FrameLayout
-        android:id="@+id/fragment_overview"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="3" />
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/overview_multipane_wide.xml b/SeriesGuide/src/main/res/layout/overview_multipane_wide.xml
index b27d086855..0555d28267 100644
--- a/SeriesGuide/src/main/res/layout/overview_multipane_wide.xml
+++ b/SeriesGuide/src/main/res/layout/overview_multipane_wide.xml
@@ -1,26 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/fragment_show"
-        android:layout_width="0px"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="2" />
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
-    <FrameLayout
-        android:id="@+id/fragment_overview"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="3" />
+        <FrameLayout
+            android:id="@+id/fragment_show"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
 
-    <FrameLayout
-        android:id="@+id/fragment_seasons"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="2" />
+        <FrameLayout
+            android:id="@+id/fragment_overview"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="3" />
+
+        <FrameLayout
+            android:id="@+id/fragment_seasons"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/search.xml b/SeriesGuide/src/main/res/layout/search.xml
index 8a749fbe24..2eb6ee8ff0 100644
--- a/SeriesGuide/src/main/res/layout/search.xml
+++ b/SeriesGuide/src/main/res/layout/search.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_fragment"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
-</FrameLayout>
\ No newline at end of file
+    <FrameLayout
+        android:id="@+id/search_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include layout="@layout/drawer_left" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/search_wide.xml b/SeriesGuide/src/main/res/layout/search_wide.xml
index ac14f5c1e8..ed02345421 100644
--- a/SeriesGuide/src/main/res/layout/search_wide.xml
+++ b/SeriesGuide/src/main/res/layout/search_wide.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
     <FrameLayout
-        android:id="@+id/search_fragment"
-        android:layout_width="@dimen/addpager_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="right" >
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/search_fragment"
+            android:layout_width="@dimen/addpager_width"
+            android:layout_height="match_parent"
+            android:layout_gravity="right" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+    <include layout="@layout/drawer_left" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/shows.xml b/SeriesGuide/src/main/res/layout/shows.xml
index 1e84bf22c5..071716b0f4 100644
--- a/SeriesGuide/src/main/res/layout/shows.xml
+++ b/SeriesGuide/src/main/res/layout/shows.xml
@@ -1,20 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <!-- The main content view -->
     <FrameLayout
-        android:id="@+id/shows_fragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
 
-    <ProgressBar
-        android:id="@+id/progressBarShows"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_marginTop="-7dp"
-        android:indeterminateOnly="true" />
+        <FrameLayout
+            android:id="@+id/shows_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <ProgressBar
+            android:id="@+id/progressBarShows"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_marginTop="-7dp"
+            android:indeterminateOnly="true" />
+
+    </FrameLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</FrameLayout>
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/upcoming.xml b/SeriesGuide/src/main/res/layout/upcoming.xml
index e77c3b49a9..eb92780081 100644
--- a/SeriesGuide/src/main/res/layout/upcoming.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming.xml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wrapper"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-        android:id="@+id/tabsUpcoming"
-        style="@style/TabStrip"
+    <LinearLayout
+        android:id="@+id/wrapper"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_strip_height" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pagerUpcoming"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+            android:id="@+id/tabsUpcoming"
+            style="@style/TabStrip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_strip_height" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pagerUpcoming"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/values-large/dimens.xml b/SeriesGuide/src/main/res/values-large/dimens.xml
index a99e678a5d..f3b78e6895 100644
--- a/SeriesGuide/src/main/res/values-large/dimens.xml
+++ b/SeriesGuide/src/main/res/values-large/dimens.xml
@@ -3,6 +3,5 @@
 
     <dimen name="layout_padding">16dp</dimen>
     <dimen name="item_padding">4dp</dimen>
-    <dimen name="addpager_width">450dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/values-w590dp/dimens.xml b/SeriesGuide/src/main/res/values-w590dp/dimens.xml
index 5b74de49ec..fb95cbf381 100644
--- a/SeriesGuide/src/main/res/values-w590dp/dimens.xml
+++ b/SeriesGuide/src/main/res/values-w590dp/dimens.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <dimen name="addpager_width">450dp</dimen>
     <dimen name="widget_item_width">35dp</dimen>
     <dimen name="widget_text_small">12sp</dimen>
     <dimen name="widget_text_middle">14sp</dimen>
diff --git a/SeriesGuide/src/main/res/values/dimens.xml b/SeriesGuide/src/main/res/values/dimens.xml
index f32ff0779a..a10202fe8b 100644
--- a/SeriesGuide/src/main/res/values/dimens.xml
+++ b/SeriesGuide/src/main/res/values/dimens.xml
@@ -13,6 +13,7 @@
     <dimen name="text_size_large">22sp</dimen>
     <dimen name="text_size_ultralarge">32sp</dimen>
     <dimen name="text_size_hyperlarge">72sp</dimen>
+    <dimen name="addpager_width">450dp</dimen>
     <dimen name="widget_item_width">28dp</dimen>
     <dimen name="widget_margin">5dp</dimen>
     <dimen name="widget_paddingTop">8dp</dimen>

From f6fb8ad2679e42be1977bf32f5d8df921b97dbb6 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 12:06:18 +0100
Subject: [PATCH 28/74] Go back when going up in migration activity.

---
 .../migration/MigrationActivity.java          | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/migration/MigrationActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/migration/MigrationActivity.java
index 4a1f4d9e2f..3850f72f64 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/migration/MigrationActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/migration/MigrationActivity.java
@@ -1,31 +1,18 @@
 package com.battlelancer.seriesguide.migration;
 
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
-import android.text.format.DateUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
 import com.battlelancer.seriesguide.dataliberation.JsonExportTask;
 import com.battlelancer.seriesguide.dataliberation.JsonImportTask;
 import com.battlelancer.seriesguide.dataliberation.OnTaskFinishedListener;
-import com.battlelancer.seriesguide.sync.SgSyncAdapter;
 import com.battlelancer.seriesguide.ui.BaseActivity;
-import com.battlelancer.seriesguide.util.TaskManager;
-import com.battlelancer.seriesguide.util.Utils;
-import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.seriesguide.R;
 
-import java.io.File;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
 
 /**
  * Helps users migrate their show database to the free version of SeriesGuide. When using
@@ -98,7 +85,7 @@ protected void onDestroy() {
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
         if (itemId == android.R.id.home) {
-            NavUtils.navigateUpFromSameTask(this);
+            onBackPressed();
             return true;
         }
         return super.onOptionsItemSelected(item);

From 0fdfce7370cabbca7b3c8adf0619aa5c4047e706 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 12:11:30 +0100
Subject: [PATCH 29/74] Enable going up from help, just goes back.

- Also fix MenuItem import.
---
 .../seriesguide/ui/HelpActivity.java           | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java
index aec1ccaea0..7df0656040 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/HelpActivity.java
@@ -3,6 +3,7 @@
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
@@ -31,9 +32,7 @@ protected void onCreate(Bundle arg0) {
         WebView webview = new WebView(this);
         setContentView(webview);
 
-        final ActionBar actionBar = getSupportActionBar();
-        actionBar.setHomeButtonEnabled(true);
-        actionBar.setTitle(R.string.help);
+        setupActionBar();
 
         setSupportProgressBarVisibility(true);
 
@@ -52,14 +51,25 @@ public void onProgressChanged(WebView view, int progress) {
         webview.loadUrl(getString(R.string.help_url));
     }
 
+    private void setupActionBar() {
+        final ActionBar actionBar = getSupportActionBar();
+        actionBar.setHomeButtonEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.help);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getSupportMenuInflater().inflate(R.menu.help_menu, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
-    public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
         if (itemId == R.id.menu_feedback) {
             fireTrackerEvent("Feedback");
 

From 4ac68ec2a1c82c77cbac1c853d7248c9e4bb31ad Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 12:21:49 +0100
Subject: [PATCH 30/74] Make shouts activity a regular activity with action
 bar.

---
 .../seriesguide/ui/TraktShoutsActivity.java   | 23 +++++++++++++++++--
 .../seriesguide/ui/TraktShoutsFragment.java   |  5 ----
 .../src/main/res/layout/shouts_fragment.xml   | 20 +---------------
 SeriesGuide/src/main/res/values/strings.xml   |  1 -
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
index 6df90c2fe9..8355363d84 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
@@ -21,7 +21,9 @@
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.MenuItem;
 import com.battlelancer.seriesguide.util.ShareUtils.ShareItems;
+import com.uwetrottmann.seriesguide.R;
 
 import android.os.Bundle;
 
@@ -58,8 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Bundle args = getIntent().getExtras();
         String title = args.getString(ShareItems.SHARESTRING);
 
-        final ActionBar actionBar = getSupportActionBar();
-        actionBar.hide();
+        setupActionBar();
 
         if (savedInstanceState == null) {
             // embed the shouts fragment dialog
@@ -81,6 +82,14 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    private void setupActionBar() {
+        final ActionBar actionBar = getSupportActionBar();
+        actionBar.setHomeButtonEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.shouts);
+        actionBar.setSubtitle(getIntent().getExtras().getString(ShareItems.SHARESTRING));
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -92,4 +101,14 @@ protected void onStop() {
         super.onStop();
         EasyTracker.getInstance(this).activityStop(this);
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsFragment.java
index b3a4f7f03f..92eb4154ff 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsFragment.java
@@ -154,7 +154,6 @@ public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.shouts_fragment, container, false);
-        final TextView item = (TextView) v.findViewById(R.id.shouts_item);
         final EditText shouttext = (EditText) v.findViewById(R.id.shouttext);
         final CheckBox checkIsSpoiler = (CheckBox) v.findViewById(R.id.checkIsSpoiler);
 
@@ -196,10 +195,6 @@ public void onClick(View v) {
             }
         });
 
-        if (item != null) {
-            item.setText(getArguments().getString(ShareItems.SHARESTRING));
-        }
-
         return v;
     }
 
diff --git a/SeriesGuide/src/main/res/layout/shouts_fragment.xml b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
index 7c93883158..6abdd306bd 100644
--- a/SeriesGuide/src/main/res/layout/shouts_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" >
 
-    <TextView
-        android:id="@+id/shouts_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/layout_padding"
-        android:layout_marginRight="@dimen/layout_padding"
-        android:layout_marginTop="@dimen/layout_padding"
-        android:text="@string/shouts"
-        android:textAppearance="@style/TextAppearance.Large.Light" />
-
-    <TextView
-        android:id="@+id/shouts_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/layout_padding"
-        android:layout_marginRight="@dimen/layout_padding"
-        android:text="@string/shouts_for"
-        android:textAppearance="@style/TextAppearance.Small.Primary" />
-
     <FrameLayout
         android:id="@+id/shouts_container"
         android:layout_width="match_parent"
diff --git a/SeriesGuide/src/main/res/values/strings.xml b/SeriesGuide/src/main/res/values/strings.xml
index 31e49a6ea6..d788f4b3d6 100644
--- a/SeriesGuide/src/main/res/values/strings.xml
+++ b/SeriesGuide/src/main/res/values/strings.xml
@@ -58,7 +58,6 @@
     <string name="shout">Shout!</string>
     <string name="isspoiler">Spoiler alert!</string>
     <string name="no_shouts">Be the first to shout!</string>
-    <string name="shouts_for">Shouts for %s</string>
     <string name="autorefresh">Refreshing automagically</string>
 
     <!-- Movies -->

From 33293414ab33e699a98f7430b82b586217c93dd8 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 13:01:11 +0100
Subject: [PATCH 31/74] Unify single pane layouts.

- Create activity_singlepane_drawer including wide variant.
- Affects movie details, stats and search activities.
---
 .../seriesguide/ui/MovieDetailsActivity.java       |  4 ++--
 .../seriesguide/ui/SearchActivity.java             |  2 +-
 .../battlelancer/seriesguide/ui/StatsActivity.java |  4 ++--
 ...ne_empty.xml => activity_singlepane_drawer.xml} |  2 +-
 ...ide.xml => activity_singlepane_drawer_wide.xml} |  4 ++--
 SeriesGuide/src/main/res/layout/search.xml         | 14 --------------
 .../src/main/res/values-large-land/layouts.xml     |  2 +-
 SeriesGuide/src/main/res/values-w590dp/layouts.xml |  2 +-
 .../src/main/res/values-xlarge-land/layouts.xml    |  2 +-
 SeriesGuide/src/main/res/values-xlarge/layouts.xml |  2 +-
 SeriesGuide/src/main/res/values/layouts.xml        |  1 +
 11 files changed, 13 insertions(+), 26 deletions(-)
 rename SeriesGuide/src/main/res/layout/{activity_singlepane_empty.xml => activity_singlepane_drawer.xml} (91%)
 rename SeriesGuide/src/main/res/layout/{search_wide.xml => activity_singlepane_drawer_wide.xml} (86%)
 delete mode 100644 SeriesGuide/src/main/res/layout/search.xml

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java
index ce3f30d1d7..8c53f5c92f 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieDetailsActivity.java
@@ -33,7 +33,7 @@ public class MovieDetailsActivity extends BaseNavDrawerActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_singlepane_empty);
+        setContentView(R.layout.activity_singlepane_drawer);
         setupNavDrawer();
 
         if (getIntent().getExtras() == null) {
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState == null) {
             MovieDetailsFragment f = MovieDetailsFragment.newInstance(tmdbId);
-            getSupportFragmentManager().beginTransaction().add(R.id.root_container, f).commit();
+            getSupportFragmentManager().beginTransaction().add(R.id.content_frame, f).commit();
         }
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
index 0100497432..b805983a28 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
@@ -100,7 +100,7 @@ private void handleIntent(Intent intent) {
                 SearchFragment newFragment = new SearchFragment();
                 newFragment.setArguments(extras);
                 getSupportFragmentManager().beginTransaction()
-                        .replace(R.id.search_fragment, newFragment).commit();
+                        .replace(R.id.content_frame, newFragment).commit();
             } else {
                 searchFragment.onPerformSearch(extras);
             }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
index 93f7210afa..1c55024613 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
@@ -36,7 +36,7 @@ public class StatsActivity extends BaseTopActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_singlepane_empty);
+        setContentView(R.layout.activity_singlepane_drawer);
         setupNavDrawer();
 
         ActionBar actionBar = getSupportActionBar();
@@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             StatsFragment f = new StatsFragment();
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.root_container, f);
+            ft.add(R.id.content_frame, f);
             ft.commit();
         }
     }
diff --git a/SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml b/SeriesGuide/src/main/res/layout/activity_singlepane_drawer.xml
similarity index 91%
rename from SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml
rename to SeriesGuide/src/main/res/layout/activity_singlepane_drawer.xml
index f186881b4d..2bcd4068e5 100644
--- a/SeriesGuide/src/main/res/layout/activity_singlepane_empty.xml
+++ b/SeriesGuide/src/main/res/layout/activity_singlepane_drawer.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent">
 
     <FrameLayout
-        android:id="@+id/root_container"
+        android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/SeriesGuide/src/main/res/layout/search_wide.xml b/SeriesGuide/src/main/res/layout/activity_singlepane_drawer_wide.xml
similarity index 86%
rename from SeriesGuide/src/main/res/layout/search_wide.xml
rename to SeriesGuide/src/main/res/layout/activity_singlepane_drawer_wide.xml
index ed02345421..36bd109221 100644
--- a/SeriesGuide/src/main/res/layout/search_wide.xml
+++ b/SeriesGuide/src/main/res/layout/activity_singlepane_drawer_wide.xml
@@ -9,10 +9,10 @@
         android:layout_height="match_parent">
 
         <FrameLayout
-            android:id="@+id/search_fragment"
+            android:id="@+id/content_frame"
             android:layout_width="@dimen/addpager_width"
             android:layout_height="match_parent"
-            android:layout_gravity="right" />
+            android:layout_gravity="right|end" />
     </FrameLayout>
 
     <include layout="@layout/drawer_left" />
diff --git a/SeriesGuide/src/main/res/layout/search.xml b/SeriesGuide/src/main/res/layout/search.xml
deleted file mode 100644
index 2eb6ee8ff0..0000000000
--- a/SeriesGuide/src/main/res/layout/search.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/search_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <include layout="@layout/drawer_left" />
-
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/values-large-land/layouts.xml b/SeriesGuide/src/main/res/values-large-land/layouts.xml
index 3b5b7cb6b8..6b56e221d1 100644
--- a/SeriesGuide/src/main/res/values-large-land/layouts.xml
+++ b/SeriesGuide/src/main/res/values-large-land/layouts.xml
@@ -3,6 +3,6 @@
 
     <item name="episodes" type="layout">@layout/episodes_multipane</item>
     <item name="upcoming" type="layout">@layout/upcoming_multipane</item>
-    <item name="search" type="layout">@layout/search_wide</item>
+    <item name="search" type="layout">@layout/activity_singlepane_drawer_wide</item>
 
 </resources>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/values-w590dp/layouts.xml b/SeriesGuide/src/main/res/values-w590dp/layouts.xml
index 8522116082..7612974e32 100644
--- a/SeriesGuide/src/main/res/values-w590dp/layouts.xml
+++ b/SeriesGuide/src/main/res/values-w590dp/layouts.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item name="episodes" type="layout">@layout/episodes_multipane</item>
-    <item name="search" type="layout">@layout/search_wide</item>
+    <item name="search" type="layout">@layout/activity_singlepane_drawer_wide</item>
     <item name="episode_pager" type="layout">@layout/episode_pager_wide</item>
     <item name="upcoming_row" type="layout">@layout/upcoming_row_wide</item>
     <item name="buttonbar_services" type="layout">@layout/buttonbar_services_wide</item>
diff --git a/SeriesGuide/src/main/res/values-xlarge-land/layouts.xml b/SeriesGuide/src/main/res/values-xlarge-land/layouts.xml
index 9a1076b24f..e6535cc5da 100644
--- a/SeriesGuide/src/main/res/values-xlarge-land/layouts.xml
+++ b/SeriesGuide/src/main/res/values-xlarge-land/layouts.xml
@@ -5,7 +5,7 @@
     <item name="show_info" type="layout">@layout/show_info_regular</item>
     <item name="episodes" type="layout">@layout/episodes_multipane_wide</item>
     <item name="upcoming" type="layout">@layout/upcoming_multipane_wide</item>
-    <item name="search" type="layout">@layout/search_wide</item>
+    <item name="search" type="layout">@layout/activity_singlepane_drawer_wide</item>
     <item name="episode_pager" type="layout">@layout/episode_pager_wide</item>
     <item name="add_searchresult" type="layout">@layout/add_searchresult_wide</item>
     <item name="shows_row" type="layout">@layout/shows_row_wide</item>
diff --git a/SeriesGuide/src/main/res/values-xlarge/layouts.xml b/SeriesGuide/src/main/res/values-xlarge/layouts.xml
index b3861cc12d..7924585996 100644
--- a/SeriesGuide/src/main/res/values-xlarge/layouts.xml
+++ b/SeriesGuide/src/main/res/values-xlarge/layouts.xml
@@ -3,7 +3,7 @@
 
     <item name="episodes" type="layout">@layout/episodes_multipane</item>
     <item name="upcoming" type="layout">@layout/upcoming_multipane</item>
-    <item name="search" type="layout">@layout/search_wide</item>
+    <item name="search" type="layout">@layout/activity_singlepane_drawer_wide</item>
     <item name="episode_pager" type="layout">@layout/episode_pager_wide</item>
     <item name="add_searchresult" type="layout">@layout/add_searchresult_wide</item>
     <item name="shows_row" type="layout">@layout/shows_row_wide</item>
diff --git a/SeriesGuide/src/main/res/values/layouts.xml b/SeriesGuide/src/main/res/values/layouts.xml
index 86b79b09ec..7e4784be88 100644
--- a/SeriesGuide/src/main/res/values/layouts.xml
+++ b/SeriesGuide/src/main/res/values/layouts.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item name="search" type="layout">@layout/activity_singlepane_drawer</item>
     <item name="show_info" type="layout">@layout/show_info_regular</item>
     <item name="buttonbar_services" type="layout">@layout/buttonbar_services_stacked</item>
     

From db6f3fca15d8d592716a6f0fab0ba6c484e26d76 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 13:03:17 +0100
Subject: [PATCH 32/74] Add drawer to upcoming multipane layouts.

---
 .../main/res/layout/upcoming_multipane.xml    | 63 ++++++++-------
 .../res/layout/upcoming_multipane_wide.xml    | 77 +++++++++++--------
 2 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/upcoming_multipane.xml b/SeriesGuide/src/main/res/layout/upcoming_multipane.xml
index 78b60adbcf..d770c50edb 100644
--- a/SeriesGuide/src/main/res/layout/upcoming_multipane.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming_multipane.xml
@@ -1,33 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <View
-        android:id="@+id/separatorUpcoming"
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:background="?attr/colorSeparator" />
-
-    <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-        android:id="@+id/tabsUpcoming"
-        style="@style/TabStrip"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_strip_height"
-        android:layout_toLeftOf="@id/separatorUpcoming" />
+    android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pagerUpcoming"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/tabsUpcoming"
-        android:layout_toLeftOf="@id/separatorUpcoming" />
+        android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/fragment_details"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_toRightOf="@id/separatorUpcoming" />
+        <View
+            android:id="@+id/separatorUpcoming"
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:background="?attr/colorSeparator" />
+
+        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+            android:id="@+id/tabsUpcoming"
+            style="@style/TabStrip"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_strip_height"
+            android:layout_toLeftOf="@id/separatorUpcoming" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pagerUpcoming"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tabsUpcoming"
+            android:layout_toLeftOf="@id/separatorUpcoming" />
+
+        <FrameLayout
+            android:id="@+id/fragment_details"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@id/separatorUpcoming" />
+
+    </RelativeLayout>
+
+    <include layout="@layout/drawer_left" />
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/layout/upcoming_multipane_wide.xml b/SeriesGuide/src/main/res/layout/upcoming_multipane_wide.xml
index 5c94b9ddf6..766dec84bb 100644
--- a/SeriesGuide/src/main/res/layout/upcoming_multipane_wide.xml
+++ b/SeriesGuide/src/main/res/layout/upcoming_multipane_wide.xml
@@ -1,46 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal" >
+    android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:layout_width="0px"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="3" >
+        android:orientation="horizontal">
 
-        <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
-            android:id="@+id/tabsUpcoming"
-            style="@style/TabStrip"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_strip_height" />
+        <RelativeLayout
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="3">
+
+            <com.astuetz.viewpager.extensions.PagerSlidingTabStrip
+                android:id="@+id/tabsUpcoming"
+                style="@style/TabStrip"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/tab_strip_height" />
+
+            <android.support.v4.view.ViewPager
+                android:id="@+id/pagerUpcoming"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/tabsUpcoming" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:background="?attr/colorSeparator" />
 
-        <android.support.v4.view.ViewPager
-            android:id="@+id/pagerUpcoming"
-            android:layout_width="match_parent"
+        <View
+            android:layout_width="0px"
             android:layout_height="match_parent"
-            android:layout_below="@id/tabsUpcoming" />
-    </RelativeLayout>
+            android:layout_weight="1" />
 
-    <View
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSeparator" />
+        <View
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:background="?attr/colorSeparator" />
 
-    <View
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
+        <FrameLayout
+            android:id="@+id/fragment_details"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="4" />
 
-    <View
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSeparator" />
+    </LinearLayout>
 
-    <FrameLayout
-        android:id="@+id/fragment_details"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="4" />
+    <include layout="@layout/drawer_left" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file

From 08fd991ba555f40f802a18cd653c66aec75ae074 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 13:18:02 +0100
Subject: [PATCH 33/74] Use centered page style for shouts, simplify layout.

- Removed wrapper around progress bar.
---
 .../src/main/res/layout/shouts_fragment.xml   | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/shouts_fragment.xml b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
index 6abdd306bd..2ba7b3e46e 100644
--- a/SeriesGuide/src/main/res/layout/shouts_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" >
+    style="@style/Page.Centered"
+    android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/shouts_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" >
+        android:layout_weight="1">
 
-        <LinearLayout
+        <ProgressBar
             android:id="@+id/progress_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <ProgressBar
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="visible" />
 
         <FrameLayout
             android:id="@+id/list_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent">
 
             <ListView
                 android:id="@+android:id/list"
@@ -36,8 +29,7 @@
                 android:layout_height="match_parent"
                 android:clipToPadding="@bool/gridClipToPadding"
                 android:divider="?attr/drawableDivider"
-                android:listSelector="?attr/custom_list_selector" >
-            </ListView>
+                android:listSelector="?attr/custom_list_selector" />
 
             <TextView
                 android:id="@+android:id/empty"
@@ -67,7 +59,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/layout_padding" >
+        android:layout_margin="@dimen/layout_padding">
 
         <EditText
             android:id="@+id/shouttext"

From 6e053983e6ebaf4edc5f5daf5f187309052327c0 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 13:30:23 +0100
Subject: [PATCH 34/74] Add padding to nav drawer in episode details.

- Directly include drawer list layout, set a top padding.
- I don't know how often I came across this today and got distracted...
---
 .../src/main/res/layout/episode_pager.xml       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/episode_pager.xml b/SeriesGuide/src/main/res/layout/episode_pager.xml
index c2c655b444..811fb23b59 100644
--- a/SeriesGuide/src/main/res/layout/episode_pager.xml
+++ b/SeriesGuide/src/main/res/layout/episode_pager.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
+<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,7 +12,7 @@
             android:id="@+id/background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop"/>
+            android:scaleType="centerCrop" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,6 +35,15 @@
 
     </FrameLayout>
 
-    <include layout="@layout/drawer_left" />
+    <ListView
+        android:id="@+id/left_drawer"
+        android:layout_width="@dimen/slidingmenu_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="left|start"
+        android:background="@color/background_lighter"
+        android:choiceMode="singleChoice"
+        android:clipToPadding="@bool/gridClipToPadding"
+        android:listSelector="?attr/custom_list_selector"
+        android:paddingTop="?actionBarSize" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file

From 4b937e942aba50ede0705ced3dc53ca8523b8771 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 13:53:25 +0100
Subject: [PATCH 35/74] Use OkHttp for AndroidUtils buildHttpUrlConnection.

---
 libraries/androidutils/build.gradle                  |  1 +
 .../com/uwetrottmann/androidutils/AndroidUtils.java  | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/androidutils/build.gradle b/libraries/androidutils/build.gradle
index fe7deed64e..89d95f58e3 100644
--- a/libraries/androidutils/build.gradle
+++ b/libraries/androidutils/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'android-library'
 
 dependencies {
     compile 'com.android.support:support-v4:19.0.+'
+    compile 'com.squareup.okhttp:okhttp:1.2.1'
 }
 
 android {
diff --git a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
index 60eee96691..5ef57f365f 100644
--- a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
+++ b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
@@ -17,6 +17,8 @@
 
 package com.uwetrottmann.androidutils;
 
+import com.squareup.okhttp.OkHttpClient;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -201,11 +203,11 @@ public static HttpURLConnection buildHttpUrlConnection(String urlString)
 
         URL url = new URL(urlString);
 
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        conn.setReadTimeout(10000 /* milliseconds */);
-        conn.setConnectTimeout(15000 /* milliseconds */);
-        conn.setDoInput(true);
-        conn.setRequestMethod("GET");
+        OkHttpClient client = new OkHttpClient();
+
+        HttpURLConnection conn = client.open(url);
+        conn.setConnectTimeout(15 * 1000 /* milliseconds */);
+        conn.setReadTimeout(20 * 1000 /* milliseconds */);
         return conn;
     }
 

From 4683d77b60673e46bcdfb1b83743ee3ba723abbd Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 14:19:46 +0100
Subject: [PATCH 36/74] Drop additional padding from shouts fragment.

---
 SeriesGuide/src/main/res/layout/shouts_fragment.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/shouts_fragment.xml b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
index 2ba7b3e46e..b387bb503f 100644
--- a/SeriesGuide/src/main/res/layout/shouts_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/shouts_fragment.xml
@@ -24,7 +24,6 @@
 
             <ListView
                 android:id="@+android:id/list"
-                style="@style/DefaultPadding.Page"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clipToPadding="@bool/gridClipToPadding"
@@ -59,7 +58,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/layout_padding">
+        android:layout_marginTop="@dimen/default_padding">
 
         <EditText
             android:id="@+id/shouttext"

From 42c92b87bf01cd82dafc1654df2d9409ea2a06a4 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 14:21:33 +0100
Subject: [PATCH 37/74] Push version to 188 and 9.1-beta1.

---
 SeriesGuide/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeriesGuide/build.gradle b/SeriesGuide/build.gradle
index 3fae08670e..f4bde6a21c 100644
--- a/SeriesGuide/build.gradle
+++ b/SeriesGuide/build.gradle
@@ -19,8 +19,8 @@ android {
     productFlavors {
         free {
             packageName "com.battlelancer.seriesguide"
-            versionCode 187
-            versionName "9"
+            versionCode 188
+            versionName "9.1-beta1"
         }
         beta {
             packageName "com.battlelancer.seriesguide.beta"

From 8c411d72add88f85137435bea2f6b32e107ef2b4 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 17:20:12 +0100
Subject: [PATCH 38/74] Only log nomedia file creation if we actually did.

---
 .../com/battlelancer/seriesguide/util/ImageProvider.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ImageProvider.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ImageProvider.java
index d6a1c552f7..b0bc25c638 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ImageProvider.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ImageProvider.java
@@ -350,8 +350,10 @@ private void updateNoMediaFile(SharedPreferences prefs) {
 
         if (prefs.getBoolean(SeriesGuidePreferences.KEY_HIDEIMAGES, true)) {
             try {
-                Log.d(TAG, "Creating .nomedia file");
-                new File(noMediaFilePath).createNewFile();
+                boolean created = new File(noMediaFilePath).createNewFile();
+                if (created) {
+                    Log.d(TAG, "Created .nomedia file");
+                }
             } catch (IOException e) {
                 Log.w(TAG, "Could not create .nomedia file");
             }

From 0fbc1f322f27387b27013dda76cff53ba9286527 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 19:33:08 +0100
Subject: [PATCH 39/74] Extract notifications settings.

---
 .../ui/SeriesGuidePreferences.java            | 62 ++++++++++++-------
 SeriesGuide/src/main/res/xml/settings.xml     | 19 ++++--
 .../src/main/res/xml/settings_basic.xml       | 34 ----------
 .../src/main/res/xml/settings_legacy.xml      | 16 +++--
 .../main/res/xml/settings_notifications.xml   | 36 +++++++++++
 5 files changed, 100 insertions(+), 67 deletions(-)
 create mode 100644 SeriesGuide/src/main/res/xml/settings_notifications.xml

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
index 6f2b63f7d5..d7e0e40c81 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
@@ -70,13 +70,17 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
     private static final String KEY_GETGLUE_DISCONNECT = "clearGetGlueCredentials";
 
     // Actions for legacy settings
-    final static String ACTION_PREFS_BASIC = "com.battlelancer.seriesguide.PREFS_BASIC";
+    private static final String ACTION_PREFS_BASIC = "com.battlelancer.seriesguide.PREFS_BASIC";
 
-    private static final Object ACTION_PREFS_SHARING = "com.battlelancer.seriesguide.PREFS_SHARING";
+    private static final String ACTION_PREFS_NOTIFICATIONS
+            = "com.battlelancer.seriesguide.PREFS_NOTIFICATIONS";
 
-    final static String ACTION_PREFS_ADVANCED = "com.battlelancer.seriesguide.PREFS_ADVANCED";
+    private static final String ACTION_PREFS_SHARING = "com.battlelancer.seriesguide.PREFS_SHARING";
 
-    final static String ACTION_PREFS_ABOUT = "com.battlelancer.seriesguide.PREFS_ABOUT";
+    private static final String ACTION_PREFS_ADVANCED
+            = "com.battlelancer.seriesguide.PREFS_ADVANCED";
+
+    private static final String ACTION_PREFS_ABOUT = "com.battlelancer.seriesguide.PREFS_ABOUT";
 
     // Preference keys
     public static final String KEY_TRAKTPWD = "com.battlelancer.seriesguide.traktpwd";
@@ -105,7 +109,8 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_SECURE = "com.battlelancer.seriesguide.secure";
 
-    public static final String KEY_UPDATEATLEASTEVERY = "com.battlelancer.seriesguide.updateatleastevery";
+    public static final String KEY_UPDATEATLEASTEVERY
+            = "com.battlelancer.seriesguide.updateatleastevery";
 
     public static final String KEY_HIDEIMAGES = "hideimages";
 
@@ -121,7 +126,8 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_SHAREWITHTRAKT = "com.battlelancer.seriesguide.sharewithtrakt";
 
-    public static final String KEY_SHAREWITHGETGLUE = "com.battlelancer.seriesguide.sharewithgetglue";
+    public static final String KEY_SHAREWITHGETGLUE
+            = "com.battlelancer.seriesguide.sharewithgetglue";
 
     public static final String KEY_THEME = "com.battlelancer.seriesguide.theme";
 
@@ -129,9 +135,11 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_ACTIVITYTAB = "com.battlelancer.seriesguide.activitytab";
 
-    public static final String KEY_AUTO_ADD_TRAKT_SHOWS = "com.battlelancer.seriesguide.autoaddtraktshows";
+    public static final String KEY_AUTO_ADD_TRAKT_SHOWS
+            = "com.battlelancer.seriesguide.autoaddtraktshows";
 
-    public static final String KEY_SYNC_UNSEEN_EPISODES = "com.battlelancer.seriesguide.syncunseenepisodes";
+    public static final String KEY_SYNC_UNSEEN_EPISODES
+            = "com.battlelancer.seriesguide.syncunseenepisodes";
 
     public static final String SUPPORT_MAIL = "support@seriesgui.de";
 
@@ -163,11 +171,14 @@ protected void onCreate(Bundle savedInstanceState) {
             setupBasicSettings(this,
                     findPreference(KEY_ONLY_FUTURE_EPISODES),
                     findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
+                    findPreference(KEY_LANGUAGE));
+        } else if (action != null && action.equals(ACTION_PREFS_NOTIFICATIONS)) {
+            addPreferencesFromResource(R.xml.settings_notifications);
+            setupNotifiationSettings(this,
                     findPreference(NotificationSettings.KEY_ENABLED),
                     findPreference(NotificationSettings.KEY_FAVONLY),
                     findPreference(NotificationSettings.KEY_VIBRATE),
                     findPreference(NotificationSettings.KEY_RINGTONE),
-                    findPreference(KEY_LANGUAGE),
                     findPreference(NotificationSettings.KEY_THRESHOLD));
         } else if (action != null && action.equals(ACTION_PREFS_SHARING)) {
             addPreferencesFromResource(R.xml.settings_services);
@@ -213,10 +224,7 @@ public boolean onPreferenceClick(Preference preference) {
     }
 
     protected static void setupBasicSettings(final Context context, Preference noAiredPref,
-            Preference noSpecialsPref, Preference notificationsPref,
-            final Preference notificationsFavOnlyPref, final Preference vibratePref,
-            final Preference ringtonePref,
-            Preference languagePref, final Preference notificationsThresholdPref) {
+            Preference noSpecialsPref, Preference languagePref) {
         // No aired episodes
         noAiredPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 
@@ -243,7 +251,13 @@ public boolean onPreferenceClick(Preference preference) {
             }
         });
 
-        // Notifications
+        setListPreferenceSummary((ListPreference) languagePref);
+    }
+
+    protected static void setupNotifiationSettings(final Context context,
+            Preference notificationsPref, final Preference notificationsFavOnlyPref,
+            final Preference vibratePref, final Preference ringtonePref,
+            final Preference notificationsThresholdPref) {
         // allow supporters to enable notifications
         if (Utils.hasAccessToX(context)) {
             notificationsPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -281,7 +295,6 @@ public boolean onPreferenceClick(Preference preference) {
             ringtonePref.setEnabled(false);
         }
 
-        setListPreferenceSummary((ListPreference) languagePref);
         setListPreferenceSummary((ListPreference) notificationsThresholdPref);
     }
 
@@ -405,10 +418,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     /**
-     * Performs certain actions on settings changes. <br>
-     * <b>WARNING This is for older devices. Newer devices should implement
-     * actions in {@link SettingsFragment}s implementation if they require
-     * findPreference() to return non-null values.</b>
+     * Performs certain actions on settings changes. <br> <b>WARNING This is for older devices.
+     * Newer devices should implement actions in {@link SettingsFragment}s implementation if they
+     * require findPreference() to return non-null values.</b>
      */
     @SuppressWarnings("deprecation")
     @Override
@@ -465,8 +477,8 @@ public void run() {
     }
 
     /**
-     * Resets and runs the notification service to take care of potential time
-     * shifts when e.g. changing the time offset.
+     * Resets and runs the notification service to take care of potential time shifts when e.g.
+     * changing the time offset.
      */
     private static void resetAndRunNotificationsService(Context context) {
         NotificationService.resetLastEpisodeAirtime(PreferenceManager
@@ -492,11 +504,14 @@ public void onCreate(Bundle savedInstanceState) {
                 addPreferencesFromResource(R.xml.settings_basic);
                 setupBasicSettings(getActivity(), findPreference(KEY_ONLY_FUTURE_EPISODES),
                         findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
+                        findPreference(KEY_LANGUAGE));
+            } else if ("notifications".equals(settings)) {
+                addPreferencesFromResource(R.xml.settings_notifications);
+                setupNotifiationSettings(getActivity(),
                         findPreference(NotificationSettings.KEY_ENABLED),
                         findPreference(NotificationSettings.KEY_FAVONLY),
                         findPreference(NotificationSettings.KEY_VIBRATE),
                         findPreference(NotificationSettings.KEY_RINGTONE),
-                        findPreference(KEY_LANGUAGE),
                         findPreference(NotificationSettings.KEY_THRESHOLD));
             } else if ("sharing".equals(settings)) {
                 addPreferencesFromResource(R.xml.settings_services);
@@ -552,7 +567,8 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                     ListPreference listPref = (ListPreference) pref;
                     // Set summary to be the user-description for the selected
                     // value
-                    listPref.setSummary(getString(R.string.pref_offsetsummary, listPref.getEntry()));
+                    listPref.setSummary(
+                            getString(R.string.pref_offsetsummary, listPref.getEntry()));
 
                     resetAndRunNotificationsService(getActivity());
                 }
diff --git a/SeriesGuide/src/main/res/xml/settings.xml b/SeriesGuide/src/main/res/xml/settings.xml
index 23d34fec92..ac6352ac43 100644
--- a/SeriesGuide/src/main/res/xml/settings.xml
+++ b/SeriesGuide/src/main/res/xml/settings.xml
@@ -1,30 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
 
     <header
         android:fragment="com.battlelancer.seriesguide.ui.SeriesGuidePreferences$SettingsFragment"
-        android:title="@string/prefs_category_basic" >
+        android:title="@string/prefs_category_basic">
         <extra
             android:name="settings"
             android:value="basic" />
     </header>
+
+    <header
+        android:fragment="com.battlelancer.seriesguide.ui.SeriesGuidePreferences$SettingsFragment"
+        android:title="@string/pref_notifications">
+        <extra
+            android:name="settings"
+            android:value="notifications" />
+    </header>
+
     <header
         android:fragment="com.battlelancer.seriesguide.ui.SeriesGuidePreferences$SettingsFragment"
-        android:title="@string/prefs_category_sharing" >
+        android:title="@string/prefs_category_sharing">
         <extra
             android:name="settings"
             android:value="sharing" />
     </header>
     <header
         android:fragment="com.battlelancer.seriesguide.ui.SeriesGuidePreferences$SettingsFragment"
-        android:title="@string/prefs_category_advanced" >
+        android:title="@string/prefs_category_advanced">
         <extra
             android:name="settings"
             android:value="advanced" />
     </header>
     <header
         android:fragment="com.battlelancer.seriesguide.ui.SeriesGuidePreferences$SettingsFragment"
-        android:title="@string/prefs_category_about" >
+        android:title="@string/prefs_category_about">
         <extra
             android:name="settings"
             android:value="about" />
diff --git a/SeriesGuide/src/main/res/xml/settings_basic.xml b/SeriesGuide/src/main/res/xml/settings_basic.xml
index 2ac28fd3e9..823bafedc4 100644
--- a/SeriesGuide/src/main/res/xml/settings_basic.xml
+++ b/SeriesGuide/src/main/res/xml/settings_basic.xml
@@ -23,38 +23,4 @@
         android:key="language"
         android:title="@string/pref_language" />
 
-    <PreferenceCategory android:title="@string/pref_notifications" >
-        <CheckBoxPreference
-            android:defaultValue="True"
-            android:key="com.battlelancer.seriesguide.notifications"
-            android:summary="@string/pref_notificationssummary"
-            android:title="@string/pref_notifications" />
-
-        <ListPreference
-            android:defaultValue="60"
-            android:entries="@array/notificationThreshold"
-            android:entryValues="@array/notificationThresholdData"
-            android:key="com.battlelancer.seriesguide.notifications.threshold"
-            android:title="@string/pref_notifications_treshold" />
-
-        <CheckBoxPreference
-            android:defaultValue="True"
-            android:key="com.battlelancer.seriesguide.notifications.favonly"
-            android:summary="@string/pref_notifyfavonlysummary"
-            android:title="@string/pref_notifyfavonly" />
-        <CheckBoxPreference
-            android:defaultValue="False"
-            android:key="com.battlelancer.seriesguide.notifications.vibrate"
-            android:summary="@string/pref_vibratesummary"
-            android:title="@string/pref_vibrate" />
-
-        <RingtonePreference
-            android:defaultValue="content://settings/system/notification_sound"
-            android:key="com.battlelancer.seriesguide.notifications.ringtone"
-            android:ringtoneType="notification"
-            android:showDefault="true"
-            android:showSilent="true"
-            android:title="@string/pref_ringtone" />
-    </PreferenceCategory>
-
 </PreferenceScreen>
\ No newline at end of file
diff --git a/SeriesGuide/src/main/res/xml/settings_legacy.xml b/SeriesGuide/src/main/res/xml/settings_legacy.xml
index ad6863ff2e..4da3a9b760 100644
--- a/SeriesGuide/src/main/res/xml/settings_legacy.xml
+++ b/SeriesGuide/src/main/res/xml/settings_legacy.xml
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Preference android:title="@string/prefs_category_basic" >
+    <Preference android:title="@string/prefs_category_basic">
         <intent
             android:action="com.battlelancer.seriesguide.PREFS_BASIC"
             android:targetClass="com.battlelancer.seriesguide.ui.SeriesGuidePreferences"
             android:targetPackage="@string/package_name" />
     </Preference>
-    <Preference android:title="@string/prefs_category_sharing" >
+    <Preference android:title="@string/pref_notifications">
+        <intent
+            android:action="com.battlelancer.seriesguide.PREFS_NOTIFICATIONS"
+            android:targetClass="com.battlelancer.seriesguide.ui.SeriesGuidePreferences"
+            android:targetPackage="@string/package_name" />
+    </Preference>
+    <Preference android:title="@string/prefs_category_sharing">
         <intent
             android:action="com.battlelancer.seriesguide.PREFS_SHARING"
             android:targetClass="com.battlelancer.seriesguide.ui.SeriesGuidePreferences"
             android:targetPackage="@string/package_name" />
     </Preference>
-    <Preference android:title="@string/prefs_category_advanced" >
+    <Preference android:title="@string/prefs_category_advanced">
         <intent
             android:action="com.battlelancer.seriesguide.PREFS_ADVANCED"
             android:targetClass="com.battlelancer.seriesguide.ui.SeriesGuidePreferences"
             android:targetPackage="@string/package_name" />
     </Preference>
-    <Preference android:title="@string/prefs_category_about" >
+    <Preference android:title="@string/prefs_category_about">
         <intent
             android:action="com.battlelancer.seriesguide.PREFS_ABOUT"
             android:targetClass="com.battlelancer.seriesguide.ui.SeriesGuidePreferences"
diff --git a/SeriesGuide/src/main/res/xml/settings_notifications.xml b/SeriesGuide/src/main/res/xml/settings_notifications.xml
new file mode 100644
index 0000000000..b325a4c5bb
--- /dev/null
+++ b/SeriesGuide/src/main/res/xml/settings_notifications.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <CheckBoxPreference
+        android:defaultValue="True"
+        android:key="com.battlelancer.seriesguide.notifications"
+        android:summary="@string/pref_notificationssummary"
+        android:title="@string/pref_notifications" />
+
+    <ListPreference
+        android:defaultValue="60"
+        android:entries="@array/notificationThreshold"
+        android:entryValues="@array/notificationThresholdData"
+        android:key="com.battlelancer.seriesguide.notifications.threshold"
+        android:title="@string/pref_notifications_treshold" />
+
+    <CheckBoxPreference
+        android:defaultValue="True"
+        android:key="com.battlelancer.seriesguide.notifications.favonly"
+        android:summary="@string/pref_notifyfavonlysummary"
+        android:title="@string/pref_notifyfavonly" />
+    <CheckBoxPreference
+        android:defaultValue="False"
+        android:key="com.battlelancer.seriesguide.notifications.vibrate"
+        android:summary="@string/pref_vibratesummary"
+        android:title="@string/pref_vibrate" />
+
+    <RingtonePreference
+        android:defaultValue="content://settings/system/notification_sound"
+        android:key="com.battlelancer.seriesguide.notifications.ringtone"
+        android:ringtoneType="notification"
+        android:showDefault="true"
+        android:showSilent="true"
+        android:title="@string/pref_ringtone" />
+
+</PreferenceScreen>
\ No newline at end of file

From 47294ba70a58137635a5bb2ddde1b56e8f700205 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 19:55:07 +0100
Subject: [PATCH 40/74] Move and rearrange some settings.

---
 .../ui/SeriesGuidePreferences.java            | 193 ++++++++++--------
 .../src/main/res/xml/settings_advanced.xml    |  88 ++++----
 .../src/main/res/xml/settings_basic.xml       |  43 +++-
 3 files changed, 178 insertions(+), 146 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
index d7e0e40c81..56a6f70501 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
@@ -168,37 +168,47 @@ protected void onCreate(Bundle savedInstanceState) {
         String action = getIntent().getAction();
         if (action != null && action.equals(ACTION_PREFS_BASIC)) {
             addPreferencesFromResource(R.xml.settings_basic);
-            setupBasicSettings(this,
+            setupBasicSettings(
+                    this,
+                    getIntent(),
                     findPreference(KEY_ONLY_FUTURE_EPISODES),
                     findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
-                    findPreference(KEY_LANGUAGE));
+                    findPreference(KEY_LANGUAGE),
+                    findPreference(KEY_THEME),
+                    findPreference(KEY_NUMBERFORMAT),
+                    findPreference(KEY_AUTOUPDATE)
+            );
         } else if (action != null && action.equals(ACTION_PREFS_NOTIFICATIONS)) {
             addPreferencesFromResource(R.xml.settings_notifications);
-            setupNotifiationSettings(this,
+            setupNotifiationSettings(
+                    this,
                     findPreference(NotificationSettings.KEY_ENABLED),
                     findPreference(NotificationSettings.KEY_FAVONLY),
                     findPreference(NotificationSettings.KEY_VIBRATE),
                     findPreference(NotificationSettings.KEY_RINGTONE),
-                    findPreference(NotificationSettings.KEY_THRESHOLD));
+                    findPreference(NotificationSettings.KEY_THRESHOLD)
+            );
         } else if (action != null && action.equals(ACTION_PREFS_SHARING)) {
             addPreferencesFromResource(R.xml.settings_services);
-            setupSharingSettings(this,
-                    findPreference(KEY_GETGLUE_DISCONNECT));
+            setupSharingSettings(
+                    this,
+                    findPreference(KEY_GETGLUE_DISCONNECT)
+            );
         } else if (action != null && action.equals(ACTION_PREFS_ADVANCED)) {
             addPreferencesFromResource(R.xml.settings_advanced);
-            setupAdvancedSettings(this,
-                    getIntent(),
-                    findPreference(KEY_THEME),
+            setupAdvancedSettings(
+                    this,
                     findPreference(AdvancedSettings.KEY_UPCOMING_LIMIT),
-                    findPreference(KEY_NUMBERFORMAT),
                     findPreference(KEY_OFFSET),
                     findPreference(AppSettings.KEY_GOOGLEANALYTICS),
-                    findPreference(KEY_CLEAR_CACHE),
-                    findPreference(KEY_AUTOUPDATE));
+                    findPreference(KEY_CLEAR_CACHE)
+            );
         } else if (action != null && action.equals(ACTION_PREFS_ABOUT)) {
             addPreferencesFromResource(R.xml.settings_about);
-            setupAboutSettings(this,
-                    findPreference(KEY_ABOUT));
+            setupAboutSettings(
+                    this,
+                    findPreference(KEY_ABOUT)
+            );
         } else if (!AndroidUtils.isHoneycombOrHigher()) {
             // Load the legacy preferences headers
             addPreferencesFromResource(R.xml.settings_legacy);
@@ -223,16 +233,17 @@ public boolean onPreferenceClick(Preference preference) {
         });
     }
 
-    protected static void setupBasicSettings(final Context context, Preference noAiredPref,
-            Preference noSpecialsPref, Preference languagePref) {
+    protected static void setupBasicSettings(final Activity activity, final Intent startIntent,
+            Preference noAiredPref, Preference noSpecialsPref, Preference languagePref,
+            Preference themePref, Preference numberFormatPref, Preference updatePref) {
         // No aired episodes
         noAiredPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 
             public boolean onPreferenceClick(Preference preference) {
                 if (((CheckBoxPreference) preference).isChecked()) {
-                    Utils.trackCustomEvent(context, TAG, "OnlyFutureEpisodes", "Enable");
+                    Utils.trackCustomEvent(activity, TAG, "OnlyFutureEpisodes", "Enable");
                 } else {
-                    Utils.trackCustomEvent(context, TAG, "OnlyFutureEpisodes", "Disable");
+                    Utils.trackCustomEvent(activity, TAG, "OnlyFutureEpisodes", "Disable");
                 }
                 return false;
             }
@@ -243,15 +254,37 @@ public boolean onPreferenceClick(Preference preference) {
 
             public boolean onPreferenceClick(Preference preference) {
                 if (((CheckBoxPreference) preference).isChecked()) {
-                    Utils.trackCustomEvent(context, TAG, "OnlySeasonEpisodes", "Enable");
+                    Utils.trackCustomEvent(activity, TAG, "OnlySeasonEpisodes", "Enable");
                 } else {
-                    Utils.trackCustomEvent(context, TAG, "OnlySeasonEpisodes", "Disable");
+                    Utils.trackCustomEvent(activity, TAG, "OnlySeasonEpisodes", "Disable");
                 }
                 return false;
             }
         });
 
+        // Theme switcher
+        themePref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (KEY_THEME.equals(preference.getKey())) {
+                    Utils.updateTheme((String) newValue);
+
+                    // restart to apply new theme
+                    NavUtils.navigateUpTo(activity,
+                            new Intent(Intent.ACTION_MAIN).setClass(activity, ShowsActivity.class));
+                    activity.startActivity(startIntent);
+                }
+                return true;
+            }
+        });
+
+        // set current value of auto-update pref
+        ((CheckBoxPreference) updatePref).setChecked(SgSyncAdapter.isSyncAutomatically(activity));
+
+        // show currently set values for list prefs
         setListPreferenceSummary((ListPreference) languagePref);
+        setListPreferenceSummary((ListPreference) themePref);
+        setListPreferenceSummary((ListPreference) numberFormatPref);
     }
 
     protected static void setupNotifiationSettings(final Context context,
@@ -298,35 +331,19 @@ public boolean onPreferenceClick(Preference preference) {
         setListPreferenceSummary((ListPreference) notificationsThresholdPref);
     }
 
-    protected static void setupAdvancedSettings(final Activity activity, final Intent startIntent,
-            Preference themePref, Preference upcomingPref, Preference numberFormatPref,
-            Preference offsetPref, Preference analyticsPref, Preference clearCachePref,
-            Preference updatePref) {
-        // Theme switcher
-        themePref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (preference.getKey().equals(KEY_THEME)) {
-                    Utils.updateTheme((String) newValue);
-
-                    // restart to apply new theme
-                    NavUtils.navigateUpTo(activity,
-                            new Intent(Intent.ACTION_MAIN).setClass(activity, ShowsActivity.class));
-                    activity.startActivity(startIntent);
-                }
-                return true;
-            }
-        });
+    protected static void setupAdvancedSettings(final Context context,
+            Preference upcomingPref, Preference offsetPref, Preference analyticsPref,
+            Preference clearCachePref) {
 
         // Clear image cache
         clearCachePref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 
             public boolean onPreferenceClick(Preference preference) {
-                fireTrackerEvent(activity, "Clear Image Cache");
+                fireTrackerEvent(context, "Clear Image Cache");
 
-                ImageProvider.getInstance(activity).clearCache();
-                ImageProvider.getInstance(activity).clearExternalStorageCache();
-                Toast.makeText(activity, activity.getString(R.string.done), Toast.LENGTH_SHORT)
+                ImageProvider.getInstance(context).clearCache();
+                ImageProvider.getInstance(context).clearExternalStorageCache();
+                Toast.makeText(context, context.getString(R.string.done), Toast.LENGTH_SHORT)
                         .show();
                 return true;
             }
@@ -338,23 +355,17 @@ public boolean onPreferenceClick(Preference preference) {
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (preference.getKey().equals(AppSettings.KEY_GOOGLEANALYTICS)) {
                     boolean isEnabled = (Boolean) newValue;
-                    GoogleAnalytics.getInstance(activity).setAppOptOut(isEnabled);
+                    GoogleAnalytics.getInstance(context).setAppOptOut(isEnabled);
                     return true;
                 }
                 return false;
             }
         });
 
-        // set current value of auto-update pref
-        ((CheckBoxPreference) updatePref).setChecked(SgSyncAdapter.isSyncAutomatically(activity));
-
         // show currently set values for list prefs
-        setListPreferenceSummary((ListPreference) themePref);
         setListPreferenceSummary((ListPreference) upcomingPref);
-
-        setListPreferenceSummary((ListPreference) numberFormatPref);
         ListPreference offsetListPref = (ListPreference) offsetPref;
-        offsetListPref.setSummary(activity.getString(R.string.pref_offsetsummary,
+        offsetListPref.setSummary(context.getString(R.string.pref_offsetsummary,
                 offsetListPref.getEntry()));
     }
 
@@ -500,37 +511,55 @@ public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
             String settings = getArguments().getString("settings");
-            if ("basic".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_basic);
-                setupBasicSettings(getActivity(), findPreference(KEY_ONLY_FUTURE_EPISODES),
-                        findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
-                        findPreference(KEY_LANGUAGE));
-            } else if ("notifications".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_notifications);
-                setupNotifiationSettings(getActivity(),
-                        findPreference(NotificationSettings.KEY_ENABLED),
-                        findPreference(NotificationSettings.KEY_FAVONLY),
-                        findPreference(NotificationSettings.KEY_VIBRATE),
-                        findPreference(NotificationSettings.KEY_RINGTONE),
-                        findPreference(NotificationSettings.KEY_THRESHOLD));
-            } else if ("sharing".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_services);
-                setupSharingSettings(getActivity(),
-                        findPreference(KEY_GETGLUE_DISCONNECT));
-            } else if ("advanced".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_advanced);
-                setupAdvancedSettings(getActivity(),
-                        getActivity().getIntent(),
-                        findPreference(KEY_THEME),
-                        findPreference(AdvancedSettings.KEY_UPCOMING_LIMIT),
-                        findPreference(KEY_NUMBERFORMAT),
-                        findPreference(KEY_OFFSET),
-                        findPreference(AppSettings.KEY_GOOGLEANALYTICS),
-                        findPreference(KEY_CLEAR_CACHE),
-                        findPreference(KEY_AUTOUPDATE));
-            } else if ("about".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_about);
-                setupAboutSettings(getActivity(), findPreference(KEY_ABOUT));
+            switch (settings) {
+                case "basic":
+                    addPreferencesFromResource(R.xml.settings_basic);
+                    setupBasicSettings(
+                            getActivity(),
+                            getActivity().getIntent(),
+                            findPreference(KEY_ONLY_FUTURE_EPISODES),
+                            findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
+                            findPreference(KEY_LANGUAGE),
+                            findPreference(KEY_THEME),
+                            findPreference(KEY_NUMBERFORMAT),
+                            findPreference(KEY_AUTOUPDATE)
+                    );
+                    break;
+                case "notifications":
+                    addPreferencesFromResource(R.xml.settings_notifications);
+                    setupNotifiationSettings(
+                            getActivity(),
+                            findPreference(NotificationSettings.KEY_ENABLED),
+                            findPreference(NotificationSettings.KEY_FAVONLY),
+                            findPreference(NotificationSettings.KEY_VIBRATE),
+                            findPreference(NotificationSettings.KEY_RINGTONE),
+                            findPreference(NotificationSettings.KEY_THRESHOLD)
+                    );
+                    break;
+                case "sharing":
+                    addPreferencesFromResource(R.xml.settings_services);
+                    setupSharingSettings(
+                            getActivity(),
+                            findPreference(KEY_GETGLUE_DISCONNECT)
+                    );
+                    break;
+                case "advanced":
+                    addPreferencesFromResource(R.xml.settings_advanced);
+                    setupAdvancedSettings(
+                            getActivity(),
+                            findPreference(AdvancedSettings.KEY_UPCOMING_LIMIT),
+                            findPreference(KEY_OFFSET),
+                            findPreference(AppSettings.KEY_GOOGLEANALYTICS),
+                            findPreference(KEY_CLEAR_CACHE)
+                    );
+                    break;
+                case "about":
+                    addPreferencesFromResource(R.xml.settings_about);
+                    setupAboutSettings(
+                            getActivity(),
+                            findPreference(KEY_ABOUT)
+                    );
+                    break;
             }
         }
 
diff --git a/SeriesGuide/src/main/res/xml/settings_advanced.xml b/SeriesGuide/src/main/res/xml/settings_advanced.xml
index 976a6b68bc..9ba7a3adbe 100644
--- a/SeriesGuide/src/main/res/xml/settings_advanced.xml
+++ b/SeriesGuide/src/main/res/xml/settings_advanced.xml
@@ -1,61 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/pref_appearance" >
-        <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/themeSelection"
-            android:entryValues="@array/themeSelectionData"
-            android:key="com.battlelancer.seriesguide.theme"
-            android:title="@string/pref_theme" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_other" >
-        <CheckBoxPreference
-            android:defaultValue="True"
-            android:key="com.battlelancer.seriesguide.autoupdate"
-            android:summary="@string/pref_autoupdatesummary"
-            android:title="@string/pref_autoupdate" />
-        <CheckBoxPreference
-            android:defaultValue="True"
-            android:key="com.battlelancer.seriesguide.autobackup"
-            android:summary="@string/pref_autobackupsummary"
-            android:title="@string/pref_autobackup" />
+    <CheckBoxPreference
+        android:defaultValue="True"
+        android:key="com.battlelancer.seriesguide.autobackup"
+        android:summary="@string/pref_autobackupsummary"
+        android:title="@string/pref_autobackup" />
 
-        <Preference
-            android:key="dataliberation"
-            android:summary="@string/backup_summary"
-            android:title="@string/backup" >
-            <intent
-                android:targetClass="com.battlelancer.seriesguide.dataliberation.DataLiberationActivity"
-                android:targetPackage="@string/package_name" />
-        </Preference>
-        <Preference
-            android:key="backup"
-            android:title="Legacy Backup/Restore" >
-            <intent
-                android:targetClass="com.battlelancer.seriesguide.ui.BackupDeleteActivity"
-                android:targetPackage="@string/package_name" />
-        </Preference>
+    <Preference
+        android:key="dataliberation"
+        android:summary="@string/backup_summary"
+        android:title="@string/backup">
+        <intent
+            android:targetClass="com.battlelancer.seriesguide.dataliberation.DataLiberationActivity"
+            android:targetPackage="@string/package_name" />
+    </Preference>
+
+    <ListPreference
+        android:defaultValue="1"
+        android:entries="@array/upcominglimit"
+        android:entryValues="@array/upcominglimitData"
+        android:key="com.battlelancer.seriesguide.upcominglimit"
+        android:title="@string/pref_upcominglimit" />
 
-        <ListPreference
-            android:defaultValue="1"
-            android:entries="@array/upcominglimit"
-            android:entryValues="@array/upcominglimitData"
-            android:key="com.battlelancer.seriesguide.upcominglimit"
-            android:title="@string/pref_upcominglimit" />
-        <ListPreference
-            android:defaultValue="default"
-            android:entries="@array/numbers"
-            android:entryValues="@array/numberData"
-            android:key="numberformat"
-            android:title="@string/pref_number" />
-        <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/offsets"
-            android:entryValues="@array/offsetData"
-            android:key="com.battlelancer.seriesguide.timeoffset"
-            android:title="@string/pref_offset" />
+    <ListPreference
+        android:defaultValue="0"
+        android:entries="@array/offsets"
+        android:entryValues="@array/offsetData"
+        android:key="com.battlelancer.seriesguide.timeoffset"
+        android:title="@string/pref_offset" />
 
+    <PreferenceCategory android:title="@string/pref_other">
         <Preference
             android:key="clearCache"
             android:summary="@string/clear_cache_summary"
@@ -71,6 +46,13 @@
             android:key="hideimages"
             android:summary="@string/pref_hideimagessummary"
             android:title="@string/pref_hideimages" />
+        <Preference
+            android:key="backup"
+            android:title="Legacy Backup/Restore">
+            <intent
+                android:targetClass="com.battlelancer.seriesguide.ui.BackupDeleteActivity"
+                android:targetPackage="@string/package_name" />
+        </Preference>
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/SeriesGuide/src/main/res/xml/settings_basic.xml b/SeriesGuide/src/main/res/xml/settings_basic.xml
index 823bafedc4..93331396ad 100644
--- a/SeriesGuide/src/main/res/xml/settings_basic.xml
+++ b/SeriesGuide/src/main/res/xml/settings_basic.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ListPreference
+        android:defaultValue="en"
+        android:entries="@array/languages"
+        android:entryValues="@array/languageData"
+        android:key="language"
+        android:title="@string/pref_language" />
+
+    <CheckBoxPreference
+        android:defaultValue="True"
+        android:key="com.battlelancer.seriesguide.autoupdate"
+        android:summary="@string/pref_autoupdatesummary"
+        android:title="@string/pref_autoupdate" />
+    <CheckBoxPreference
+        android:defaultValue="False"
+        android:key="com.battlelancer.seriesguide.autoupdatewlanonly"
+        android:title="@string/pref_updatewifionly" />
 
     <CheckBoxPreference
         android:defaultValue="False"
@@ -11,16 +28,20 @@
         android:key="onlySeasonEpisodes"
         android:summary="@string/pref_onlyseasonepssummary"
         android:title="@string/pref_onlyseasoneps" />
-    <CheckBoxPreference
-        android:defaultValue="False"
-        android:key="com.battlelancer.seriesguide.autoupdatewlanonly"
-        android:title="@string/pref_updatewifionly" />
 
-    <ListPreference
-        android:defaultValue="en"
-        android:entries="@array/languages"
-        android:entryValues="@array/languageData"
-        android:key="language"
-        android:title="@string/pref_language" />
+    <PreferenceCategory android:title="@string/pref_appearance">
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/themeSelection"
+            android:entryValues="@array/themeSelectionData"
+            android:key="com.battlelancer.seriesguide.theme"
+            android:title="@string/pref_theme" />
+        <ListPreference
+            android:defaultValue="default"
+            android:entries="@array/numbers"
+            android:entryValues="@array/numberData"
+            android:key="numberformat"
+            android:title="@string/pref_number" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file

From bcabfbc40ba7222353b636c2b4728bdbc2addb75 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 20:00:25 +0100
Subject: [PATCH 41/74] Show notifications for every show by default.

---
 .../battlelancer/seriesguide/settings/NotificationSettings.java | 2 +-
 SeriesGuide/src/main/res/xml/settings_notifications.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/NotificationSettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/NotificationSettings.java
index 90156eedb3..f5184cff14 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/NotificationSettings.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/NotificationSettings.java
@@ -31,7 +31,7 @@ public static boolean isNotificationsEnabled(Context context) {
 
     public static boolean isNotifyAboutFavoritesOnly(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(KEY_FAVONLY, true);
+                .getBoolean(KEY_FAVONLY, false);
     }
 
     /**
diff --git a/SeriesGuide/src/main/res/xml/settings_notifications.xml b/SeriesGuide/src/main/res/xml/settings_notifications.xml
index b325a4c5bb..b94a77d042 100644
--- a/SeriesGuide/src/main/res/xml/settings_notifications.xml
+++ b/SeriesGuide/src/main/res/xml/settings_notifications.xml
@@ -15,7 +15,7 @@
         android:title="@string/pref_notifications_treshold" />
 
     <CheckBoxPreference
-        android:defaultValue="True"
+        android:defaultValue="False"
         android:key="com.battlelancer.seriesguide.notifications.favonly"
         android:summary="@string/pref_notifyfavonlysummary"
         android:title="@string/pref_notifyfavonly" />

From 7f5224c4382e3db32519d0f602674d19f019e799 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 20:15:31 +0100
Subject: [PATCH 42/74] Create UpdateSettings, move relevant settings there.

- Also create and use settings helper methods.
---
 .../settings/AdvancedSettings.java            | 16 --------
 .../seriesguide/settings/UpdateSettings.java  | 41 +++++++++++++++++++
 .../seriesguide/sync/SgSyncAdapter.java       | 17 ++++----
 .../ui/SeriesGuidePreferences.java            | 15 +++----
 .../battlelancer/seriesguide/util/Utils.java  | 40 +++++++++---------
 5 files changed, 73 insertions(+), 56 deletions(-)
 create mode 100644 SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/UpdateSettings.java

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/AdvancedSettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/AdvancedSettings.java
index 832e782413..c12b81ba40 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/AdvancedSettings.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/AdvancedSettings.java
@@ -10,8 +10,6 @@
  */
 public class AdvancedSettings {
 
-    public static final String KEY_LASTUPDATE = "com.battlelancer.seriesguide.lastupdate";
-
     public static final String KEY_AUTOBACKUP = "com.battlelancer.seriesguide.autobackup";
 
     public static final String KEY_LASTBACKUP = "com.battlelancer.seriesguide.lastbackup";
@@ -20,20 +18,6 @@ public class AdvancedSettings {
 
     public static final String KEY_UPCOMING_LIMIT = "com.battlelancer.seriesguide.upcominglimit";
 
-    public static long getLastAutoUpdateTime(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        long time = prefs.getLong(KEY_LASTUPDATE, 0);
-        if (time == 0) {
-            // use now as default value, so auto-update will not run on first
-            // launch
-            time = System.currentTimeMillis();
-            prefs.edit().putLong(KEY_LASTUPDATE, time).commit();
-        }
-
-        return time;
-    }
-
     public static boolean isAutoBackupEnabled(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(KEY_AUTOBACKUP,
                 true);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/UpdateSettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/UpdateSettings.java
new file mode 100644
index 0000000000..0a334fc97e
--- /dev/null
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/UpdateSettings.java
@@ -0,0 +1,41 @@
+package com.battlelancer.seriesguide.settings;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class UpdateSettings {
+
+    public static final String KEY_AUTOUPDATE = "com.battlelancer.seriesguide.autoupdate";
+
+    public static final String KEY_ONLYWIFI = "com.battlelancer.seriesguide.autoupdatewlanonly";
+
+    public static final String KEY_LASTUPDATE = "com.battlelancer.seriesguide.lastupdate";
+
+    public static final String KEY_FAILED_COUNTER = "com.battlelancer.seriesguide.failedcounter";
+
+    public static boolean isOnlyUpdateOverWifi(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+                KEY_ONLYWIFI, false
+        );
+    }
+
+    public static long getLastAutoUpdateTime(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        long time = prefs.getLong(KEY_LASTUPDATE, 0);
+        if (time == 0) {
+            // use now as default value, so auto-update will not run on first
+            // launch
+            time = System.currentTimeMillis();
+            prefs.edit().putLong(KEY_LASTUPDATE, time).commit();
+        }
+
+        return time;
+    }
+
+    public static int getFailedNumberOfUpdates(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getInt(KEY_FAILED_COUNTER, 0);
+    }
+
+}
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
index a58adde8c6..9cb10871eb 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
@@ -6,7 +6,7 @@
 import com.battlelancer.seriesguide.items.SearchResult;
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.battlelancer.seriesguide.settings.AdvancedSettings;
+import com.battlelancer.seriesguide.settings.UpdateSettings;
 import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
 import com.battlelancer.seriesguide.util.DBUtils;
 import com.battlelancer.seriesguide.util.ServiceUtils;
@@ -70,7 +70,7 @@ public class SgSyncAdapter extends AbstractThreadedSyncAdapter {
     public static void requestSync(Context context) {
         // only request sync if at least UPDATE_INTERVAL has passed
         long now = System.currentTimeMillis();
-        long previousUpdateTime = AdvancedSettings.getLastAutoUpdateTime(context);
+        long previousUpdateTime = UpdateSettings.getLastAutoUpdateTime(context);
 
         final boolean isTime = (now - previousUpdateTime) >
                 UPDATE_INTERVAL_MINUTES * DateUtils.MINUTE_IN_MILLIS;
@@ -101,8 +101,7 @@ public static void requestSync(Context context, int showTvdbId, boolean isUserRe
         if (!Utils.isAllowedConnection(context)) {
             // abort if no connection available
             if (isUserRequested) {
-                final boolean isWifiOnly = PreferenceManager.getDefaultSharedPreferences(context)
-                        .getBoolean(SeriesGuidePreferences.KEY_ONLYWIFI, false);
+                final boolean isWifiOnly = UpdateSettings.isOnlyUpdateOverWifi(context);
                 Toast.makeText(context,
                         isWifiOnly ? R.string.update_no_wifi : R.string.update_no_connection,
                         Toast.LENGTH_LONG).show();
@@ -283,10 +282,10 @@ public void onPerformSync(Account account, Bundle extras, String authority,
             // store time of update, set retry counter on failure
             if (resultCode == UpdateResult.SUCCESS) {
                 // we were successful, reset failed counter
-                prefs.edit().putLong(AdvancedSettings.KEY_LASTUPDATE, currentTime)
-                        .putInt(SeriesGuidePreferences.KEY_FAILED_COUNTER, 0).commit();
+                prefs.edit().putLong(UpdateSettings.KEY_LASTUPDATE, currentTime)
+                        .putInt(UpdateSettings.KEY_FAILED_COUNTER, 0).commit();
             } else {
-                int failed = prefs.getInt(SeriesGuidePreferences.KEY_FAILED_COUNTER, 0);
+                int failed = UpdateSettings.getFailedNumberOfUpdates(getContext());
 
                 /*
                  * Back off by 2**(failure + 2) * minutes. Purposely set a fake
@@ -305,8 +304,8 @@ public void onPerformSync(Account account, Bundle extras, String authority,
 
                 failed += 1;
                 prefs.edit()
-                        .putLong(AdvancedSettings.KEY_LASTUPDATE, fakeLastUpdateTime)
-                        .putInt(SeriesGuidePreferences.KEY_FAILED_COUNTER, failed).commit();
+                        .putLong(UpdateSettings.KEY_LASTUPDATE, fakeLastUpdateTime)
+                        .putInt(UpdateSettings.KEY_FAILED_COUNTER, failed).commit();
             }
         }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
index 56a6f70501..596ac43af9 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
@@ -31,6 +31,7 @@
 import com.battlelancer.seriesguide.settings.AppSettings;
 import com.battlelancer.seriesguide.settings.GetGlueSettings;
 import com.battlelancer.seriesguide.settings.NotificationSettings;
+import com.battlelancer.seriesguide.settings.UpdateSettings;
 import com.battlelancer.seriesguide.sync.SgSyncAdapter;
 import com.battlelancer.seriesguide.util.ImageProvider;
 import com.battlelancer.seriesguide.util.Utils;
@@ -114,10 +115,6 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_HIDEIMAGES = "hideimages";
 
-    public static final String KEY_AUTOUPDATE = "com.battlelancer.seriesguide.autoupdate";
-
-    public static final String KEY_ONLYWIFI = "com.battlelancer.seriesguide.autoupdatewlanonly";
-
     public static final String KEY_LASTTRAKTUPDATE = "com.battlelancer.seriesguide.lasttraktupdate";
 
     public static final String KEY_NOWATCHED = "com.battlelancer.seriesguide.activity.nowatched";
@@ -131,8 +128,6 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_THEME = "com.battlelancer.seriesguide.theme";
 
-    public static final String KEY_FAILED_COUNTER = "com.battlelancer.seriesguide.failedcounter";
-
     public static final String KEY_ACTIVITYTAB = "com.battlelancer.seriesguide.activitytab";
 
     public static final String KEY_AUTO_ADD_TRAKT_SHOWS
@@ -176,7 +171,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     findPreference(KEY_LANGUAGE),
                     findPreference(KEY_THEME),
                     findPreference(KEY_NUMBERFORMAT),
-                    findPreference(KEY_AUTOUPDATE)
+                    findPreference(UpdateSettings.KEY_AUTOUPDATE)
             );
         } else if (action != null && action.equals(ACTION_PREFS_NOTIFICATIONS)) {
             addPreferencesFromResource(R.xml.settings_notifications);
@@ -479,7 +474,7 @@ public void run() {
         }
 
         // Toggle auto-update on SyncAdapter
-        if (KEY_AUTOUPDATE.equals(key)) {
+        if (UpdateSettings.KEY_AUTOUPDATE.equals(key)) {
             CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
             if (pref != null) {
                 SgSyncAdapter.setSyncAutomatically(SeriesGuidePreferences.this, pref.isChecked());
@@ -522,7 +517,7 @@ public void onCreate(Bundle savedInstanceState) {
                             findPreference(KEY_LANGUAGE),
                             findPreference(KEY_THEME),
                             findPreference(KEY_NUMBERFORMAT),
-                            findPreference(KEY_AUTOUPDATE)
+                            findPreference(UpdateSettings.KEY_AUTOUPDATE)
                     );
                     break;
                 case "notifications":
@@ -611,7 +606,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             }
 
             // Toggle auto-update on SyncAdapter
-            if (KEY_AUTOUPDATE.equals(key)) {
+            if (UpdateSettings.KEY_AUTOUPDATE.equals(key)) {
                 CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
                 if (pref != null) {
                     SgSyncAdapter.setSyncAutomatically(getActivity(), pref.isChecked());
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java
index 9fcde50d0e..a4ba6b4c7d 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java
@@ -17,6 +17,24 @@
 
 package com.battlelancer.seriesguide.util;
 
+import com.google.analytics.tracking.android.EasyTracker;
+import com.google.analytics.tracking.android.Fields;
+import com.google.analytics.tracking.android.MapBuilder;
+
+import com.battlelancer.seriesguide.Constants;
+import com.battlelancer.seriesguide.Constants.EpisodeSorting;
+import com.battlelancer.seriesguide.billing.BillingActivity;
+import com.battlelancer.seriesguide.provider.SeriesContract.ListItems;
+import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.service.NotificationService;
+import com.battlelancer.seriesguide.service.OnAlarmReceiver;
+import com.battlelancer.seriesguide.settings.ActivitySettings;
+import com.battlelancer.seriesguide.settings.AdvancedSettings;
+import com.battlelancer.seriesguide.settings.UpdateSettings;
+import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
+import com.uwetrottmann.androidutils.AndroidUtils;
+import com.uwetrottmann.seriesguide.R;
+
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlarmManager;
@@ -40,23 +58,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.battlelancer.seriesguide.Constants;
-import com.battlelancer.seriesguide.Constants.EpisodeSorting;
-import com.battlelancer.seriesguide.billing.BillingActivity;
-import com.battlelancer.seriesguide.provider.SeriesContract.ListItems;
-import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.battlelancer.seriesguide.service.NotificationService;
-import com.battlelancer.seriesguide.service.OnAlarmReceiver;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
-import com.battlelancer.seriesguide.settings.AdvancedSettings;
-import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
-import com.google.analytics.tracking.android.EasyTracker;
-import com.google.analytics.tracking.android.Fields;
-import com.google.analytics.tracking.android.MapBuilder;
-
-import com.uwetrottmann.androidutils.AndroidUtils;
-import com.uwetrottmann.seriesguide.R;
-
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -871,10 +872,7 @@ public static void trackClick(Context context, String tag, String label) {
      * connection.
      */
     public static boolean isAllowedConnection(Context context) {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        final boolean isWlanOnly = prefs.getBoolean(SeriesGuidePreferences.KEY_ONLYWIFI, false);
-
-        if (isWlanOnly) {
+        if (UpdateSettings.isOnlyUpdateOverWifi(context)) {
             return AndroidUtils.isWifiConnected(context);
         } else {
             return AndroidUtils.isNetworkConnected(context);

From a82109a153b70fc5a723e6bb7519afa54a8089a3 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 21:12:57 +0100
Subject: [PATCH 43/74] Create DisplaySettings, move relevant settings there.

- Also created helper methods to get those settings and using them
everywhere.
- Also moved some helper methods directly into the settings class.
---
 .../seriesguide/SeriesGuideApplication.java   |   7 +-
 .../adapters/SearchResultsAdapter.java        |  27 +++--
 .../seriesguide/appwidget/AppWidget.java      |  19 ++-
 .../appwidget/ListWidgetService.java          |  25 ++--
 .../service/NotificationService.java          |  32 ++---
 .../settings/ActivitySettings.java            |  36 ------
 .../seriesguide/settings/DisplaySettings.java | 109 ++++++++++++++++++
 .../ui/EpisodeDetailsActivity.java            |  44 ++++---
 .../seriesguide/ui/EpisodesActivity.java      |  12 +-
 .../seriesguide/ui/EpisodesFragment.java      |  27 ++---
 .../seriesguide/ui/FirstRunFragment.java      |   3 +-
 .../seriesguide/ui/ListsFragment.java         |   6 +-
 .../seriesguide/ui/OverviewFragment.java      |  35 +++---
 .../seriesguide/ui/QuickCheckInActivity.java  |  28 ++---
 .../seriesguide/ui/SeasonsFragment.java       |  26 ++---
 .../ui/SeriesGuidePreferences.java            |  84 +++++---------
 .../seriesguide/ui/TraktFriendsFragment.java  |   9 +-
 .../seriesguide/ui/UpcomingFragment.java      |  20 ++--
 .../ui/UpcomingRecentActivity.java            |  24 ++--
 .../seriesguide/util/DBUtils.java             |  24 ++--
 .../seriesguide/util/FlagTask.java            |  18 +--
 .../seriesguide/util/ShareUtils.java          |   3 +-
 .../seriesguide/util/TraktTask.java           |   6 +-
 .../battlelancer/seriesguide/util/Utils.java  |  44 ++-----
 .../com/battlelancer/thetvdbapi/TheTVDB.java  |  13 +--
 25 files changed, 329 insertions(+), 352 deletions(-)
 create mode 100644 SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/SeriesGuideApplication.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/SeriesGuideApplication.java
index 089ac15336..3ffccf1d5c 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/SeriesGuideApplication.java
+++ b/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));
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/SearchResultsAdapter.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/SearchResultsAdapter.java
index 200ca10ce5..6c4481556c 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/SearchResultsAdapter.java
+++ b/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;
     }
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/AppWidget.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/AppWidget.java
index e1ae7e3ae8..15669f171c 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/AppWidget.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/AppWidget.java
@@ -16,6 +16,14 @@
 
 package com.battlelancer.seriesguide.appwidget;
 
+import com.battlelancer.seriesguide.ui.ShowsActivity;
+import com.battlelancer.seriesguide.ui.UpcomingFragment.UpcomingQuery;
+import com.battlelancer.seriesguide.ui.UpcomingRecentActivity;
+import com.battlelancer.seriesguide.util.DBUtils;
+import com.battlelancer.seriesguide.util.ImageProvider;
+import com.battlelancer.seriesguide.util.Utils;
+import com.uwetrottmann.seriesguide.R;
+
 import android.app.IntentService;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
@@ -30,14 +38,6 @@
 import android.support.v4.app.TaskStackBuilder;
 import android.widget.RemoteViews;
 
-import com.battlelancer.seriesguide.ui.ShowsActivity;
-import com.battlelancer.seriesguide.ui.UpcomingFragment.UpcomingQuery;
-import com.battlelancer.seriesguide.ui.UpcomingRecentActivity;
-import com.battlelancer.seriesguide.util.DBUtils;
-import com.battlelancer.seriesguide.util.ImageProvider;
-import com.battlelancer.seriesguide.util.Utils;
-import com.uwetrottmann.seriesguide.R;
-
 public class AppWidget extends AppWidgetProvider {
     public static final String REFRESH = "com.battlelancer.seriesguide.appwidget.REFRESH";
 
@@ -125,9 +125,8 @@ protected RemoteViews buildUpdate(Context context, String limit, int layout,
                     int seasonNumber = upcomingEpisodes.getInt(UpcomingQuery.SEASON);
                     int episodeNumber = upcomingEpisodes.getInt(UpcomingQuery.NUMBER);
                     String title = upcomingEpisodes.getString(UpcomingQuery.TITLE);
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
                     item.setTextViewText(R.id.textViewWidgetEpisode,
-                            Utils.getNextEpisodeString(prefs, seasonNumber, episodeNumber, title));
+                            Utils.getNextEpisodeString(this, seasonNumber, episodeNumber, title));
 
                     // relative airtime
                     long airtime = upcomingEpisodes.getLong(UpcomingQuery.FIRSTAIREDMS);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetService.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetService.java
index 01c70316d0..95b1f28a83 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetService.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetService.java
@@ -17,18 +17,6 @@
 
 package com.battlelancer.seriesguide.appwidget;
 
-import android.annotation.TargetApi;
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
-
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Qualified;
@@ -40,6 +28,16 @@
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
+import android.annotation.TargetApi;
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+import android.widget.RemoteViewsService;
+
 @TargetApi(11)
 public class ListWidgetService extends RemoteViewsService {
 
@@ -132,9 +130,8 @@ public RemoteViews getViewAt(int position) {
                     ShowsQuery.EPISODE_NUMBER : UpcomingQuery.NUMBER);
             String title = mDataCursor.getString(isShowQuery ?
                     ShowsQuery.EPISODE_TITLE : UpcomingQuery.TITLE);
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
             rv.setTextViewText(R.id.textViewWidgetEpisode,
-                    Utils.getNextEpisodeString(prefs, seasonNumber, episodeNumber, title));
+                    Utils.getNextEpisodeString(mContext, seasonNumber, episodeNumber, title));
 
             // relative airtime
             long airtime = mDataCursor.getLong(isShowQuery ?
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/NotificationService.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/NotificationService.java
index 4a80ec63de..ca7bc2be9c 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/NotificationService.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/NotificationService.java
@@ -17,6 +17,20 @@
 
 package com.battlelancer.seriesguide.service;
 
+import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
+import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Tables;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
+import com.battlelancer.seriesguide.settings.NotificationSettings;
+import com.battlelancer.seriesguide.ui.EpisodesActivity;
+import com.battlelancer.seriesguide.ui.QuickCheckInActivity;
+import com.battlelancer.seriesguide.ui.UpcomingRecentActivity;
+import com.battlelancer.seriesguide.util.ImageProvider;
+import com.battlelancer.seriesguide.util.Utils;
+import com.uwetrottmann.androidutils.AndroidUtils;
+import com.uwetrottmann.androidutils.Lists;
+import com.uwetrottmann.seriesguide.R;
+
 import android.annotation.TargetApi;
 import android.app.AlarmManager;
 import android.app.IntentService;
@@ -35,20 +49,6 @@
 import android.text.format.DateUtils;
 import android.text.style.ForegroundColorSpan;
 
-import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
-import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Tables;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
-import com.battlelancer.seriesguide.settings.NotificationSettings;
-import com.battlelancer.seriesguide.ui.EpisodesActivity;
-import com.battlelancer.seriesguide.ui.QuickCheckInActivity;
-import com.battlelancer.seriesguide.ui.UpcomingRecentActivity;
-import com.battlelancer.seriesguide.util.ImageProvider;
-import com.battlelancer.seriesguide.util.Utils;
-import com.uwetrottmann.androidutils.AndroidUtils;
-import com.uwetrottmann.androidutils.Lists;
-import com.uwetrottmann.seriesguide.R;
-
 import java.util.List;
 
 public class NotificationService extends IntentService {
@@ -148,7 +148,7 @@ protected void onHandleIntent(Intent intent) {
         if (isFavsOnly) {
             selection.append(Shows.SELECTION_FAVORITES);
         }
-        boolean isNoSpecials = ActivitySettings.isHidingSpecials(this);
+        boolean isNoSpecials = DisplaySettings.isHidingSpecials(this);
         if (isNoSpecials) {
             selection.append(Episodes.SELECTION_NOSPECIALS);
         }
@@ -342,7 +342,7 @@ private void onNotify(final SharedPreferences prefs, final Cursor upcomingEpisod
             contentTitle = showTitle
                     + " "
                     + Utils.getEpisodeNumber(
-                    PreferenceManager.getDefaultSharedPreferences(this),
+                    this,
                     upcomingEpisodes.getInt(NotificationQuery.SEASON),
                     upcomingEpisodes.getInt(NotificationQuery.NUMBER));
             contentText = getString(R.string.upcoming_show_detailed, airs, network);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java
index 5a436b67db..159befaca9 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java
@@ -1,48 +1,12 @@
 
 package com.battlelancer.seriesguide.settings;
 
-import android.content.Context;
-import android.preference.PreferenceManager;
-
 /**
  * Access settings related to the activity stream, e.g. upcoming and recent
  * episodes.
  */
 public class ActivitySettings {
 
-    public static final String KEY_HIDE_SPECIALS = "onlySeasonEpisodes";
-
-    public static final String KEY_INFINITE_SCROLLING = "com.battlelancer.seriesguide.activity.infinite";
-
-    public static final String KEY_ONLY_FAVORITES = "com.battlelancer.seriesguide.onlyfavorites";
-
-    /**
-     * Whether to exclude special episodes wherever possible (except in the
-     * actual seasons and episode lists of a show).
-     */
-    public static boolean isHidingSpecials(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                KEY_HIDE_SPECIALS, false);
-    }
-
-    /**
-     * Whether the activity stream should be infinite or limited to a number of
-     * days.
-     */
-    public static boolean isInfiniteScrolling(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                KEY_INFINITE_SCROLLING,
-                false);
-    }
 
-    /**
-     * Whether the activity stream should only include episodes from favorited
-     * shows.
-     */
-    public static boolean isOnlyFavorites(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                KEY_ONLY_FAVORITES,
-                false);
-    }
 
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java
new file mode 100644
index 0000000000..faad2131dc
--- /dev/null
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java
@@ -0,0 +1,109 @@
+package com.battlelancer.seriesguide.settings;
+
+import com.battlelancer.seriesguide.Constants;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+public class DisplaySettings {
+
+    public static final String KEY_THEME = "com.battlelancer.seriesguide.theme";
+
+    public static final String KEY_LANGUAGE = "language";
+
+    public static final String KEY_NUMBERFORMAT = "numberformat";
+
+    public static final String NUMBERFORMAT_DEFAULT = "default";
+
+    public static final String NUMBERFORMAT_ENGLISHLOWER = "englishlower";
+
+    public static final String KEY_NO_RELEASED_EPISODES = "onlyFutureEpisodes";
+
+    public static final String KEY_NO_WATCHED_EPISODES
+            = "com.battlelancer.seriesguide.activity.nowatched";
+
+    public static final String KEY_SEASON_SORT_ORDER = "seasonSorting";
+
+    public static final String KEY_EPISODE_SORT_ORDER = "episodeSorting";
+
+    public static final String KEY_HIDE_SPECIALS = "onlySeasonEpisodes";
+
+    // Only applies to activity stream
+    public static final String KEY_ACTIVITYTAB = "com.battlelancer.seriesguide.activitytab";
+
+    public static final String KEY_INFINITE_ACTIVITY
+            = "com.battlelancer.seriesguide.activity.infinite";
+
+    public static final String KEY_ONLY_FAVORITE_SHOWS
+            = "com.battlelancer.seriesguide.onlyfavorites";
+
+    public static String getThemeIndex(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).
+                getString(KEY_THEME, "0");
+    }
+
+    public static String getContentLanguage(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(KEY_LANGUAGE, "en");
+    }
+
+    public static String getNumberFormat(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(KEY_NUMBERFORMAT, NUMBERFORMAT_DEFAULT);
+    }
+
+    public static Constants.EpisodeSorting getEpisodeSortOrder(Context context) {
+        String orderId = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(KEY_EPISODE_SORT_ORDER, Constants.EpisodeSorting.OLDEST_FIRST.value());
+        return Constants.EpisodeSorting.fromValue(orderId);
+    }
+
+    public static Constants.SeasonSorting getSeasonSortOrder(Context context) {
+        String orderId = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(KEY_SEASON_SORT_ORDER, Constants.SeasonSorting.LATEST_FIRST.value());
+        return Constants.SeasonSorting.fromValue(orderId);
+    }
+
+    public static boolean isNoReleasedEpisodes(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(KEY_NO_RELEASED_EPISODES, false);
+    }
+
+    public static boolean isNoWatchedEpisodes(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(KEY_NO_WATCHED_EPISODES, false);
+    }
+
+    /**
+     * Whether to exclude special episodes wherever possible (except in the actual seasons and
+     * episode lists of a show).
+     */
+    public static boolean isHidingSpecials(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+                KEY_HIDE_SPECIALS, false);
+    }
+
+    public static int getDefaultActivityTabPosition(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getInt(KEY_ACTIVITYTAB, 0);
+    }
+
+    /**
+     * Whether the activity stream should be infinite or limited to a number of days.
+     */
+    public static boolean isInfiniteActivity(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+                KEY_INFINITE_ACTIVITY,
+                false);
+    }
+
+    /**
+     * Whether the activity stream should only include episodes from favorited shows.
+     */
+    public static boolean isOnlyFavorites(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+                KEY_ONLY_FAVORITE_SHOWS,
+                false);
+    }
+
+}
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
index 7eb01592fb..084b3967ea 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
@@ -28,14 +28,14 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
+import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
@@ -47,11 +47,12 @@
 import java.util.ArrayList;
 
 /**
- * Hosts a {@link ViewPager} displaying an episode per fragment of a complete
- * season. Used on smaller screens which do not allow for multi-pane layouts or
- * if coming from a search result selection.
+ * Hosts a {@link ViewPager} displaying an episode per fragment of a complete season. Used on
+ * smaller screens which do not allow for multi-pane layouts or if coming from a search result
+ * selection.
  */
 public class EpisodeDetailsActivity extends BaseNavDrawerActivity {
+
     protected static final String TAG = "Episode Details";
 
     private EpisodePagerAdapter mAdapter;
@@ -63,10 +64,10 @@ public class EpisodeDetailsActivity extends BaseNavDrawerActivity {
     private int mShowId;
 
     /**
-     * Data which has to be passed when creating this activity. All Bundle
-     * extras are integer.
+     * Data which has to be passed when creating this activity. All Bundle extras are integer.
      */
     public interface InitBundle {
+
         String EPISODE_TVDBID = "episode_tvdbid";
     }
 
@@ -91,9 +92,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Lookup show and season of episode
         final Cursor episode = getContentResolver().query(
-                Episodes.buildEpisodeWithShowUri(String.valueOf(episodeId)), new String[] {
-                        Seasons.REF_SEASON_ID, Shows.POSTER, Shows.REF_SHOW_ID
-                }, null, null, null);
+                Episodes.buildEpisodeWithShowUri(String.valueOf(episodeId)), new String[]{
+                Seasons.REF_SEASON_ID, Shows.POSTER, Shows.REF_SHOW_ID
+        }, null, null, null);
 
         if (episode == null || !episode.moveToFirst()) {
             // nothing to display
@@ -108,12 +109,12 @@ protected void onCreate(Bundle savedInstanceState) {
         // lookup episodes of season
         mShowId = episode.getInt(2);
         mSeasonId = episode.getInt(0);
-        Constants.EpisodeSorting sorting = Utils.getEpisodeSorting(this);
+        Constants.EpisodeSorting sortOrder = DisplaySettings.getEpisodeSortOrder(this);
 
         Cursor episodeCursor = getContentResolver().query(
-                Episodes.buildEpisodesOfSeasonUri(String.valueOf(mSeasonId)), new String[] {
-                        Episodes._ID, Episodes.NUMBER, Episodes.SEASON
-                }, null, null, sorting.query());
+                Episodes.buildEpisodesOfSeasonUri(String.valueOf(mSeasonId)), new String[]{
+                Episodes._ID, Episodes.NUMBER, Episodes.SEASON
+        }, null, null, sortOrder.query());
 
         if (episodeCursor != null) {
             int i = 0;
@@ -135,10 +136,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         episode.close();
 
-        final SharedPreferences prefs = PreferenceManager
-                .getDefaultSharedPreferences(getApplicationContext());
-
-        mAdapter = new EpisodePagerAdapter(getSupportFragmentManager(), episodes, prefs, true);
+        mAdapter = new EpisodePagerAdapter(this, getSupportFragmentManager(), episodes, true);
 
         mPager = (ViewPager) findViewById(R.id.pagerEpisodeDetails);
         mPager.setAdapter(mAdapter);
@@ -223,15 +221,15 @@ public static class EpisodePagerAdapter extends FragmentStatePagerAdapter {
 
         private ArrayList<Episode> mEpisodes;
 
-        private SharedPreferences mPrefs;
+        private Context mContext;
 
         private boolean mIsShowingShowLink;
 
-        public EpisodePagerAdapter(FragmentManager fm, ArrayList<Episode> episodes,
-                SharedPreferences prefs, boolean isShowingShowLink) {
+        public EpisodePagerAdapter(Context context, FragmentManager fm, ArrayList<Episode> episodes,
+                boolean isShowingShowLink) {
             super(fm);
             mEpisodes = episodes;
-            mPrefs = prefs;
+            mContext = context;
             mIsShowingShowLink = isShowingShowLink;
         }
 
@@ -271,7 +269,7 @@ public int getCount() {
         @Override
         public CharSequence getPageTitle(int position) {
             Episode episode = mEpisodes.get(position);
-            return Utils.getEpisodeNumber(mPrefs, episode.seasonNumber, episode.episodeNumber);
+            return Utils.getEpisodeNumber(mContext, episode.seasonNumber, episode.episodeNumber);
         }
 
         public void updateEpisodeList(ArrayList<Episode> list) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java
index 02275e7098..8c48ff704a 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesActivity.java
@@ -29,6 +29,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.service.NotificationService;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.EpisodeDetailsActivity.EpisodePagerAdapter;
 import com.battlelancer.seriesguide.util.DBUtils;
 import com.battlelancer.seriesguide.util.Utils;
@@ -182,12 +183,9 @@ protected void onCreate(Bundle savedInstanceState) {
             final ImageView background = (ImageView) findViewById(R.id.background);
             Utils.setPosterBackground(background, show.getPoster(), this);
 
-            final SharedPreferences prefs = PreferenceManager
-                    .getDefaultSharedPreferences(getApplicationContext());
-
             // set adapters for pager and indicator
             int startPosition = updateEpisodeList(episodeId);
-            mAdapter = new EpisodePagerAdapter(getSupportFragmentManager(), mEpisodes, prefs, false);
+            mAdapter = new EpisodePagerAdapter(this, getSupportFragmentManager(), mEpisodes, false);
             mPager = (ViewPager) pager;
             mPager.setAdapter(mAdapter);
 
@@ -312,7 +310,7 @@ public void onBackPressed() {
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         // update the viewpager with new sorting, if shown
-        if (key.equals(SeriesGuidePreferences.KEY_EPISODE_SORT_ORDER) && mDualPane) {
+        if (DisplaySettings.KEY_EPISODE_SORT_ORDER.equals(key) && mDualPane) {
             // Workaround in combination with
             // EpisodePagerAdapter.getItemPosition()
             // save visible episode
@@ -342,13 +340,13 @@ private int updateEpisodeList() {
      * episode id is given it will return its position in the created list.
      */
     private int updateEpisodeList(int initialEpisodeId) {
-        Constants.EpisodeSorting sorting = Utils.getEpisodeSorting(this);
+        Constants.EpisodeSorting sortOrder = DisplaySettings.getEpisodeSortOrder(this);
 
         Cursor episodeCursor = getContentResolver().query(
                 Episodes.buildEpisodesOfSeasonWithShowUri(String.valueOf(mSeasonId)),
                 new String[] {
                         Episodes._ID, Episodes.NUMBER
-                }, null, null, sorting.query());
+                }, null, null, sortOrder.query());
 
         ArrayList<Episode> episodeList = new ArrayList<Episode>();
         int startPosition = 0;
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesFragment.java
index a82ed3a8d2..da58963096 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodesFragment.java
@@ -22,13 +22,13 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.battlelancer.seriesguide.Constants;
-import com.battlelancer.seriesguide.Constants.EpisodeSorting;
 import com.battlelancer.seriesguide.adapters.EpisodesAdapter;
 import com.battlelancer.seriesguide.adapters.EpisodesAdapter.OnFlagEpisodeListener;
 import com.battlelancer.seriesguide.enums.EpisodeFlags;
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.ListItemTypes;
 import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Tables;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.dialogs.ListsDialogFragment;
 import com.battlelancer.seriesguide.ui.dialogs.SortDialogFragment;
 import com.battlelancer.seriesguide.util.FlagTask;
@@ -36,7 +36,6 @@
 import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.seriesguide.R;
 
-import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -119,7 +118,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        updatePreferences();
+        getPreferences();
 
         // listen to changes to the sorting preference
         final SharedPreferences prefs = PreferenceManager
@@ -190,7 +189,7 @@ private void showDetails(long episodeId) {
     @Override
     public void onResume() {
         super.onResume();
-        updatePreferences();
+        getPreferences();
     }
 
     @Override
@@ -351,8 +350,8 @@ private void onMarkUntilHere(long firstaired) {
                 .execute();
     }
 
-    private void updatePreferences() {
-        mSorting = Utils.getEpisodeSorting(getActivity());
+    private void getPreferences() {
+        mSorting = DisplaySettings.getEpisodeSortOrder(getActivity());
     }
 
     public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
@@ -397,24 +396,22 @@ private void showSortDialog() {
         FragmentManager fm = getFragmentManager();
         SortDialogFragment sortDialog = SortDialogFragment.newInstance(R.array.epsorting,
                 R.array.epsortingData, mSorting.index(),
-                SeriesGuidePreferences.KEY_EPISODE_SORT_ORDER, R.string.pref_episodesorting);
+                DisplaySettings.KEY_EPISODE_SORT_ORDER, R.string.pref_episodesorting);
         sortDialog.show(fm, "fragment_sort");
     }
 
-    private final OnSharedPreferenceChangeListener mPrefsListener = new OnSharedPreferenceChangeListener() {
+    private final OnSharedPreferenceChangeListener mPrefsListener
+            = new OnSharedPreferenceChangeListener() {
 
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (key.equals(SeriesGuidePreferences.KEY_EPISODE_SORT_ORDER)) {
-                updateSorting(sharedPreferences);
+            if (DisplaySettings.KEY_EPISODE_SORT_ORDER.equals(key)) {
+                onSortOrderChanged();
             }
         }
     };
 
-    @SuppressLint("NewApi")
-    private void updateSorting(SharedPreferences prefs) {
-        mSorting = EpisodeSorting
-                .fromValue(prefs.getString(SeriesGuidePreferences.KEY_EPISODE_SORT_ORDER,
-                        EpisodeSorting.OLDEST_FIRST.value()));
+    private void onSortOrderChanged() {
+        getPreferences();
 
         getLoaderManager().restartLoader(EPISODES_LOADER, null, EpisodesFragment.this);
         getSherlockActivity().invalidateOptionsMenu();
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java
index d7aec19f71..fb0285b1cb 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/FirstRunFragment.java
@@ -19,6 +19,7 @@
 
 import com.actionbarsherlock.app.SherlockFragment;
 import com.battlelancer.seriesguide.migration.MigrationActivity;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.androidutils.CheatSheet;
 import com.uwetrottmann.seriesguide.R;
@@ -158,7 +159,7 @@ public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
             final SharedPreferences prefs = PreferenceManager
                     .getDefaultSharedPreferences(getActivity());
             final String value = getResources().getStringArray(R.array.languageData)[pos];
-            prefs.edit().putString(SeriesGuidePreferences.KEY_LANGUAGE, value).commit();
+            prefs.edit().putString(DisplaySettings.KEY_LANGUAGE, value).commit();
         }
 
         public void onNothingSelected(AdapterView<?> parent) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsFragment.java
index e1399129e4..817f9aa212 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsFragment.java
@@ -29,10 +29,8 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -212,12 +210,10 @@ public void onLoaderReset(Loader<Cursor> loader) {
     private class ListItemAdapter extends CursorAdapter {
 
         private LayoutInflater mInflater;
-        private SharedPreferences mPrefs;
 
         public ListItemAdapter(Context context, Cursor c, int flags) {
             super(context, c, flags);
             mInflater = LayoutInflater.from(context);
-            mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         }
 
         @Override
@@ -311,7 +307,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 case 3:
                     // episodes
                     viewHolder.timeAndNetwork.setText(R.string.episode);
-                    viewHolder.episode.setText(Utils.getNextEpisodeString(mPrefs,
+                    viewHolder.episode.setText(Utils.getNextEpisodeString(mContext,
                             mCursor.getInt(ListItemsQuery.SHOW_NEXTTEXT),
                             mCursor.getInt(ListItemsQuery.SHOW_NEXTAIRDATETEXT),
                             mCursor.getString(ListItemsQuery.ITEM_TITLE)));
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
index 23ec4d10a6..20a6f7d154 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
@@ -50,13 +50,11 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -110,6 +108,7 @@ public class OverviewFragment extends SherlockFragment implements
      * All values have to be integer.
      */
     public interface InitBundle {
+
         String SHOW_TVDBID = "show_tvdbid";
     }
 
@@ -125,7 +124,8 @@ public static OverviewFragment newInstance(int showId) {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         if (container == null) {
             return null;
         }
@@ -272,7 +272,7 @@ private void onAddCalendarEvent() {
             ShareUtils.onAddCalendarEvent(
                     getActivity(),
                     mShowCursor.getString(ShowQuery.SHOW_TITLE),
-                    buildEpisodeString(seasonNumber, episodeNumber,
+                    Utils.getNextEpisodeString(getActivity(), seasonNumber, episodeNumber,
                             episodeTitle), mEpisodeCursor.getLong(EpisodeQuery.FIRSTAIREDMS),
                     mShowCursor.getInt(ShowQuery.SHOW_RUNTIME));
         }
@@ -331,8 +331,8 @@ private void onShareEpisode(ShareMethod shareMethod) {
             shareData.putInt(ShareItems.EPISODE, episodeNumber);
             shareData.putInt(ShareItems.TVDBID, getShowId());
 
-            String episodestring = buildEpisodeString(seasonNumber, episodeNumber,
-                    mEpisodeCursor.getString(EpisodeQuery.TITLE));
+            String episodestring = Utils.getNextEpisodeString(getActivity(), seasonNumber,
+                    episodeNumber, mEpisodeCursor.getString(EpisodeQuery.TITLE));
             shareData.putString(ShareItems.EPISODESTRING, episodestring);
 
             final StringBuilder shareString = new
@@ -381,13 +381,6 @@ private void onToggleShowFavorited(View v) {
         Utils.runNotificationService(getActivity());
     }
 
-    private String buildEpisodeString(int seasonNumber, int episodeNumber, String episodeTitle) {
-        final SharedPreferences prefs = PreferenceManager
-                .getDefaultSharedPreferences(getActivity());
-        return Utils.getNextEpisodeString(prefs, seasonNumber,
-                episodeNumber, episodeTitle);
-    }
-
     public static class EpisodeLoader extends CursorLoader {
 
         private int mShowTvdbId;
@@ -411,7 +404,7 @@ public Cursor loadInBackground() {
 
     interface EpisodeQuery {
 
-        String[] PROJECTION = new String[] {
+        String[] PROJECTION = new String[]{
                 Tables.EPISODES + "." + Episodes._ID, Shows.REF_SHOW_ID, Episodes.OVERVIEW,
                 Episodes.NUMBER, Episodes.SEASON, Episodes.WATCHED, Episodes.FIRSTAIREDMS,
                 Episodes.GUESTSTARS, Tables.EPISODES + "." + Episodes.RATING,
@@ -456,7 +449,7 @@ interface EpisodeQuery {
 
     interface ShowQuery {
 
-        String[] PROJECTION = new String[] {
+        String[] PROJECTION = new String[]{
                 Shows._ID, Shows.TITLE, Shows.STATUS, Shows.AIRSTIME, Shows.AIRSDAYOFWEEK,
                 Shows.NETWORK, Shows.POSTER, Shows.IMDBID, Shows.RUNTIME, Shows.FAVORITE
         };
@@ -513,7 +506,8 @@ public void onLoaderReset(Loader<Cursor> loader) {
     }
 
     public void onEvent(TraktActionCompleteEvent event) {
-        if (event.mTraktTaskArgs.getInt(TraktTask.InitBundle.TRAKTACTION) == TraktAction.RATE_EPISODE.index) {
+        if (event.mTraktTaskArgs.getInt(TraktTask.InitBundle.TRAKTACTION)
+                == TraktAction.RATE_EPISODE.index) {
             onLoadTraktRatings(false);
         }
     }
@@ -610,7 +604,8 @@ public void onClick(View v) {
             ImageButton collectedButton = (ImageButton) buttons
                     .findViewById(R.id.imageButtonBarCollected);
             collectedButton.setImageResource(isCollected ? R.drawable.ic_collected
-                    : Utils.resolveAttributeToResourceId(getActivity().getTheme(), R.attr.drawableCollect));
+                    : Utils.resolveAttributeToResourceId(getActivity().getTheme(),
+                            R.attr.drawableCollect));
             collectedButton.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -705,7 +700,7 @@ private void onLoadEpisodeDetails(final Cursor episode) {
                 .getDouble(EpisodeQuery.DVDNUMBER));
         Utils.setLabelValueOrHide(getView().findViewById(R.id.labelGuestStars),
                 (TextView) getView().findViewById(R.id.TextViewEpisodeGuestStars), Utils
-                        .splitAndKitTVDBStrings(episode.getString(EpisodeQuery.GUESTSTARS)));
+                .splitAndKitTVDBStrings(episode.getString(EpisodeQuery.GUESTSTARS)));
 
         // TVDb rating
         final String ratingText = episode.getString(EpisodeQuery.RATING);
@@ -773,7 +768,7 @@ private void onLoadTraktRatings(boolean isUseCachedValues) {
             int episodeNumber = mEpisodeCursor.getInt(EpisodeQuery.NUMBER);
             mTraktTask = new TraktSummaryTask(getSherlockActivity(), getView(), isUseCachedValues)
                     .episode(getShowId(), seasonNumber, episodeNumber);
-            AndroidUtils.executeAsyncTask(mTraktTask, new Void[] {});
+            AndroidUtils.executeAsyncTask(mTraktTask, new Void[]{});
         }
     }
 
@@ -786,7 +781,7 @@ private void onLoadImage(String imagePath) {
             mArtTask = null;
         }
         mArtTask = (FetchArtTask) new FetchArtTask(imagePath, container, getActivity());
-        AndroidUtils.executeAsyncTask(mArtTask, new Void[] {
+        AndroidUtils.executeAsyncTask(mArtTask, new Void[]{
                 null
         });
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
index 5a0c716704..ab89b05fe5 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
@@ -1,19 +1,6 @@
 
 package com.battlelancer.seriesguide.ui;
 
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.text.TextUtils;
-import android.widget.Toast;
-
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.battlelancer.seriesguide.enums.TraktAction;
 import com.battlelancer.seriesguide.getglueapi.GetGlueCheckin.CheckInTask;
@@ -28,6 +15,19 @@
 import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.seriesguide.R;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.text.TextUtils;
+import android.widget.Toast;
+
 /**
  * Blank activity, just used to quickly check into a show/episode on
  * GetGlue/trakt.
@@ -85,7 +85,7 @@ protected void onCreate(Bundle arg0) {
         int showTvdbId = episodeWithShow.getInt(4);
         String showTitle = episodeWithShow.getString(5);
         episodeWithShow.close();
-        String defaultMessage = Utils.getNextEpisodeString(prefs, season, episode, title);
+        String defaultMessage = Utils.getNextEpisodeString(this, season, episode, title);
 
         // get share service enabled settings
         boolean isShareWithGetGlue = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHGETGLUE,
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeasonsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeasonsFragment.java
index 1692b22548..e56e861b00 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeasonsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeasonsFragment.java
@@ -22,11 +22,11 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.battlelancer.seriesguide.Constants;
-import com.battlelancer.seriesguide.Constants.SeasonSorting;
 import com.battlelancer.seriesguide.adapters.SeasonsAdapter;
 import com.battlelancer.seriesguide.enums.EpisodeFlags;
 import com.battlelancer.seriesguide.provider.SeriesContract.ListItemTypes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.dialogs.ListsDialogFragment;
 import com.battlelancer.seriesguide.ui.dialogs.SortDialogFragment;
 import com.battlelancer.seriesguide.util.DBUtils;
@@ -38,7 +38,6 @@
 import com.uwetrottmann.androidutils.CheatSheet;
 import com.uwetrottmann.seriesguide.R;
 
-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -182,7 +181,7 @@ private void setCollectedToggleState(Integer result) {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        updatePreferences();
+        getPreferences();
 
         // populate list
         mAdapter = new SeasonsAdapter(getActivity(), null, 0, this);
@@ -202,7 +201,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-        updatePreferences();
+        getPreferences();
         updateUnwatchedCounts();
         onLoadRemainingCounter();
         EventBus.getDefault().register(this);
@@ -438,11 +437,8 @@ private void notifyContentProvider(final FragmentActivity context) {
         }
     }
 
-    private void updatePreferences() {
-        final SharedPreferences prefs = PreferenceManager
-                .getDefaultSharedPreferences(getActivity());
-        mSorting = SeasonSorting.fromValue(prefs.getString(
-                SeriesGuidePreferences.KEY_SEASON_SORT_ORDER, SeasonSorting.LATEST_FIRST.value()));
+    private void getPreferences() {
+        mSorting = DisplaySettings.getSeasonSortOrder(getActivity());
     }
 
     public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
@@ -538,23 +534,21 @@ private void showSortDialog() {
         FragmentManager fm = getFragmentManager();
         SortDialogFragment sortDialog = SortDialogFragment.newInstance(R.array.sesorting,
                 R.array.sesortingData, mSorting.index(),
-                SeriesGuidePreferences.KEY_SEASON_SORT_ORDER, R.string.pref_seasonsorting);
+                DisplaySettings.KEY_SEASON_SORT_ORDER, R.string.pref_seasonsorting);
         sortDialog.show(fm, "fragment_sort");
     }
 
     private final OnSharedPreferenceChangeListener mPrefsListener = new OnSharedPreferenceChangeListener() {
 
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (key.equals(SeriesGuidePreferences.KEY_SEASON_SORT_ORDER)) {
-                updateSorting(sharedPreferences);
+            if (DisplaySettings.KEY_SEASON_SORT_ORDER.equals(key)) {
+                onSortOrderChanged();
             }
         }
     };
 
-    @SuppressLint("NewApi")
-    private void updateSorting(SharedPreferences prefs) {
-        mSorting = SeasonSorting.fromValue(prefs.getString(
-                SeriesGuidePreferences.KEY_SEASON_SORT_ORDER, SeasonSorting.LATEST_FIRST.value()));
+    private void onSortOrderChanged() {
+        getPreferences();
 
         Utils.trackCustomEvent(getActivity(), TAG, "Sorting", mSorting.name());
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
index 596ac43af9..c84948389d 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
@@ -26,9 +26,9 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesGuideDatabase;
 import com.battlelancer.seriesguide.service.NotificationService;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
 import com.battlelancer.seriesguide.settings.AdvancedSettings;
 import com.battlelancer.seriesguide.settings.AppSettings;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.settings.GetGlueSettings;
 import com.battlelancer.seriesguide.settings.NotificationSettings;
 import com.battlelancer.seriesguide.settings.UpdateSettings;
@@ -66,9 +66,7 @@
 public class SeriesGuidePreferences extends SherlockPreferenceActivity implements
         OnSharedPreferenceChangeListener {
 
-    private static final String KEY_CLEAR_CACHE = "clearCache";
-
-    private static final String KEY_GETGLUE_DISCONNECT = "clearGetGlueCredentials";
+    private static final String TAG = "Settings";
 
     // Actions for legacy settings
     private static final String ACTION_PREFS_BASIC = "com.battlelancer.seriesguide.PREFS_BASIC";
@@ -84,30 +82,18 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
     private static final String ACTION_PREFS_ABOUT = "com.battlelancer.seriesguide.PREFS_ABOUT";
 
     // Preference keys
-    public static final String KEY_TRAKTPWD = "com.battlelancer.seriesguide.traktpwd";
-
-    public static final String KEY_TRAKTUSER = "com.battlelancer.seriesguide.traktuser";
-
-    public static final String KEY_ONLY_FUTURE_EPISODES = "onlyFutureEpisodes";
-
-    public static final String KEY_NUMBERFORMAT = "numberformat";
+    private static final String KEY_CLEAR_CACHE = "clearCache";
 
-    public static final String NUMBERFORMAT_DEFAULT = "default";
+    private static final String KEY_GETGLUE_DISCONNECT = "clearGetGlueCredentials";
 
-    public static final String NUMBERFORMAT_ENGLISH = "english";
+    public static final String KEY_TRAKTPWD = "com.battlelancer.seriesguide.traktpwd";
 
-    public static final String NUMBERFORMAT_ENGLISHLOWER = "englishlower";
+    public static final String KEY_TRAKTUSER = "com.battlelancer.seriesguide.traktuser";
 
     public static final String KEY_OFFSET = "com.battlelancer.seriesguide.timeoffset";
 
     public static final String KEY_DATABASEIMPORTED = "com.battlelancer.seriesguide.dbimported";
 
-    public static final String KEY_SEASON_SORT_ORDER = "seasonSorting";
-
-    public static final String KEY_EPISODE_SORT_ORDER = "episodeSorting";
-
-    public static final String KEY_SHOWFILTER = "com.battlelancer.seriesguide.showfilter";
-
     public static final String KEY_SECURE = "com.battlelancer.seriesguide.secure";
 
     public static final String KEY_UPDATEATLEASTEVERY
@@ -117,19 +103,11 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_LASTTRAKTUPDATE = "com.battlelancer.seriesguide.lasttraktupdate";
 
-    public static final String KEY_NOWATCHED = "com.battlelancer.seriesguide.activity.nowatched";
-
-    public static final String KEY_LANGUAGE = "language";
-
     public static final String KEY_SHAREWITHTRAKT = "com.battlelancer.seriesguide.sharewithtrakt";
 
     public static final String KEY_SHAREWITHGETGLUE
             = "com.battlelancer.seriesguide.sharewithgetglue";
 
-    public static final String KEY_THEME = "com.battlelancer.seriesguide.theme";
-
-    public static final String KEY_ACTIVITYTAB = "com.battlelancer.seriesguide.activitytab";
-
     public static final String KEY_AUTO_ADD_TRAKT_SHOWS
             = "com.battlelancer.seriesguide.autoaddtraktshows";
 
@@ -138,12 +116,8 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String SUPPORT_MAIL = "support@seriesgui.de";
 
-    private static final String TAG = "Settings";
-
     private static final String KEY_ABOUT = "aboutPref";
 
-    public static final String KEY_SELECTED_PAGE = "com.battlelancer.seriesguide.selectedpage";
-
     public static final String KEY_TMDB_BASE_URL = "com.battlelancer.seriesguide.tmdb.baseurl";
 
     public static final String KEY_TAPE_INTERVAL = "com.battlelancer.seriesguide.tapeinterval";
@@ -166,11 +140,11 @@ protected void onCreate(Bundle savedInstanceState) {
             setupBasicSettings(
                     this,
                     getIntent(),
-                    findPreference(KEY_ONLY_FUTURE_EPISODES),
-                    findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
-                    findPreference(KEY_LANGUAGE),
-                    findPreference(KEY_THEME),
-                    findPreference(KEY_NUMBERFORMAT),
+                    findPreference(DisplaySettings.KEY_NO_RELEASED_EPISODES),
+                    findPreference(DisplaySettings.KEY_HIDE_SPECIALS),
+                    findPreference(DisplaySettings.KEY_LANGUAGE),
+                    findPreference(DisplaySettings.KEY_THEME),
+                    findPreference(DisplaySettings.KEY_NUMBERFORMAT),
                     findPreference(UpdateSettings.KEY_AUTOUPDATE)
             );
         } else if (action != null && action.equals(ACTION_PREFS_NOTIFICATIONS)) {
@@ -261,7 +235,7 @@ public boolean onPreferenceClick(Preference preference) {
         themePref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (KEY_THEME.equals(preference.getKey())) {
+                if (DisplaySettings.KEY_THEME.equals(preference.getKey())) {
                     Utils.updateTheme((String) newValue);
 
                     // restart to apply new theme
@@ -431,9 +405,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @SuppressWarnings("deprecation")
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(AdvancedSettings.KEY_UPCOMING_LIMIT) || key.equals(KEY_LANGUAGE)
-                || key.equals(KEY_NUMBERFORMAT) || key.equals(KEY_THEME)
-                || key.equals(NotificationSettings.KEY_THRESHOLD)) {
+        if (AdvancedSettings.KEY_UPCOMING_LIMIT.equals(key)
+                || DisplaySettings.KEY_LANGUAGE.equals(key)
+                || DisplaySettings.KEY_NUMBERFORMAT.equals(key)
+                || DisplaySettings.KEY_THEME.equals(key)
+                || NotificationSettings.KEY_THRESHOLD.equals(key)
+                ) {
             Preference pref = findPreference(key);
             if (pref != null) {
                 setListPreferenceSummary((ListPreference) pref);
@@ -444,7 +421,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
          * This can run here, as it does not depend on findPreference() which
          * would return null when using a SettingsFragment.
          */
-        if (key.equals(KEY_LANGUAGE)) {
+        if (DisplaySettings.KEY_LANGUAGE.equals(key)) {
             // reset last edit date of all episodes so they will get updated
             new Thread(new Runnable() {
                 public void run() {
@@ -466,7 +443,7 @@ public void run() {
             }
         }
 
-        if (key.equals(NotificationSettings.KEY_THRESHOLD)) {
+        if (NotificationSettings.KEY_THRESHOLD.equals(key)) {
             Preference pref = findPreference(key);
             if (pref != null) {
                 resetAndRunNotificationsService(SeriesGuidePreferences.this);
@@ -512,11 +489,11 @@ public void onCreate(Bundle savedInstanceState) {
                     setupBasicSettings(
                             getActivity(),
                             getActivity().getIntent(),
-                            findPreference(KEY_ONLY_FUTURE_EPISODES),
-                            findPreference(ActivitySettings.KEY_HIDE_SPECIALS),
-                            findPreference(KEY_LANGUAGE),
-                            findPreference(KEY_THEME),
-                            findPreference(KEY_NUMBERFORMAT),
+                            findPreference(DisplaySettings.KEY_NO_RELEASED_EPISODES),
+                            findPreference(DisplaySettings.KEY_HIDE_SPECIALS),
+                            findPreference(DisplaySettings.KEY_LANGUAGE),
+                            findPreference(DisplaySettings.KEY_THEME),
+                            findPreference(DisplaySettings.KEY_NUMBERFORMAT),
                             findPreference(UpdateSettings.KEY_AUTOUPDATE)
                     );
                     break;
@@ -576,9 +553,12 @@ public void onStop() {
 
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (key.equals(AdvancedSettings.KEY_UPCOMING_LIMIT) || key.equals(KEY_LANGUAGE)
-                    || key.equals(KEY_NUMBERFORMAT) || key.equals(KEY_THEME)
-                    || key.equals(NotificationSettings.KEY_THRESHOLD)) {
+            if (AdvancedSettings.KEY_UPCOMING_LIMIT.equals(key)
+                    || DisplaySettings.KEY_LANGUAGE.equals(key)
+                    || DisplaySettings.KEY_NUMBERFORMAT.equals(key)
+                    || DisplaySettings.KEY_THEME.equals(key)
+                    || NotificationSettings.KEY_THRESHOLD.equals(key)
+                    ) {
                 Preference pref = findPreference(key);
                 if (pref != null) {
                     setListPreferenceSummary((ListPreference) pref);
@@ -598,7 +578,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                 }
             }
 
-            if (key.equals(NotificationSettings.KEY_THRESHOLD)) {
+            if (NotificationSettings.KEY_THRESHOLD.equals(key)) {
                 Preference pref = findPreference(key);
                 if (pref != null) {
                     resetAndRunNotificationsService(getActivity());
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java
index 7bc59c3f10..2fb711032d 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java
@@ -38,11 +38,9 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
@@ -255,12 +253,9 @@ private static class TraktFriendsAdapter extends ArrayAdapter<UserProfile> {
 
         private final LayoutInflater mInflater;
 
-        private final SharedPreferences mPrefs;
-
         public TraktFriendsAdapter(Context context) {
             super(context, R.layout.friend);
             mImageDownloader = ImageDownloader.getInstance(context);
-            mPrefs = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
             mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         }
 
@@ -311,7 +306,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 switch (watching.type) {
                     case Episode:
                         show = watching.show.title;
-                        String episodenumber = Utils.getEpisodeNumber(mPrefs,
+                        String episodenumber = Utils.getEpisodeNumber(getContext(),
                                 watching.episode.season, watching.episode.number);
                         episode = episodenumber + " " + watching.episode.title;
                         timestamp = getContext().getString(R.string.now);
@@ -333,7 +328,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
                 if (latestShow != null) {
                     show = latestShow.show.title;
-                    String episodenumber = Utils.getEpisodeNumber(mPrefs,
+                    String episodenumber = Utils.getEpisodeNumber(getContext(),
                             latestShow.episode.season, latestShow.episode.number);
                     episode = episodenumber + " " + latestShow.episode.title;
                     timestamp = (String) DateUtils.getRelativeTimeSpanString(
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
index 1b44b4c995..74c72779dc 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
@@ -23,7 +23,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Tables;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.dialogs.CheckInDialogFragment;
 import com.battlelancer.seriesguide.util.DBUtils;
 import com.battlelancer.seriesguide.util.EpisodeTools;
@@ -130,7 +130,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
         // setup adapter
         mAdapter = new SlowAdapter(getActivity(), null, 0);
-        mAdapter.setIsShowingHeaders(!ActivitySettings.isInfiniteScrolling(getActivity()));
+        mAdapter.setIsShowingHeaders(!DisplaySettings.isInfiniteActivity(getActivity()));
 
         // setup grid view
         mGridView.setAdapter(mAdapter);
@@ -255,7 +255,7 @@ private int getLoaderId() {
 
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         String type = getArguments().getString(InitBundle.TYPE);
-        boolean isInfiniteScrolling = ActivitySettings.isInfiniteScrolling(getActivity());
+        boolean isInfiniteScrolling = DisplaySettings.isInfiniteActivity(getActivity());
 
         // infinite or 30 days activity stream
         String[][] queryArgs = DBUtils.buildActivityQuery(getActivity(), type,
@@ -275,13 +275,13 @@ public void onLoaderReset(Loader<Cursor> loader) {
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (ActivitySettings.KEY_INFINITE_SCROLLING.equals(key)) {
-            mAdapter.setIsShowingHeaders(!ActivitySettings.isInfiniteScrolling(getActivity()));
+        if (DisplaySettings.KEY_INFINITE_ACTIVITY.equals(key)) {
+            mAdapter.setIsShowingHeaders(!DisplaySettings.isInfiniteActivity(getActivity()));
         }
-        if (ActivitySettings.KEY_ONLY_FAVORITES.equals(key)
-                || ActivitySettings.KEY_HIDE_SPECIALS.equals(key)
-                || SeriesGuidePreferences.KEY_NOWATCHED.equals(key)
-                || ActivitySettings.KEY_INFINITE_SCROLLING.equals(key)) {
+        if (DisplaySettings.KEY_ONLY_FAVORITE_SHOWS.equals(key)
+                || DisplaySettings.KEY_HIDE_SPECIALS.equals(key)
+                || DisplaySettings.KEY_NO_WATCHED_EPISODES.equals(key)
+                || DisplaySettings.KEY_INFINITE_ACTIVITY.equals(key)) {
             onRequery();
         }
     }
@@ -435,7 +435,7 @@ public void onClick(View v) {
             }
 
             // number and show
-            final String number = Utils.getEpisodeNumber(mPrefs, season, episode);
+            final String number = Utils.getEpisodeNumber(mContext, season, episode);
             viewHolder.show.setText(number + " | " + mCursor.getString(UpcomingQuery.SHOW_TITLE));
 
             // title
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
index 3dadb70809..d20099ebe3 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
@@ -24,7 +24,7 @@
 import com.battlelancer.seriesguide.adapters.TabStripAdapter;
 import com.battlelancer.seriesguide.items.SearchResult;
 import com.battlelancer.seriesguide.service.NotificationService;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.ActivityType;
 import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment.OnAddShowListener;
 import com.battlelancer.seriesguide.util.ServiceUtils;
@@ -110,8 +110,7 @@ private void setupViews(Bundle savedInstanceState) {
                 selection = extras.getInt(InitBundle.SELECTED_TAB, 0);
             } else {
                 // use saved selection
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-                selection = prefs.getInt(SeriesGuidePreferences.KEY_ACTIVITYTAB, 0);
+                selection = DisplaySettings.getDefaultActivityTabPosition(this);
             }
         }
         // never select a non-existent tab
@@ -135,12 +134,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
                 .getDefaultSharedPreferences(getApplicationContext());
 
         // set menu items to current values
-        menu.findItem(R.id.menu_onlyfavorites).setChecked(ActivitySettings.isOnlyFavorites(this));
-        menu.findItem(R.id.menu_nospecials).setChecked(ActivitySettings.isHidingSpecials(this));
-        menu.findItem(R.id.menu_nowatched).setChecked(
-                prefs.getBoolean(SeriesGuidePreferences.KEY_NOWATCHED, false));
+        menu.findItem(R.id.menu_onlyfavorites).setChecked(DisplaySettings.isOnlyFavorites(this));
+        menu.findItem(R.id.menu_nospecials).setChecked(DisplaySettings.isHidingSpecials(this));
+        menu.findItem(R.id.menu_nowatched).setChecked(DisplaySettings.isNoWatchedEpisodes(this));
         menu.findItem(R.id.menu_infinite_scrolling).setChecked(
-                ActivitySettings.isInfiniteScrolling(this));
+                DisplaySettings.isInfiniteActivity(this));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -149,19 +147,19 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
         if (itemId == R.id.menu_onlyfavorites) {
-            storeBooleanPreference(item, ActivitySettings.KEY_ONLY_FAVORITES);
+            storeBooleanPreference(item, DisplaySettings.KEY_ONLY_FAVORITE_SHOWS);
             fireTrackerEvent("Only favorite shows Toggle");
             return true;
         } else if (itemId == R.id.menu_nospecials) {
-            storeBooleanPreference(item, ActivitySettings.KEY_HIDE_SPECIALS);
+            storeBooleanPreference(item, DisplaySettings.KEY_HIDE_SPECIALS);
             fireTrackerEvent("Hide specials Toggle");
             return true;
         } else if (itemId == R.id.menu_nowatched) {
-            storeBooleanPreference(item, SeriesGuidePreferences.KEY_NOWATCHED);
+            storeBooleanPreference(item, DisplaySettings.KEY_NO_WATCHED_EPISODES);
             fireTrackerEvent("Hide watched Toggle");
             return true;
         } else if (itemId == R.id.menu_infinite_scrolling) {
-            storeBooleanPreference(item, ActivitySettings.KEY_INFINITE_SCROLLING);
+            storeBooleanPreference(item, DisplaySettings.KEY_INFINITE_ACTIVITY);
             fireTrackerEvent("Infinite Scrolling Toggle");
             return true;
         } else {
@@ -197,7 +195,7 @@ public void onPageScrolled(int arg0, float arg1, int arg2) {
         @Override
         public void onPageSelected(int position) {
             // save selected tab index
-            mPrefs.edit().putInt(SeriesGuidePreferences.KEY_ACTIVITYTAB, position).commit();
+            mPrefs.edit().putInt(DisplaySettings.KEY_ACTIVITYTAB, position).commit();
         }
 
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
index 326ea2e4d6..3079e5f3a5 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
@@ -27,8 +27,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
-import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.ActivityType;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.UpcomingQuery;
 import com.battlelancer.thetvdbapi.TheTVDB.ShowStatus;
@@ -249,9 +248,7 @@ public static Cursor getRecentEpisodes(boolean isOnlyUnwatched, Context context)
      */
     public static String[][] buildActivityQuery(Context context, String type,
             int numberOfDaysToInclude) {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        boolean isNoWatched = prefs.getBoolean(SeriesGuidePreferences.KEY_NOWATCHED, false);
+        boolean isNoWatched = DisplaySettings.isNoWatchedEpisodes(context);
 
         return buildActivityQuery(context, type, isNoWatched, numberOfDaysToInclude);
     }
@@ -297,13 +294,13 @@ private static String[][] buildActivityQuery(Context context, String type,
         };
 
         // append only favorites selection if necessary
-        boolean isOnlyFavorites = ActivitySettings.isOnlyFavorites(context);
+        boolean isOnlyFavorites = DisplaySettings.isOnlyFavorites(context);
         if (isOnlyFavorites) {
             query += Shows.SELECTION_FAVORITES;
         }
 
         // append no specials selection if necessary
-        boolean isNoSpecials = ActivitySettings.isHidingSpecials(context);
+        boolean isNoSpecials = DisplaySettings.isHidingSpecials(context);
         if (isNoSpecials) {
             query += Episodes.SELECTION_NOSPECIALS;
         }
@@ -626,10 +623,9 @@ public static ContentProviderOperation buildSeasonOp(ContentValues values, boole
      */
     public static long updateLatestEpisode(Context context, int showTvdbId) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        final boolean isOnlyFutureEpisodes = prefs.getBoolean(
-                SeriesGuidePreferences.KEY_ONLY_FUTURE_EPISODES, false);
-        final boolean isNoSpecials = ActivitySettings.isHidingSpecials(context);
-        return updateLatestEpisode(context, showTvdbId, isOnlyFutureEpisodes, isNoSpecials, prefs);
+        final boolean isNoReleasedEpisodes = DisplaySettings.isNoReleasedEpisodes(context);
+        final boolean isNoSpecials = DisplaySettings.isHidingSpecials(context);
+        return updateLatestEpisode(context, showTvdbId, isNoReleasedEpisodes, isNoSpecials, prefs);
     }
 
     /**
@@ -638,7 +634,7 @@ public static long updateLatestEpisode(Context context, int showTvdbId) {
      * @return The TVDb id of the calculated next episode.
      */
     public static long updateLatestEpisode(Context context, int showTvdbId,
-            boolean isOnlyFutureEpisodes, boolean isNoSpecials, SharedPreferences prefs) {
+            boolean isNoReleasedEpisodes, boolean isNoSpecials, SharedPreferences prefs) {
         final Uri episodesWithShow = Episodes.buildEpisodesOfShowUri(showTvdbId);
         final StringBuilder selectQuery = new StringBuilder();
 
@@ -686,7 +682,7 @@ public static long updateLatestEpisode(Context context, int showTvdbId,
             // do not take specials into account
             selectQuery.append(Episodes.SELECTION_NOSPECIALS);
         }
-        if (isOnlyFutureEpisodes) {
+        if (isNoReleasedEpisodes) {
             // restrict to episodes with future air date
             selectQuery.append(NextEpisodeQuery.SELECT_ONLYFUTURE);
             final String now = String.valueOf(Utils.getFakeCurrentTime(prefs));
@@ -710,7 +706,7 @@ public static long updateLatestEpisode(Context context, int showTvdbId,
         final ContentValues update = new ContentValues();
         if (next != null && next.moveToFirst()) {
             // next episode text, e.g. '0x12 Episode Name'
-            final String nextEpisodeString = Utils.getNextEpisodeString(prefs,
+            final String nextEpisodeString = Utils.getNextEpisodeString(context,
                     next.getInt(NextEpisodeQuery.SEASON), next.getInt(NextEpisodeQuery.NUMBER),
                     next.getString(NextEpisodeQuery.TITLE));
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java
index b05ee015c5..a0a5c13cf7 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java
@@ -28,11 +28,9 @@
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.preference.PreferenceManager;
 import android.widget.Toast;
 
 import java.util.List;
@@ -291,9 +289,7 @@ public String getNotificationText() {
             }
 
             // show episode seen/unseen message
-            final SharedPreferences prefs = PreferenceManager
-                    .getDefaultSharedPreferences(mContext);
-            String number = Utils.getEpisodeNumber(prefs, mSeason, mEpisode);
+            String number = Utils.getEpisodeNumber(mContext, mSeason, mEpisode);
             return mContext.getString(
                     EpisodeTools.isWatched(mEpisodeFlag) ? R.string.trakt_seen
                             : R.string.trakt_notseen,
@@ -322,9 +318,7 @@ protected int getLastEpisodeTvdbId() {
 
         @Override
         public String getNotificationText() {
-            final SharedPreferences prefs = PreferenceManager
-                    .getDefaultSharedPreferences(mContext);
-            String number = Utils.getEpisodeNumber(prefs, mSeason, mEpisode);
+            String number = Utils.getEpisodeNumber(mContext, mSeason, mEpisode);
             return mContext.getString(mEpisodeFlag == 1 ? R.string.trakt_collected
                     : R.string.trakt_notcollected, number);
         }
@@ -428,9 +422,7 @@ public String getNotificationText() {
                 return null;
             }
 
-            final SharedPreferences prefs = PreferenceManager
-                    .getDefaultSharedPreferences(mContext);
-            String number = Utils.getEpisodeNumber(prefs, mSeason, -1);
+            String number = Utils.getEpisodeNumber(mContext, mSeason, -1);
             return mContext.getString(
                     EpisodeTools.isWatched(mEpisodeFlag) ? R.string.trakt_seen
                             : R.string.trakt_notseen,
@@ -458,9 +450,7 @@ protected int getLastEpisodeTvdbId() {
 
         @Override
         public String getNotificationText() {
-            final SharedPreferences prefs = PreferenceManager
-                    .getDefaultSharedPreferences(mContext);
-            String number = Utils.getEpisodeNumber(prefs, mSeason, -1);
+            String number = Utils.getEpisodeNumber(mContext, mSeason, -1);
             return mContext.getString(mEpisodeFlag == 1 ? R.string.trakt_collected
                     : R.string.trakt_notcollected, number);
         }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ShareUtils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ShareUtils.java
index 67c9e06618..9f418f0431 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ShareUtils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ShareUtils.java
@@ -128,8 +128,7 @@ public static String onCreateShareString(Context context, final Cursor episode)
         int season = episode.getInt(episode.getColumnIndexOrThrow(Episodes.SEASON));
         int number = episode.getInt(episode.getColumnIndexOrThrow(Episodes.NUMBER));
         String title = episode.getString(episode.getColumnIndexOrThrow(Episodes.TITLE));
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return Utils.getNextEpisodeString(prefs, season, number, title);
+        return Utils.getNextEpisodeString(context, season, number, title);
     }
 
     public static void onAddCalendarEvent(Context context, String title, String description,
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java
index 8a1cbf0750..5e4ba46ea5 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java
@@ -32,10 +32,8 @@
 import com.uwetrottmann.seriesguide.R;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -259,12 +257,10 @@ protected Response doInBackground(Void... params) {
                     }
 
                     if (com.jakewharton.trakt.enumerations.Status.SUCCESS.equals(r.status)) {
-                        SharedPreferences prefs = PreferenceManager
-                                .getDefaultSharedPreferences(mContext);
                         r.message = mContext
                                 .getString(R.string.checkin_success_trakt,
                                         (r.show != null ? r.show.title + " " : "")
-                                                + Utils.getEpisodeNumber(prefs, season, episode));
+                                                + Utils.getEpisodeNumber(mContext, season, episode));
                     }
 
                     break;
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java
index a4ba6b4c7d..ab49b505b5 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/Utils.java
@@ -22,14 +22,13 @@
 import com.google.analytics.tracking.android.MapBuilder;
 
 import com.battlelancer.seriesguide.Constants;
-import com.battlelancer.seriesguide.Constants.EpisodeSorting;
 import com.battlelancer.seriesguide.billing.BillingActivity;
 import com.battlelancer.seriesguide.provider.SeriesContract.ListItems;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.service.NotificationService;
 import com.battlelancer.seriesguide.service.OnAlarmReceiver;
-import com.battlelancer.seriesguide.settings.ActivitySettings;
 import com.battlelancer.seriesguide.settings.AdvancedSettings;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.settings.UpdateSettings;
 import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
 import com.uwetrottmann.androidutils.AndroidUtils;
@@ -473,9 +472,9 @@ public static long buildEpisodeAirtime(String tvdbDateString, long airtime) {
      * Returns a string in format "1x01 title" or "S1E01 title" dependent on a
      * user preference.
      */
-    public static String getNextEpisodeString(SharedPreferences prefs, int season, int episode,
+    public static String getNextEpisodeString(Context context, int season, int episode,
             String title) {
-        String result = getEpisodeNumber(prefs, season, episode);
+        String result = getEpisodeNumber(context, season, episode);
         result += " " + title;
         return result;
     }
@@ -484,12 +483,10 @@ public static String getNextEpisodeString(SharedPreferences prefs, int season, i
      * Returns the episode number formatted according to the users preference
      * (e.g. '1x01', 'S01E01', ...).
      */
-    public static String getEpisodeNumber(SharedPreferences prefs, int season,
-            int episode) {
-        String format = prefs.getString(SeriesGuidePreferences.KEY_NUMBERFORMAT,
-                SeriesGuidePreferences.NUMBERFORMAT_DEFAULT);
+    public static String getEpisodeNumber(Context context, int season, int episode) {
+        String format = DisplaySettings.getNumberFormat(context);
         String result = String.valueOf(season);
-        if (format.equals(SeriesGuidePreferences.NUMBERFORMAT_DEFAULT)) {
+        if (DisplaySettings.NUMBERFORMAT_DEFAULT.equals(format)) {
             // 1x01 format
             result += "x";
         } else {
@@ -498,7 +495,7 @@ public static String getEpisodeNumber(SharedPreferences prefs, int season,
             if (season < 10) {
                 result = "0" + result;
             }
-            if (format.equals(SeriesGuidePreferences.NUMBERFORMAT_ENGLISHLOWER)) {
+            if (DisplaySettings.NUMBERFORMAT_ENGLISHLOWER.equals(format)) {
                 result = "s" + result + "e";
             } else {
                 result = "S" + result + "E";
@@ -535,24 +532,6 @@ public static String splitAndKitTVDBStrings(String tvdbstring) {
         return tvdbstring;
     }
 
-    /**
-     * Get the currently set episode sorting from settings.
-     * 
-     * @return a EpisodeSorting enum set to the current sorting
-     */
-    public static EpisodeSorting getEpisodeSorting(Context context) {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String currentPref = prefs.getString(SeriesGuidePreferences.KEY_EPISODE_SORT_ORDER,
-                EpisodeSorting.OLDEST_FIRST.value());
-
-        EpisodeSorting sorting = EpisodeSorting.fromValue(currentPref);
-        if (sorting == null) {
-            return EpisodeSorting.OLDEST_FIRST;
-        } else {
-            return EpisodeSorting.fromValue(currentPref);
-        }
-    }
-
     /**
      * Update the latest episode fields for all existing shows.
      */
@@ -586,13 +565,12 @@ public UpdateLatestEpisodeThread(Context context, int showTvdbId) {
 
         public void run() {
             final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-            final boolean isOnlyFutureEpisodes = prefs.getBoolean(
-                    SeriesGuidePreferences.KEY_ONLY_FUTURE_EPISODES, false);
-            final boolean isNoSpecials = ActivitySettings.isHidingSpecials(mContext);
+            final boolean isNoReleasedEpisodes = DisplaySettings.isNoReleasedEpisodes(mContext);
+            final boolean isNoSpecials = DisplaySettings.isHidingSpecials(mContext);
 
             if (mShowTvdbId > 0) {
                 // update single show
-                DBUtils.updateLatestEpisode(mContext, mShowTvdbId, isOnlyFutureEpisodes, isNoSpecials,
+                DBUtils.updateLatestEpisode(mContext, mShowTvdbId, isNoReleasedEpisodes, isNoSpecials,
                         prefs);
             } else {
                 // update all shows
@@ -603,7 +581,7 @@ public void run() {
                 if (shows != null) {
                     while (shows.moveToNext()) {
                         int showTvdbId = shows.getInt(0);
-                        DBUtils.updateLatestEpisode(mContext, showTvdbId, isOnlyFutureEpisodes,
+                        DBUtils.updateLatestEpisode(mContext, showTvdbId, isNoReleasedEpisodes,
                                 isNoSpecials, prefs);
                     }
                     shows.close();
diff --git a/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java b/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java
index d3b037a173..247656ff6b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java
@@ -25,6 +25,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
 import com.battlelancer.seriesguide.util.DBUtils;
 import com.battlelancer.seriesguide.util.ImageProvider;
@@ -123,7 +124,7 @@ public static boolean isUpdateShow(String showId, long currentTime, Context cont
      */
     public static boolean addShow(int showTvdbId, List<TvShow> seenShows,
             List<TvShow> collectedShows, Context context) throws SAXException {
-        String language = getTheTVDBLanguage(context);
+        String language = DisplaySettings.getContentLanguage(context);
         Show show = fetchShow(showTvdbId, language, context);
 
         boolean isShowExists = DBUtils.isShowExists(showTvdbId, context);
@@ -145,7 +146,7 @@ public static boolean addShow(int showTvdbId, List<TvShow> seenShows,
      * orphaned episodes.
      */
     public static void updateShow(int showTvdbId, Context context) throws SAXException {
-        String language = getTheTVDBLanguage(context);
+        String language = DisplaySettings.getContentLanguage(context);
         Show show = fetchShow(showTvdbId, language, context);
 
         final ArrayList<ContentProviderOperation> batch = Lists.newArrayList();
@@ -161,7 +162,7 @@ public static void updateShow(int showTvdbId, Context context) throws SAXExcepti
      */
     public static List<SearchResult> searchShow(String title, Context context) throws IOException,
             SAXException {
-        String language = getTheTVDBLanguage(context);
+        String language = DisplaySettings.getContentLanguage(context);
 
         URL url;
         try {
@@ -270,12 +271,6 @@ private static void getEpisodesAndUpdateDatabase(Context context, Show show,
         context.getContentResolver().bulkInsert(Episodes.CONTENT_URI, newEpisodesValues);
     }
 
-    private static String getTheTVDBLanguage(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context
-                .getApplicationContext());
-        return prefs.getString(SeriesGuidePreferences.KEY_LANGUAGE, "en");
-    }
-
     private static void storeTraktFlags(int showTvdbId, List<TvShow> shows, Context context,
             boolean isSeenFlags) {
         // try to find seen episodes from trakt of the given show

From 809ea019b21fee523cdc9147a74c88b96d7a53e0 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 21:18:42 +0100
Subject: [PATCH 44/74] Move some pure activity related settings back to
 ActivitySettings.

- DisplaySettings was getting crowded.
---
 .../settings/ActivitySettings.java            | 36 +++++++++++++++++--
 .../seriesguide/settings/DisplaySettings.java | 35 ++----------------
 .../seriesguide/ui/UpcomingFragment.java      | 13 +++----
 .../ui/UpcomingRecentActivity.java            | 13 +++----
 .../seriesguide/util/DBUtils.java             |  3 +-
 5 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java
index 159befaca9..f845a0bc97 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/ActivitySettings.java
@@ -1,12 +1,44 @@
 
 package com.battlelancer.seriesguide.settings;
 
+import android.content.Context;
+import android.preference.PreferenceManager;
+
 /**
- * Access settings related to the activity stream, e.g. upcoming and recent
- * episodes.
+ * Access settings specifically related to the activity stream, e.g. upcoming and recent episodes.
  */
 public class ActivitySettings {
 
+    // Only applies to activity stream
+    public static final String KEY_ACTIVITYTAB = "com.battlelancer.seriesguide.activitytab";
+
+    public static final String KEY_INFINITE_ACTIVITY
+            = "com.battlelancer.seriesguide.activity.infinite";
+
+    public static final String KEY_ONLY_FAVORITE_SHOWS
+            = "com.battlelancer.seriesguide.onlyfavorites";
+
+    public static int getDefaultActivityTabPosition(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getInt(KEY_ACTIVITYTAB, 0);
+    }
+
+    /**
+     * Whether the activity stream should be infinite or limited to a number of days.
+     */
+    public static boolean isInfiniteActivity(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+                KEY_INFINITE_ACTIVITY,
+                false);
+    }
 
+    /**
+     * Whether the activity stream should only include episodes from favorited shows.
+     */
+    public static boolean isOnlyFavorites(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
+                KEY_ONLY_FAVORITE_SHOWS,
+                false);
+    }
 
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java
index faad2131dc..4fcc1d7789 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/DisplaySettings.java
@@ -5,6 +5,9 @@
 import android.content.Context;
 import android.preference.PreferenceManager;
 
+/**
+ * Settings related to appearance, display formats and sort orders.
+ */
 public class DisplaySettings {
 
     public static final String KEY_THEME = "com.battlelancer.seriesguide.theme";
@@ -28,15 +31,6 @@ public class DisplaySettings {
 
     public static final String KEY_HIDE_SPECIALS = "onlySeasonEpisodes";
 
-    // Only applies to activity stream
-    public static final String KEY_ACTIVITYTAB = "com.battlelancer.seriesguide.activitytab";
-
-    public static final String KEY_INFINITE_ACTIVITY
-            = "com.battlelancer.seriesguide.activity.infinite";
-
-    public static final String KEY_ONLY_FAVORITE_SHOWS
-            = "com.battlelancer.seriesguide.onlyfavorites";
-
     public static String getThemeIndex(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context).
                 getString(KEY_THEME, "0");
@@ -83,27 +77,4 @@ public static boolean isHidingSpecials(Context context) {
                 KEY_HIDE_SPECIALS, false);
     }
 
-    public static int getDefaultActivityTabPosition(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getInt(KEY_ACTIVITYTAB, 0);
-    }
-
-    /**
-     * Whether the activity stream should be infinite or limited to a number of days.
-     */
-    public static boolean isInfiniteActivity(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                KEY_INFINITE_ACTIVITY,
-                false);
-    }
-
-    /**
-     * Whether the activity stream should only include episodes from favorited shows.
-     */
-    public static boolean isOnlyFavorites(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                KEY_ONLY_FAVORITE_SHOWS,
-                false);
-    }
-
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
index 74c72779dc..f4ba7f3e7e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
@@ -23,6 +23,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.provider.SeriesGuideDatabase.Tables;
+import com.battlelancer.seriesguide.settings.ActivitySettings;
 import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.dialogs.CheckInDialogFragment;
 import com.battlelancer.seriesguide.util.DBUtils;
@@ -130,7 +131,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
         // setup adapter
         mAdapter = new SlowAdapter(getActivity(), null, 0);
-        mAdapter.setIsShowingHeaders(!DisplaySettings.isInfiniteActivity(getActivity()));
+        mAdapter.setIsShowingHeaders(!ActivitySettings.isInfiniteActivity(getActivity()));
 
         // setup grid view
         mGridView.setAdapter(mAdapter);
@@ -255,7 +256,7 @@ private int getLoaderId() {
 
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         String type = getArguments().getString(InitBundle.TYPE);
-        boolean isInfiniteScrolling = DisplaySettings.isInfiniteActivity(getActivity());
+        boolean isInfiniteScrolling = ActivitySettings.isInfiniteActivity(getActivity());
 
         // infinite or 30 days activity stream
         String[][] queryArgs = DBUtils.buildActivityQuery(getActivity(), type,
@@ -275,13 +276,13 @@ public void onLoaderReset(Loader<Cursor> loader) {
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (DisplaySettings.KEY_INFINITE_ACTIVITY.equals(key)) {
-            mAdapter.setIsShowingHeaders(!DisplaySettings.isInfiniteActivity(getActivity()));
+        if (ActivitySettings.KEY_INFINITE_ACTIVITY.equals(key)) {
+            mAdapter.setIsShowingHeaders(!ActivitySettings.isInfiniteActivity(getActivity()));
         }
-        if (DisplaySettings.KEY_ONLY_FAVORITE_SHOWS.equals(key)
+        if (ActivitySettings.KEY_ONLY_FAVORITE_SHOWS.equals(key)
                 || DisplaySettings.KEY_HIDE_SPECIALS.equals(key)
                 || DisplaySettings.KEY_NO_WATCHED_EPISODES.equals(key)
-                || DisplaySettings.KEY_INFINITE_ACTIVITY.equals(key)) {
+                || ActivitySettings.KEY_INFINITE_ACTIVITY.equals(key)) {
             onRequery();
         }
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
index d20099ebe3..afb7f5fb94 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
@@ -24,6 +24,7 @@
 import com.battlelancer.seriesguide.adapters.TabStripAdapter;
 import com.battlelancer.seriesguide.items.SearchResult;
 import com.battlelancer.seriesguide.service.NotificationService;
+import com.battlelancer.seriesguide.settings.ActivitySettings;
 import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.ActivityType;
 import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment.OnAddShowListener;
@@ -110,7 +111,7 @@ private void setupViews(Bundle savedInstanceState) {
                 selection = extras.getInt(InitBundle.SELECTED_TAB, 0);
             } else {
                 // use saved selection
-                selection = DisplaySettings.getDefaultActivityTabPosition(this);
+                selection = ActivitySettings.getDefaultActivityTabPosition(this);
             }
         }
         // never select a non-existent tab
@@ -134,11 +135,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
                 .getDefaultSharedPreferences(getApplicationContext());
 
         // set menu items to current values
-        menu.findItem(R.id.menu_onlyfavorites).setChecked(DisplaySettings.isOnlyFavorites(this));
+        menu.findItem(R.id.menu_onlyfavorites).setChecked(ActivitySettings.isOnlyFavorites(this));
         menu.findItem(R.id.menu_nospecials).setChecked(DisplaySettings.isHidingSpecials(this));
         menu.findItem(R.id.menu_nowatched).setChecked(DisplaySettings.isNoWatchedEpisodes(this));
         menu.findItem(R.id.menu_infinite_scrolling).setChecked(
-                DisplaySettings.isInfiniteActivity(this));
+                ActivitySettings.isInfiniteActivity(this));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -147,7 +148,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
         if (itemId == R.id.menu_onlyfavorites) {
-            storeBooleanPreference(item, DisplaySettings.KEY_ONLY_FAVORITE_SHOWS);
+            storeBooleanPreference(item, ActivitySettings.KEY_ONLY_FAVORITE_SHOWS);
             fireTrackerEvent("Only favorite shows Toggle");
             return true;
         } else if (itemId == R.id.menu_nospecials) {
@@ -159,7 +160,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             fireTrackerEvent("Hide watched Toggle");
             return true;
         } else if (itemId == R.id.menu_infinite_scrolling) {
-            storeBooleanPreference(item, DisplaySettings.KEY_INFINITE_ACTIVITY);
+            storeBooleanPreference(item, ActivitySettings.KEY_INFINITE_ACTIVITY);
             fireTrackerEvent("Infinite Scrolling Toggle");
             return true;
         } else {
@@ -195,7 +196,7 @@ public void onPageScrolled(int arg0, float arg1, int arg2) {
         @Override
         public void onPageSelected(int position) {
             // save selected tab index
-            mPrefs.edit().putInt(DisplaySettings.KEY_ACTIVITYTAB, position).commit();
+            mPrefs.edit().putInt(ActivitySettings.KEY_ACTIVITYTAB, position).commit();
         }
 
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
index 3079e5f3a5..f1c5381638 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
@@ -27,6 +27,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.ActivitySettings;
 import com.battlelancer.seriesguide.settings.DisplaySettings;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.ActivityType;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.UpcomingQuery;
@@ -294,7 +295,7 @@ private static String[][] buildActivityQuery(Context context, String type,
         };
 
         // append only favorites selection if necessary
-        boolean isOnlyFavorites = DisplaySettings.isOnlyFavorites(context);
+        boolean isOnlyFavorites = ActivitySettings.isOnlyFavorites(context);
         if (isOnlyFavorites) {
             query += Shows.SELECTION_FAVORITES;
         }

From 7c483e0b52f3047e689c51fd8712f106f9bda6ed Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 21:44:54 +0100
Subject: [PATCH 45/74] Create TraktSettings, move related settings there, add
 helpers.

---
 .../loaders/TraktMoviesWatchlistLoader.java   |  3 +-
 .../seriesguide/service/TraktFlagService.java |  3 +-
 .../seriesguide/settings/TraktSettings.java   | 80 +++++++++++++++++++
 .../seriesguide/sync/SgSyncAdapter.java       | 23 +++---
 .../seriesguide/ui/AddActivity.java           |  4 +-
 .../seriesguide/ui/ConnectTraktActivity.java  |  4 +-
 .../ui/ConnectTraktCredentialsFragment.java   | 30 ++++---
 .../seriesguide/ui/MoviesActivity.java        |  4 +-
 .../seriesguide/ui/QuickCheckInActivity.java  |  4 +-
 .../ui/SeriesGuidePreferences.java            | 14 ----
 .../seriesguide/ui/ShowsActivity.java         |  4 +-
 .../seriesguide/ui/TraktAddFragment.java      |  5 +-
 .../seriesguide/ui/TraktFriendsFragment.java  |  5 +-
 .../seriesguide/ui/TraktSyncActivity.java     | 37 +++++----
 .../ui/UpcomingRecentActivity.java            |  4 +-
 .../dialogs/GenericCheckInDialogFragment.java | 10 +--
 .../seriesguide/util/AddShowTask.java         |  7 +-
 .../seriesguide/util/FlagTask.java            |  3 +-
 .../seriesguide/util/ServiceUtils.java        | 51 ++----------
 .../seriesguide/util/TraktSummaryTask.java    |  3 +-
 .../seriesguide/util/TraktSync.java           |  5 +-
 .../seriesguide/util/TraktTask.java           |  3 +-
 22 files changed, 174 insertions(+), 132 deletions(-)
 create mode 100644 SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/TraktSettings.java

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/loaders/TraktMoviesWatchlistLoader.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/loaders/TraktMoviesWatchlistLoader.java
index 743f047ce3..437ee6a92e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/loaders/TraktMoviesWatchlistLoader.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/loaders/TraktMoviesWatchlistLoader.java
@@ -1,6 +1,7 @@
 
 package com.battlelancer.seriesguide.loaders;
 
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.Utils;
 import com.jakewharton.trakt.Trakt;
@@ -30,7 +31,7 @@ public List<Movie> loadInBackground() {
 
         try {
             return manager.userService()
-                    .watchlistMovies(ServiceUtils.getTraktUsername(getContext()));
+                    .watchlistMovies(TraktSettings.getUsername(getContext()));
         } catch (RetrofitError e) {
             Utils.trackExceptionAndLog(getContext(), TAG, e);
         }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/TraktFlagService.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/TraktFlagService.java
index 080fc61e6e..7608e0164c 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/TraktFlagService.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/service/TraktFlagService.java
@@ -17,6 +17,7 @@
 
 package com.battlelancer.seriesguide.service;
 
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
 import com.battlelancer.seriesguide.util.FlagTapeEntry;
 import com.battlelancer.seriesguide.util.FlagTapeEntryQueue;
@@ -101,7 +102,7 @@ public void onSuccess() {
     @Override
     public void onFailure(boolean isNotConnected) {
         // The user has disconnected from trakt in the meanwhile
-        if (!ServiceUtils.hasTraktCredentials(getApplicationContext())) {
+        if (!TraktSettings.hasTraktCredentials(getApplicationContext())) {
             // clear all remaining tasks
             while (mQueue.size() > 0) {
                 mQueue.remove();
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/TraktSettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/TraktSettings.java
new file mode 100644
index 0000000000..db19bb5a68
--- /dev/null
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/TraktSettings.java
@@ -0,0 +1,80 @@
+package com.battlelancer.seriesguide.settings;
+
+import com.battlelancer.seriesguide.util.SimpleCrypto;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+
+/**
+ * Settings related to trakt.tv integration.
+ */
+public class TraktSettings {
+
+    public static final String KEY_PASSWORD_SHA1_ENCR = "com.battlelancer.seriesguide.traktpwd";
+
+    public static final String KEY_USERNAME = "com.battlelancer.seriesguide.traktuser";
+
+    public static final String KEY_LAST_UPDATE = "com.battlelancer.seriesguide.lasttraktupdate";
+
+    public static final String KEY_SHARE_WITH_TRAKT = "com.battlelancer.seriesguide.sharewithtrakt";
+
+    public static final String KEY_AUTO_ADD_TRAKT_SHOWS
+            = "com.battlelancer.seriesguide.autoaddtraktshows";
+
+    public static final String KEY_SYNC_UNWATCHED_EPISODES
+            = "com.battlelancer.seriesguide.syncunseenepisodes";
+
+    /**
+     * Checks if there are a non-empty trakt username and password. Returns false if either one is
+     * empty.
+     */
+    public static boolean hasTraktCredentials(Context context) {
+        String username = getUsername(context);
+        String password = getPasswordSha1(context);
+
+        return (!TextUtils.isEmpty(username) && !TextUtils.isEmpty(password));
+    }
+
+    public static String getUsername(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getString(
+                KEY_USERNAME, "");
+    }
+
+    /**
+     * Returns the SHA hash of the users trakt password.<br> <b>Never</b> store this yourself,
+     * always call this method.
+     */
+    public static String getPasswordSha1(Context context) {
+        String hash = PreferenceManager.getDefaultSharedPreferences(context).getString(
+                KEY_PASSWORD_SHA1_ENCR, "");
+
+        // try decrypting the hash
+        if (!TextUtils.isEmpty(hash)) {
+            hash = SimpleCrypto.decrypt(hash, context);
+        }
+
+        return hash;
+    }
+
+    public static boolean isSharingWithTrakt(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(KEY_SHARE_WITH_TRAKT, false);
+    }
+
+    public static long getLastUpdateTime(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getLong(KEY_LAST_UPDATE, System.currentTimeMillis());
+    }
+
+    public static boolean isAutoAddingShows(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(KEY_AUTO_ADD_TRAKT_SHOWS, true);
+    }
+
+    public static boolean isSyncingUnwatchedEpisodes(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(KEY_SYNC_UNWATCHED_EPISODES, false);
+    }
+
+}
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
index 9cb10871eb..7fbe784ab9 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
@@ -6,6 +6,7 @@
 import com.battlelancer.seriesguide.items.SearchResult;
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.settings.UpdateSettings;
 import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
 import com.battlelancer.seriesguide.util.DBUtils;
@@ -272,7 +273,7 @@ public void onPerformSync(Account account, Bundle extras, String authority,
             ServiceUtils.checkTraktCredentials(getContext());
 
             // get newly watched episodes from trakt
-            final UpdateResult traktResult = getTraktActivity(currentTime);
+            final UpdateResult traktResult = getTraktActivity();
 
             // do not overwrite earlier failure codes
             if (resultCode == UpdateResult.SUCCESS) {
@@ -349,9 +350,9 @@ private int[] getShowsToUpdate(UpdateType type, long currentTime) {
         }
     }
 
-    private UpdateResult getTraktActivity(long currentTime) {
+    private UpdateResult getTraktActivity() {
         Log.d(TAG, "Getting trakt activity...");
-        if (!ServiceUtils.hasTraktCredentials(getContext())) {
+        if (!TraktSettings.hasTraktCredentials(getContext())) {
             // trakt is not connected, we are done here
             return UpdateResult.SUCCESS;
         }
@@ -367,16 +368,14 @@ private UpdateResult getTraktActivity(long currentTime) {
         }
 
         // get last trakt update timestamp
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        final long startTimeTrakt = prefs.getLong(SeriesGuidePreferences.KEY_LASTTRAKTUPDATE,
-                currentTime) / 1000;
+        final long startTimeTrakt = TraktSettings.getLastUpdateTime(getContext()) / 1000;
 
         // get activity from trakt
         Activity activities;
         try {
             activities = manager
                     .activityService()
-                    .user(ServiceUtils.getTraktUsername(getContext()),
+                    .user(TraktSettings.getUsername(getContext()),
                             ActivityType.Episode.toString(),
                             ActivityAction.Checkin + "," + ActivityAction.Seen + "," +
                                     ActivityAction.Scrobble + "," + ActivityAction.Collection,
@@ -404,8 +403,7 @@ private UpdateResult getTraktActivity(long currentTime) {
 
         // build an update batch for episode flag changes of existing shows, detect new shows
         mNewShows = new ArrayList<>();
-        boolean isAutoAddingShows = prefs.getBoolean(
-                SeriesGuidePreferences.KEY_AUTO_ADD_TRAKT_SHOWS, true);
+        boolean isAutoAddingShows = TraktSettings.isAutoAddingShows(getContext());
         final HashSet<Integer> newShowTvdbIds = new HashSet<>();
         final ArrayList<ContentProviderOperation> batch = new ArrayList<>();
         for (ActivityItem activity : activities.activity) {
@@ -432,9 +430,10 @@ private UpdateResult getTraktActivity(long currentTime) {
         DBUtils.applyInSmallBatches(getContext(), batch);
 
         // store time of this update as seen by the trakt server
-        prefs.edit()
-                .putLong(SeriesGuidePreferences.KEY_LASTTRAKTUPDATE,
-                        activities.timestamps.current.getTime()).commit();
+        final SharedPreferences.Editor editor = PreferenceManager
+                .getDefaultSharedPreferences(getContext()).edit();
+        editor.putLong(TraktSettings.KEY_LAST_UPDATE,
+                activities.timestamps.current.getTime()).commit();
 
         return UpdateResult.SUCCESS;
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
index bc485e2449..86261f8b47 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
@@ -21,9 +21,9 @@
 import com.actionbarsherlock.view.Window;
 import com.astuetz.viewpager.extensions.PagerSlidingTabStrip;
 import com.battlelancer.seriesguide.items.SearchResult;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment;
 import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment.OnAddShowListener;
-import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.TaskManager;
 import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.seriesguide.R;
@@ -169,7 +169,7 @@ public Fragment getItem(int position) {
 
         @Override
         public int getCount() {
-            final boolean isValidCredentials = ServiceUtils.hasTraktCredentials(mContext);
+            final boolean isValidCredentials = TraktSettings.hasTraktCredentials(mContext);
             if (isValidCredentials) {
                 // show trakt recommended and libraried shows, too
                 return TRAKT_CONNECTED_TABCOUNT;
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktActivity.java
index fb16419d63..e5139d6491 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktActivity.java
@@ -3,7 +3,7 @@
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
-import com.battlelancer.seriesguide.util.ServiceUtils;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.uwetrottmann.seriesguide.R;
 
 import android.os.Bundle;
@@ -22,7 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setupActionBar();
 
         if (savedInstanceState == null) {
-            if (ServiceUtils.hasTraktCredentials(this)) {
+            if (TraktSettings.hasTraktCredentials(this)) {
                 // immediately show credentials to allow disconnecting
                 ConnectTraktCredentialsFragment f = ConnectTraktCredentialsFragment.newInstance();
                 FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java
index 2d2af7b6a3..ab76f28a4f 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java
@@ -20,6 +20,7 @@
 import com.actionbarsherlock.app.SherlockFragment;
 import com.battlelancer.seriesguide.enums.TraktAction;
 import com.battlelancer.seriesguide.enums.TraktStatus;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.ShareUtils.ProgressDialog;
 import com.battlelancer.seriesguide.util.ShareUtils.ShareItems;
@@ -33,7 +34,6 @@
 import com.uwetrottmann.seriesguide.R;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -79,15 +79,15 @@ public void onStart() {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         final Context context = getActivity().getApplicationContext();
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final View layout = inflater.inflate(R.layout.trakt_credentials_dialog, container, false);
         final FragmentManager fm = getFragmentManager();
         final Bundle args = getArguments();
 
         // restore the username from settings
-        final String username = prefs.getString(SeriesGuidePreferences.KEY_TRAKTUSER, "");
+        final String username = TraktSettings.getUsername(context);
 
         // new account toggle
         final View mailviews = layout.findViewById(R.id.mailviews);
@@ -150,7 +150,8 @@ public void onClick(View v) {
                         .isChecked();
                 final String traktApiKey = getResources().getString(R.string.trakt_apikey);
 
-                AsyncTask<String, Void, Response> accountValidatorTask = new AsyncTask<String, Void, Response>() {
+                AsyncTask<String, Void, Response> accountValidatorTask
+                        = new AsyncTask<String, Void, Response>() {
 
                     @Override
                     protected void onPreExecute() {
@@ -222,21 +223,24 @@ protected void onPostExecute(Response response) {
                         }
 
                         // prepare writing credentials to settings
-                        Editor editor = prefs.edit();
-                        editor.putString(SeriesGuidePreferences.KEY_TRAKTUSER, username).putString(
-                                SeriesGuidePreferences.KEY_TRAKTPWD, passwordEncr);
+                        final Editor editor = PreferenceManager.getDefaultSharedPreferences(context)
+                                .edit();
+                        editor.putString(TraktSettings.KEY_USERNAME, username).putString(
+                                TraktSettings.KEY_PASSWORD_SHA1_ENCR, passwordEncr);
 
                         if (response.status.equals(TraktStatus.SUCCESS)
                                 && passwordEncr.length() != 0 && editor.commit()) {
                             // try setting new auth data for service manager
-                            if (ServiceUtils.getTraktServiceManagerWithAuth(context, true) == null) {
+                            if (ServiceUtils.getTraktServiceManagerWithAuth(context, true)
+                                    == null) {
                                 status.setText(R.string.trakt_error_credentials);
                                 return;
                             }
 
                             if (isForwardingGivenTask) {
                                 // continue with original task
-                                if (TraktAction.values()[args.getInt(ShareItems.TRAKTACTION)] == TraktAction.CHECKIN_EPISODE) {
+                                if (TraktAction.values()[args.getInt(ShareItems.TRAKTACTION)]
+                                        == TraktAction.CHECKIN_EPISODE) {
                                     FragmentTransaction ft = fm.beginTransaction();
                                     Fragment prev = fm.findFragmentByTag("progress-dialog");
                                     if (prev != null) {
@@ -248,9 +252,9 @@ protected void onPostExecute(Response response) {
 
                                 // relaunch the trakt task which called us
                                 AndroidUtils.executeAsyncTask(
-                                        new TraktTask(context, args, null), new Void[] {
-                                            null
-                                        });
+                                        new TraktTask(context, args, null), new Void[]{
+                                        null
+                                });
 
                                 FragmentActivity activity = getActivity();
                                 if (activity != null) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
index e8a15a6fd4..8332e42d4e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
@@ -21,7 +21,7 @@
 import com.actionbarsherlock.view.Window;
 import com.astuetz.viewpager.extensions.PagerSlidingTabStrip;
 import com.battlelancer.seriesguide.adapters.TabStripAdapter;
-import com.battlelancer.seriesguide.util.ServiceUtils;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
 
@@ -64,7 +64,7 @@ private void setupViews() {
         TabStripAdapter tabsAdapter = new TabStripAdapter(getSupportFragmentManager(), this, pager,
                 tabs);
         // only show the trakt watchlist with valid credentials
-        if (ServiceUtils.hasTraktCredentials(this)) {
+        if (TraktSettings.hasTraktCredentials(this)) {
             tabsAdapter.addTab(R.string.movies_watchlist, MoviesWatchListFragment.class, null);
         }
         // movie search
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
index ab89b05fe5..661afc5ad0 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
@@ -7,6 +7,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
 import com.battlelancer.seriesguide.settings.GetGlueSettings;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.dialogs.TraktCancelCheckinDialogFragment;
 import com.battlelancer.seriesguide.util.ShareUtils.ProgressDialog;
 import com.battlelancer.seriesguide.util.TraktTask;
@@ -90,8 +91,7 @@ protected void onCreate(Bundle arg0) {
         // get share service enabled settings
         boolean isShareWithGetGlue = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHGETGLUE,
                 false);
-        boolean isShareWithTrakt = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHTRAKT,
-                false);
+        boolean isShareWithTrakt = TraktSettings.isSharingWithTrakt(this);
 
         if (isShareWithTrakt) {
             // We want to remove any currently showing
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
index c84948389d..c947126828 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
@@ -86,10 +86,6 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     private static final String KEY_GETGLUE_DISCONNECT = "clearGetGlueCredentials";
 
-    public static final String KEY_TRAKTPWD = "com.battlelancer.seriesguide.traktpwd";
-
-    public static final String KEY_TRAKTUSER = "com.battlelancer.seriesguide.traktuser";
-
     public static final String KEY_OFFSET = "com.battlelancer.seriesguide.timeoffset";
 
     public static final String KEY_DATABASEIMPORTED = "com.battlelancer.seriesguide.dbimported";
@@ -101,19 +97,9 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_HIDEIMAGES = "hideimages";
 
-    public static final String KEY_LASTTRAKTUPDATE = "com.battlelancer.seriesguide.lasttraktupdate";
-
-    public static final String KEY_SHAREWITHTRAKT = "com.battlelancer.seriesguide.sharewithtrakt";
-
     public static final String KEY_SHAREWITHGETGLUE
             = "com.battlelancer.seriesguide.sharewithgetglue";
 
-    public static final String KEY_AUTO_ADD_TRAKT_SHOWS
-            = "com.battlelancer.seriesguide.autoaddtraktshows";
-
-    public static final String KEY_SYNC_UNSEEN_EPISODES
-            = "com.battlelancer.seriesguide.syncunseenepisodes";
-
     public static final String SUPPORT_MAIL = "support@seriesgui.de";
 
     private static final String KEY_ABOUT = "aboutPref";
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
index 21f74c4978..528cf57d6e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
@@ -33,6 +33,7 @@
 import com.battlelancer.seriesguide.sync.SyncUtils;
 import com.battlelancer.seriesguide.ui.FirstRunFragment.OnFirstRunDismissedListener;
 import com.battlelancer.seriesguide.util.ImageProvider;
+import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.Utils;
 import com.battlelancer.thetvdbapi.TheTVDB;
 import com.uwetrottmann.androidutils.AndroidUtils;
@@ -452,8 +453,7 @@ private void onUpgrade() {
                 }
 
                 if (lastVersion < VER_TRAKT_SEC_CHANGES) {
-                    // clear trakt credentials
-                    editor.putString(SeriesGuidePreferences.KEY_TRAKTPWD, null);
+                    ServiceUtils.clearTraktCredentials(this);
                     editor.putString(SeriesGuidePreferences.KEY_SECURE, null);
                 }
                 if (lastVersion < VER_SUMMERTIME_FIX) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java
index 3f26ef9b66..6359c9c972 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java
@@ -22,6 +22,7 @@
 import com.actionbarsherlock.view.MenuItem;
 import com.battlelancer.seriesguide.items.SearchResult;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.AddActivity.AddPagerAdapter;
 import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.TaskManager;
@@ -186,11 +187,11 @@ protected List<SearchResult> doInBackground(Integer... params) {
                                 break;
                             case AddPagerAdapter.LIBRARY_TAB_POSITION:
                                 shows = manager.userService()
-                                        .libraryShowsAll(ServiceUtils.getTraktUsername(mContext));
+                                        .libraryShowsAll(TraktSettings.getUsername(mContext));
                                 break;
                             case AddPagerAdapter.WATCHLIST_TAB_POSITION:
                                 shows = manager.userService()
-                                        .watchlistShows(ServiceUtils.getTraktUsername(mContext));
+                                        .watchlistShows(TraktSettings.getUsername(mContext));
                                 break;
                         }
                     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java
index 2fb711032d..dc467fdb3e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktFriendsFragment.java
@@ -19,6 +19,7 @@
 
 import com.battlelancer.seriesguide.items.SearchResult;
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment;
 import com.battlelancer.seriesguide.util.ImageDownloader;
 import com.battlelancer.seriesguide.util.ServiceUtils;
@@ -187,7 +188,7 @@ public TraktFriendsLoader(Context context) {
 
         @Override
         public List<UserProfile> loadInBackground() {
-            if (ServiceUtils.hasTraktCredentials(getContext())) {
+            if (TraktSettings.hasTraktCredentials(getContext())) {
                 Trakt manager = ServiceUtils.getTraktServiceManagerWithAuth(getContext(), false);
                 if (manager == null) {
                     return null;
@@ -198,7 +199,7 @@ public List<UserProfile> loadInBackground() {
                 try {
                     final UserService userService = manager.userService();
                     List<UserProfile> friends = userService
-                            .friends(ServiceUtils.getTraktUsername(getContext()));
+                            .friends(TraktSettings.getUsername(getContext()));
 
                     for (UserProfile friend : friends) {
                         // get the detailed profile
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktSyncActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktSyncActivity.java
index dafe2ea946..2e7e2f475c 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktSyncActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktSyncActivity.java
@@ -17,6 +17,16 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import com.google.analytics.tracking.android.EasyTracker;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.MenuItem;
+import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.TraktSettings;
+import com.battlelancer.seriesguide.util.TraktSync;
+import com.battlelancer.seriesguide.util.Utils;
+import com.uwetrottmann.seriesguide.R;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ContentValues;
@@ -32,15 +42,6 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.view.MenuItem;
-import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.battlelancer.seriesguide.util.TraktSync;
-import com.google.analytics.tracking.android.EasyTracker;
-
-import com.battlelancer.seriesguide.util.Utils;
-import com.uwetrottmann.seriesguide.R;
-
 /**
  * Displays information and offers tools to upload or download watched flags
  * from trakt.
@@ -53,7 +54,7 @@ public class TraktSyncActivity extends BaseActivity {
 
     private TraktSync mSyncTask;
 
-    private CheckBox mSyncUnseenEpisodes;
+    private CheckBox mSyncUnwatchedEpisodes;
 
     private View mContainer;
 
@@ -75,7 +76,7 @@ private void setupActionBar() {
     private void setupViews() {
         mContainer = findViewById(R.id.syncbuttons);
     
-        mSyncUnseenEpisodes = (CheckBox) findViewById(R.id.checkBoxSyncUnseen);
+        mSyncUnwatchedEpisodes = (CheckBox) findViewById(R.id.checkBoxSyncUnseen);
     
         // Sync to SeriesGuide button
         final Button syncToDeviceButton = (Button) findViewById(R.id.syncToDeviceButton);
@@ -86,7 +87,7 @@ public void onClick(View v) {
                 if (mSyncTask == null
                         || (mSyncTask != null && mSyncTask.getStatus() == AsyncTask.Status.FINISHED)) {
                     mSyncTask = (TraktSync) new TraktSync(TraktSyncActivity.this, mContainer,
-                            false, mSyncUnseenEpisodes.isChecked()).execute();
+                            false, mSyncUnwatchedEpisodes.isChecked()).execute();
                 }
             }
         });
@@ -111,18 +112,16 @@ protected void onStart() {
     @Override
     protected void onResume() {
         super.onResume();
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean isSyncUnseenEpisodes = prefs.getBoolean(
-                SeriesGuidePreferences.KEY_SYNC_UNSEEN_EPISODES, false);
-        mSyncUnseenEpisodes.setChecked(isSyncUnseenEpisodes);
+        boolean isSyncUnseenEpisodes = TraktSettings.isSyncingUnwatchedEpisodes(this);
+        mSyncUnwatchedEpisodes.setChecked(isSyncUnseenEpisodes);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        prefs.edit().putBoolean(SeriesGuidePreferences.KEY_SYNC_UNSEEN_EPISODES,
-                mSyncUnseenEpisodes.isChecked()).commit();
+        prefs.edit().putBoolean(TraktSettings.KEY_SYNC_UNWATCHED_EPISODES,
+                mSyncUnwatchedEpisodes.isChecked()).commit();
     }
 
     @Override
@@ -191,7 +190,7 @@ public void onClick(DialogInterface dialog, int which) {
                                 if (mSyncTask == null
                                         || (mSyncTask != null && mSyncTask.getStatus() == AsyncTask.Status.FINISHED)) {
                                     mSyncTask = (TraktSync) new TraktSync(TraktSyncActivity.this,
-                                            mContainer, true, mSyncUnseenEpisodes.isChecked())
+                                            mContainer, true, mSyncUnwatchedEpisodes.isChecked())
                                             .execute();
                                 }
                             }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
index afb7f5fb94..c6f1658ee1 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
@@ -26,9 +26,9 @@
 import com.battlelancer.seriesguide.service.NotificationService;
 import com.battlelancer.seriesguide.settings.ActivitySettings;
 import com.battlelancer.seriesguide.settings.DisplaySettings;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.UpcomingFragment.ActivityType;
 import com.battlelancer.seriesguide.ui.dialogs.AddDialogFragment.OnAddShowListener;
-import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.TaskManager;
 import com.battlelancer.seriesguide.util.Utils;
 import com.uwetrottmann.seriesguide.R;
@@ -92,7 +92,7 @@ private void setupViews(Bundle savedInstanceState) {
         tabsAdapter.addTab(R.string.recent, UpcomingFragment.class, argsRecent);
 
         // trakt friends tab
-        final boolean isTraktSetup = ServiceUtils.hasTraktCredentials(this);
+        final boolean isTraktSetup = TraktSettings.hasTraktCredentials(this);
         if (isTraktSetup) {
             tabsAdapter.addTab(R.string.friends, TraktFriendsFragment.class, null);
         }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
index d29e7352bf..e76cddb39f 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
@@ -19,10 +19,10 @@
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.battlelancer.seriesguide.getglueapi.GetGlueAuthActivity;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.ConnectTraktActivity;
 import com.battlelancer.seriesguide.ui.FixGetGlueCheckInActivity;
 import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
-import com.battlelancer.seriesguide.util.ServiceUtils;
 import com.battlelancer.seriesguide.util.ShareUtils.ProgressDialog;
 import com.battlelancer.seriesguide.util.TraktTask.OnTraktActionCompleteListener;
 import com.uwetrottmann.androidutils.AndroidUtils;
@@ -132,7 +132,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         // get share service enabled settings
         mGetGlueChecked = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHGETGLUE, false);
-        mTraktChecked = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHTRAKT, false);
+        mTraktChecked = TraktSettings.isSharingWithTrakt(getSherlockActivity());;
 
         // Message box, set title as default comment
         mMessageBox = (EditText) layout.findViewById(R.id.message);
@@ -183,7 +183,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
-                    if (!ServiceUtils.hasTraktCredentials(getSherlockActivity())) {
+                    if (!TraktSettings.hasTraktCredentials(getSherlockActivity())) {
                         // authenticate already here
                         Intent i = new Intent(getActivity(), ConnectTraktActivity.class);
                         startActivity(i);
@@ -191,7 +191,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 }
 
                 mTraktChecked = isChecked;
-                prefs.edit().putBoolean(SeriesGuidePreferences.KEY_SHAREWITHTRAKT, isChecked)
+                prefs.edit().putBoolean(TraktSettings.KEY_SHARE_WITH_TRAKT, isChecked)
                         .commit();
                 updateCheckInButtonState();
             }
@@ -218,7 +218,7 @@ public void onClick(View v) {
                 }
 
                 if (mTraktChecked) {
-                    if (!ServiceUtils.hasTraktCredentials(getActivity())) {
+                    if (!TraktSettings.hasTraktCredentials(getActivity())) {
                         // cancel if required auth data is missing
                         mToggleTraktButton.setChecked(false);
                         mTraktChecked = false;
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/AddShowTask.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/AddShowTask.java
index cad9d2d085..ebf53938b5 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/AddShowTask.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/AddShowTask.java
@@ -18,6 +18,7 @@
 package com.battlelancer.seriesguide.util;
 
 import com.battlelancer.seriesguide.items.SearchResult;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.thetvdbapi.TheTVDB;
 import com.jakewharton.trakt.Trakt;
 import com.jakewharton.trakt.entities.TvShow;
@@ -114,16 +115,16 @@ protected Void doInBackground(Void... params) {
         // already here, so we only have to get it once
         List<TvShow> watched = new ArrayList<TvShow>();
         List<TvShow> collection = new ArrayList<TvShow>();
-        if (ServiceUtils.hasTraktCredentials(mContext)) {
+        if (TraktSettings.hasTraktCredentials(mContext)) {
             Log.d(TAG, "Getting watched and collected episodes from trakt.");
             Trakt manager = ServiceUtils.getTraktServiceManagerWithAuth(mContext, false);
             if (manager != null) {
                 try {
                     watched = manager.userService()
-                            .libraryShowsWatchedMinimum(ServiceUtils.getTraktUsername(mContext));
+                            .libraryShowsWatchedMinimum(TraktSettings.getUsername(mContext));
 
                     collection = manager.userService()
-                            .libraryShowsCollectionMinimum(ServiceUtils.getTraktUsername(mContext));
+                            .libraryShowsCollectionMinimum(TraktSettings.getUsername(mContext));
                 } catch (RetrofitError e) {
                     // something went wrong, just go on
                 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java
index a0a5c13cf7..b71f49d34a 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/FlagTask.java
@@ -21,6 +21,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.ListItems;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.util.FlagTapeEntry.Flag;
 import com.uwetrottmann.androidutils.AndroidUtils;
 import com.uwetrottmann.androidutils.Lists;
@@ -664,7 +665,7 @@ protected Integer doInBackground(Void... params) {
          */
         // check for valid trakt credentials
         mIsTraktInvolved = !EpisodeTools.isSkipped(mType.mEpisodeFlag)
-                && ServiceUtils.hasTraktCredentials(mContext);
+                && TraktSettings.hasTraktCredentials(mContext);
 
         // prepare trakt stuff
         if (mIsTraktInvolved) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ServiceUtils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ServiceUtils.java
index 73ff2d8194..8dfaf149f2 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ServiceUtils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/ServiceUtils.java
@@ -18,8 +18,8 @@
 package com.battlelancer.seriesguide.util;
 
 import com.battlelancer.seriesguide.enums.TraktStatus;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.ConnectTraktActivity;
-import com.battlelancer.seriesguide.ui.SeriesGuidePreferences;
 import com.jakewharton.trakt.Trakt;
 import com.jakewharton.trakt.entities.Response;
 import com.uwetrottmann.androidutils.AndroidUtils;
@@ -28,7 +28,6 @@
 import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -137,8 +136,8 @@ public static synchronized Trakt getTraktServiceManagerWithAuth(Context context,
         }
 
         if (refreshCredentials) {
-            final String username = getTraktUsername(context);
-            final String password = getTraktPasswordHash(context);
+            final String username = TraktSettings.getUsername(context);
+            final String password = TraktSettings.getPasswordSha1(context);
 
             if (!TextUtils.isEmpty(username) && !TextUtils.isEmpty(password)) {
                 ServiceUtils.sTraktServiceManagerWithAuthInstance.setAuthentication(username,
@@ -152,49 +151,15 @@ public static synchronized Trakt getTraktServiceManagerWithAuth(Context context,
         return ServiceUtils.sTraktServiceManagerWithAuthInstance;
     }
 
-    public static String getTraktUsername(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getString(
-                SeriesGuidePreferences.KEY_TRAKTUSER, "");
-    }
-
-    /**
-     * Returns the SHA hash of the users trakt password.<br> <b>Never</b> store this yourself,
-     * always call this method.
-     */
-    private static String getTraktPasswordHash(Context context) {
-        String hash = PreferenceManager.getDefaultSharedPreferences(context).getString(
-                SeriesGuidePreferences.KEY_TRAKTPWD, null);
-
-        // try decrypting the hash
-        if (!TextUtils.isEmpty(hash)) {
-            hash = SimpleCrypto.decrypt(hash, context);
-        }
-
-        return hash;
-    }
-
-    /**
-     * Checks if there are a non-empty trakt username and password. Returns false if either one is
-     * empty.
-     */
-    public static boolean hasTraktCredentials(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context
-                .getApplicationContext());
-        String username = prefs.getString(SeriesGuidePreferences.KEY_TRAKTUSER, "");
-        String password = prefs.getString(SeriesGuidePreferences.KEY_TRAKTPWD, "");
-
-        return (!username.equalsIgnoreCase("") && !password.equalsIgnoreCase(""));
-    }
-
     /**
      * Checks for existing trakt credentials. If there aren't any valid ones (determined by {@link
-     * #hasTraktCredentials(Context)}), launches the trakt connect flow.
+     * TraktSettings#hasTraktCredentials(Context)}), launches the trakt connect flow.
      *
      * @return <b>true</b> if credentials are valid, <b>false</b> if invalid and launching trakt
      * connect flow.
      */
     public static boolean ensureTraktCredentials(Context context) {
-        if (!hasTraktCredentials(context)) {
+        if (!TraktSettings.hasTraktCredentials(context)) {
             // launch trakt connect process
             context.startActivity(new Intent(context, ConnectTraktActivity.class));
             return false;
@@ -211,7 +176,7 @@ public static void checkTraktCredentials(Context context) {
         Log.d(TAG, "Checking trakt credentials...");
 
         // no username or password? stop right here
-        if (!hasTraktCredentials(context)) {
+        if (!TraktSettings.hasTraktCredentials(context)) {
             return;
         }
 
@@ -248,8 +213,8 @@ public static void clearTraktCredentials(Context context) {
         // remove from settings
         Editor editor = PreferenceManager.getDefaultSharedPreferences(context
                 .getApplicationContext()).edit();
-        editor.putString(SeriesGuidePreferences.KEY_TRAKTUSER, "").putString(
-                SeriesGuidePreferences.KEY_TRAKTPWD, "");
+        editor.putString(TraktSettings.KEY_USERNAME, "").putString(
+                TraktSettings.KEY_PASSWORD_SHA1_ENCR, "");
         editor.commit();
 
         // remove from memory
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSummaryTask.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSummaryTask.java
index 4cf5ef699b..3b7a62139b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSummaryTask.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSummaryTask.java
@@ -17,6 +17,7 @@
 
 package com.battlelancer.seriesguide.util;
 
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.util.TraktSummaryTask.RatingsWrapper;
 import com.jakewharton.trakt.Trakt;
 import com.jakewharton.trakt.entities.Ratings;
@@ -161,7 +162,7 @@ protected RatingsWrapper doInBackground(Void... params) {
 
     private Trakt getTrakt() {
         Trakt trakt;
-        if (ServiceUtils.hasTraktCredentials(mContext)) {
+        if (TraktSettings.hasTraktCredentials(mContext)) {
             trakt = ServiceUtils.getTraktServiceManagerWithAuth(mContext,
                     false);
         } else {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSync.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSync.java
index 78a10b3aaa..2922e6c407 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSync.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktSync.java
@@ -21,6 +21,7 @@
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Seasons;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.jakewharton.trakt.Trakt;
 import com.jakewharton.trakt.entities.TvShow;
 import com.jakewharton.trakt.entities.TvShowSeason;
@@ -87,7 +88,7 @@ protected void onPreExecute() {
 
     @Override
     protected Integer doInBackground(Void... params) {
-        if (!ServiceUtils.hasTraktCredentials(mContext)) {
+        if (!TraktSettings.hasTraktCredentials(mContext)) {
             return FAILED_CREDENTIALS;
         }
 
@@ -100,7 +101,7 @@ protected Integer doInBackground(Void... params) {
         if (mIsSyncToTrakt) {
             return syncToTrakt(manager);
         } else {
-            return syncToSeriesGuide(manager, ServiceUtils.getTraktUsername(mContext));
+            return syncToSeriesGuide(manager, TraktSettings.getUsername(mContext));
         }
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java
index 5e4ba46ea5..ba4493887b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTask.java
@@ -19,6 +19,7 @@
 
 import com.battlelancer.seriesguide.enums.TraktAction;
 import com.battlelancer.seriesguide.enums.TraktStatus;
+import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.ConnectTraktActivity;
 import com.jakewharton.trakt.Trakt;
 import com.jakewharton.trakt.entities.CheckinResponse;
@@ -213,7 +214,7 @@ protected Response doInBackground(Void... params) {
         }
 
         // check for valid credentials
-        if (!ServiceUtils.hasTraktCredentials(mContext)) {
+        if (!TraktSettings.hasTraktCredentials(mContext)) {
             return null;
         }
 

From 613453143e42d2e265ae22b0f4c992a5c3c9b6aa Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sat, 9 Nov 2013 21:51:17 +0100
Subject: [PATCH 46/74] Move GetGlue sharing setting to GetGlueSettings.

---
 .../seriesguide/settings/GetGlueSettings.java      | 14 ++++++++++++--
 .../seriesguide/ui/QuickCheckInActivity.java       |  3 +--
 .../seriesguide/ui/SeriesGuidePreferences.java     |  3 ---
 .../ui/dialogs/GenericCheckInDialogFragment.java   |  7 ++++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/GetGlueSettings.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/GetGlueSettings.java
index 6048ea2d84..4aa627c676 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/GetGlueSettings.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/GetGlueSettings.java
@@ -8,9 +8,14 @@ public class GetGlueSettings {
 
     public static final String KEY_AUTH_TOKEN = "com.battlelancer.seriesguide.getglue.authtoken";
 
-    public static final String KEY_AUTH_EXPIRATION = "com.battlelancer.seriesguide.getglue.authexpiration";
+    public static final String KEY_AUTH_EXPIRATION
+            = "com.battlelancer.seriesguide.getglue.authexpiration";
 
-    public static final String KEY_REFRESH_TOKEN = "com.battlelancer.seriesguide.getglue.refreshtoken";
+    public static final String KEY_REFRESH_TOKEN
+            = "com.battlelancer.seriesguide.getglue.refreshtoken";
+
+    public static final String KEY_SHARE_WITH_GETGLUE
+            = "com.battlelancer.seriesguide.sharewithgetglue";
 
     public static String getAuthToken(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context)
@@ -43,4 +48,9 @@ public static void clearTokens(Context context) {
                 .putString(KEY_REFRESH_TOKEN, "")
                 .commit();
     }
+
+    public static boolean isSharingWithGetGlue(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(KEY_SHARE_WITH_GETGLUE, false);
+    }
 }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
index 661afc5ad0..80b1121818 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/QuickCheckInActivity.java
@@ -89,8 +89,7 @@ protected void onCreate(Bundle arg0) {
         String defaultMessage = Utils.getNextEpisodeString(this, season, episode, title);
 
         // get share service enabled settings
-        boolean isShareWithGetGlue = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHGETGLUE,
-                false);
+        boolean isShareWithGetGlue = GetGlueSettings.isSharingWithGetGlue(this);
         boolean isShareWithTrakt = TraktSettings.isSharingWithTrakt(this);
 
         if (isShareWithTrakt) {
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
index c947126828..def6938447 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SeriesGuidePreferences.java
@@ -97,9 +97,6 @@ public class SeriesGuidePreferences extends SherlockPreferenceActivity implement
 
     public static final String KEY_HIDEIMAGES = "hideimages";
 
-    public static final String KEY_SHAREWITHGETGLUE
-            = "com.battlelancer.seriesguide.sharewithgetglue";
-
     public static final String SUPPORT_MAIL = "support@seriesgui.de";
 
     private static final String KEY_ABOUT = "aboutPref";
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
index e76cddb39f..bcba44a533 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
@@ -19,6 +19,7 @@
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.battlelancer.seriesguide.getglueapi.GetGlueAuthActivity;
+import com.battlelancer.seriesguide.settings.GetGlueSettings;
 import com.battlelancer.seriesguide.settings.TraktSettings;
 import com.battlelancer.seriesguide.ui.ConnectTraktActivity;
 import com.battlelancer.seriesguide.ui.FixGetGlueCheckInActivity;
@@ -131,8 +132,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         final String itemTitle = getArguments().getString(InitBundle.ITEM_TITLE);
 
         // get share service enabled settings
-        mGetGlueChecked = prefs.getBoolean(SeriesGuidePreferences.KEY_SHAREWITHGETGLUE, false);
-        mTraktChecked = TraktSettings.isSharingWithTrakt(getSherlockActivity());;
+        mGetGlueChecked = GetGlueSettings.isSharingWithGetGlue(getSherlockActivity());
+        mTraktChecked = TraktSettings.isSharingWithTrakt(getSherlockActivity());
 
         // Message box, set title as default comment
         mMessageBox = (EditText) layout.findViewById(R.id.message);
@@ -170,7 +171,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 handleGetGlueToggle(isChecked);
 
                 mGetGlueChecked = isChecked;
-                prefs.edit().putBoolean(SeriesGuidePreferences.KEY_SHAREWITHGETGLUE, isChecked)
+                prefs.edit().putBoolean(GetGlueSettings.KEY_SHARE_WITH_GETGLUE, isChecked)
                         .commit();
                 updateCheckInButtonState();
             }

From 3ff74a53d121e9b785df6b00b3af0c3c5349ae09 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 08:52:42 +0100
Subject: [PATCH 47/74] Drop invalid TargetApi annotation.

---
 .../com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
index 85e0819cfb..084b3967ea 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsActivity.java
@@ -45,7 +45,6 @@
 import android.widget.ImageView;
 
 import java.util.ArrayList;
-import java.util.Locale;
 
 /**
  * Hosts a {@link ViewPager} displaying an episode per fragment of a complete season. Used on
@@ -148,7 +147,6 @@ protected void onCreate(Bundle savedInstanceState) {
         mPager.setCurrentItem(startPosition, false);
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     @Override
     protected void setCustomTheme() {
         // use a special immersive theme

From 3ea349c662823defc8a03304a22725209defa816 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 08:55:23 +0100
Subject: [PATCH 48/74] Format and remove unneeded properties from checkin
 layout.

---
 SeriesGuide/src/main/res/layout/checkin.xml | 71 ++++++++++-----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/checkin.xml b/SeriesGuide/src/main/res/layout/checkin.xml
index ff292c63cc..9c718cc780 100644
--- a/SeriesGuide/src/main/res/layout/checkin.xml
+++ b/SeriesGuide/src/main/res/layout/checkin.xml
@@ -4,28 +4,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
         android:id="@+id/root"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <EditText
-        android:id="@+id/editTextCheckinSearch"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="@dimen/large_padding"
-        android:layout_marginStart="@dimen/large_padding"
-        android:layout_marginTop="@dimen/large_padding"
-        android:layout_toLeftOf="@+id/imageButtonClearSearch"
-        android:layout_toStartOf="@+id/imageButtonClearSearch"
-        android:ems="10"
-        android:hint="@string/checkin_searchhint"
-        android:inputType="text"
-        android:paddingBottom="@dimen/default_padding">
+        <EditText
+            android:id="@+id/editTextCheckinSearch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="@dimen/large_padding"
+            android:layout_marginStart="@dimen/large_padding"
+            android:layout_marginTop="@dimen/large_padding"
+            android:layout_toLeftOf="@+id/imageButtonClearSearch"
+            android:layout_toStartOf="@+id/imageButtonClearSearch"
+            android:ems="10"
+            android:hint="@string/checkin_searchhint"
+            android:inputType="text"
+            android:paddingBottom="@dimen/default_padding">
 
             <requestFocus />
         </EditText>
@@ -45,7 +45,6 @@
             android:id="@+id/gridViewCheckinShows"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
             android:layout_below="@+id/empty"
             android:clipToPadding="@bool/gridClipToPadding"
             android:columnWidth="@dimen/showgrid_columnWidth"
@@ -55,25 +54,25 @@
             android:numColumns="auto_fit"
             android:padding="@dimen/showgrid_padding"
             android:stretchMode="columnWidth"
-            android:verticalSpacing="@dimen/showgrid_spacing"/>
+            android:verticalSpacing="@dimen/showgrid_spacing" />
 
-    <ImageButton
-        android:id="@+id/imageButtonClearSearch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/editTextCheckinSearch"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignTop="@+id/editTextCheckinSearch"
-        android:layout_marginEnd="@dimen/large_padding"
-        android:layout_marginRight="@dimen/large_padding"
-        android:layout_marginTop="@dimen/large_padding"
-        android:background="?custom_list_selector"
-        android:contentDescription="@string/clear"
-        android:paddingLeft="@dimen/inline_padding"
-        android:paddingRight="@dimen/inline_padding"
-        android:src="?attr/drawableCancel" />
+        <ImageButton
+            android:id="@+id/imageButtonClearSearch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/editTextCheckinSearch"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignTop="@+id/editTextCheckinSearch"
+            android:layout_marginEnd="@dimen/large_padding"
+            android:layout_marginRight="@dimen/large_padding"
+            android:layout_marginTop="@dimen/large_padding"
+            android:background="?custom_list_selector"
+            android:contentDescription="@string/clear"
+            android:paddingLeft="@dimen/inline_padding"
+            android:paddingRight="@dimen/inline_padding"
+            android:src="?attr/drawableCancel" />
 
     </RelativeLayout>
 

From 66fbe4ca39d0c6f70b59cbd604692af6b2472dfc Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 09:12:19 +0100
Subject: [PATCH 49/74] Also align show title in regular show info layout.

---
 SeriesGuide/src/main/res/layout/show_info_regular.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeriesGuide/src/main/res/layout/show_info_regular.xml b/SeriesGuide/src/main/res/layout/show_info_regular.xml
index 9e2447b7af..4a04473df0 100644
--- a/SeriesGuide/src/main/res/layout/show_info_regular.xml
+++ b/SeriesGuide/src/main/res/layout/show_info_regular.xml
@@ -28,9 +28,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/default_padding"
                 android:layout_marginRight="@dimen/default_padding"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.Large.Light"
                 android:textIsSelectable="true"
-                android:textSize="@dimen/text_size_ultralarge" />
+                android:textSize="@dimen/text_size_ultralarge"
+                tools:text="Awesome Show Title" />
 
             <RelativeLayout
                 android:layout_width="match_parent"

From c1f6e5d0d6bf82ac4509ef14afa82dde1c9c0000 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 09:19:32 +0100
Subject: [PATCH 50/74] Add RTL layout detector to AndroidUtils.

---
 .../androidutils/AndroidUtils.java            | 62 +++++++++----------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
index dc7b9620c9..1bb197c729 100644
--- a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
+++ b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
@@ -26,6 +26,8 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Environment;
+import android.text.TextUtils;
+import android.view.View;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -37,6 +39,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.channels.FileChannel;
+import java.util.Locale;
 
 public class AndroidUtils {
 
@@ -69,17 +72,14 @@ public static boolean isGingerbreadOrHigher() {
     public static boolean isFroyoOrHigher() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO;
     }
-    
-    public static boolean isGoogleTV(Context context){
+
+    public static boolean isGoogleTV(Context context) {
         return context.getPackageManager().hasSystemFeature("com.google.android.tv");
     }
 
     /**
-     * Checks if {@link Environment}.MEDIA_MOUNTED is returned by
-     * {@code getExternalStorageState()} and therefore external storage is read-
-     * and writeable.
-     * 
-     * @return
+     * Checks if {@link Environment}.MEDIA_MOUNTED is returned by {@code getExternalStorageState()}
+     * and therefore external storage is read- and writeable.
      */
     public static boolean isExtStorageAvailable() {
         return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
@@ -87,9 +87,6 @@ public static boolean isExtStorageAvailable() {
 
     /**
      * Whether there is any network with a usable connection.
-     * 
-     * @param context
-     * @return
      */
     public static boolean isNetworkConnected(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context
@@ -101,11 +98,17 @@ public static boolean isNetworkConnected(Context context) {
         return false;
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public static boolean isRtlLayout() {
+        if (AndroidUtils.isJellyBeanMR1OrHigher()) {
+            int direction = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault());
+            return direction == View.LAYOUT_DIRECTION_RTL;
+        }
+        return false;
+    }
+
     /**
      * Whether WiFi has an active, usable connection.
-     * 
-     * @param context
-     * @return
      */
     public static boolean isWifiConnected(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context
@@ -120,10 +123,9 @@ public static boolean isWifiConnected(Context context) {
 
     /**
      * Copies the contents of one file to the other using {@link FileChannel}s.
-     * 
+     *
      * @param src source {@link File}
      * @param dst destination {@link File}
-     * @throws IOException
      */
     public static void copyFile(File src, File dst) throws IOException {
         FileInputStream in = new FileInputStream(src);
@@ -147,13 +149,10 @@ public static void copyFile(File src, File dst) throws IOException {
     }
 
     /**
-     * Copies data from one input stream to the other using a buffer of 8
-     * kilobyte in size.
-     * 
-     * @param input {@link InputStream}
+     * Copies data from one input stream to the other using a buffer of 8 kilobyte in size.
+     *
+     * @param input  {@link InputStream}
      * @param output {@link OutputStream}
-     * @return
-     * @throws IOException
      */
     public static int copy(InputStream input, OutputStream output) throws IOException {
         byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
@@ -168,11 +167,10 @@ public static int copy(InputStream input, OutputStream output) throws IOExceptio
 
     /**
      * Execute an {@link AsyncTask} on a thread pool.
-     * 
+     *
      * @param task Task to execute.
-     * @param args Optional arguments to pass to
-     *            {@link AsyncTask#execute(Object[])}.
-     * @param <T> Task argument type.
+     * @param args Optional arguments to pass to {@link AsyncTask#execute(Object[])}.
+     * @param <T>  Task argument type.
      */
     @TargetApi(11)
     public static <T> void executeAsyncTask(AsyncTask<T, ?, ?> task, T... args) {
@@ -186,8 +184,7 @@ public static <T> void executeAsyncTask(AsyncTask<T, ?, ?> task, T... args) {
     }
 
     /**
-     * Returns an {@link InputStream} using {@link HttpURLConnection} to connect
-     * to the given URL.
+     * Returns an {@link InputStream} using {@link HttpURLConnection} to connect to the given URL.
      */
     public static InputStream downloadUrl(String urlString) throws IOException {
         HttpURLConnection conn = buildHttpUrlConnection(urlString);
@@ -198,8 +195,8 @@ public static InputStream downloadUrl(String urlString) throws IOException {
     }
 
     /**
-     * Returns an {@link HttpURLConnection} using sensible default settings for
-     * mobile and taking care of buggy behavior prior to Froyo.
+     * Returns an {@link HttpURLConnection} using sensible default settings for mobile and taking
+     * care of buggy behavior prior to Froyo.
      */
     public static HttpURLConnection buildHttpUrlConnection(String urlString)
             throws MalformedURLException, IOException {
@@ -216,10 +213,9 @@ public static HttpURLConnection buildHttpUrlConnection(String urlString)
     }
 
     /**
-     * Prior to Android 2.2 (Froyo), {@link HttpURLConnection} had some
-     * frustrating bugs. In particular, calling close() on a readable
-     * InputStream could poison the connection pool. Work around this by
-     * disabling connection pooling.
+     * Prior to Android 2.2 (Froyo), {@link HttpURLConnection} had some frustrating bugs. In
+     * particular, calling close() on a readable InputStream could poison the connection pool. Work
+     * around this by disabling connection pooling.
      */
     public static void disableConnectionReuseIfNecessary() {
         // HTTP connection reuse which was buggy pre-froyo

From 5005e301b48a465e2c033d87fa0600dc8e595916 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 11:46:58 +0100
Subject: [PATCH 51/74] Fix right side padding of season row.

---
 .../src/main/res/layout/season_row.xml        | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/season_row.xml b/SeriesGuide/src/main/res/layout/season_row.xml
index ee4617ff19..3c39c68441 100644
--- a/SeriesGuide/src/main/res/layout/season_row.xml
+++ b/SeriesGuide/src/main/res/layout/season_row.xml
@@ -2,9 +2,7 @@
 <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="wrap_content"
-    android:paddingLeft="@dimen/default_padding"
-    android:paddingStart="@dimen/default_padding">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/textViewSeasonTitle"
@@ -12,6 +10,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_marginLeft="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:layout_toLeftOf="@+id/textViewSeasonProgress"
         android:layout_toStartOf="@+id/textViewSeasonProgress"
         android:paddingTop="@dimen/default_padding"
@@ -49,19 +49,23 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/textViewSeasonTitle"
+        android:layout_marginLeft="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:layout_toLeftOf="@id/imageViewContextMenu"
         android:layout_toStartOf="@id/imageViewContextMenu" />
 
     <ImageView
         android:id="@+id/imageViewSeasonSkipped"
-        android:layout_height="16dp"
         android:layout_width="16dp"
-        android:src="@drawable/ic_action_playback_next_highlight"
-        android:layout_below="@id/progressBarSeason"
-        android:layout_marginEnd="@dimen/inline_padding"
-        android:layout_marginRight="@dimen/inline_padding"
+        android:layout_height="16dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_below="@id/progressBarSeason"
+        android:layout_marginEnd="-4dp"
+        android:layout_marginLeft="@dimen/default_padding"
+        android:layout_marginRight="-4dp"
+        android:layout_marginStart="@dimen/default_padding"
+        android:src="@drawable/ic_action_playback_next_highlight"
         android:visibility="visible" />
 
     <TextView
@@ -69,10 +73,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/progressBarSeason"
-        android:layout_toLeftOf="@id/imageViewContextMenu"
-        android:layout_toStartOf="@id/imageViewContextMenu"
+        android:layout_marginLeft="@dimen/default_padding"
+        android:layout_marginStart="@dimen/default_padding"
         android:layout_toEndOf="@id/imageViewSeasonSkipped"
+        android:layout_toLeftOf="@id/imageViewContextMenu"
         android:layout_toRightOf="@id/imageViewSeasonSkipped"
+        android:layout_toStartOf="@id/imageViewContextMenu"
         android:paddingBottom="@dimen/default_padding"
         android:textAlignment="viewStart"
         android:textAllCaps="true"

From 4c2cf08728af9d150d54df4a87d03688ef0eeeb3 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 11:59:56 +0100
Subject: [PATCH 52/74] RTL layout for wide shows row.

---
 .../src/main/res/layout/shows_row_wide.xml    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/shows_row_wide.xml b/SeriesGuide/src/main/res/layout/shows_row_wide.xml
index 1ea35d24be..3746e95ece 100644
--- a/SeriesGuide/src/main/res/layout/shows_row_wide.xml
+++ b/SeriesGuide/src/main/res/layout/shows_row_wide.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="wrap_content"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <ImageView
         android:id="@+id/showposter"
         android:layout_width="102dp"
         android:layout_height="150dp"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginEnd="@dimen/large_padding"
         android:layout_marginRight="@dimen/large_padding"
         android:contentDescription="@string/description_poster"
         android:scaleType="centerCrop"
@@ -18,6 +21,7 @@
         android:id="@+id/imageViewShowsContextMenu"
         android:layout_width="32dp"
         android:layout_height="32dp"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:background="?attr/custom_list_selector"
         android:scaleType="center"
@@ -31,6 +35,7 @@
         android:layout_alignWithParentIfMissing="true"
         android:layout_marginTop="@dimen/inline_padding"
         android:layout_toLeftOf="@id/imageViewShowsContextMenu"
+        android:layout_toStartOf="@id/imageViewShowsContextMenu"
         android:background="?attr/custom_list_selector"
         android:contentDescription="@string/favorited"
         android:src="?attr/drawableStar" />
@@ -39,16 +44,20 @@
         android:id="@+id/seriesname"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toLeftOf="@id/favoritedLabel"
         android:layout_toRightOf="@id/showposter"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextAppearance.Large.Light" />
+        android:layout_toStartOf="@id/favoritedLabel"
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Large.Light"
+        tools:text="@string/show" />
 
     <TextView
         android:id="@+id/textViewShowsTimeAndNetwork"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/seriesname"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toRightOf="@id/showposter"
         android:paddingBottom="@dimen/default_padding"
         android:text="@string/norating"
@@ -59,8 +68,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/textViewShowsTimeAndNetwork"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toRightOf="@id/showposter"
         android:text="@string/no_nextepisode"
+        android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Light" />
 
     <TextView
@@ -68,8 +79,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/TextViewShowListNextEpisode"
+        android:layout_toEndOf="@id/showposter"
         android:layout_toRightOf="@id/showposter"
         android:paddingBottom="@dimen/item_padding"
-        android:textAppearance="@style/TextAppearance.Small" />
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Small"
+        tools:text="@string/episode" />
 
 </RelativeLayout>
\ No newline at end of file

From 308b2afcbb227f31ff6f47a85f68d8c8bbaaae1f Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 12:05:08 +0100
Subject: [PATCH 53/74] RTL layout for search row.

---
 .../src/main/res/layout/search_row.xml        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/search_row.xml b/SeriesGuide/src/main/res/layout/search_row.xml
index 9da303cb2b..86e6ffbdf7 100644
--- a/SeriesGuide/src/main/res/layout/search_row.xml
+++ b/SeriesGuide/src/main/res/layout/search_row.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
-    android:padding="@dimen/default_padding" >
+    android:padding="@dimen/default_padding">
 
     <ImageView
         android:id="@+id/imageViewWatchedStatus"
         android:layout_width="16dp"
         android:layout_height="16dp"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginBottom="@dimen/inline_padding"
         android:layout_marginTop="@dimen/inline_padding"
@@ -18,24 +20,28 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="@dimen/inline_padding"
         android:layout_toLeftOf="@id/imageViewWatchedStatus"
-        android:text="@string/app_name"
+        android:layout_toStartOf="@id/imageViewWatchedStatus"
+        android:textAlignment="viewStart"
         android:textAllCaps="true"
         android:textAppearance="@style/TextAppearance.XSmall"
-        android:textStyle="bold" >
-    </TextView>
+        android:textStyle="bold"
+        tools:text="@string/show" />
 
     <TextView
         android:id="@+id/textViewEpisodeTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_below="@id/textViewShowTitle"
         android:layout_toLeftOf="@id/imageViewWatchedStatus"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextAppearance.Medium.Light" >
-    </TextView>
+        android:layout_toStartOf="@id/imageViewWatchedStatus"
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Medium.Light"
+        tools:text="@string/episode" />
 
     <TextView
         android:id="@+id/textViewSearchSnippet"
@@ -45,7 +51,7 @@
         android:paddingBottom="@dimen/inline_padding"
         android:paddingTop="@dimen/inline_padding"
         android:text="@string/no_nextepisode"
-        android:textAppearance="@style/TextAppearance.Small.Dim" >
-    </TextView>
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Small.Dim" />
 
 </RelativeLayout>
\ No newline at end of file

From a6f12e29ce19e3e92661dcf0c040310f5b0ede50 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 12:10:06 +0100
Subject: [PATCH 54/74] Disable RTL support for now so we can merge.

- Merge right now to prevent layouts from deviating even more. As RTL
support is disabled there are no negative side effects.
---
 SeriesGuide/src/main/AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeriesGuide/src/main/AndroidManifest.xml b/SeriesGuide/src/main/AndroidManifest.xml
index 9e0c587059..970ddbb103 100644
--- a/SeriesGuide/src/main/AndroidManifest.xml
+++ b/SeriesGuide/src/main/AndroidManifest.xml
@@ -40,7 +40,6 @@
             android:hardwareAccelerated="true"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
-            android:supportsRtl="true"
             android:theme="@style/SeriesGuideTheme">
 
         <!-- Launch activity -->

From 46d019442fb31c88bcd99616169a1ffbd1b8a3a0 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 12:23:39 +0100
Subject: [PATCH 55/74] No need to disableConnectionReuse anymore.

- Dropping it from AndroidUtils.
---
 .../uwetrottmann/androidutils/AndroidUtils.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
index 1bb197c729..da824199c8 100644
--- a/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
+++ b/libraries/androidutils/src/com/uwetrottmann/androidutils/AndroidUtils.java
@@ -36,7 +36,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.util.Locale;
@@ -198,10 +197,7 @@ public static InputStream downloadUrl(String urlString) throws IOException {
      * Returns an {@link HttpURLConnection} using sensible default settings for mobile and taking
      * care of buggy behavior prior to Froyo.
      */
-    public static HttpURLConnection buildHttpUrlConnection(String urlString)
-            throws MalformedURLException, IOException {
-        AndroidUtils.disableConnectionReuseIfNecessary();
-
+    public static HttpURLConnection buildHttpUrlConnection(String urlString) throws IOException {
         URL url = new URL(urlString);
 
         OkHttpClient client = new OkHttpClient();
@@ -212,15 +208,4 @@ public static HttpURLConnection buildHttpUrlConnection(String urlString)
         return conn;
     }
 
-    /**
-     * Prior to Android 2.2 (Froyo), {@link HttpURLConnection} had some frustrating bugs. In
-     * particular, calling close() on a readable InputStream could poison the connection pool. Work
-     * around this by disabling connection pooling.
-     */
-    public static void disableConnectionReuseIfNecessary() {
-        // HTTP connection reuse which was buggy pre-froyo
-        if (!isFroyoOrHigher()) {
-            System.setProperty("http.keepAlive", "false");
-        }
-    }
 }

From e667ce50508b0b691172e997ef890b5cb8a6eea3 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 12:28:58 +0100
Subject: [PATCH 56/74] Add shadow to nav drawer.

---
 .../seriesguide/ui/BaseNavDrawerActivity.java     |   2 ++
 .../main/res/drawable-hdpi/drawer_shadow.9.png    | Bin 0 -> 171 bytes
 .../main/res/drawable-mdpi/drawer_shadow.9.png    | Bin 0 -> 158 bytes
 .../main/res/drawable-xhdpi/drawer_shadow.9.png   | Bin 0 -> 182 bytes
 4 files changed, 2 insertions(+)
 create mode 100644 SeriesGuide/src/main/res/drawable-hdpi/drawer_shadow.9.png
 create mode 100644 SeriesGuide/src/main/res/drawable-mdpi/drawer_shadow.9.png
 create mode 100644 SeriesGuide/src/main/res/drawable-xhdpi/drawer_shadow.9.png

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
index 374408cccb..02df750d7b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
@@ -79,6 +79,8 @@ protected void onCreate(Bundle savedInstanceState) {
      */
     public void setupNavDrawer() {
         mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
+
         mDrawerList = (ListView) findViewById(R.id.left_drawer);
 
         // setup menu adapter
diff --git a/SeriesGuide/src/main/res/drawable-hdpi/drawer_shadow.9.png b/SeriesGuide/src/main/res/drawable-hdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..224cc4ff43a29c546ae50c654c20c58c2f4cdb75
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#3!3HEVSgovp6icy_X9x!n)NrJ90QsB+9+AZi
z4BVX{%xHe{^je^xucwP+h)3t!Yl?gg4m>OeUfNFiFU`@U5Xr+-Y2h+^&Fz!7ypldm
za#4)fkaYOplLMWvd)czen2t>^YG&h=GRe5G;NW`))xgl;_^?U481>l1!)FR53IYvg
N@O1TaS?83{1OO&fGZ_E?

literal 0
HcmV?d00001

diff --git a/SeriesGuide/src/main/res/drawable-mdpi/drawer_shadow.9.png b/SeriesGuide/src/main/res/drawable-mdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3797f99c0ef9f657c2b0a1f84a4d0f16cc8ee5f4
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^96+qZ!3HFgEN0vWQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`$i(4xTQKAr`%FuWaOOaA06QaQd;(yN7D;?7i2paNm#nvBfgTEqd~o
zcU{8lWjX#P6K=BftS@S075ic65$zclza&>r_mjZQ`zwzw1DeI)>FVdQ&MBb@0Ae69
AivR!s

literal 0
HcmV?d00001

diff --git a/SeriesGuide/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/SeriesGuide/src/main/res/drawable-xhdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d853e902401d850f09b1cc50a58cda9bd3bb5
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^{6Or)!3HEd1bTh|DVAa<&kznEsNqQI0P;BtJR*x3
z7`Qt@n9=;?>9s(?2u~Ns5RcBc*A@8=2k<aom@ZfHU481R#!RUh-d)GOIZkwDS|k40
zBPnsx5rv8et+M$t*Xte?r{2HMES<JgYFlVT3^J&(o~M%b>^;BD$vKZ(B+Ju<=2igh
OVDNPHb6Mw<&;$UPn>!5v

literal 0
HcmV?d00001


From fb874e74e9f95b03ff0686469faeed1d94871148 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 12:54:40 +0100
Subject: [PATCH 57/74] Make drawer items selectable.

---
 .../seriesguide/ui/BaseNavDrawerActivity.java | 54 +++++++++----------
 .../src/main/res/layout/drawer_item.xml       |  3 +-
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
index 02df750d7b..0fee40f0ec 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
@@ -54,17 +54,17 @@ public abstract class BaseNavDrawerActivity extends BaseActivity
 
     private DrawerAdapter mDrawerAdapter;
 
-    private static final int MENU_ITEM_SHOWS_ID = 0;
+    public static final int MENU_ITEM_SHOWS_POSITION = 0;
 
-    private static final int MENU_ITEM_LISTS_ID = 1;
+    public static final int MENU_ITEM_LISTS_POSITION = 1;
 
-    private static final int MENU_ITEM_ACTIVITY_ID = 3;
+    public static final int MENU_ITEM_ACTIVITY_POSITION = 2;
 
-    private static final int MENU_ITEM_SEARCH_ID = 4;
+    public static final int MENU_ITEM_MOVIES_POSITION = 3;
 
-    private static final int MENU_ITEM_MOVIES_ID = 5;
+    public static final int MENU_ITEM_STATS_POSITION = 4;
 
-    private static final int MENU_ITEM_STATS_ID = 6;
+    public static final int MENU_ITEM_SEARCH_POSITION = 5;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,21 +85,15 @@ public void setupNavDrawer() {
 
         // setup menu adapter
         mDrawerAdapter = new DrawerAdapter(this);
-        mDrawerAdapter.add(new DrawerItem(getString(R.string.shows), R.drawable.ic_action_tv,
-                MENU_ITEM_SHOWS_ID));
-        mDrawerAdapter.add(new DrawerItem(getString(R.string.lists), R.drawable.ic_action_list,
-                MENU_ITEM_LISTS_ID));
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.shows), R.drawable.ic_action_tv));
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.lists), R.drawable.ic_action_list));
         mDrawerAdapter
-                .add(new DrawerItem(getString(R.string.activity), R.drawable.ic_action_upcoming,
-                        MENU_ITEM_ACTIVITY_ID));
-        mDrawerAdapter.add(new DrawerItem(getString(R.string.movies), R.drawable.ic_action_movie,
-                MENU_ITEM_MOVIES_ID));
+                .add(new DrawerItem(getString(R.string.activity), R.drawable.ic_action_upcoming));
+        mDrawerAdapter.add(new DrawerItem(getString(R.string.movies), R.drawable.ic_action_movie));
         mDrawerAdapter.add(new DrawerItem(getString(R.string.statistics),
-                R.drawable.ic_action_bargraph, MENU_ITEM_STATS_ID));
-        mDrawerAdapter.add(new DrawerCategory());
+                R.drawable.ic_action_bargraph));
         mDrawerAdapter
-                .add(new DrawerItem(getString(R.string.search_hint), R.drawable.ic_action_search,
-                        MENU_ITEM_SEARCH_ID));
+                .add(new DrawerItem(getString(R.string.search_hint), R.drawable.ic_action_search));
 
         mDrawerList.setAdapter(mDrawerAdapter);
         mDrawerList.setOnItemClickListener(this);
@@ -143,35 +137,34 @@ public void run() {
             }
         }, 200);
 
-        int menuId = ((DrawerItem) mDrawerAdapter.getItem(position)).mId;
-        switch (menuId) {
-            case MENU_ITEM_SHOWS_ID:
+        switch (position) {
+            case MENU_ITEM_SHOWS_POSITION:
                 startActivity(new Intent(this, ShowsActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
                                 | Intent.FLAG_ACTIVITY_SINGLE_TOP));
                 Utils.trackAction(this, TAG_NAV_DRAWER, "Shows");
                 break;
-            case MENU_ITEM_LISTS_ID:
+            case MENU_ITEM_LISTS_POSITION:
                 startActivity(new Intent(this, ListsActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
                 Utils.trackAction(this, TAG_NAV_DRAWER, "Lists");
                 break;
-            case MENU_ITEM_ACTIVITY_ID:
+            case MENU_ITEM_ACTIVITY_POSITION:
                 startActivity(new Intent(this, UpcomingRecentActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
                 Utils.trackAction(this, TAG_NAV_DRAWER, "Activity");
                 break;
-            case MENU_ITEM_MOVIES_ID:
+            case MENU_ITEM_MOVIES_POSITION:
                 startActivity(new Intent(this, MoviesActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
                 Utils.trackAction(this, TAG_NAV_DRAWER, "Movies");
                 break;
-            case MENU_ITEM_STATS_ID:
+            case MENU_ITEM_STATS_POSITION:
                 startActivity(new Intent(this, StatsActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
                 Utils.trackAction(this, TAG_NAV_DRAWER, "Statistics");
                 break;
-            case MENU_ITEM_SEARCH_ID:
+            case MENU_ITEM_SEARCH_POSITION:
                 startActivity(new Intent(this, SearchActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP));
                 Utils.trackAction(this, TAG_NAV_DRAWER, "Search");
@@ -192,6 +185,10 @@ public void setDrawerIndicatorEnabled(boolean isEnabled) {
         mDrawerToggle.setDrawerIndicatorEnabled(isEnabled);
     }
 
+    public void setDrawerSelectedItem(int menuItemPosition) {
+        mDrawerList.setItemChecked(menuItemPosition, true);
+    }
+
     public boolean toggleDrawer(MenuItem item) {
         if (item != null && item.getItemId() == android.R.id.home && mDrawerToggle
                 .isDrawerIndicatorEnabled()) {
@@ -211,12 +208,9 @@ private class DrawerItem {
 
         int mIconRes;
 
-        int mId;
-
-        public DrawerItem(String title, int iconRes, int id) {
+        public DrawerItem(String title, int iconRes) {
             mTitle = title;
             mIconRes = iconRes;
-            mId = id;
         }
     }
 
diff --git a/SeriesGuide/src/main/res/layout/drawer_item.xml b/SeriesGuide/src/main/res/layout/drawer_item.xml
index f179c3bdde..8775271070 100644
--- a/SeriesGuide/src/main/res/layout/drawer_item.xml
+++ b/SeriesGuide/src/main/res/layout/drawer_item.xml
@@ -2,7 +2,8 @@
 <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="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@drawable/activated_background_sg">
 
     <ImageView
         android:id="@+id/menu_icon"

From ce1c4567a429ed6a17536f5eba08e7487c4a00e5 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Sun, 10 Nov 2013 13:38:55 +0100
Subject: [PATCH 58/74] Highlight currently active drawer item for top
 activities.

---
 .../battlelancer/seriesguide/ui/BaseNavDrawerActivity.java | 4 ++++
 .../com/battlelancer/seriesguide/ui/ListsActivity.java     | 2 ++
 .../com/battlelancer/seriesguide/ui/MoviesActivity.java    | 7 +++++++
 .../com/battlelancer/seriesguide/ui/SearchActivity.java    | 2 ++
 .../com/battlelancer/seriesguide/ui/ShowsActivity.java     | 1 +
 .../com/battlelancer/seriesguide/ui/StatsActivity.java     | 2 ++
 .../seriesguide/ui/UpcomingRecentActivity.java             | 7 +++++++
 .../src/main/res/drawable/activated_background_sg.xml      | 2 +-
 8 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
index 0fee40f0ec..b716e8c4c4 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/BaseNavDrawerActivity.java
@@ -185,6 +185,10 @@ public void setDrawerIndicatorEnabled(boolean isEnabled) {
         mDrawerToggle.setDrawerIndicatorEnabled(isEnabled);
     }
 
+    /**
+     * Highlights the given position in the drawer menu. Activities listed in the drawer should call
+     * this in {@link #onStart()}.
+     */
     public void setDrawerSelectedItem(int menuItemPosition) {
         mDrawerList.setItemChecked(menuItemPosition, true);
     }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java
index 25058ab361..47e5af4ba8 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ListsActivity.java
@@ -69,6 +69,8 @@ public void onTabClick(int position) {
     @Override
     protected void onStart() {
         super.onStart();
+
+        setDrawerSelectedItem(BaseNavDrawerActivity.MENU_ITEM_LISTS_POSITION);
         EasyTracker.getInstance(this).activityStart(this);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
index 8332e42d4e..82ce9d54bc 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MoviesActivity.java
@@ -72,6 +72,13 @@ private void setupViews() {
         tabsAdapter.updateTabs();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        setDrawerSelectedItem(BaseNavDrawerActivity.MENU_ITEM_MOVIES_POSITION);
+    }
+
     @Override
     protected void fireTrackerEvent(String label) {
         Utils.trackAction(this, TAG, label);
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
index b805983a28..7c78c77958 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/SearchActivity.java
@@ -57,6 +57,8 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onStart() {
         super.onStart();
+
+        setDrawerSelectedItem(BaseNavDrawerActivity.MENU_ITEM_SEARCH_POSITION);
         EasyTracker.getInstance(this).activityStart(this);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
index 528cf57d6e..117ad58cc8 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowsActivity.java
@@ -163,6 +163,7 @@ private void setupViews(Bundle savedInstanceState) {
     protected void onStart() {
         super.onStart();
 
+        setDrawerSelectedItem(BaseNavDrawerActivity.MENU_ITEM_SHOWS_POSITION);
         EasyTracker.getInstance(this).activityStart(this);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
index 1c55024613..f42379b70b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsActivity.java
@@ -54,6 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onStart() {
         super.onStart();
+
+        setDrawerSelectedItem(BaseNavDrawerActivity.MENU_ITEM_STATS_POSITION);
         EasyTracker.getInstance(this).activityStart(this);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
index c6f1658ee1..8bc8fb7464 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingRecentActivity.java
@@ -121,6 +121,13 @@ private void setupViews(Bundle savedInstanceState) {
         pager.setCurrentItem(selection);
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        setDrawerSelectedItem(BaseNavDrawerActivity.MENU_ITEM_ACTIVITY_POSITION);
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/SeriesGuide/src/main/res/drawable/activated_background_sg.xml b/SeriesGuide/src/main/res/drawable/activated_background_sg.xml
index 69245b085b..b6d4d89f44 100644
--- a/SeriesGuide/src/main/res/drawable/activated_background_sg.xml
+++ b/SeriesGuide/src/main/res/drawable/activated_background_sg.xml
@@ -15,6 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/list_longpressed_sg" />
+    <item android:state_activated="true" android:drawable="@drawable/list_pressed_holo_dark" />
     <item android:drawable="@android:color/transparent" />
 </selector>

From c240d68a0ed729b1c0a18c6ee4a10885f99a9290 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 09:33:13 +0100
Subject: [PATCH 59/74] Use episode flag instead of hard coding value on stats
 page.

---
 .../seriesguide/ui/StatsFragment.java             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsFragment.java
index 3020855044..9acb346fe1 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/StatsFragment.java
@@ -17,6 +17,13 @@
 
 package com.battlelancer.seriesguide.ui;
 
+import com.actionbarsherlock.app.SherlockFragment;
+import com.battlelancer.seriesguide.enums.EpisodeFlags;
+import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
+import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
+import com.uwetrottmann.androidutils.AsyncTask;
+import com.uwetrottmann.seriesguide.R;
+
 import android.content.ContentResolver;
 import android.database.Cursor;
 import android.os.Bundle;
@@ -27,12 +34,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragment;
-import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
-import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
-import com.uwetrottmann.androidutils.AsyncTask;
-import com.uwetrottmann.seriesguide.R;
-
 import java.util.Locale;
 
 /**
@@ -110,7 +111,7 @@ protected Stats doInBackground(Void... params) {
                 // ...watched episodes
                 final Cursor episodesWatched = mResolver.query(Episodes.CONTENT_URI, new String[] {
                         Episodes._ID
-                }, Episodes.WATCHED + "=1", null, null);
+                }, Episodes.WATCHED + "=" + EpisodeFlags.WATCHED, null, null);
                 if (episodesWatched != null) {
                     stats.episodesWatched(episodesWatched.getCount());
                     episodesWatched.close();

From 8610859fb52ed9923928243d033be899be14cb95 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 09:59:33 +0100
Subject: [PATCH 60/74] RTL improvements for first run layout.

---
 SeriesGuide/src/main/res/layout/firstrun_fragment.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/SeriesGuide/src/main/res/layout/firstrun_fragment.xml b/SeriesGuide/src/main/res/layout/firstrun_fragment.xml
index 673825cbb6..8efb953e3b 100644
--- a/SeriesGuide/src/main/res/layout/firstrun_fragment.xml
+++ b/SeriesGuide/src/main/res/layout/firstrun_fragment.xml
@@ -25,6 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/default_padding"
+                android:paddingStart="@dimen/default_padding"
                 android:paddingTop="@dimen/default_padding"
                 android:text="@string/welcome_add_part1"
                 android:textAppearance="@style/TextAppearance.Large.Light" />
@@ -35,8 +36,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/default_padding"
-                android:drawableLeft="?attr/drawableAddIcon"
+                android:layout_marginStart="@dimen/default_padding"
                 android:drawablePadding="5dp"
+                android:drawableStart="?attr/drawableAddIcon"
                 android:paddingLeft="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/action_shows_add"
@@ -56,7 +58,7 @@
                 style="@style/Widget.SeriesGuide.Button.Borderless.Small.Highlight"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical|left"
+                android:gravity="center_vertical|left|start"
                 android:paddingLeft="@dimen/default_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/action_migrate" />
@@ -106,8 +108,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/default_padding"
-                    android:drawableLeft="@drawable/ic_trakt"
                     android:drawablePadding="8dp"
+                    android:drawableStart="@drawable/ic_trakt"
                     android:text="@string/connect_trakt" />
             </LinearLayout>
         </LinearLayout>
@@ -117,7 +119,8 @@
         android:id="@+id/buttonFirstRunDismiss"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_gravity="top|right"
+        android:layout_gravity="top|end|right"
+        android:layout_marginEnd="@dimen/default_padding"
         android:layout_marginRight="@dimen/default_padding"
         android:layout_marginTop="@dimen/default_padding"
         android:background="?attr/custom_list_selector"

From 6ed15480005513484203b2c9c23e5d2357559759 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 11:19:41 +0100
Subject: [PATCH 61/74] More carefully check episode data from TVDb.

- Also use Integer instead of Long to conserve memory.
---
 .../seriesguide/provider/SeriesContract.java  |   4 +
 .../seriesguide/util/DBUtils.java             |  30 ++--
 .../com/battlelancer/thetvdbapi/TheTVDB.java  | 128 +++++++++---------
 3 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/provider/SeriesContract.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/provider/SeriesContract.java
index e7308518f6..4222849aa2 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/provider/SeriesContract.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/provider/SeriesContract.java
@@ -323,6 +323,10 @@ public static Uri buildEpisodeUri(String episodeId) {
             return CONTENT_URI.buildUpon().appendPath(episodeId).build();
         }
 
+        public static Uri buildEpisodeUri(int episodeId) {
+            return buildEpisodeUri(String.valueOf(episodeId));
+        }
+
         public static String getEpisodeId(Uri uri) {
             return uri.getLastPathSegment();
         }
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
index f1c5381638..1e2e728d2e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/DBUtils.java
@@ -543,17 +543,17 @@ public static void deleteShow(Context context, String showId, ProgressDialog pro
      * 
      * @return HashMap containing the shows existing episodes
      */
-    public static HashMap<Long, Long> getEpisodeMapForShow(Context context, int showTvdbId) {
-        Cursor eptest = context.getContentResolver().query(
+    public static HashMap<Integer, Long> getEpisodeMapForShow(Context context, int showTvdbId) {
+        Cursor episodes = context.getContentResolver().query(
                 Episodes.buildEpisodesOfShowUri(showTvdbId), new String[] {
                         Episodes._ID, Episodes.LAST_EDITED
                 }, null, null, null);
-        HashMap<Long, Long> episodeMap = new HashMap<Long, Long>();
-        if (eptest != null) {
-            while (eptest.moveToNext()) {
-                episodeMap.put(eptest.getLong(0), eptest.getLong(1));
+        HashMap<Integer, Long> episodeMap = new HashMap<>();
+        if (episodes != null) {
+            while (episodes.moveToNext()) {
+                episodeMap.put(episodes.getInt(0), episodes.getLong(1));
             }
-            eptest.close();
+            episodes.close();
         }
         return episodeMap;
     }
@@ -564,20 +564,20 @@ public static HashMap<Long, Long> getEpisodeMapForShow(Context context, int show
      * 
      * @return HashMap containing the shows existing seasons
      */
-    public static HashSet<Long> getSeasonIDsForShow(Context context, int showTvdbId) {
-        Cursor setest = context.getContentResolver().query(
+    public static HashSet<Integer> getSeasonIdsOfShow(Context context, int showTvdbId) {
+        Cursor seasons = context.getContentResolver().query(
                 Seasons.buildSeasonsOfShowUri(showTvdbId),
                 new String[] {
                     Seasons._ID
                 }, null, null, null);
-        HashSet<Long> seasonIDs = new HashSet<Long>();
-        if (setest != null) {
-            while (setest.moveToNext()) {
-                seasonIDs.add(setest.getLong(0));
+        HashSet<Integer> seasonIds = new HashSet<>();
+        if (seasons != null) {
+            while (seasons.moveToNext()) {
+                seasonIds.add(seasons.getInt(0));
             }
-            setest.close();
+            seasons.close();
         }
-        return seasonIDs;
+        return seasonIds;
     }
 
     /**
diff --git a/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java b/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java
index 247656ff6b..69dba8cd88 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/thetvdbapi/TheTVDB.java
@@ -74,12 +74,13 @@
 import retrofit.RetrofitError;
 
 /**
- * Provides access to the TheTVDb.com XML API throwing in some additional data
- * from trakt.tv here and there.
+ * Provides access to the TheTVDb.com XML API throwing in some additional data from trakt.tv here
+ * and there.
  */
 public class TheTVDB {
 
     public interface ShowStatus {
+
         int CONTINUING = 1;
         int ENDED = 0;
         int UNKNOWN = -1;
@@ -96,7 +97,7 @@ public interface ShowStatus {
      */
     public static boolean isUpdateShow(String showId, long currentTime, Context context) {
         final Cursor show = context.getContentResolver().query(Shows.buildShowUri(showId),
-                new String[] {
+                new String[]{
                         Shows._ID, Shows.LASTUPDATED
                 }, null, null, null);
         boolean isUpdate = false;
@@ -113,14 +114,12 @@ public static boolean isUpdateShow(String showId, long currentTime, Context cont
     }
 
     /**
-     * Adds a show and its episodes. If it already exists updates them. This
-     * uses two consequent connections. The first one downloads the base series
-     * record, to check if the show is already in the database. The second
-     * downloads all episode information. This allows for a smaller download, if
-     * a show already exists in your database.
-     * 
-     * @return true if show and its episodes were added, false if it already
-     *         exists
+     * Adds a show and its episodes. If it already exists updates them. This uses two consequent
+     * connections. The first one downloads the base series record, to check if the show is already
+     * in the database. The second downloads all episode information. This allows for a smaller
+     * download, if a show already exists in your database.
+     *
+     * @return true if show and its episodes were added, false if it already exists
      */
     public static boolean addShow(int showTvdbId, List<TvShow> seenShows,
             List<TvShow> collectedShows, Context context) throws SAXException {
@@ -142,8 +141,7 @@ public static boolean addShow(int showTvdbId, List<TvShow> seenShows,
     }
 
     /**
-     * Updates all show information. Adds new, updates changed and removes
-     * orphaned episodes.
+     * Updates all show information. Adds new, updates changed and removes orphaned episodes.
      */
     public static void updateShow(int showTvdbId, Context context) throws SAXException {
         String language = DisplaySettings.getContentLanguage(context);
@@ -155,9 +153,9 @@ public static void updateShow(int showTvdbId, Context context) throws SAXExcepti
     }
 
     /**
-     * Search for shows which include a certain keyword in their title.
-     * Dependent on the TheTVDB search algorithms.
-     * 
+     * Search for shows which include a certain keyword in their title. Dependent on the TheTVDB
+     * search algorithms.
+     *
      * @return a List with SearchResult objects, max 100
      */
     public static List<SearchResult> searchShow(String title, Context context) throws IOException,
@@ -225,7 +223,7 @@ public static int[] deltaUpdateShows(long currentTime, Context context) {
         final List<Integer> updatableShowIds = Lists.newArrayList();
 
         // get existing show ids
-        final Cursor shows = context.getContentResolver().query(Shows.CONTENT_URI, new String[] {
+        final Cursor shows = context.getContentResolver().query(Shows.CONTENT_URI, new String[]{
                 Shows._ID, Shows.LASTUPDATED
         }, null, null, null);
 
@@ -253,8 +251,8 @@ public static int[] deltaUpdateShows(long currentTime, Context context) {
     }
 
     /**
-     * Fetches episodes for the given show from TVDb, adds database ops for
-     * them. Then adds all information to the database.
+     * Fetches episodes for the given show from TVDb, adds database ops for them. Then adds all
+     * information to the database.
      */
     private static void getEpisodesAndUpdateDatabase(Context context, Show show,
             String language, final ArrayList<ContentProviderOperation> batch)
@@ -295,12 +293,11 @@ private static void storeTraktFlags(int showTvdbId, List<TvShow> shows, Context
     }
 
     /**
-     * Get details for one show, identified by the given series TVDb id. Tries
-     * to fetch additional information from trakt.
-     * 
-     * @param language A TVDb language code (see <a
-     *            href="http://www.thetvdb.com/wiki/index.php/API:languages.xml"
-     *            >TVDb wiki</a>).
+     * Get details for one show, identified by the given series TVDb id. Tries to fetch additional
+     * information from trakt.
+     *
+     * @param language A TVDb language code (see <a href="http://www.thetvdb.com/wiki/index.php/API:languages.xml"
+     *                 >TVDb wiki</a>).
      */
     private static Show fetchShow(int showTvdbId, String language, Context context)
             throws SAXException {
@@ -343,9 +340,8 @@ private static Show fetchShow(int showTvdbId, String language, Context context)
     }
 
     /**
-     * Get a show from TVDb. Already tries to download the show poster if there
-     * is one.
-     * 
+     * Get a show from TVDb. Already tries to download the show poster if there is one.
+     *
      * @param url API call to get the show.
      * @return The show wrapped in a {@link Show} object
      * @throws SAXException If anything goes wrong.
@@ -476,10 +472,9 @@ private static ArrayList<ContentValues> fetchEpisodes(
     }
 
     /**
-     * Loads the given zipped XML and parses containing episodes to create an
-     * array of {@link ContentValues} for new episodes.<br>
-     * Adds update ops for updated episodes and delete ops for local orphaned
-     * episodes to the given {@link ContentProviderOperation} batch.
+     * Loads the given zipped XML and parses containing episodes to create an array of {@link
+     * ContentValues} for new episodes.<br> Adds update ops for updated episodes and delete ops for
+     * local orphaned episodes to the given {@link ContentProviderOperation} batch.
      */
     private static ArrayList<ContentValues> parseEpisodes(
             final ArrayList<ContentProviderOperation> batch, String url, final Show show,
@@ -491,28 +486,39 @@ private static ArrayList<ContentValues> parseEpisodes(
         RootElement root = new RootElement("Data");
         Element episode = root.getChild("Episode");
 
-        final HashMap<Long, Long> episodeIDs = DBUtils.getEpisodeMapForShow(context, show.tvdbId);
-        final HashMap<Long, Long> existingEpisodeIds = new HashMap<Long, Long>(episodeIDs);
-        final HashSet<Long> existingSeasonIDs = DBUtils.getSeasonIDsForShow(context, show.tvdbId);
+        final HashMap<Integer, Long> localEpisodeIds = DBUtils
+                .getEpisodeMapForShow(context, show.tvdbId);
+        final HashMap<Integer, Long> removableEpisodeIds = new HashMap<>(
+                localEpisodeIds); // just copy episodes list, then remove valid ones
+        final HashSet<Integer> localSeasonIds = DBUtils.getSeasonIdsOfShow(context, show.tvdbId);
         // store updated seasons to avoid duplicate ops
-        final HashSet<Long> updatedSeasonIDs = new HashSet<Long>();
+        final HashSet<Integer> seasonIdsToUpdate = new HashSet<>();
         final ContentValues values = new ContentValues();
 
         // set handlers for elements we want to react to
         episode.setEndElementListener(new EndElementListener() {
             public void end() {
-                long episodeId = values.getAsLong(Episodes._ID);
-                existingEpisodeIds.remove(episodeId);
+                Integer episodeId = values.getAsInteger(Episodes._ID);
+                if (episodeId == null || episodeId <= 0) {
+                    // invalid id, skip
+                    return;
+                }
 
-                if (episodeIDs.containsKey(episodeId)) {
+                // don't clean up this episode
+                removableEpisodeIds.remove(episodeId);
+
+                // decide whether to insert or update
+                if (localEpisodeIds.containsKey(episodeId)) {
                     /*
                      * Update uses provider ops which take a long time. Only
                      * update if episode was edited on TVDb or is not older than
                      * a month (ensures show air time changes get stored).
                      */
-                    long lastEditEpoch = episodeIDs.get(episodeId);
-                    if (lastEditEpoch < values.getAsLong(Episodes.LAST_EDITED)
-                            || dateLastMonthEpoch < lastEditEpoch) {
+                    Long lastEditEpoch = localEpisodeIds.get(episodeId);
+                    Long lastEditEpochNew = values.getAsLong(Episodes.LAST_EDITED);
+                    if (lastEditEpoch != null && lastEditEpochNew != null
+                            && (lastEditEpoch < lastEditEpochNew
+                            || dateLastMonthEpoch < lastEditEpoch)) {
                         // complete update op for episode
                         batch.add(DBUtils.buildEpisodeUpdateOp(values));
                     }
@@ -521,12 +527,11 @@ public void end() {
                     newEpisodesValues.add(new ContentValues(values));
                 }
 
-                long seasonid = values.getAsLong(Seasons.REF_SEASON_ID);
-                if (!updatedSeasonIDs.contains(seasonid)) {
+                Integer seasonId = values.getAsInteger(Seasons.REF_SEASON_ID);
+                if (seasonId != null && !seasonIdsToUpdate.contains(seasonId)) {
                     // add insert/update op for season
-                    batch.add(DBUtils.buildSeasonOp(values,
-                            !existingSeasonIDs.contains(seasonid)));
-                    updatedSeasonIDs.add(values.getAsLong(Seasons.REF_SEASON_ID));
+                    batch.add(DBUtils.buildSeasonOp(values, !localSeasonIds.contains(seasonId)));
+                    seasonIdsToUpdate.add(values.getAsInteger(Seasons.REF_SEASON_ID));
                 }
 
                 values.clear();
@@ -628,20 +633,19 @@ public void end(String body) {
 
         downloadAndParse(url, root.getContentHandler(), true);
 
-        // add delete ops for left over episodeIds in our db
-        for (Long id : existingEpisodeIds.keySet()) {
-            batch.add(ContentProviderOperation.newDelete(Episodes.buildEpisodeUri(String
-                    .valueOf(id))).build());
+        // add delete ops for leftover episodeIds in our db
+        for (Integer episodeId : removableEpisodeIds.keySet()) {
+            batch.add(ContentProviderOperation.newDelete(Episodes.buildEpisodeUri(episodeId))
+                    .build());
         }
 
         return newEpisodesValues;
     }
 
     /**
-     * Downloads the XML or ZIP file from the given URL, passing a valid
-     * response to
-     * {@link Xml#parse(InputStream, android.util.Xml.Encoding, ContentHandler)}
-     * using the given {@link ContentHandler}.
+     * Downloads the XML or ZIP file from the given URL, passing a valid response to {@link
+     * Xml#parse(InputStream, android.util.Xml.Encoding, ContentHandler)} using the given {@link
+     * ContentHandler}.
      */
     private static void downloadAndParse(String urlString,
             ContentHandler handler, boolean isZipFile) throws SAXException {
@@ -685,15 +689,12 @@ private static void downloadAndParse(String urlString,
     }
 
     /**
-     * Tries to download art from the thetvdb banner TVDB_MIRROR. Ignores blank
-     * ("") or null paths and skips existing images. Returns true even if there
-     * was no art downloaded.
-     * 
+     * Tries to download art from the thetvdb banner TVDB_MIRROR. Ignores blank ("") or null paths
+     * and skips existing images. Returns true even if there was no art downloaded.
+     *
      * @param fileName of image
-     * @param isPoster
-     * @param context
-     * @return false if not all images could be fetched. true otherwise, even if
-     *         nothing was downloaded
+     * @return false if not all images could be fetched. true otherwise, even if nothing was
+     * downloaded
      */
     public static boolean fetchArt(String fileName, boolean isPoster, Context context) {
         if (TextUtils.isEmpty(fileName) || context == null) {
@@ -768,6 +769,7 @@ private static Bitmap downloadBitmap(String url, Context context) {
      * reaches EOF.
      */
     static class FlushedInputStream extends FilterInputStream {
+
         public FlushedInputStream(InputStream inputStream) {
             super(inputStream);
         }

From 098fb18ffbdda653f34edd0bd5bbc87880a32278 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 13:38:20 +0100
Subject: [PATCH 62/74] Extract UpcomingSlowAdapter.

- Also split up getView into bindView and newView.
---
 .../adapters/UpcomingSlowAdapter.java         | 328 +++++++++++++++++
 .../seriesguide/ui/UpcomingFragment.java      | 334 +-----------------
 2 files changed, 342 insertions(+), 320 deletions(-)
 create mode 100644 SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/UpcomingSlowAdapter.java

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/UpcomingSlowAdapter.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/UpcomingSlowAdapter.java
new file mode 100644
index 0000000000..7c202f836a
--- /dev/null
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/adapters/UpcomingSlowAdapter.java
@@ -0,0 +1,328 @@
+package com.battlelancer.seriesguide.adapters;
+
+import com.battlelancer.seriesguide.WatchedBox;
+import com.battlelancer.seriesguide.enums.EpisodeFlags;
+import com.battlelancer.seriesguide.util.EpisodeTools;
+import com.battlelancer.seriesguide.util.FlagTask;
+import com.battlelancer.seriesguide.util.ImageProvider;
+import com.battlelancer.seriesguide.util.Utils;
+import com.tonicartos.widget.stickygridheaders.StickyGridHeadersBaseAdapter;
+import com.uwetrottmann.androidutils.CheatSheet;
+import com.uwetrottmann.androidutils.Lists;
+import com.uwetrottmann.androidutils.Maps;
+import com.uwetrottmann.seriesguide.R;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.preference.PreferenceManager;
+import android.support.v4.widget.CursorAdapter;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
+import static com.battlelancer.seriesguide.ui.UpcomingFragment.UpcomingQuery;
+
+/**
+ * Adapter for {@link com.battlelancer.seriesguide.ui.UpcomingFragment} with optimizations for image
+ * loading for smoother scrolling.
+ */
+public class UpcomingSlowAdapter extends CursorAdapter implements StickyGridHeadersBaseAdapter {
+
+    private final int LAYOUT = R.layout.upcoming_row;
+
+    private final int LAYOUT_HEADER = R.layout.upcoming_header;
+
+    private final CheckInListener mCheckInListener;
+
+    private LayoutInflater mLayoutInflater;
+
+    private SharedPreferences mPrefs;
+
+    private List<HeaderData> mHeaders;
+
+    private DataSetObserverExtension mHeaderChangeDataObserver;
+
+    public interface CheckInListener {
+
+        public void onCheckinEpisode(int episodeTvdbId);
+        
+    }
+
+    public UpcomingSlowAdapter(Context context, Cursor c, int flags,
+            CheckInListener checkInListener) {
+        super(context, c, flags);
+        mLayoutInflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        mCheckInListener = checkInListener;
+    }
+
+    /**
+     * Whether to show episodes grouped by day with header. Disable headers for larger data sets as
+     * calculating them is expensive.
+     */
+    public void setIsShowingHeaders(boolean isShowingHeaders) {
+        if (isShowingHeaders) {
+            if (mHeaderChangeDataObserver == null) {
+                mHeaderChangeDataObserver = new DataSetObserverExtension();
+                registerDataSetObserver(mHeaderChangeDataObserver);
+            }
+        } else {
+            if (mHeaderChangeDataObserver != null) {
+                unregisterDataSetObserver(mHeaderChangeDataObserver);
+            }
+            mHeaders = null;
+            mHeaderChangeDataObserver = null;
+        }
+    }
+
+    @Override
+    public void bindView(View view, final Context context, Cursor cursor) {
+        ViewHolder viewHolder = (ViewHolder) view.getTag();
+
+        // watched box
+        // save rowid to hand over to OnClick event listener
+        final int showTvdbId = cursor.getInt(UpcomingQuery.REF_SHOW_ID);
+        final int season = cursor.getInt(UpcomingQuery.SEASON);
+        final int episodeTvdbId = cursor.getInt(UpcomingQuery._ID);
+        final int episode = cursor.getInt(UpcomingQuery.NUMBER);
+        viewHolder.watchedBox.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                WatchedBox box = (WatchedBox) v;
+                new FlagTask(context, showTvdbId)
+                        .episodeWatched(episodeTvdbId, season, episode,
+                                EpisodeTools.isWatched(box.getEpisodeFlag())
+                                        ? EpisodeFlags.UNWATCHED : EpisodeFlags.WATCHED)
+                        .execute();
+            }
+        });
+        viewHolder.watchedBox.setEpisodeFlag(cursor.getInt(UpcomingQuery.WATCHED));
+        CheatSheet.setup(viewHolder.watchedBox,
+                EpisodeTools.isWatched(viewHolder.watchedBox.getEpisodeFlag())
+                        ? R.string.unmark_episode : R.string.mark_episode);
+
+        // checkin button (not avail in all layouts)
+        if (viewHolder.buttonCheckin != null) {
+            viewHolder.buttonCheckin.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mCheckInListener != null) {
+                        mCheckInListener.onCheckinEpisode(episodeTvdbId);
+                    }
+                }
+            });
+            CheatSheet.setup(viewHolder.buttonCheckin, R.string.checkin);
+        }
+
+        // number and show
+        final String number = Utils.getEpisodeNumber(context, season, episode);
+        viewHolder.show.setText(number + " | " + cursor.getString(UpcomingQuery.SHOW_TITLE));
+
+        // title
+        viewHolder.episode.setText(cursor.getString(UpcomingQuery.TITLE));
+
+        // meta data: time, day and network
+        StringBuilder metaText = new StringBuilder();
+        final long airtime = cursor.getLong(UpcomingQuery.FIRSTAIREDMS);
+        if (airtime != -1) {
+            String[] timeAndDay = Utils.formatToTimeAndDay(airtime, context);
+            // 10:00 | Fri in 3 days, 10:00 PM | Mon 23 Jul
+            metaText.append(timeAndDay[0]).append(" | ").append(timeAndDay[1]).append(" ")
+                    .append(timeAndDay[2]);
+        }
+        final String network = cursor.getString(UpcomingQuery.SHOW_NETWORK);
+        if (!TextUtils.isEmpty(network)) {
+            metaText.append("\n").append(network);
+        }
+        viewHolder.meta.setText(metaText);
+
+        // set poster
+        final String imagePath = cursor.getString(UpcomingQuery.SHOW_POSTER);
+        ImageProvider.getInstance(context).loadPosterThumb(viewHolder.poster, imagePath);
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        View v = mLayoutInflater.inflate(LAYOUT, parent, false);
+
+        ViewHolder viewHolder = new ViewHolder();
+        viewHolder.episode = (TextView) v
+                .findViewById(R.id.textViewUpcomingEpisode);
+        viewHolder.show = (TextView) v.findViewById(R.id.textViewUpcomingShow);
+        viewHolder.watchedBox = (WatchedBox) v.findViewById(R.id.watchedBoxUpcoming);
+        viewHolder.meta = (TextView) v.findViewById(R.id.textViewUpcomingMeta);
+        viewHolder.poster = (ImageView) v.findViewById(R.id.poster);
+        viewHolder.buttonCheckin = v.findViewById(R.id.imageViewUpcomingCheckIn);
+
+        v.setTag(viewHolder);
+
+        return v;
+    }
+
+    private long getHeaderId(int position) {
+        Object obj = getItem(position);
+        if (obj != null) {
+                /*
+                 * Maps all episodes airing the same day to the same id (which
+                 * equals the time midnight of their air day).
+                 */
+            @SuppressWarnings("resource")
+            Cursor item = (Cursor) obj;
+            long airtime = item.getLong(UpcomingQuery.FIRSTAIREDMS);
+            Calendar cal = Utils.getAirtimeCalendar(airtime, mPrefs);
+            cal.set(Calendar.HOUR_OF_DAY, 1);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+            cal.set(Calendar.MILLISECOND, 0);
+            long airDay = cal.getTimeInMillis();
+            return airDay;
+        }
+        return 0;
+    }
+
+    @Override
+    public int getCountForHeader(int position) {
+        if (mHeaders != null) {
+            return mHeaders.get(position).getCount();
+        }
+        return 0;
+    }
+
+    @Override
+    public int getNumHeaders() {
+        if (mHeaders != null) {
+            return mHeaders.size();
+        }
+        return 0;
+    }
+
+    @Override
+    public View getHeaderView(int position, View convertView, ViewGroup parent) {
+        // get header position for item position
+        position = mHeaders.get(position).getRefPosition();
+
+        Object obj = getItem(position);
+        if (obj == null) {
+            return null;
+        }
+
+        HeaderViewHolder holder;
+        if (convertView == null) {
+            convertView = mLayoutInflater.inflate(LAYOUT_HEADER, null);
+
+            holder = new HeaderViewHolder();
+            holder.day = (TextView) convertView.findViewById(R.id.textViewUpcomingHeader);
+
+            convertView.setTag(holder);
+        } else {
+            holder = (HeaderViewHolder) convertView.getTag();
+        }
+
+        @SuppressWarnings("resource")
+        Cursor item = (Cursor) obj;
+        long airtime = item.getLong(UpcomingQuery.FIRSTAIREDMS);
+        Calendar cal = Utils.getAirtimeCalendar(airtime, mPrefs);
+        cal.set(Calendar.HOUR_OF_DAY, 1);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        long airDay = cal.getTimeInMillis();
+
+        String dayAndTime = Utils.formatToDayAndTimeWithoutOffsets(mContext, airDay);
+
+        holder.day.setText(dayAndTime);
+
+        return convertView;
+    }
+
+    protected List<HeaderData> generateHeaderList() {
+        Map<Long, HeaderData> mapping = Maps.newHashMap();
+        List<HeaderData> headers = Lists.newArrayList();
+
+        for (int i = 0; i < getCount(); i++) {
+            long headerId = getHeaderId(i);
+            HeaderData headerData = mapping.get(headerId);
+            if (headerData == null) {
+                headerData = new HeaderData(i);
+                headers.add(headerData);
+            }
+            headerData.incrementCount();
+            mapping.put(headerId, headerData);
+        }
+
+        return headers;
+    }
+
+    @Override
+    public Cursor swapCursor(Cursor newCursor) {
+        mHeaders = null;
+        return super.swapCursor(newCursor);
+    }
+
+    private final class DataSetObserverExtension extends DataSetObserver {
+
+        @Override
+        public void onChanged() {
+            mHeaders = generateHeaderList();
+        }
+
+        @Override
+        public void onInvalidated() {
+            mHeaders = generateHeaderList();
+        }
+    }
+
+    private class HeaderData {
+
+        private int mCount;
+
+        private int mRefPosition;
+
+        public HeaderData(int refPosition) {
+            mRefPosition = refPosition;
+            mCount = 0;
+        }
+
+        public int getCount() {
+            return mCount;
+        }
+
+        public int getRefPosition() {
+            return mRefPosition;
+        }
+
+        public void incrementCount() {
+            mCount++;
+        }
+    }
+
+    static class ViewHolder {
+
+        public TextView show;
+
+        public TextView episode;
+
+        public WatchedBox watchedBox;
+
+        public View buttonCheckin;
+
+        public TextView meta;
+
+        public ImageView poster;
+    }
+
+    static class HeaderViewHolder {
+
+        public TextView day;
+
+    }
+}
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
index f4ba7f3e7e..25a3370e4e 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/UpcomingFragment.java
@@ -19,6 +19,7 @@
 
 import com.actionbarsherlock.app.SherlockFragment;
 import com.battlelancer.seriesguide.WatchedBox;
+import com.battlelancer.seriesguide.adapters.UpcomingSlowAdapter;
 import com.battlelancer.seriesguide.enums.EpisodeFlags;
 import com.battlelancer.seriesguide.provider.SeriesContract.Episodes;
 import com.battlelancer.seriesguide.provider.SeriesContract.Shows;
@@ -29,49 +30,34 @@
 import com.battlelancer.seriesguide.util.DBUtils;
 import com.battlelancer.seriesguide.util.EpisodeTools;
 import com.battlelancer.seriesguide.util.FlagTask;
-import com.battlelancer.seriesguide.util.ImageProvider;
 import com.battlelancer.seriesguide.util.Utils;
-import com.tonicartos.widget.stickygridheaders.StickyGridHeadersBaseAdapter;
 import com.tonicartos.widget.stickygridheaders.StickyGridHeadersGridView;
-import com.uwetrottmann.androidutils.CheatSheet;
-import com.uwetrottmann.androidutils.Lists;
-import com.uwetrottmann.androidutils.Maps;
 import com.uwetrottmann.seriesguide.R;
 
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.database.Cursor;
-import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
-import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
-
 public class UpcomingFragment extends SherlockFragment implements
         LoaderManager.LoaderCallbacks<Cursor>, OnItemClickListener,
-        OnSharedPreferenceChangeListener {
+        OnSharedPreferenceChangeListener, UpcomingSlowAdapter.CheckInListener {
 
     private static final int CONTEXT_FLAG_WATCHED_ID = 0;
 
@@ -79,7 +65,7 @@ public class UpcomingFragment extends SherlockFragment implements
 
     private static final int CONTEXT_CHECKIN_ID = 2;
 
-    private SlowAdapter mAdapter;
+    private UpcomingSlowAdapter mAdapter;
 
     private boolean mDualPane;
 
@@ -88,10 +74,11 @@ public class UpcomingFragment extends SherlockFragment implements
     private TextView mEmptyView;
 
     /**
-     * Data which has to be passed when creating {@link UpcomingFragment}. All
-     * Bundle extras are strings, except LOADER_ID and EMPTY_STRING_ID.
+     * Data which has to be passed when creating {@link UpcomingFragment}. All Bundle extras are
+     * strings, except LOADER_ID and EMPTY_STRING_ID.
      */
     public interface InitBundle {
+
         String TYPE = "type";
 
         String ANALYTICS_TAG = "analyticstag";
@@ -102,12 +89,14 @@ public interface InitBundle {
     }
 
     public interface ActivityType {
+
         public String UPCOMING = "upcoming";
         public String RECENT = "recent";
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.upcoming_fragment, container, false);
 
         mEmptyView = (TextView) v.findViewById(R.id.emptyViewUpcoming);
@@ -130,7 +119,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         mDualPane = detailsFragment != null && detailsFragment.getVisibility() == View.VISIBLE;
 
         // setup adapter
-        mAdapter = new SlowAdapter(getActivity(), null, 0);
+        mAdapter = new UpcomingSlowAdapter(getActivity(), null, 0, this);
         mAdapter.setIsShowingHeaders(!ActivitySettings.isInfiniteActivity(getActivity()));
 
         // setup grid view
@@ -202,7 +191,8 @@ public boolean onContextItemSelected(MenuItem item) {
         return super.onContextItemSelected(item);
     }
 
-    private void onCheckinEpisode(int episodeTvdbId) {
+    @Override
+    public void onCheckinEpisode(int episodeTvdbId) {
         CheckInDialogFragment f = CheckInDialogFragment.newInstance(getActivity(), episodeTvdbId);
         f.show(getFragmentManager(), "checkin-dialog");
     }
@@ -288,7 +278,8 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
     }
 
     public interface UpcomingQuery {
-        String[] PROJECTION = new String[] {
+
+        String[] PROJECTION = new String[]{
                 Tables.EPISODES + "." + Episodes._ID, Episodes.TITLE, Episodes.WATCHED,
                 Episodes.NUMBER, Episodes.SEASON, Episodes.FIRSTAIREDMS, Shows.TITLE,
                 Shows.AIRSTIME, Shows.NETWORK, Shows.POSTER, Shows.REF_SHOW_ID, Shows.IMDBID
@@ -332,301 +323,4 @@ public interface UpcomingQuery {
 
     }
 
-    private class SlowAdapter extends CursorAdapter implements StickyGridHeadersBaseAdapter {
-
-        private final int LAYOUT = R.layout.upcoming_row;
-
-        private final int LAYOUT_HEADER = R.layout.upcoming_header;
-
-        private LayoutInflater mLayoutInflater;
-
-        private SharedPreferences mPrefs;
-
-        private List<HeaderData> mHeaders;
-
-        private DataSetObserverExtension mHeaderChangeDataObserver;
-
-        public SlowAdapter(Context context, Cursor c, int flags) {
-            super(context, c, flags);
-            mLayoutInflater = (LayoutInflater) context
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        }
-
-        /**
-         * Whether to show episodes grouped by day with header. Disable headers
-         * for larger data sets as calculating them is expensive.
-         */
-        public void setIsShowingHeaders(boolean isShowingHeaders) {
-            if (isShowingHeaders) {
-                if (mHeaderChangeDataObserver == null) {
-                    mHeaderChangeDataObserver = new DataSetObserverExtension();
-                    registerDataSetObserver(mHeaderChangeDataObserver);
-                }
-            } else {
-                if (mHeaderChangeDataObserver != null) {
-                    unregisterDataSetObserver(mHeaderChangeDataObserver);
-                }
-                mHeaders = null;
-                mHeaderChangeDataObserver = null;
-            }
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if (!mDataValid) {
-                throw new IllegalStateException(
-                        "this should only be called when the cursor is valid");
-            }
-            if (!mCursor.moveToPosition(position)) {
-                throw new IllegalStateException("couldn't move cursor to position " + position);
-            }
-
-            final ViewHolder viewHolder;
-
-            if (convertView == null) {
-                convertView = mLayoutInflater.inflate(LAYOUT, null);
-
-                viewHolder = new ViewHolder();
-                viewHolder.episode = (TextView) convertView
-                        .findViewById(R.id.textViewUpcomingEpisode);
-                viewHolder.show = (TextView) convertView.findViewById(R.id.textViewUpcomingShow);
-                viewHolder.watchedBox = (WatchedBox) convertView
-                        .findViewById(R.id.watchedBoxUpcoming);
-                viewHolder.meta = (TextView) convertView
-                        .findViewById(R.id.textViewUpcomingMeta);
-                viewHolder.poster = (ImageView) convertView.findViewById(R.id.poster);
-                viewHolder.buttonCheckin = convertView.findViewById(R.id.imageViewUpcomingCheckIn);
-
-                convertView.setTag(viewHolder);
-            } else {
-                viewHolder = (ViewHolder) convertView.getTag();
-            }
-
-            // watched box
-            // save rowid to hand over to OnClick event listener
-            final int showTvdbId = mCursor.getInt(UpcomingQuery.REF_SHOW_ID);
-            final int season = mCursor.getInt(UpcomingQuery.SEASON);
-            final int episodeTvdbId = mCursor.getInt(UpcomingQuery._ID);
-            final int episode = mCursor.getInt(UpcomingQuery.NUMBER);
-            viewHolder.watchedBox.setOnClickListener(new OnClickListener() {
-                public void onClick(View v) {
-                    WatchedBox box = (WatchedBox) v;
-                    new FlagTask(mContext, showTvdbId)
-                            .episodeWatched(episodeTvdbId, season, episode,
-                                    EpisodeTools.isWatched(box.getEpisodeFlag())
-                                            ? EpisodeFlags.UNWATCHED : EpisodeFlags.WATCHED)
-                            .execute();
-                }
-            });
-            viewHolder.watchedBox.setEpisodeFlag(mCursor.getInt(UpcomingQuery.WATCHED));
-            CheatSheet.setup(viewHolder.watchedBox,
-                    EpisodeTools.isWatched(viewHolder.watchedBox.getEpisodeFlag())
-                            ? R.string.unmark_episode : R.string.mark_episode);
-
-            // checkin button (not avail in all layouts)
-            if (viewHolder.buttonCheckin != null) {
-                viewHolder.buttonCheckin.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        onCheckinEpisode(episodeTvdbId);
-                    }
-                });
-                CheatSheet.setup(viewHolder.buttonCheckin, R.string.checkin);
-            }
-
-            // number and show
-            final String number = Utils.getEpisodeNumber(mContext, season, episode);
-            viewHolder.show.setText(number + " | " + mCursor.getString(UpcomingQuery.SHOW_TITLE));
-
-            // title
-            viewHolder.episode.setText(mCursor.getString(UpcomingQuery.TITLE));
-
-            // meta data: time, day and network
-            StringBuilder metaText = new StringBuilder();
-            final long airtime = mCursor.getLong(UpcomingQuery.FIRSTAIREDMS);
-            if (airtime != -1) {
-                String[] timeAndDay = Utils.formatToTimeAndDay(airtime, mContext);
-                // 10:00 | Fri in 3 days, 10:00 PM | Mon 23 Jul
-                metaText.append(timeAndDay[0]).append(" | ").append(timeAndDay[1]).append(" ")
-                        .append(timeAndDay[2]);
-            }
-            final String network = mCursor.getString(UpcomingQuery.SHOW_NETWORK);
-            if (!TextUtils.isEmpty(network)) {
-                metaText.append("\n").append(network);
-            }
-            viewHolder.meta.setText(metaText);
-
-            // set poster
-            final String imagePath = mCursor.getString(UpcomingQuery.SHOW_POSTER);
-            ImageProvider.getInstance(mContext).loadPosterThumb(viewHolder.poster, imagePath);
-
-            return convertView;
-        }
-
-        @Override
-        public void bindView(View view, Context context, Cursor cursor) {
-            // do nothing here
-        }
-
-        @Override
-        public View newView(Context context, Cursor cursor, ViewGroup parent) {
-            return mLayoutInflater.inflate(LAYOUT, parent, false);
-        }
-
-        private long getHeaderId(int position) {
-            Object obj = getItem(position);
-            if (obj != null) {
-                /*
-                 * Maps all episodes airing the same day to the same id (which
-                 * equals the time midnight of their air day).
-                 */
-                @SuppressWarnings("resource")
-                Cursor item = (Cursor) obj;
-                long airtime = item.getLong(UpcomingQuery.FIRSTAIREDMS);
-                Calendar cal = Utils.getAirtimeCalendar(airtime, mPrefs);
-                cal.set(Calendar.HOUR_OF_DAY, 1);
-                cal.set(Calendar.MINUTE, 0);
-                cal.set(Calendar.SECOND, 0);
-                cal.set(Calendar.MILLISECOND, 0);
-                long airDay = cal.getTimeInMillis();
-                return airDay;
-            }
-            return 0;
-        }
-
-        @Override
-        public int getCountForHeader(int position) {
-            if (mHeaders != null) {
-                return mHeaders.get(position).getCount();
-            }
-            return 0;
-        }
-
-        @Override
-        public int getNumHeaders() {
-            if (mHeaders != null) {
-                return mHeaders.size();
-            }
-            return 0;
-        }
-
-        @Override
-        public View getHeaderView(int position, View convertView, ViewGroup parent) {
-            // get header position for item position
-            position = mHeaders.get(position).getRefPosition();
-
-            Object obj = getItem(position);
-            if (obj == null) {
-                return null;
-            }
-
-            HeaderViewHolder holder;
-            if (convertView == null) {
-                convertView = mLayoutInflater.inflate(LAYOUT_HEADER, null);
-
-                holder = new HeaderViewHolder();
-                holder.day = (TextView) convertView.findViewById(R.id.textViewUpcomingHeader);
-
-                convertView.setTag(holder);
-            } else {
-                holder = (HeaderViewHolder) convertView.getTag();
-            }
-
-            @SuppressWarnings("resource")
-            Cursor item = (Cursor) obj;
-            long airtime = item.getLong(UpcomingQuery.FIRSTAIREDMS);
-            Calendar cal = Utils.getAirtimeCalendar(airtime, mPrefs);
-            cal.set(Calendar.HOUR_OF_DAY, 1);
-            cal.set(Calendar.MINUTE, 0);
-            cal.set(Calendar.SECOND, 0);
-            cal.set(Calendar.MILLISECOND, 0);
-            long airDay = cal.getTimeInMillis();
-
-            String dayAndTime = Utils.formatToDayAndTimeWithoutOffsets(mContext, airDay);
-
-            holder.day.setText(dayAndTime);
-
-            return convertView;
-        }
-
-        protected List<HeaderData> generateHeaderList() {
-            Map<Long, HeaderData> mapping = Maps.newHashMap();
-            List<HeaderData> headers = Lists.newArrayList();
-
-            for (int i = 0; i < getCount(); i++) {
-                long headerId = getHeaderId(i);
-                HeaderData headerData = mapping.get(headerId);
-                if (headerData == null) {
-                    headerData = new HeaderData(i);
-                    headers.add(headerData);
-                }
-                headerData.incrementCount();
-                mapping.put(headerId, headerData);
-            }
-
-            return headers;
-        }
-
-        @Override
-        public Cursor swapCursor(Cursor newCursor) {
-            mHeaders = null;
-            return super.swapCursor(newCursor);
-        }
-
-        private final class DataSetObserverExtension extends DataSetObserver {
-            @Override
-            public void onChanged() {
-                mHeaders = generateHeaderList();
-            }
-
-            @Override
-            public void onInvalidated() {
-                mHeaders = generateHeaderList();
-            }
-        }
-
-        private class HeaderData {
-            private int mCount;
-            private int mRefPosition;
-
-            public HeaderData(int refPosition) {
-                mRefPosition = refPosition;
-                mCount = 0;
-            }
-
-            public int getCount() {
-                return mCount;
-            }
-
-            public int getRefPosition() {
-                return mRefPosition;
-            }
-
-            public void incrementCount() {
-                mCount++;
-            }
-        }
-    }
-
-    static class ViewHolder {
-
-        public TextView show;
-
-        public TextView episode;
-
-        public WatchedBox watchedBox;
-
-        public View buttonCheckin;
-
-        public TextView meta;
-
-        public ImageView poster;
-    }
-
-    static class HeaderViewHolder {
-
-        public TextView day;
-
-    }
 }

From 438f279a95fc84f60081cce8d1c825516e132fa4 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 13:53:40 +0100
Subject: [PATCH 63/74] Use ABS activity for system UI hider to fix crash on
 HC.

---
 .../com/battlelancer/seriesguide/util/SystemUiHider.java | 9 ++++++---
 .../battlelancer/seriesguide/util/SystemUiHiderBase.java | 5 +++--
 .../seriesguide/util/SystemUiHiderHoneycomb.java         | 9 +++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.java
index e998ca1c04..95385493c5 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.java
@@ -1,6 +1,8 @@
 
 package com.battlelancer.seriesguide.util;
 
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
 import android.app.Activity;
 import android.os.Build;
 import android.view.View;
@@ -57,7 +59,7 @@ public abstract class SystemUiHider {
     /**
      * The activity associated with this UI hider object.
      */
-    protected Activity mActivity;
+    protected SherlockFragmentActivity mActivity;
 
     /**
      * The view on which {@link View#setSystemUiVisibility(int)} will be called.
@@ -92,7 +94,8 @@ public abstract class SystemUiHider {
      *            {@link #FLAG_HIDE_NAVIGATION}, and
      *            {@link #FLAG_LAYOUT_IN_SCREEN_OLDER_DEVICES}.
      */
-    public static SystemUiHider getInstance(Activity activity, View anchorView, int flags) {
+    public static SystemUiHider getInstance(SherlockFragmentActivity activity, View anchorView,
+            int flags) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             return new SystemUiHiderHoneycomb(activity, anchorView, flags);
         } else {
@@ -100,7 +103,7 @@ public static SystemUiHider getInstance(Activity activity, View anchorView, int
         }
     }
 
-    protected SystemUiHider(Activity activity, View anchorView, int flags) {
+    protected SystemUiHider(SherlockFragmentActivity activity, View anchorView, int flags) {
         mActivity = activity;
         mAnchorView = anchorView;
         mFlags = flags;
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderBase.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderBase.java
index 0706f4f682..400ac0b70b 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderBase.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderBase.java
@@ -1,7 +1,8 @@
 
 package com.battlelancer.seriesguide.util;
 
-import android.app.Activity;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
 import android.view.View;
 import android.view.WindowManager;
 
@@ -20,7 +21,7 @@ public class SystemUiHiderBase extends SystemUiHider {
      * Constructor not intended to be called by clients. Use
      * {@link SystemUiHider#getInstance} to obtain an instance.
      */
-    protected SystemUiHiderBase(Activity activity, View anchorView, int flags) {
+    protected SystemUiHiderBase(SherlockFragmentActivity activity, View anchorView, int flags) {
         super(activity, anchorView, flags);
     }
 
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderHoneycomb.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderHoneycomb.java
index a57b5d92bf..4ee8f11cd2 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderHoneycomb.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/SystemUiHiderHoneycomb.java
@@ -1,8 +1,9 @@
 
 package com.battlelancer.seriesguide.util;
 
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.os.Build;
 import android.view.View;
 import android.view.WindowManager;
@@ -43,7 +44,7 @@ public class SystemUiHiderHoneycomb extends SystemUiHiderBase {
      * Constructor not intended to be called by clients. Use
      * {@link SystemUiHider#getInstance} to obtain an instance.
      */
-    protected SystemUiHiderHoneycomb(Activity activity, View anchorView, int flags) {
+    protected SystemUiHiderHoneycomb(SherlockFragmentActivity activity, View anchorView, int flags) {
         super(activity, anchorView, flags);
 
         mShowFlags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
@@ -100,7 +101,7 @@ public void onSystemUiVisibilityChange(int vis) {
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
                     // Pre-Jelly Bean, we must manually hide the action bar
                     // and use the old window flags API.
-                    mActivity.getActionBar().hide();
+                    mActivity.getSupportActionBar().hide();
                     mActivity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                             WindowManager.LayoutParams.FLAG_FULLSCREEN);
                 }
@@ -115,7 +116,7 @@ public void onSystemUiVisibilityChange(int vis) {
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
                     // Pre-Jelly Bean, we must manually show the action bar
                     // and use the old window flags API.
-                    mActivity.getActionBar().show();
+                    mActivity.getSupportActionBar().show();
                     mActivity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
                 }
 

From d997b8abd83fe39c1e5681e569ab3e02baf421d0 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 13:58:24 +0100
Subject: [PATCH 64/74] Ensure there is a fragment manager to use.

- Fixes Play Store reported java.lang.NullPointerException in
com.battlelancer.seriesguide.ui.dialogs.ListsDialogFragment.showListsDialog.
---
 .../ui/dialogs/ListsDialogFragment.java       | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/ListsDialogFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/ListsDialogFragment.java
index 0a73a401c6..f164c7ae28 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/ListsDialogFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/dialogs/ListsDialogFragment.java
@@ -43,8 +43,8 @@
 import java.util.ArrayList;
 
 /**
- * Displays a dialog displaying all lists, allowing to add the given show,
- * season or episode to any number of them.
+ * Displays a dialog displaying all lists, allowing to add the given show, season or episode to any
+ * number of them.
  */
 public class ListsDialogFragment extends DialogFragment implements
         LoaderManager.LoaderCallbacks<Cursor>, OnItemClickListener {
@@ -59,6 +59,7 @@ public static ListsDialogFragment newInstance(String itemId, int itemType) {
     }
 
     private ListView mListView;
+
     private ListsAdapter mAdapter;
 
     @Override
@@ -74,7 +75,8 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         final View layout = inflater.inflate(R.layout.list_dialog, null);
 
         // buttons
@@ -96,7 +98,8 @@ public void onClick(View v) {
                 int itemType = getArguments().getInt("itemtype");
                 SparseBooleanArray checkedLists = mAdapter.getCheckedPositions();
 
-                final ArrayList<ContentProviderOperation> batch = com.uwetrottmann.androidutils.Lists
+                final ArrayList<ContentProviderOperation> batch = com.uwetrottmann.androidutils
+                        .Lists
                         .newArrayList();
 
                 for (int position = 0; position < mAdapter.getCount(); position++) {
@@ -161,21 +164,21 @@ public void onActivityCreated(Bundle args) {
             case 1:
                 // show
                 uri = Shows.buildShowUri(itemId);
-                projection = new String[] {
+                projection = new String[]{
                         Shows._ID, Shows.TITLE
                 };
                 break;
             case 2:
                 // season
                 uri = Seasons.buildSeasonUri(itemId);
-                projection = new String[] {
+                projection = new String[]{
                         Seasons._ID, Seasons.COMBINED
                 };
                 break;
             case 3:
                 // episode
                 uri = Episodes.buildEpisodeUri(itemId);
-                projection = new String[] {
+                projection = new String[]{
                         Episodes._ID, Episodes.TITLE
                 };
                 break;
@@ -241,6 +244,7 @@ public void onLoaderReset(Loader<Cursor> loader) {
     private class ListsAdapter extends CursorAdapter {
 
         private LayoutInflater mInflater;
+
         private SparseBooleanArray mCheckedItems;
 
         public ListsAdapter(Context context, Cursor c, int flags) {
@@ -299,7 +303,8 @@ public SparseBooleanArray getCheckedPositions() {
     }
 
     interface ListsQuery {
-        String[] PROJECTION = new String[] {
+
+        String[] PROJECTION = new String[]{
                 Tables.LISTS + "." + Lists._ID, Tables.LISTS + "." + Lists.LIST_ID, Lists.NAME,
                 ListItems.LIST_ITEM_ID
         };
@@ -312,14 +317,16 @@ interface ListsQuery {
     }
 
     /**
-     * Display a dialog which asks if the user wants to add the given show to
-     * one or more lists.
-     * 
-     * @param itemId TVDb/database id of the item to add
+     * Display a dialog which asks if the user wants to add the given show to one or more lists.
+     *
+     * @param itemId   TVDb/database id of the item to add
      * @param itemType type of the item to add (show, season or episode)
-     * @param fm
      */
     public static void showListsDialog(String itemId, int itemType, FragmentManager fm) {
+        if (fm == null) {
+            return;
+        }
+
         // DialogFragment.show() will take care of adding the fragment
         // in a transaction. We also want to remove any currently showing
         // dialog, so make our own transaction and take care of that here.

From 16b496d79b343f378c6fee437eeee2368da80350 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 14:02:04 +0100
Subject: [PATCH 65/74] Ensure there is a fragment manager when finished
 connecting trakt.

- Fixes Play Store reported java.lang.NullPointerException
in
com.battlelancer.seriesguide.ui.ConnectTraktCredentialsFragment$2$1.onPostExecu....
---
 .../ui/ConnectTraktCredentialsFragment.java           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java
index ab76f28a4f..5cd019a37f 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ConnectTraktCredentialsFragment.java
@@ -262,10 +262,13 @@ protected void onPostExecute(Response response) {
                                 }
                             } else {
                                 // show options after successful connection
-                                ConnectTraktFinishedFragment f = new ConnectTraktFinishedFragment();
-                                FragmentTransaction ft = getFragmentManager().beginTransaction();
-                                ft.replace(android.R.id.content, f);
-                                ft.commit();
+                                FragmentManager fm = getFragmentManager();
+                                if (fm != null) {
+                                    ConnectTraktFinishedFragment f = new ConnectTraktFinishedFragment();
+                                    FragmentTransaction ft = fm.beginTransaction();
+                                    ft.replace(android.R.id.content, f);
+                                    ft.commit();
+                                }
                             }
                         }
                     }

From 96132187501abbb8637258c7f808a3764439cdeb Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 14:21:55 +0100
Subject: [PATCH 66/74] Save add page count, notify viewpager if it changes.

- trakt credentials could get invalidated while user is within add
activity changing the page count. However, we did not notify ViewPager
about it which made him very unhappy.
- Fixes Play Store reported java.lang.IllegalStateException in
android.support.v4.view.ViewPager.populate.
---
 .../seriesguide/ui/AddActivity.java           | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
index 86261f8b47..ce8f425b28 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
@@ -45,8 +45,7 @@
 import java.util.Locale;
 
 /**
- * Hosts various fragments in a {@link ViewPager} which allow adding shows to
- * the database.
+ * Hosts various fragments in a {@link ViewPager} which allow adding shows to the database.
  */
 public class AddActivity extends BaseNavDrawerActivity implements OnAddShowListener {
 
@@ -55,6 +54,7 @@ public class AddActivity extends BaseNavDrawerActivity implements OnAddShowListe
     private ViewPager mPager;
 
     public interface InitBundle {
+
         /**
          * Which tab to select upon launch.
          */
@@ -139,18 +139,27 @@ void processIntent(Intent intent) {
     public static class AddPagerAdapter extends FragmentPagerAdapter {
 
         private static final int DEFAULT_TABCOUNT = 2;
+
         private static final int TRAKT_CONNECTED_TABCOUNT = 5;
 
         public static final int TRENDING_TAB_POSITION = 0;
+
         public static final int RECOMMENDED_TAB_POSITION = 2;
+
         public static final int LIBRARY_TAB_POSITION = 3;
+
         public static final int WATCHLIST_TAB_POSITION = 4;
 
         public static final int SEARCH_TAB_DEFAULT_POSITION = 1;
+
         public static final int SEARCH_TAB_CONNECTED_POSITION = 1;
 
+        private static final String CURRENT_COUNT = "current_count";
+
         private Context mContext;
 
+        private int mCurrentCount;
+
         public AddPagerAdapter(FragmentManager fm, Context context) {
             super(fm);
             mContext = context;
@@ -160,7 +169,8 @@ public AddPagerAdapter(FragmentManager fm, Context context) {
         public Fragment getItem(int position) {
             int count = getCount();
             if ((count == DEFAULT_TABCOUNT && position == SEARCH_TAB_DEFAULT_POSITION)
-                    || (count == TRAKT_CONNECTED_TABCOUNT && position == SEARCH_TAB_CONNECTED_POSITION)) {
+                    || (count == TRAKT_CONNECTED_TABCOUNT
+                    && position == SEARCH_TAB_CONNECTED_POSITION)) {
                 return TvdbAddFragment.newInstance();
             } else {
                 return TraktAddFragment.newInstance(position);
@@ -169,14 +179,27 @@ public Fragment getItem(int position) {
 
         @Override
         public int getCount() {
+            int newCount;
+
             final boolean isValidCredentials = TraktSettings.hasTraktCredentials(mContext);
             if (isValidCredentials) {
                 // show trakt recommended and libraried shows, too
-                return TRAKT_CONNECTED_TABCOUNT;
+                newCount = TRAKT_CONNECTED_TABCOUNT;
             } else {
                 // show search results and trakt trending shows
-                return DEFAULT_TABCOUNT;
+                newCount = DEFAULT_TABCOUNT;
             }
+
+            /**
+             * Background check on trakt credentials could invalidate them while user is still
+             * within this activity. We need to notify the adapter that the number of pages changed.
+             */
+            if (mCurrentCount != 0 && newCount != mCurrentCount) {
+                notifyDataSetChanged();
+            }
+            mCurrentCount = newCount;
+
+            return newCount;
         }
 
         @Override
@@ -212,6 +235,20 @@ public CharSequence getPageTitle(int position) {
             return "";
         }
 
+        @Override
+        public Parcelable saveState() {
+            Bundle bundle = new Bundle();
+            bundle.putInt(CURRENT_COUNT, mCurrentCount);
+            return bundle;
+        }
+
+        @Override
+        public void restoreState(Parcelable state, ClassLoader loader) {
+            if (state instanceof Bundle) {
+                Bundle bundle = (Bundle) state;
+                mCurrentCount = bundle.getInt(CURRENT_COUNT);
+            }
+        }
     }
 
     @Override

From 52dcb7a4c40955bb27d1e6421ecc2931b296a1bc Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:01:51 +0100
Subject: [PATCH 67/74] Only check for trakt creds when creating
 AddPagerAdapter.

- getCount is called very often, causing significant slow-down.
---
 .../seriesguide/ui/AddActivity.java           | 40 +++----------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
index ce8f425b28..26afb71e26 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/AddActivity.java
@@ -154,15 +154,14 @@ public static class AddPagerAdapter extends FragmentPagerAdapter {
 
         public static final int SEARCH_TAB_CONNECTED_POSITION = 1;
 
-        private static final String CURRENT_COUNT = "current_count";
+        private final boolean mIsConnectedToTrakt;
 
         private Context mContext;
 
-        private int mCurrentCount;
-
         public AddPagerAdapter(FragmentManager fm, Context context) {
             super(fm);
             mContext = context;
+            mIsConnectedToTrakt = TraktSettings.hasTraktCredentials(mContext);
         }
 
         @Override
@@ -179,27 +178,13 @@ public Fragment getItem(int position) {
 
         @Override
         public int getCount() {
-            int newCount;
-
-            final boolean isValidCredentials = TraktSettings.hasTraktCredentials(mContext);
-            if (isValidCredentials) {
+            if (mIsConnectedToTrakt) {
                 // show trakt recommended and libraried shows, too
-                newCount = TRAKT_CONNECTED_TABCOUNT;
+                return TRAKT_CONNECTED_TABCOUNT;
             } else {
                 // show search results and trakt trending shows
-                newCount = DEFAULT_TABCOUNT;
-            }
-
-            /**
-             * Background check on trakt credentials could invalidate them while user is still
-             * within this activity. We need to notify the adapter that the number of pages changed.
-             */
-            if (mCurrentCount != 0 && newCount != mCurrentCount) {
-                notifyDataSetChanged();
+                return DEFAULT_TABCOUNT;
             }
-            mCurrentCount = newCount;
-
-            return newCount;
         }
 
         @Override
@@ -234,21 +219,6 @@ public CharSequence getPageTitle(int position) {
             }
             return "";
         }
-
-        @Override
-        public Parcelable saveState() {
-            Bundle bundle = new Bundle();
-            bundle.putInt(CURRENT_COUNT, mCurrentCount);
-            return bundle;
-        }
-
-        @Override
-        public void restoreState(Parcelable state, ClassLoader loader) {
-            if (state instanceof Bundle) {
-                Bundle bundle = (Bundle) state;
-                mCurrentCount = bundle.getInt(CURRENT_COUNT);
-            }
-        }
     }
 
     @Override

From d6ed3f201861f9bdc586eeb4d27af628bcd08915 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:02:35 +0100
Subject: [PATCH 68/74] Abort early when fetching shows from trakt failed in
 add fragment.

---
 .../seriesguide/ui/TraktAddFragment.java            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java
index 6359c9c972..5bdee05919 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktAddFragment.java
@@ -38,6 +38,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -158,6 +159,8 @@ private int getListType() {
 
     public class GetTraktShowsTask extends AsyncTask<Integer, Void, List<SearchResult>> {
 
+        private static final String TAG = "GetTraktShowsTask";
+
         private Context mContext;
 
         public GetTraktShowsTask(Context context) {
@@ -166,10 +169,11 @@ public GetTraktShowsTask(Context context) {
 
         @Override
         protected List<SearchResult> doInBackground(Integer... params) {
+            Log.d(TAG, "Getting shows from trakt...");
             int type = params[0];
-            List<SearchResult> showList = new ArrayList<SearchResult>();
+            List<SearchResult> showList = new ArrayList<>();
 
-            List<TvShow> shows = new ArrayList<TvShow>();
+            List<TvShow> shows = new ArrayList<>();
 
             if (type == AddPagerAdapter.TRENDING_TAB_POSITION) {
                 try {
@@ -200,6 +204,11 @@ protected List<SearchResult> doInBackground(Integer... params) {
                 }
             }
 
+            // return empty list right away if there are no results
+            if (shows == null || shows.size() == 0) {
+                return showList;
+            }
+
             // get a list of existing shows to filter against
             final Cursor existingShows = mContext.getContentResolver().query(Shows.CONTENT_URI,
                     new String[]{

From e14947083a691d6028b88d2ff9e07e4daba0a089 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:08:10 +0100
Subject: [PATCH 69/74] Latest translations.

- Exported from crowdin on 2013-11-11.
---
 .../src/main/res/values-cs/strings.xml        |  28 +--
 .../src/main/res/values-fi/strings.xml        |   2 +-
 .../src/main/res/values-ko/strings.xml        | 184 +++++++++---------
 .../src/main/res/values-pl/strings.xml        |   6 +-
 .../src/main/res/values-zh-rCN/strings.xml    |  10 +-
 5 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/SeriesGuide/src/main/res/values-cs/strings.xml b/SeriesGuide/src/main/res/values-cs/strings.xml
index a1ef38fc5f..fd44556776 100644
--- a/SeriesGuide/src/main/res/values-cs/strings.xml
+++ b/SeriesGuide/src/main/res/values-cs/strings.xml
@@ -32,7 +32,7 @@
   <string name="offline">Bez připojení k síti. Zkuste to později.</string>
   <string name="app_not_available">Není k dispozici použitelná aplikace.</string>
   <string name="onlyx">K dispozici pouze po odemknutí rozšířených funkcí</string>
-  <string name="add_empty">Nejsou tu žádné pořady nebo váš přístroj není připojený k internetu.</string>
+  <string name="add_empty">Nejsou uloženy žádné seriály nebo váš přístroj není připojený k internetu.</string>
   <string name="share_show">Sdílet seriál</string>
   <string name="share_episode">Sdílet epizodu</string>
   <string name="share_checkout">Podívejte se na</string>
@@ -100,8 +100,8 @@
   <string name="uncollect">Epizoda chybí ve sbírce</string>
   <string name="collect_all">Přidat sérii do sbírky</string>
   <string name="uncollect_all">Odebráno ze sbírky</string>
-  <string name="action_skip">Skip</string>
-  <string name="action_dont_skip">Don\'t skip</string>
+  <string name="action_skip">Přeskočit</string>
+  <string name="action_dont_skip">Nepřeskakovat</string>
   <string name="trakt_submitqueued">Odesíláno na trakt.</string>
   <string name="trakt_seen">%s zhlédnuto.</string>
   <string name="trakt_notseen">%s nových.</string>
@@ -118,8 +118,8 @@
   <string name="unfavorited">Odebráno z oblíbených</string>
   <string name="context_hide">Skrýt</string>
   <string name="context_unhide">Obnovit</string>
-  <string name="hidden">Skytý pořad</string>
-  <string name="unhidden">Obnovený pořad</string>
+  <string name="hidden">Skytý seriál</string>
+  <string name="unhidden">Obnovený seriál</string>
   <string name="action_shows_add">Přidat seriál</string>
   <string name="action_shows_filter">Filtrovat seriály</string>
   <string name="empty_filter">Zrušit všechny filtry</string>
@@ -141,7 +141,7 @@
   <string name="friends_empty">Žádná aktivita přátel na traktu.</string>
   <string name="noupcoming">Žádné nadcházející epizody.</string>
   <string name="norecent">Žádné nedávné epizody.</string>
-  <string name="only_favorites">Pouze oblíbené pořady</string>
+  <string name="only_favorites">Pouze oblíbené seriály</string>
   <string name="togglewatched">Přepnout zhlédnutí</string>
   <string name="pref_infinite_scrolling">Aktivita bez omezení časem</string>
   <string name="update_scheduled">Probíhá aktualizace…</string>
@@ -160,13 +160,13 @@
   <string name="oneotherepisode">jiná epizoda</string>
   <string name="otherepisodes">jiné epizody</string>
   <string name="remaining">Zbývá %s</string>
-  <string name="search_hint_add">Název pořadu</string>
+  <string name="search_hint_add">Název seriálu</string>
   <string name="no_results">Bez výsledku, zkuste celá slova.</string>
   <string name="search_error">Vyhledání selhalo, zkuste to později.</string>
   <string name="add_all">Přidat vše</string>
   <string name="dont_add_show">Nepřidávat</string>
-  <string name="add_multiple">Všechny pořady se brzy objeví ve Vašem seznamu pořadů.</string>
-  <string name="add_started">se brzy objeví na Vašem seznamu pořadů.</string>
+  <string name="add_multiple">Všechny seriály se brzy objeví ve Vašem seznamu pořadů.</string>
+  <string name="add_started">se brzy objeví na Vašem seznamu seriálů.</string>
   <string name="add_success">úspěšně přidán.</string>
   <string name="add_error_begin">Nelze přidat\"</string>
   <string name="add_error_end">\".</string>
@@ -185,7 +185,7 @@
   <string name="list_empty">Do seznamu můžete přidat seriály, série nebo epizody.</string>
   <string name="connect_trakt">Připojit trakt.tv</string>
   <string name="connect_trakt_done">Připojeno k trakt.tv!</string>
-  <string name="add_trakt_shows">Přidat pořady z vaší knihovny:</string>
+  <string name="add_trakt_shows">Přidat seriály z vaší knihovny:</string>
   <string name="show_library">Ukázat vaši knihovnu</string>
   <string name="upload_shows">Nahrát váš SeriesGuide seznam pořadů:</string>
   <string name="upload_existing_shows">Nahrát existující pořady</string>
@@ -269,7 +269,7 @@
   <string name="paste_title">Vložit název</string>
   <string name="checkinsuccess">Ohlášeno do %s na GetGlue.</string>
   <string name="checkinfailed">Ohlášení GetGlue selhalo. Zkuste to znovu později.</string>
-  <string name="getglue_authentication">Connect GetGlue</string>
+  <string name="getglue_authentication">Připojit GetGlue</string>
   <string name="getglue_authfailed">Ověření u GetGlue selhalo. Zkuste to později.</string>
   <string name="checkin_success_trakt">Ohlášen u %s na traktu.</string>
   <string name="checkin_canceled_success_trakt">Ohlášení na traktu zrušeno.</string>
@@ -323,10 +323,10 @@
   <string name="dashclock_extension_description">Zobrazuje nadcházející epizodu z pořadů v SeriesGuide.</string>
   <string name="dashclock_pref_upcoming_threshold">Zobrazovat epizody nadcházející během</string>
   <string name="action_migrate">Přesunutí z verze X</string>
-  <string name="migration_description">SeriesGuide X nyný odblokuje rozšířené funkce v bezplatné verzi (\"doživotní verze X\"). Prosím přeneste své seriály na bezplatnou verzi SeriesGuide. Nechte verzi X nainstalovanou pro odemknutí všech funkcí v bezplatné verzi.</string>
+  <string name="migration_description">SeriesGuide X nyní slouží k odemknutí Rozšířených funkcí v bezplatné verzi (\"doživotní verze X\"). Prosím přesuňte své seriály na bezplatnou verzi SeriesGuide. Nechte verzi X nainstalovanou pro odemknutí všech funkcí v bezplatné verzi.</string>
   <string name="migration_import">Klikněte dole pro importování zálohy vytvořené ve verzi X.</string>
   <string name="migration_action_import">Importovat a nahradit stávající seriály</string>
-  <string name="action_upgrade">Get X features</string>
+  <string name="action_upgrade">Získat rozšířené funkce</string>
   <string name="upgrade_description">Získejte přístup k oznámení, další možnosti widgetu a všechny budoucí vlastnosti verze X. Podpořte budoucí vývoj.\n\nPokud jste již zakoupili SeriesGuide X, proveďte instalaci k odemknutí tohoto upgradu.</string>
   <string name="upgrade_success">Děkujeme, nyní máte odemknuty všechny rozšířené funkce!</string>
   <string name="subscription_activated">Nyní máte zpřístuněny rozšířené funkce.</string>
@@ -334,7 +334,7 @@
   <string name="subscription_expired_details">Vaše zakoupení rozšířených funkcí vypršelo.</string>
   <string name="add_to_homescreen">Přidat na domovskou obrazovku</string>
   <string name="search_within_show">Hledat v %s</string>
-  <string name="web_search">Web search</string>
+  <string name="web_search">Webové vyhledávání</string>
   <string-array name="sesorting">
     <item>Od nejnovější</item>
     <item>Od nejstarší</item>
diff --git a/SeriesGuide/src/main/res/values-fi/strings.xml b/SeriesGuide/src/main/res/values-fi/strings.xml
index bb8b749a76..5776de8eec 100644
--- a/SeriesGuide/src/main/res/values-fi/strings.xml
+++ b/SeriesGuide/src/main/res/values-fi/strings.xml
@@ -111,7 +111,7 @@
   <string name="delete_has_list_items">Ei onnistu. Poista %s kaikilta listoiltasi ensin.</string>
   <string name="delete_show">Poista</string>
   <string name="dontdelete_show">Älä poista</string>
-  <string name="no_nextepisode">seuraavaa jaksoa ei löynyt</string>
+  <string name="no_nextepisode">seuraavaa jaksoa ei löytynyt</string>
   <string name="context_favorite">Lisää suosikkeihin</string>
   <string name="context_unfavorite">Poista suosikeista</string>
   <string name="favorited">Lisätty suosikkeihin</string>
diff --git a/SeriesGuide/src/main/res/values-ko/strings.xml b/SeriesGuide/src/main/res/values-ko/strings.xml
index e37b39c500..b508124e71 100644
--- a/SeriesGuide/src/main/res/values-ko/strings.xml
+++ b/SeriesGuide/src/main/res/values-ko/strings.xml
@@ -9,12 +9,12 @@
   <string name="search">검색</string>
   <string name="preferences">설정</string>
   <string name="help">도움말</string>
-  <string name="show">Show</string>
+  <string name="show">쇼</string>
   <string name="episode">에피소드</string>
-  <string name="episode_number">Episode %s</string>
+  <string name="episode_number">에피소드 %s</string>
   <string name="episodes">에피소드</string>
   <string name="season">시즌</string>
-  <string name="season_number">Season %s</string>
+  <string name="season_number">시즌 %s</string>
   <string name="seasons">시즌</string>
   <string name="specialseason">스페셜 에피소드</string>
   <string name="description_overview">개요</string>
@@ -30,34 +30,34 @@
   <string name="norating">n/a</string>
   <string name="unknown">알 수 없음</string>
   <string name="offline">네트워크에 연결에 실패하였습니다. 나중에 다시 시도해주세요.</string>
-  <string name="app_not_available">No app available to handle this.</string>
-  <string name="onlyx">Only available with X Subscription</string>
+  <string name="app_not_available">이 형식을 실행할 수 있는 앱이 없습니다.</string>
+  <string name="onlyx">X 구독자에게만 제공되는 기능입니다</string>
   <string name="add_empty">쇼정보가 없거나 인터넷 연결이 끊겨있습니다.</string>
-  <string name="share_show">Share show</string>
+  <string name="share_show">쇼 공유</string>
   <string name="share_episode">에피소드 공유</string>
   <string name="share_checkout">체크 아웃</string>
   <string name="shouts">감상평</string>
-  <string name="comments">Comments</string>
+  <string name="comments">코멘트</string>
   <string name="shout_hint">감상평쓰기 (영어로 쓰세요)</string>
   <string name="shout">외쳐! (이이)</string>
   <string name="isspoiler">스포일러 경고!</string>
   <string name="no_shouts">첫 감상평의 주인공이 되세요!</string>
   <string name="shouts_for">%s에 대한 감상평</string>
   <string name="autorefresh">자동으로 새로고침</string>
-  <string name="movies_watchlist">Watchlist (trakt)</string>
-  <string name="watchlist_add">Add to watchlist</string>
-  <string name="watchlist_remove">Remove from watchlist</string>
-  <string name="watchlist_added">Added to watchlist</string>
-  <string name="watchlist_removed">Removed from watchlist</string>
+  <string name="movies_watchlist">관심목록 (trakt)</string>
+  <string name="watchlist_add">관심목록에 추가</string>
+  <string name="watchlist_remove">관심목록에서 제거</string>
+  <string name="watchlist_added">관심목록에 추가되었습니다</string>
+  <string name="watchlist_removed">관심목록에서 제거되었습니다</string>
   <string name="movies_search_hint">영화 제목을 입력하세요</string>
   <string name="movies_empty">위의 검색창에서 영화를 검색하세요.</string>
-  <string name="movies_watchlist_empty">You have no internet connection or not added movies to your trakt watchlist.</string>
+  <string name="movies_watchlist_empty">인터넷 연결이 끊어졌거나 trakt 관심목록에 추가된 영화가 없습니다.</string>
   <string name="trailer">예고편</string>
-  <string name="shows_with_next">%s with next episodes</string>
-  <string name="shows_continuing">%s continuing</string>
+  <string name="shows_with_next">%s 개의 다음 에피소드</string>
+  <string name="shows_continuing">%s 방영 중</string>
   <string name="episodes_watched">%s 시청함</string>
   <string name="runtime_all_episodes">시청한 모든 에피소드의 런타임</string>
-  <string name="your_rating">Your rating</string>
+  <string name="your_rating">당신의 평가</string>
   <string name="love">킹왕짱!</string>
   <string name="hate">쓰레기 :(</string>
   <string name="rating2">끔찍해</string>
@@ -70,8 +70,8 @@
   <string name="rating9">강추</string>
   <string name="episode_number_absolute">ABSOLUTE</string>
   <string name="episode_number_disk">DVD</string>
-  <string name="episode_firstaired">Release date</string>
-  <string name="episode_firstaired_unknown">Release date unknown</string>
+  <string name="episode_firstaired">첫 방영 날짜</string>
+  <string name="episode_firstaired_unknown">첫 방영 날짜 알 수 없음</string>
   <string name="episode_dvdnumber">DVD 에피소드</string>
   <string name="show_actors">배우</string>
   <string name="show_firstaired">첫 방영날짜</string>
@@ -86,7 +86,7 @@
   <string name="show_isnotalive">종료</string>
   <string name="lastEdit">마지막 편집 // TVDb</string>
   <string name="services_watch">Watch</string>
-  <string name="services_more">More</string>
+  <string name="services_more">더보기</string>
   <string name="sort">정렬 기준</string>
   <string name="today">오늘</string>
   <string name="now">지금</string>
@@ -100,9 +100,9 @@
   <string name="uncollect">수집하지 않은 에피소드</string>
   <string name="collect_all">Collected all</string>
   <string name="uncollect_all">Collected none</string>
-  <string name="action_skip">Skip</string>
-  <string name="action_dont_skip">Don\'t skip</string>
-  <string name="trakt_submitqueued">Submitting to trakt.</string>
+  <string name="action_skip">건너뛰기</string>
+  <string name="action_dont_skip">건너뛰지 않기</string>
+  <string name="trakt_submitqueued">trakt에 업로드 중.</string>
   <string name="trakt_seen">%s 시청.</string>
   <string name="trakt_notseen">%s 미시청.</string>
   <string name="trakt_collected">%s 수집됨.</string>
@@ -120,17 +120,17 @@
   <string name="context_unhide">보이기</string>
   <string name="hidden">숨겨진 쇼</string>
   <string name="unhidden">쇼 보이기</string>
-  <string name="action_shows_add">Add show</string>
-  <string name="action_shows_filter">Filter shows</string>
-  <string name="empty_filter">Remove all filters</string>
+  <string name="action_shows_add">쇼 추가</string>
+  <string name="action_shows_filter">쇼 필터링</string>
+  <string name="empty_filter">모든 필터 제거</string>
   <string name="action_shows_filter_favorites">즐겨찾기</string>
-  <string name="action_shows_filter_unwatched">Unwatched</string>
+  <string name="action_shows_filter_unwatched">미시청</string>
   <string name="action_shows_filter_upcoming">방영예정</string>
-  <string name="action_shows_filter_hidden">Hidden</string>
-  <string name="action_shows_sort">Sort shows</string>
-  <string name="action_shows_sort_title">Title</string>
-  <string name="action_shows_sort_episode">Next episode</string>
-  <string name="action_shows_sort_favorites">Favorites first</string>
+  <string name="action_shows_filter_hidden">숨긴 것</string>
+  <string name="action_shows_sort">쇼 정렬</string>
+  <string name="action_shows_sort_title">제목</string>
+  <string name="action_shows_sort_episode">다음 에피소드</string>
+  <string name="action_shows_sort_favorites">즐겨찾기 먼저</string>
   <string name="updateall_yes">업데이트 (모두)</string>
   <string name="menu_update_delta">업데이트 (오래된 것만)</string>
   <string name="context_updateshow">업데이트</string>
@@ -143,16 +143,16 @@
   <string name="norecent">최근 방영된 에피소드가 없습니다.</string>
   <string name="only_favorites">즐겨찾기한 쇼만 보이기</string>
   <string name="togglewatched">시청/미시청 토글</string>
-  <string name="pref_infinite_scrolling">Infinite activity</string>
-  <string name="update_scheduled">Updating…</string>
-  <string name="update_no_connection">To update connect to the internet.</string>
-  <string name="update_no_wifi">To update connect to WiFi or allow other connections in Settings.</string>
+  <string name="pref_infinite_scrolling">무한스크롤</string>
+  <string name="update_scheduled">업데이트 중…</string>
+  <string name="update_no_connection">업데이트를 하려면 인터넷에 연결하세요.</string>
+  <string name="update_no_wifi">업데이트하려면 WiFi를 켜거나 \'설정\'에서 데이터 연결을 허용하세요.</string>
   <string name="update_inprogress">업데이트가 진행 중 입니다. 잠시 후 다시 시도해주세요.</string>
   <string name="menu_updateart">포스터 불러오기</string>
   <string name="arttask_incomplete">일부 포스터 읽기에 실패하였습니다, 나중에 다시 시도하세요.</string>
   <string name="arttask_start">포스터 로드 중</string>
   <string name="arttask_nosdcard">포스터를 불러오기 위해서는 외장 SD카드가 필요합니다.</string>
-  <string name="show_on_network">on %s</string>
+  <string name="show_on_network">방송국 %s</string>
   <string name="season_watchcount">시청하지 않았음</string>
   <string name="season_allwatched">모든 에피소드 시청완료</string>
   <string name="season_onenotwatched">시청하지 않음</string>
@@ -222,9 +222,9 @@
   <string name="pref_theme">앱 테마</string>
   <string name="pref_other">기타</string>
   <string name="pref_autoupdate">자동 업데이트 켜기</string>
-  <string name="pref_autoupdatesummary">Periodically update your shows</string>
-  <string name="pref_autobackup">Turn on Auto Backup</string>
-  <string name="pref_autobackupsummary">Weekly backup of your show database into the Download folder</string>
+  <string name="pref_autoupdatesummary">주기적으로 쇼 업데이트</string>
+  <string name="pref_autobackup">자동백업 켜기</string>
+  <string name="pref_autobackupsummary">주간 백업한 쇼 정보를 다운로드 폴더로 보내기</string>
   <string name="backup">백업/복원</string>
   <string name="backup_summary">쇼 목록을 백업학거나 복원합니다</string>
   <string name="pref_upcominglimit">방영 예정 쇼 표기</string>
@@ -236,17 +236,17 @@
   <string name="pref_ganalyticssummary">시리즈가이드를 개선시키는데 도움을 주기 위해 사용 이력을 추적합니다</string>
   <string name="pref_hideimages">이미지 숨기기</string>
   <string name="pref_hideimagessummary">갤러리에 있는 이미지를 숨깁니다 (재부팅 필요)</string>
-  <string name="backup_description"><b>Backup</b> will export your shows, seasons, episodes and lists to a JSON file into the folder below.\nTo <b>Restore</b> make sure the JSON files created by backup are in the folder below.</string>
-  <string name="backup_full_dump">Include all meta-data like descriptions, actors and ratings.</string>
-  <string name="backup_path">Backup folder</string>
-  <string name="backup_version">Database version</string>
+  <string name="backup_description"><b>백업</b>은 쇼, 시즌, 에피소드 등의 목록을  JSON 파일로 아래의 폴더에 저장합니다. \n<b>복원</b>하려면 백업 파일이 아래 폴더에 있는지 확인하세요.</string>
+  <string name="backup_full_dump">설명, 배우 및 등급과 같은 모든 메타데이터를 포함합니다.</string>
+  <string name="backup_path">백업폴더</string>
+  <string name="backup_version">데이터베이스 버전</string>
   <string name="backup_failed_nosd">백업 실패. 백업폴더가 존재하지 않습니다.</string>
   <string name="backup_inprogress">데이터베이스 백업 중...</string>
   <string name="backup_success">성공적으로 백업하였습니다.</string>
   <string name="backup_failed">백업에 실패하였습니다.</string>
   <string name="import_inprogress">데이터베이스 복원 중...</string>
   <string name="import_failed_nosd">복원 실패. 백업 폴더가 존재하지 않습니다.</string>
-  <string name="import_failed_nofile">There is no readable backup file.</string>
+  <string name="import_failed_nofile">읽을 수 있는 백업 파일이 없습니다.</string>
   <string name="import_failed_noread">백업 파일을 읽을 수 없습니다.</string>
   <string name="dbupgradefailed">백업이 너무 오래되었거나 비어있습니다. 주의: 2.0 버전 이전의 백업은 1.9.X 버전의 앱을 설치하여 임포트하세요.</string>
   <string name="import_success">백업을 성공적으로 복원하였습니다.</string>
@@ -257,11 +257,11 @@
   <string name="backup_no">백업 취소</string>
   <string name="import_question">현재의 쇼 목록 손실 될 것입니다! 백업 폴더 안에 백업 파일이 있는지 확인하세요.</string>
   <string name="import_no">복원 취소</string>
-  <string name="import_warning">I understand my current shows and lists will be lost!</string>
-  <string name="last_auto_backup">Last Auto Backup: %s</string>
-  <string name="restore_auto_backup">Restore Auto Backup</string>
+  <string name="import_warning">현재 앱에 저장한 쇼 목록이 삭제될 수 있습니다!</string>
+  <string name="last_auto_backup">최근 자동 백업: %s</string>
+  <string name="restore_auto_backup">자동 백업 복원</string>
   <string name="checkin">체크인</string>
-  <string name="checkin_noaction">No services enabled, check in once within SeriesGuide.</string>
+  <string name="checkin_noaction">활성화된 서비스가 없습니다. 시리즈가이드에서 서비스에 체크인하세요.</string>
   <string name="checkin_searchhint">쇼 이름을 입력하세요</string>
   <string name="checkin_empty">일치하는 쇼가 없습니다</string>
   <string name="checkin_hint">메세지 입력 (선택사항)</string>
@@ -269,7 +269,7 @@
   <string name="paste_title">제목 붙여넣기</string>
   <string name="checkinsuccess">%s을 GetGlue에 체크인 완료.</string>
   <string name="checkinfailed">GetGlue 체크인에 실패하였습니다. 나중에 다시 시도하십시오.</string>
-  <string name="getglue_authentication">Connect GetGlue</string>
+  <string name="getglue_authentication">GetGlue에 연결</string>
   <string name="getglue_authfailed">GetGlue 인증이 실패 하였습니다. 나중에 다시 시도 하세요.</string>
   <string name="checkin_success_trakt">%s을 trakt에 체크인하였습니다.</string>
   <string name="checkin_canceled_success_trakt">trakt 체크인을 취소하였습니다.</string>
@@ -277,8 +277,8 @@
   <string name="check_into">체크인</string>
   <string name="no_selection">아래에서 선택하세요</string>
   <string name="looking_for_something_else">다른것을 찾고 있습니까?</string>
-  <string name="menu_rate_episode">Rate episode</string>
-  <string name="menu_rate_show">Rate show</string>
+  <string name="menu_rate_episode">에피소드 평가</string>
+  <string name="menu_rate_show">쇼 평가</string>
   <string name="traktcheckin_cancel">오버라이드</string>
   <string name="traktcheckin_inprogress">이미 다른 에피소드 또는 영화에 체크인하였습니다. 이전 체크인을 해제하거나 %s 기다렸다가 다시 시도하세요.</string>
   <string name="traktcheckin_wait">기다리겠소</string>
@@ -292,8 +292,8 @@
   <string name="disconnect">연결끊기</string>
   <string name="trakt_error">trakt와 통신 실패</string>
   <string name="trakt_decryptfail">암호 복호화 실패</string>
-  <string name="trakt_error_credentials">Something went wrong. Please check your credentials and try again.</string>
-  <string name="trakt_error_general">Could not talk to trakt. Try again later.</string>
+  <string name="trakt_error_credentials">오류가 있습니다. 계정정보를 확인하여 재시도해주세요.</string>
+  <string name="trakt_error_general">Trakt 와 통신할 수 없습니다. 잠시 후 다시 시도해주세요.</string>
   <string name="trakt_createaccount">새 계정 만들기</string>
   <string name="welcome_setuplanguage">언어 선택</string>
   <string name="welcome_traktmessage">track.tv 라이브러리와 친구의 상태를 확인하세요</string>
@@ -301,7 +301,7 @@
   <string name="welcome_add_part1">시작하려면 액션바에 있는</string>
   <string name="upcoming_show">%s가 방영 예정입니다</string>
   <string name="upcoming_episodes">새 에피소드 방영예정</string>
-  <string name="upcoming_episodes_number">%s new episodes</string>
+  <string name="upcoming_episodes_number">%s 개의 새로운 에피소드</string>
   <string name="upcoming_show_detailed">%1$s on %2$s</string>
   <string name="more">%s개의 에피소드 정보 더 있음</string>
   <string name="upcoming_display">방영예정인 쇼를 표시하려면 선택</string>
@@ -321,20 +321,20 @@
   <string name="pref_widget_type">위젯 형태</string>
   <string name="dashclock_extension_label">방영예정 에피소드</string>
   <string name="dashclock_extension_description">시리즈가이드에 있는 쇼의 다음 에피소드를 표시합니다.</string>
-  <string name="dashclock_pref_upcoming_threshold">Show episodes in the next</string>
-  <string name="action_migrate">Migrate from X</string>
-  <string name="migration_description">SeriesGuide X is now an unlock key for X features in the free version (X Pass). Please migrate your shows to the free version of SeriesGuide. Keep X installed to unlock all features in the free version.</string>
-  <string name="migration_import">Touch below to import the backup created in SeriesGuide X.</string>
-  <string name="migration_action_import">Import and replace existing shows</string>
-  <string name="action_upgrade">Get X features</string>
-  <string name="upgrade_description">Get access to notifications, more list widget options and all future X features. Support further development.\n\nIf you have already purchased SeriesGuide X, install it to unlock this upgrade.</string>
-  <string name="upgrade_success">Thanks, you are already subscribed to all X features!</string>
-  <string name="subscription_activated">You are now subscribed to X features.</string>
-  <string name="subscription_expired">Subscription expired</string>
-  <string name="subscription_expired_details">Your X features subscription has expired.</string>
-  <string name="add_to_homescreen">Add to Home screen</string>
-  <string name="search_within_show">Search within %s</string>
-  <string name="web_search">Web search</string>
+  <string name="dashclock_pref_upcoming_threshold">방영 예정 에피소드 보기</string>
+  <string name="action_migrate">시리즈가이드X 로 부터 데이터 가져오기</string>
+  <string name="migration_description">시리즈가이드 X는 이제 X Pass라는 이름의 유료 앱을 다운로드하는 방식으로 바뀌었습니다. 무료 버전의 시리즈가이드에 있는 쇼를 가져오기 바랍니다. 추가기능을 이용하려면 X를 설치하세요.</string>
+  <string name="migration_import">시리즈가이드 X에서 만든 백업을 가져오려면 아래를 터치하세요.</string>
+  <string name="migration_action_import">데이터를 가져온 후 기존 쇼 대체</string>
+  <string name="action_upgrade">X 추가기능 다운받기</string>
+  <string name="upgrade_description">알람기능 지원, 더 다양한 위젯 옵션과 모든 X의 기능을 즐기세요. 그리고 개발자를 지원해주세요.\n\n이미 시리즈가이드 X를 과거에 구매하였다면 무료로 지금 설치하여 기능을 언락하세요.</string>
+  <string name="upgrade_success">이미 X 추가기능을 다운로드하였습니다. 감사합니다!</string>
+  <string name="subscription_activated">이제 X의 모든 기능을 활용하실 수 있습니다.</string>
+  <string name="subscription_expired">구독 만료되었습니다</string>
+  <string name="subscription_expired_details">X 추가기능 구독 기간이 만료되었습니다.</string>
+  <string name="add_to_homescreen">홈 화면에 추가</string>
+  <string name="search_within_show">%s 에서 검색</string>
+  <string name="web_search">웹 검색</string>
   <string-array name="sesorting">
     <item>최근 방영 순</item>
     <item>예전 방영 순</item>
@@ -363,7 +363,7 @@
     <item>1시간전</item>
   </string-array>
   <string-array name="widgetOpacity">
-    <item>투명도</item>
+    <item>투명</item>
     <item>25% 블랙</item>
     <item>50% 블랙</item>
     <item>75% 블랙</item>
@@ -375,36 +375,36 @@
     <item>즐겨찾기</item>
   </string-array>
   <string-array name="dashclockUpcomingThresholds">
-    <item>hour</item>
-    <item>6 hours</item>
-    <item>12 hours</item>
-    <item>24 hours</item>
+    <item>시간</item>
+    <item>6 시간</item>
+    <item>12 시간</item>
+    <item>24 시간</item>
     <item>3일</item>
-    <item>week</item>
+    <item>주</item>
   </string-array>
   <plurals name="days_plural">
-    <item quantity="one">%d day</item>
-    <item quantity="zero">%d days</item>
-    <item quantity="two">%d days</item>
-    <item quantity="few">%d days</item>
-    <item quantity="many">%d days</item>
-    <item quantity="other">%d days</item>
+    <item quantity="one">%d 일</item>
+    <item quantity="zero">%d 일</item>
+    <item quantity="two">%d 일</item>
+    <item quantity="few">%d 일</item>
+    <item quantity="many">%d 일</item>
+    <item quantity="other">%d 일</item>
   </plurals>
   <plurals name="hours_plural">
-    <item quantity="zero">%d hours</item>
-    <item quantity="one">%d hour</item>
-    <item quantity="two">%d hours</item>
-    <item quantity="few">%d hours</item>
-    <item quantity="many">%d hours</item>
-    <item quantity="other">%d hours</item>
+    <item quantity="zero">%d 시간</item>
+    <item quantity="one">%d 시간</item>
+    <item quantity="two">%d 시간</item>
+    <item quantity="few">%d 시간</item>
+    <item quantity="many">%d 시간</item>
+    <item quantity="other">%d 시간</item>
   </plurals>
   <plurals name="minutes_plural">
-    <item quantity="zero">%d minutes</item>
-    <item quantity="one">%d minute</item>
-    <item quantity="two">%d minutes</item>
-    <item quantity="few">%d minutes</item>
-    <item quantity="many">%d minutes</item>
-    <item quantity="other">%d minutes</item>
+    <item quantity="zero">%d 분</item>
+    <item quantity="one">%d 분</item>
+    <item quantity="two">%d 분</item>
+    <item quantity="few">%d 분</item>
+    <item quantity="many">%d 분</item>
+    <item quantity="other">%d 분</item>
   </plurals>
   <plurals name="votes">
     <item quantity="zero">%d명이 투표</item>
diff --git a/SeriesGuide/src/main/res/values-pl/strings.xml b/SeriesGuide/src/main/res/values-pl/strings.xml
index cbbe5f8eb1..a1f3ebeb5c 100644
--- a/SeriesGuide/src/main/res/values-pl/strings.xml
+++ b/SeriesGuide/src/main/res/values-pl/strings.xml
@@ -101,7 +101,7 @@
   <string name="collect_all">Wszystkie zebrane</string>
   <string name="uncollect_all">Brak zebranych</string>
   <string name="action_skip">Pomiń</string>
-  <string name="action_dont_skip">Don\'t skip</string>
+  <string name="action_dont_skip">Nie pomijaj</string>
   <string name="trakt_submitqueued">Wysyłanie do trakt.</string>
   <string name="trakt_seen">%s obejrzane.</string>
   <string name="trakt_notseen">%s nieobejrzane.</string>
@@ -326,7 +326,7 @@
   <string name="migration_description">SeriesGuide X jest teraz kluczem odblokowującym funkcje X w wersji darmowej (\"X Life-Time Pass\"). Proszę dokonać migracji seriali do darmowej wersji SeriesGuide. Zachowaj zainstalowaną wersję X, aby odblokować wszystkie funkcje w wersji darmowej.</string>
   <string name="migration_import">Dotknij poniżej aby zaimportować kopię zapasową utworzoną w SeriesGuide X.</string>
   <string name="migration_action_import">Importuj i zastąp istniejące seriale</string>
-  <string name="action_upgrade">Get X features</string>
+  <string name="action_upgrade">Uzyskaj funkcje X</string>
   <string name="upgrade_description">Uzyskaj dostęp do powiadomień, większej ilości opcji w widżetach i innych funkcji X które będą dostępne w przyszłości. Wesprzyj tworzenie tej aplikacji.\n\nIf Jeśli już zakupiłeś SeriesGuide X, zainstaluj go aby odblokować nowe funkcje.</string>
   <string name="upgrade_success">Dzięki jesteś już zapisany do wszystkich funkcji X!</string>
   <string name="subscription_activated">Subskrybujesz teraz funkcję X.</string>
@@ -334,7 +334,7 @@
   <string name="subscription_expired_details">Twoje funkcję X wygasły.</string>
   <string name="add_to_homescreen">Dodaj do pulpitu</string>
   <string name="search_within_show">Szukaj w %s</string>
-  <string name="web_search">Web search</string>
+  <string name="web_search">Wyszukiwarka</string>
   <string-array name="sesorting">
     <item>Najpierw najnowsze</item>
     <item>Najpierw najstarsze</item>
diff --git a/SeriesGuide/src/main/res/values-zh-rCN/strings.xml b/SeriesGuide/src/main/res/values-zh-rCN/strings.xml
index d76d6bccca..92dc2a2877 100644
--- a/SeriesGuide/src/main/res/values-zh-rCN/strings.xml
+++ b/SeriesGuide/src/main/res/values-zh-rCN/strings.xml
@@ -100,8 +100,8 @@
   <string name="uncollect">标记剧集为未收藏</string>
   <string name="collect_all">标记全部剧集为已收藏</string>
   <string name="uncollect_all">标记全部剧集为未收藏</string>
-  <string name="action_skip">Skip</string>
-  <string name="action_dont_skip">Don\'t skip</string>
+  <string name="action_skip">跳过</string>
+  <string name="action_dont_skip">不要跳过</string>
   <string name="trakt_submitqueued">正在提交到 trakt</string>
   <string name="trakt_seen">%s 已观看。</string>
   <string name="trakt_notseen">%s 未观看。</string>
@@ -269,7 +269,7 @@
   <string name="paste_title">粘贴名称</string>
   <string name="checkinsuccess">在 GetGlue 上标记 %s。</string>
   <string name="checkinfailed">GetGlue 登录失败，请稍后再试。</string>
-  <string name="getglue_authentication">Connect GetGlue</string>
+  <string name="getglue_authentication">连接到GetGlue</string>
   <string name="getglue_authfailed">GetGlue 认证失败，请稍后重试。</string>
   <string name="checkin_success_trakt">在 trakt 上标记 %s。</string>
   <string name="checkin_canceled_success_trakt">放弃 trakt 登录</string>
@@ -326,7 +326,7 @@
   <string name="migration_description">现在追剧助手X是免费版(\"X Life-Time Pass\")的X特性解锁文件。请迁移您的剧目到追剧助手免费版。确保X已安装以解锁免费版的全部特性。</string>
   <string name="migration_import">触摸下面导入追剧助手X中创建的备份。</string>
   <string name="migration_action_import">导入并替换现有剧集</string>
-  <string name="action_upgrade">Get X features</string>
+  <string name="action_upgrade">获取X特性</string>
   <string name="upgrade_description">获取通知功能，更多的小插件选项和未来全部的X特性。支持未来的更新。\n\n如果你已经购买了追剧助手X，安装它以解锁升级。</string>
   <string name="upgrade_success">谢谢，您已经订阅全部的X特性！</string>
   <string name="subscription_activated">您已经订阅X特性。</string>
@@ -334,7 +334,7 @@
   <string name="subscription_expired_details">您的X特性订阅已过期。</string>
   <string name="add_to_homescreen">添加到主屏幕</string>
   <string name="search_within_show">在%s中搜索</string>
-  <string name="web_search">Web search</string>
+  <string name="web_search">网页搜索</string>
   <string-array name="sesorting">
     <item>最新在最上</item>
     <item>最旧在最上</item>

From 46151c9c9a6e01274540e5f0421e8b499698e60e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:15:57 +0100
Subject: [PATCH 70/74] Push version to 189 and 9.1.

---
 SeriesGuide/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeriesGuide/build.gradle b/SeriesGuide/build.gradle
index f4bde6a21c..1b76afeffc 100644
--- a/SeriesGuide/build.gradle
+++ b/SeriesGuide/build.gradle
@@ -19,8 +19,8 @@ android {
     productFlavors {
         free {
             packageName "com.battlelancer.seriesguide"
-            versionCode 188
-            versionName "9.1-beta1"
+            versionCode 189
+            versionName "9.1"
         }
         beta {
             packageName "com.battlelancer.seriesguide.beta"

From 9f0686360f09d509b8d79c85da0f14741cf1c304 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:28:09 +0100
Subject: [PATCH 71/74] Preliminary changes for 9.1.

---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8094a1079a..480967325e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 9.1 *(in testing)*
+--------------------------
+
+* 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)*
 ----------------------------
 

From e35ff23aa0737d838c961860089518afcfd8f800 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:29:54 +0100
Subject: [PATCH 72/74] Change 'Shouts' window title to 'Comments'.

---
 .../com/battlelancer/seriesguide/ui/TraktShoutsActivity.java    | 2 +-
 SeriesGuide/src/main/res/values/strings.xml                     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
index 8355363d84..2d735e05f3 100644
--- a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
+++ b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/TraktShoutsActivity.java
@@ -86,7 +86,7 @@ private void setupActionBar() {
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setHomeButtonEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setTitle(R.string.shouts);
+        actionBar.setTitle(R.string.comments);
         actionBar.setSubtitle(getIntent().getExtras().getString(ShareItems.SHARESTRING));
     }
 
diff --git a/SeriesGuide/src/main/res/values/strings.xml b/SeriesGuide/src/main/res/values/strings.xml
index d788f4b3d6..6aaf51a9ab 100644
--- a/SeriesGuide/src/main/res/values/strings.xml
+++ b/SeriesGuide/src/main/res/values/strings.xml
@@ -52,7 +52,6 @@
     <string name="share_checkout">Check out</string>
 
     <!-- Shouts -->
-    <string name="shouts">Shouts</string>
     <string name="comments">Comments</string>
     <string name="shout_hint">Type a shout (in English)</string>
     <string name="shout">Shout!</string>

From d092f4a3776e86d9d134eb4e18e45566977aba4e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 15:30:43 +0100
Subject: [PATCH 73/74] Push version to 190.

---
 SeriesGuide/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeriesGuide/build.gradle b/SeriesGuide/build.gradle
index 1b76afeffc..affc9456a6 100644
--- a/SeriesGuide/build.gradle
+++ b/SeriesGuide/build.gradle
@@ -19,7 +19,7 @@ android {
     productFlavors {
         free {
             packageName "com.battlelancer.seriesguide"
-            versionCode 189
+            versionCode 190
             versionName "9.1"
         }
         beta {

From afab17ffad4dabe56fe61c3254c2260df2f536e9 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe.trottmann@gmail.com>
Date: Mon, 11 Nov 2013 19:09:42 +0100
Subject: [PATCH 74/74] Summary for 9.1 changes.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 480967325e..53405c00fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ 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.