Merge branch 'release-8'

.gitignore

@@ -1,6 +1,7 @@
 dist
 analytics.xml
 keys.xml
+*.keystore
 
 ### Android
 ###########
@@ -20,6 +21,7 @@ gen/
 
 # Local configuration file (sdk path, etc)
 local.properties
+gradle.properties
 
 ### Linux
 #########
@@ -42,4 +44,9 @@ $RECYCLE.BIN/
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/
+
+### Gradle
+.gradle/
+build/
+out/

CHANGELOG.md

@@ -5,6 +5,45 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 8 *(in beta)*
+-----------------
+
+* SeriesGuide X users, time to migrate your shows to the free version! Use the migration assistants, keep X installed to unlock all features in the free version.
+* Revamped filter and sort options for shows. Apply sort order twice to reverse it.
+* YouTube and web search button for shows and episodes.
+* Reduced minimum size of list widget, removed legacy one row widget on Android 3.0 and up.
+* Bug and crash fixes.
+
+### Detailed changes:
+
+#### 8 *(2013-10-07)*
+
+* FEATURE Support Hebrew and Japanese TVDb content languages.
+* FEATURE 'Web search' button for shows and episodes. Thanks Andrew Neal (@adneal)!
+* TWEAK Correct air times for Australian shows using information from trakt.tv.
+
+#### 8-beta2 *(2013-10-04)*
+
+* FEATURE New filter and sort options for shows. Apply sort order twice to reverse it. Removed old categories.
+* FIX Some reported crashes.
+* NOTICE Latest translations from crowdin.
+
+#### 7.2-beta1 *(2013-10-01)*
+
+* NOTICE SeriesGuide X users, time to migrate your shows to the free version! Keep X installed to unlock all features in the free version.
+* FEATURE YouTube search link on show and episode pages. Thanks Andrew Neal (@adneal)!
+* FEATURE Migration assistant. Helps export shows and install SeriesGuide in X, import shows within SeriesGuide.
+* TWEAK Refined first run info card, now a less distracting dismiss button.
+* TWEAK Some layout tweaks for larger screens (7-inch, 10-inch).
+* TWEAK Refreshed icons. Search inside show action now shown with any tab in show overview.
+* TWEAK List widget can be resized down to about one row in height and three columns in width. Removed legacy one row widget.
+* TWEAK Display subscription button right in the top menu for better discovery.
+* FIX Day headers on activity screen blacked out.
+* FIX Going back from X subscription screen dropped you out of the app.
+* FIX Layout animations in season list caused wierd overlaps.
+* NOTICE Switched to Gradle build system.
+* NOTICE Latest translations from crowdin.
+
 Version 7.1 *(2013-08-10)*
 -----------------
 

CONTRIBUTING.md

@@ -16,9 +16,9 @@ The repository is made up of two main branches: master (stable) and beta (develo
 Setup
 -----
 
-This project is built with [Android Developer Tools (ADT)][3] using the Android library concept for dependency management. Clone this repository inside your working folder. Add all projects inside the root and the libraries folder. (You can also have a look at the project.properties files on how the projects depend on another.)
+This project is built with Gradle and the [Android Gradle plugin][3] using the Android library concept for dependency management. Clone this repository inside your working folder. Import the build.gradle file in the root folder into Android Studio. (You can also have a look at the build.gradle files on how the projects depend on another.)
 
-To successfully build with ADT, you should also create a keys.xml file in the SeriesGuide/res/values folder and add the string values 
+To successfully build with ADT, you should also create a keys.xml file in the `SeriesGuide/src/main/res/values` folder and add the string values 
 
     <resources>
         <string name="tvdb_apikey"></string>
@@ -30,9 +30,10 @@ To successfully build with ADT, you should also create a keys.xml file in the Se
 
 to it. These are not shared with the public mainly for security reasons.
 
-To build any of the free, X or beta version use the appropiate flavor project. They all use the SeriesGuide project as an Android library project and just change the package names and icons as well as the Content Provider URI.
+Now build any of the free, X or beta debug build variants (flavor + debug build type, see [instructions about product flavors][5]) defined in `SeriesGuide/build.gradle`. Each flavor just changes the package names and icons as well as the Content Provider URI and some additional properties.
 
  [1]: https://play.google.com/store/apps/details?id=com.battlelancer.seriesguide
  [2]: https://github.com/UweTrottmann/SeriesGuide/wiki/Beta
- [3]: http://developer.android.com/tools/help/adt.html
- [4]: http://crowdin.net/project/seriesguide-translations
+ [3]: http://tools.android.com/tech-docs/new-build-system/user-guide
+ [4]: http://crowdin.net/project/seriesguide-translations
+ [5]: http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Product-flavors

CREDITS.txt

@@ -152,4 +152,11 @@ 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.
+limitations under the License.
+
+
+Androidicons Developer set (http://www.androidicons.com/)
+-------------------------------------------------------------------
+
+They do not require crediting, but I'll do it anyways because you
+absolutely have to check their icons out!

RELEASE-PROCESS.md

@@ -4,9 +4,8 @@ Release procedure
 1. Get latest translations from crowdin and check for errors.
 2. Update change log.
 3. Bump version code and number.
-4. Create release tag.
 5. Build APK.
-6. Create Google Play change log (for stable only).
-7. Upload to Google Play.
-8. Modify website (changes, new APKs).
+6. Create Google Play change log, prepare screenshots (for stable only).
+7. Create new release on GitHub.
+8. Upload to Google Play.
 9. Post on social networks.

SeriesGuide/build.gradle

@@ -1,36 +1,63 @@
-buildscript {
-    repositories {
-        mavenCentral()
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 18
+    buildToolsVersion "18.1"
+    compileOptions.encoding = "UTF-8"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 18
+    }
+
+    productFlavors {
+        free {
+            packageName "com.battlelancer.seriesguide"
+            versionCode 176
+            versionName "8"
+        }
+        beta {
+            packageName "com.battlelancer.seriesguide.beta"
+            versionCode 215
+            versionName "8-internal"
+        }
+        x {
+            packageName "com.battlelancer.seriesguide.x"
+            versionCode 160
+            versionName "8x"
+        }
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.4'
+
+    signingConfigs {
+        release {
+            storeFile file('release.keystore')
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+        }
     }
 }
-apply plugin: 'android-library'
 
 dependencies {
+    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+    compile project(':libraries:android-menudrawer')
+    compile project(':libraries:androidutils')
+    compile project(':libraries:pagerslidingtabstrip')
+    compile project(':libraries:stickygridheaders')
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile project(':AndroidUtils:library')
-    compile project(':ActionBarSherlock:actionbarsherlock')
-    compile project(':Android-ViewPagerIndicator:library')
-    compile project(':android-menudrawer:library')
+    compile 'com.android.support:support-v4:18.0.+'
 }
 
-android {
-    compileSdkVersion 17
-    buildToolsVersion "17.0.0"
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-
-        instrumentTest.setRoot('tests')
-    }
-}
+// get signing config from gradle.properties file
+if (project.hasProperty('storePassword')
+        && project.hasProperty('keyAlias')
+        && project.hasProperty('keyPassword')) {
+    android.signingConfigs.release.storePassword = storePassword
+    android.signingConfigs.release.keyAlias = keyAlias
+    android.signingConfigs.release.keyPassword = keyPassword
+} else {
+    android.buildTypes.release.signingConfig = null
+}