Merge branch 'beta'

Conflicts:
	SeriesGuide/res/values/dimens.xml
	SeriesGuideBeta/res/drawable-hdpi/ic_launcher.png
	SeriesGuideBeta/res/drawable-mdpi/ic_launcher.png
	SeriesGuideBeta/res/drawable-xhdpi/ic_launcher.png

.gitignore

@@ -23,7 +23,6 @@ local.properties
 
 ### Linux
 #########
-.*
 !.gitignore
 *~
 

CHANGELOG.md

@@ -5,6 +5,67 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 4 *(2013-03-21)*
+--------------------------
+
+### Notable changes:
+
+* FEATURE Add statistics.
+* FEATURE New next episode algorithm: remembers what you last watched and offers later episodes as next. Improves watching older seasons.
+* FEATURE Supply extension for Roman Nurik's DashClock.
+* TWEAK Change widget settings from new widget settings shortcut.
+* TWEAK Rate on trakt by just tapping on the rating values.
+* TWEAK Make favorite stars touchable.
+* TWEAK Text in detail views is mostly selectable (Android 3.0+). Easily copy actor names or descriptions.
+* NOTICE Database upgraded to version 31. Starting SeriesGuide the first time after installing the update may take a little longer than usual.
+
+### Detailed changes:
+
+#### 4beta4 *(2013-03-21)*
+
+* FIX Remove decor view background to reduce overdraw due to android-menudrawer usage, should very slightly improve performance.
+
+#### 4beta3 *(2013-03-14)*
+
+* FEATURE Add statistics.
+* TWEAK Use new improved swipe menu library (MenuDrawer from SimonVT).
+* TWEAK Change widget settings from new widget settings shortcut.
+* TWEAK Show title in activity activity.
+* FIX Spinner on Gingerbread (Android 2.3) and below was not readable (reverted to platform style).
+* TWEAK Increase line height for description text for easier reading.
+* TWEAK Rate on trakt by just tapping on the rating values.
+* TWEAK Overall design tweaks (removals, text size improvements, layout changes).
+* TWEAK Add favorite button in overview.
+* TWEAK Make favorite stars in the show list touchable.
+* TWEAK Improve TVDb reliability by removing www from TVDB API url.
+* TWEAK Displays your own trakt ratings in brackets.
+
+#### 4beta2 *(2013-02-22)*
+
+* FEATURE New next episode algorithm: remembers what you last watched and offers later episodes as next. Improves watching older seasons.
+* FEATURE Allow setting the widget opacity level, for X only.
+* FEATURE Started movie details pages, adds description and a trailer button.
+* TWEAK Display the online help page inline, revamped the online help page.
+* TWEAK Overview updates on new information (e.g. a picture).
+* TWEAK Load movies playing now for empty search query.
+* FIX Restore correct text styles for season watch count.
+* NOTICE Database upgraded to version 31. Starting SeriesGuide the first time after installing the update may take a little longer than usual.
+
+#### 4beta1 *(2013-02-12)*
+
+* FEATURE Supply extension for Roman Nurik's DashClock.
+* TWEAK Text in detail views is mostly selectable (Android 3.0+). Easily copy actor names or descriptions.
+* TWEAK New screen animations.
+* TWEAK New side-attached large-screen layout for activity screen.
+* TWEAK Link to app settings from Android network manager tool (Android 4.0+).
+* TWEAK Smoother transition after pressing swipe-menu item.
+* TWEAK Display show poster in show info, other tweaks for more prettiness.
+* TWEAK Display type of list item if it is an episode or a season.
+* FIX Full screen swipe opens menu if first episode detail page is shown.
+* FIX Very long network names wrap correctly in show list.
+* FIX Crash with list widget.
+* NOTICE Latest translations from crowdin.
+
 Version 3 *(2013-01-29)*
 ------------------------
 

README.md

@@ -8,7 +8,7 @@ For more information about SeriesGuide have a look at [seriesgui.de][1].
 Contributing
 ------------
 
-See CONTRIBUTING.md.
+See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 License
 -------

SeriesGuide/project.properties

@@ -12,9 +12,10 @@
 
 # Project target.
 target=android-17
-android.library.reference.1=../../AndroidUtils/library
-android.library.reference.2=../../SlidingMenu/library
-android.library.reference.3=../../Android-ViewPagerIndicator/library
+android.library.reference.1=../../ActionBarSherlock/library
+android.library.reference.2=../../android-menudrawer/library
+android.library.reference.3=../../AndroidUtils/library
+android.library.reference.4=../../Android-ViewPagerIndicator/library
 android.library.reference.5=../../trakt-java
-android.library.reference.4=../../tmdb-java
+android.library.reference.6=../../tmdb-java
 android.library=true

SeriesGuide/res/anim/blow_up_enter.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <alpha
+        android:duration="@integer/animation_duration"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="1.0" />
+
+    <scale
+        android:duration="@integer/animation_duration"
+        android:fromXScale="0.8"
+        android:fromYScale="0.8"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
+</set>

SeriesGuide/res/anim/blow_up_exit.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <alpha
+        android:duration="@integer/animation_duration"
+        android:fromAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="0.0" />
+
+    <scale
+        android:duration="@integer/animation_duration"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="1.5"
+        android:toYScale="1.5" />
+
+</set>

SeriesGuide/res/anim/fade_in.xml

@@ -18,7 +18,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <alpha
-        android:duration="200"
+        android:duration="500"
         android:fromAlpha="0.0"
         android:toAlpha="1.0" />
 

SeriesGuide/res/anim/fade_out.xml

@@ -18,7 +18,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <alpha
-        android:duration="200"
+        android:duration="500"
         android:fromAlpha="1.0"
         android:toAlpha="0.0" />
 

SeriesGuide/res/anim/shrink_enter.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <alpha
+        android:duration="@integer/animation_duration"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="1.0" />
+
+    <scale
+        android:duration="@integer/animation_duration"
+        android:fromXScale="1.5"
+        android:fromYScale="1.5"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
+</set>

SeriesGuide/res/anim/shrink_exit.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <alpha
+        android:duration="@integer/animation_duration"
+        android:fromAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="0.0" />
+
+    <scale
+        android:duration="@integer/animation_duration"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="0.8"
+        android:toYScale="0.8" />
+
+</set>

SeriesGuide/res/layout-v11/appwidget_v11.xml

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:padding="@dimen/widget_margin" >
 
+    <!-- Need parent FrameLayout for padding backwards compatibility -->
+
     <LinearLayout
+        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/appwidget_bg"
-        android:orientation="vertical" >
+        android:background="@color/widget_default_background"
+        android:orientation="vertical"
+        tools:ignore="UselessParent" >
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -33,9 +38,31 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:fontFamily="sans-serif-light"
                     android:text="@string/upcoming"
                     android:textAllCaps="true"
-                    android:textAppearance="@style/TextAppearance.Medium.Light" />
+                    android:textColor="@color/text_primary"
+                    android:textSize="@dimen/text_size_medium" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/widget_settings"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="@drawable/list_selector_sg"
+                android:focusable="true"
+                android:paddingBottom="@dimen/inline_padding"
+                android:paddingLeft="@dimen/default_padding"
+                android:paddingRight="@dimen/default_padding"
+                android:paddingTop="@dimen/inline_padding" >
+
+                <ImageView
+                    android:id="@+id/imageViewSettings"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="center"
+                    android:contentDescription="@string/preferences"
+                    android:src="@drawable/ic_action_settings" />
             </FrameLayout>
 
             <FrameLayout
@@ -50,7 +77,7 @@
                 android:paddingTop="@dimen/inline_padding" >
 
                 <ImageView
-                    android:id="@+id/imageView1"
+                    android:id="@+id/imageViewLauncher"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"
@@ -73,9 +100,9 @@
             android:id="@+id/empty_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:fontFamily="sans-serif-light"
             android:gravity="center"
-            android:text="@string/no_nextepisode"
-            android:textAppearance="@style/TextAppearance.Medium.Light" />
+            android:text="@string/no_nextepisode" />
     </LinearLayout>
 
 </FrameLayout>

SeriesGuide/res/layout/add_dialog.xml

@@ -23,7 +23,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_toLeftOf="@+id/poster"
                 android:text="@string/add_show"
-                android:textAppearance="?attr/textAppearanceSgXLargeLight" />
+                android:textAppearance="@style/TextAppearance.Large.Light" />
 
             <TextView
                 android:id="@+id/description"

SeriesGuide/res/layout/add_searchresult.xml

@@ -36,7 +36,7 @@
             android:paddingBottom="@dimen/inline_padding"
             android:paddingRight="@dimen/default_padding"
             android:text="@string/app_name"
-            android:textAppearance="?attr/textAppearanceSgMediumLight" />
+            android:textAppearance="@style/TextAppearance.Medium.Light" />
 
         <TextView
             android:id="@+id/description"

SeriesGuide/res/layout/add_searchresult_wide.xml

@@ -40,7 +40,7 @@
                 android:paddingBottom="@dimen/inline_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/app_name"
-                android:textAppearance="?attr/textAppearanceSgXLargeLight" />
+                android:textAppearance="@style/TextAppearance.Large.Light" />
 
             <TextView
                 android:id="@+id/description"
@@ -52,7 +52,7 @@
                 android:paddingBottom="@dimen/inline_padding"
                 android:paddingRight="@dimen/default_padding"
                 android:text="@string/app_name"
-                android:textAppearance="?attr/textAppearanceSgSmall" />
+                android:textAppearance="@style/TextAppearance.Small" />
         </LinearLayout>
 
         <include layout="@layout/divider_horizontal" />

SeriesGuide/res/layout/buttonbar.xml

@@ -1,18 +1,26 @@
 <?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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/buttonbar"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="48dp"
     android:layout_marginBottom="@dimen/default_padding"
-    android:layout_marginLeft="@dimen/default_padding"
-    android:layout_marginRight="@dimen/default_padding" >
+    android:background="?attr/colorBackgroundDim"
+    tools:ignore="Overdraw" >
 
     <Button
         android:id="@+id/checkinButton"
+        style="@style/Widget.SeriesGuide.Button.Borderless.Small"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:nextFocusLeft="@+id/calendarButton"
-        android:text="@string/checkin" />
+        android:paddingLeft="@dimen/default_padding"
+        android:paddingRight="@dimen/default_padding"
+        android:text="@string/checkin"
+        android:textAllCaps="true"
+        android:textStyle="bold" />
+
+    <include layout="@layout/divider_vertical" />
 
     <ImageButton
         android:id="@+id/watchedButton"
@@ -44,7 +52,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:contentDescription="@string/addtocalendar"
-        android:nextFocusRight="@+id/checkinButton"
         android:paddingLeft="@dimen/default_padding"
         android:paddingRight="@dimen/default_padding"
         android:src="?attr/drawableCalendarIcon" />