merge master

AudioWifeDemo/.classpath

@@ -3,8 +3,8 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

AudioWifeDemo/res/layout/main.xml

@@ -41,7 +41,7 @@
             android:paddingTop="5dp" >
 
             <SeekBar
-                android:id="@+id/mediaSeekBar"
+                android:id="@+id/media_seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"

AudioWifeDemo/src/nl/changer/audiowifedemo/MainActivity.java

@@ -41,10 +41,10 @@ public void onClick(View v) {
 			}
 		});
 
-		// initialize the player contols
+		// initialize the player controls
 		mPlayMedia = findViewById(R.id.play);
 		mPauseMedia = findViewById(R.id.pause);
-		mMediaSeekBar = (SeekBar) findViewById(R.id.mediaSeekBar);
+		mMediaSeekBar = (SeekBar) findViewById(R.id.media_seekbar);
 		mPlaybackTime = (TextView) findViewById(R.id.playback_time);
 
 		mPlayMedia.setOnClickListener(new View.OnClickListener() {

README.md

@@ -1,10 +1,35 @@
-Audio Wife
+Index
+==================
+
+* [Introduction](https://github.com/jaydeepw/audio-wife#audio-wife---introduction)
+* [Why this project?](https://github.com/jaydeepw/audio-wife#why-this-project)
+
+* [Including in your own project](https://github.com/jaydeepw/audio-wife#including-in-your-project)
+
+* [Getting started](https://github.com/jaydeepw/audio-wife#getting-started)
+
+* [Add custom listeners](https://github.com/jaydeepw/audio-wife#add-custom-listeners)
+
+* [Why the name 'AudioWife'?](https://github.com/jaydeepw/audio-wife#why-the-name-audiowife)
+
+* [Contributing](https://github.com/jaydeepw/audio-wife#contributing)
+
+* [Developed by](https://github.com/jaydeepw/audio-wife#developed-by)
+
+* [Credits](https://github.com/jaydeepw/audio-wife#credits)
+
+* [License](https://github.com/jaydeepw/audio-wife#license)
+
+
+
+Audio Wife - Introduction
 ==========
 
 A simple themable audio player library for Android. Helps you have an Audio Controller
 for your Audio Player UI. Have your own UI and pass the instance of UI controls like
 Play button, Pause button, Seekbar etc to AudioWife and rest is taken care of.
 
+your_player.xml
 ![Audio Player Paused](images/paused.JPG)
 
 ![Audio Player Playing](images/playing.JPG)
@@ -32,10 +57,10 @@ Getting started
 ====================
 ```java
 
-// initialize the player contols
+// initialize the player controls
 mPlayMedia = findViewById(R.id.play);
 mPauseMedia = findViewById(R.id.pause);
-mMediaSeekBar = (SeekBar) findViewById(R.id.mediaSeekBar);
+mMediaSeekBar = (SeekBar) findViewById(R.id.media_seekbar);
 mPlaybackTime = (TextView) findViewById(R.id.playback_time);
 
 // initialize AudioWife
@@ -67,6 +92,7 @@ To extend the capabilities of AudioWife, custom click listeners can be attached.
 Refer to source documentation for more details.
 
 ```java
+<<<<<<< HEAD
 		AudioWife.getInstance().init(MainActivity.this, uri)
 				.setPlayView(mPlayMedia)		// AudioWife takes care of click handler for play button
 				.setPauseView(mPauseMedia)		// AudioWife takes care of click handler for pause button
@@ -102,6 +128,43 @@ Refer to source documentation for more details.
 				// Your on audio pause stuff.
 			}
 		});
+=======
+AudioWife.getInstance().init(MainActivity.this, uri)
+		.setPlayView(mPlayMedia)		// AudioWife takes care of click handler for play button
+		.setPauseView(mPauseMedia)		// AudioWife takes care of click handler for pause button
+		.setSeekBar(mMediaSeekBar)
+		.setPlaytime(mPlaybackTime);
+
+AudioWife.getInstance().addOnCompletionListener( new MediaPlayer.OnCompletionListener() {
+
+	@Override
+	public void onCompletion(MediaPlayer mp) {
+		Toast.makeText(getBaseContext(), "Completed", Toast.LENGTH_SHORT)
+			 .show();
+		// do you stuff
+	}
+});
+
+AudioWife.getInstance().addOnPlayClickListener(new View.OnClickListener() {
+
+	@Override
+	public void onClick(View v) {
+		Toast.makeText(getBaseContext(), "Play", Toast.LENGTH_SHORT)
+			 .show();
+		// get-set-go. Lets dance.
+	}
+});
+
+AudioWife.getInstance().addOnPauseClickListener(new View.OnClickListener() {
+
+	@Override
+	public void onClick(View v) {
+		Toast.makeText(getBaseContext(), "Pause", Toast.LENGTH_SHORT)
+			 .show();
+		// Your on audio pause stuff.
+	}
+});
+>>>>>>> 4c8df84fe2d195c99e1526de98390ba9c1932c63
 ```
 
 Why the name 'AudioWife'?