Merge branch 'fix-11.1'

UweTrottmann · Jan 21, 2014 · daacdea · daacdea
2 parents ae768a3 + 610d542
commit daacdea
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 11.1 *(2014-01-21)*
+-------------------------
+
+* FIX Mirrored shows and movies grid on some Android 4.1 tablets.
+* FIX Crash when rating episode if SeriesGuide is running on ART.
+
 Version 11 *(2014-01-17)*
 -------------------------
 

diff --git a/SeriesGuide/build.gradle b/SeriesGuide/build.gradle
@@ -25,8 +25,8 @@ android {
     productFlavors {
         free {
             packageName "com.battlelancer.seriesguide"
-            versionCode 207
-            versionName "11"
+            versionCode 209
+            versionName "11.1"
         }
         beta {
             packageName "com.battlelancer.seriesguide.beta"

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/TraktCredentials.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/settings/TraktCredentials.java
@@ -154,10 +154,10 @@ private boolean setPassword(String password) {
      * @return <b>true</b> if credentials are valid, <b>false</b> if invalid and launching trakt
      * connect flow.
      */
-    public boolean ensureCredentials() {
-        if (!hasCredentials()) {
+    public static boolean ensureCredentials(Context context) {
+        if (!TraktCredentials.get(context).hasCredentials()) {
             // launch trakt connect flow
-            mContext.startActivity(new Intent(mContext, ConnectTraktActivity.class));
+            context.startActivity(new Intent(context, ConnectTraktActivity.class));
             return false;
         }
         return true;

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/EpisodeDetailsFragment.java
@@ -244,7 +244,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void onRateOnTrakt() {
-        if (TraktCredentials.get(getActivity()).ensureCredentials()) {
+        if (TraktCredentials.ensureCredentials(getActivity())) {
             onShareEpisode(ShareMethod.RATE_TRAKT);
         }
         fireTrackerEvent("Rate (trakt)");

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieSearchFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/MovieSearchFragment.java
@@ -145,7 +145,7 @@ public boolean onContextItemSelected(MenuItem item) {
 
         switch (item.getItemId()) {
             case CONTEXT_ADD_TO_WATCHLIST_ID: {
-                if (TraktCredentials.get(getActivity()).ensureCredentials()) {
+                if (TraktCredentials.ensureCredentials(getActivity())) {
                     // Add item to watchlist
                     AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
                     Movie movie = mAdapter.getItem(info.position);

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/OverviewFragment.java
@@ -312,7 +312,7 @@ private void onChangeEpisodeFlag(int episodeFlag) {
 
     private void onRateOnTrakt() {
         // rate episode on trakt.tv
-        if (TraktCredentials.get(getActivity()).ensureCredentials()) {
+        if (TraktCredentials.ensureCredentials(getActivity())) {
             onShareEpisode(ShareMethod.RATE_TRAKT);
         }
         fireTrackerEvent("Rate (trakt)");

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowFragment.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/ui/ShowFragment.java
@@ -325,7 +325,7 @@ private int getShowTvdbId() {
     }
 
     private void onRateOnTrakt() {
-        if (TraktCredentials.get(getActivity()).ensureCredentials()) {
+        if (TraktCredentials.ensureCredentials(getActivity())) {
             TraktRateDialogFragment rateShow = TraktRateDialogFragment.newInstance(getShowTvdbId());
             rateShow.show(getFragmentManager(), "traktratedialog");
         }

diff --git a/...e/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java b/...e/src/main/java/com/battlelancer/seriesguide/ui/dialogs/GenericCheckInDialogFragment.java
@@ -185,7 +185,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
                     // ask the user for credentials if there are none
-                    TraktCredentials.get(getActivity()).ensureCredentials();
+                    TraktCredentials.ensureCredentials(getActivity());
                 }
 
                 mTraktChecked = isChecked;

diff --git a/SeriesGuide/src/main/res/layout-ldrtl/grid_movies.xml b/SeriesGuide/src/main/res/layout-ldrtl/grid_movies.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/list"
+    style="@style/Widget.SeriesGuide.RtlGridView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="@bool/gridClipToPadding"
+    android:columnWidth="@dimen/movie_item_width"
+    android:fastScrollEnabled="true"
+    android:horizontalSpacing="@dimen/grid_horizontal_spacing"
+    android:listSelector="@color/transparent"
+    android:numColumns="auto_fit"
+    android:padding="@dimen/default_padding"
+    android:scrollbarStyle="outsideOverlay"
+    android:stretchMode="columnWidth"
+    android:verticalSpacing="@dimen/grid_vertical_spacing" />
diff --git a/SeriesGuide/src/main/res/layout-ldrtl/grid_shows.xml b/SeriesGuide/src/main/res/layout-ldrtl/grid_shows.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/list"
+    style="@style/Widget.SeriesGuide.RtlGridView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="@bool/gridClipToPadding"
+    android:columnWidth="@dimen/showgrid_columnWidth"
+    android:fastScrollEnabled="true"
+    android:horizontalSpacing="@dimen/grid_horizontal_spacing"
+    android:listSelector="@color/transparent"
+    android:numColumns="auto_fit"
+    android:padding="@dimen/default_padding"
+    android:scrollbarStyle="outsideOverlay"
+    android:stretchMode="columnWidth"
+    android:verticalSpacing="@dimen/grid_vertical_spacing" />
diff --git a/SeriesGuide/src/main/res/layout/grid_movies.xml b/SeriesGuide/src/main/res/layout/grid_movies.xml
@@ -2,7 +2,6 @@
 
 <GridView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+android:id/list"
-    style="@style/Widget.SeriesGuide.RtlGridView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="@bool/gridClipToPadding"

diff --git a/SeriesGuide/src/main/res/layout/grid_shows.xml b/SeriesGuide/src/main/res/layout/grid_shows.xml
@@ -2,7 +2,6 @@
 
 <GridView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+android:id/list"
-    style="@style/Widget.SeriesGuide.RtlGridView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="@bool/gridClipToPadding"