Merge pull request #2 from brianwernick/playlist_support

Playlist support
brianwernick · May 14, 2015 · 9434d74 · 9434d74
2 parents daa1237 + 8081f9e
commit 9434d74
Show file tree

Hide file tree

Showing 36 changed files with 3,572 additions and 395 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,11 @@ Or included in your gradle dependencies
 compile 'com.devbrackets.android:exomedia:1.0.1'
 ```
 
+Additionally, if you use ProGuard you will need to add the following rule
+```proguard
+# ExoMedia
+-keep class com.devbrackets.android.exomedia.** {*;}
+```
 
 Example
 -------

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter();
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath 'com.novoda:bintray-release:0.2.7'
     }
 }

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -2,7 +2,8 @@ apply plugin: 'com.android.application'
 
 dependencies {
     compile project(':library')
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:appcompat-v7:22.1.1'
+    compile 'com.squareup.picasso:picasso:2.5.2'
 }
 
 android {

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -1,39 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.devbrackets.android.exomediademo" >
+<manifest package="com.devbrackets.android.exomediademo"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:name=".App">
         <activity
             android:name=".StartupActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
             android:name=".VideoPlayerActivity"
-            android:label="@string/title_activity_video_player" >
+            android:label="@string/title_activity_video_player">
         </activity>
         <activity
-            android:name=".AudioPlayerActivity"
-            android:label="@string/title_activity_audio_player" >
+            android:name=".FullScreenVideoPlayerActivity"
+            android:label="@string/title_activity_video_player">
         </activity>
         <activity
-            android:name=".FullScreenVideoPlayerActivity"
-            android:label="@string/title_activity_audio_player" >
+            android:name=".AudioSelectionActivity"
+            android:label="@string/title_activity_audio_player">
         </activity>
+        <activity
+            android:name=".AudioPlayerActivity"
+            android:label="@string/title_activity_audio_player">
+        </activity>
+
 
         <service
             android:name=".service.AudioService"
             android:enabled="true"
-            android:exported="false" >
+            android:exported="false">
         </service>
     </application>
 

diff --git a/demo/src/main/java/com/devbrackets/android/exomediademo/App.java b/demo/src/main/java/com/devbrackets/android/exomediademo/App.java
@@ -0,0 +1,35 @@
+package com.devbrackets.android.exomediademo;
+
+import android.app.Application;
+
+import com.devbrackets.android.exomediademo.manager.PlaylistManager;
+
+public class App extends Application {
+
+    private static App application;
+    private static PlaylistManager playlistManager;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        application = this;
+        playlistManager = new PlaylistManager();
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+
+        application = null;
+        playlistManager = null;
+    }
+
+    public static PlaylistManager getPlaylistManager() {
+        return playlistManager;
+    }
+
+    public static App getApplication() {
+        return application;
+    }
+}