Package name and fork description

.gitignore

@@ -1,8 +1,8 @@
-/MPDroid/bin
-/MPDroid/gen
-/MPDroid/.classpath
-/MPDroid/local.properties
-/MPDroid/proguard*
+/main/bin
+/main/gen
+/main/.classpath
+/main/local.properties
+/main/proguard*
 /ActionBarSherlock/bin
 /ActionBarSherlock/gen
 /ActionBarSherlock/proguard*

.travis.yml

@@ -20,9 +20,10 @@ before_install:
   - export KEY_STORE="${PWD}/.travis-debug"
   - wget http://mirrors.ukfast.co.uk/sites/ftp.apache.org//ant/binaries/apache-ant-1.9.2-bin.tar.bz2 -O - |tar jx
   - export PATH="${PWD}/apache-ant-1.9.2/bin:${PATH}"
+  - export APP="$(sed 's/.*"app_name"[^>]*>\([^<]*\).*/\1/p' -n ./main/res/values-de/strings.xml)"
 
 script:
-  - cd ./MPDroid
+  - cd ./main
   - envsubst < local.properties.tmpl |tee local.properties
   - cp ${SCALA_PATH}/lib/scala-library.jar libs/
   - ant clean
@@ -38,7 +39,7 @@ after_success:
   - chmod 600 .travis-deploy
   - ssh-agent bash -c "ssh-add .travis-deploy; git clone --depth=1 --branch=downloads git@github.com:${TRAVIS_REPO_SLUG} downloads"
   - cd downloads
-  - find ../bin -name '*.apk'|while read i; do cp $i $(basename $(cd ..; pwd -P))-${i#*-}; done
+  - find ../bin -name '*.apk'|while read i; do cp $i ${APP}-${i#*-}; done
   - git add \*.apk
   - git config user.email "${USER}@$(hostname -f)"
   - git config user.name "Travis CI"

README.md

@@ -1,16 +1,14 @@
-## MPDroid
+## Mupeace
 
-**MPDroid** is a MPD client for Android. It is a fork of [PMix](http://code.google.com/p/pmix/).
+**Mupeace** is an Android Music Player Client (/ˈmjuːˌpiːs/, from MPC with pronounceability vowels) for MPD, the Music Player Daemon. It is a fork of MPDroid and, in turn, [PMix](http://code.google.com/p/pmix/). This fork retains Gingerbread compatibility, is active at squashing bugs, especially crashes, and adds features to aid navigation of large jazz or classical collections.
 
-You can browse your library, control the current song and playlist, manage your outputs, and stream music right to your phone. And all of this wrapped up in a beautiful modern Holo design !
+You can browse your library, control the current song and playlist, manage your outputs and stream music to your phone. Switch between different servers, say, in different rooms, easily with Zeroconf auto-discovery and share from the YouTube application to queue the audio for your stereo. 
 
-What's not to like ? 
-
-![Now Playing/library Screenshot](https://raw.github.com/abarisain/dmix/master/Screenshots/readme.png)
+![Now Playing/library Screenshot](https://raw.github.com/eisnerd/dmix/master/Screenshots/readme.png)
 
 #### Compatibility
 
-MPDroid works on **all** devices from 2.2 to 4.1
+Mupeace works on **all** devices from 2.2 to 4.1
 1280x800 (13") Tablets are also supported, and even have a special layout.
 10" will use the phone layout, and Nexus 7 support is being worked on.
 
@@ -28,9 +26,9 @@ LastFM-java - Last.FM cover art support
  - Lack some library information (read the roadmap)
 
 ## Roadmap
-New features will most likely be delayed. MPDroid is, in my opinion, almost fully-featured and pushes (hits) MPD's api limits. Widely requested features (like better search, better library browsing) can't be done whithout duplicating MPD's database locally.  
+New features will most likely be delayed. Mupeace is, in my opinion, almost fully-featured and pushes (hits) MPD's api limits. Widely requested features (like better search, better library browsing) can't be done whithout duplicating MPD's database locally.  
 This is a huge project, and it will take a lot of time (if ever done).
-Also, MPDroid's speed isn't that great, but considering that MPD's api was never made for 3G (read crappy) connections, it is also not that bad.
+Also, Mupeace's speed isn't that great, but considering that MPD's api was never made for 3G (read crappy) connections, it is also not that bad.
 
 So, the current roadmap is :
 
@@ -39,21 +37,21 @@ So, the current roadmap is :
  - [x] ~~Select default library tab to show (for people who mainly use filesystem view)~~ (done in 1.03)
  - [ ] Add better streams support
  - [ ] Add lyrics & artist/album info
- - [ ] Make MPDroid configurable for multiple servers (Better implementation than the hackish wlan based one)
+ - [ ] Make Mupeace configurable for multiple servers (Better implementation than the hackish wlan based one)
  - [ ] Add bonjour support
  - [ ] Streams XML Import/Export
  - [ ] Rework AlbumArtist (also, see LouBas's request on the blog)
  - [ ] Split album details by CD and allow only one CD to be added to the playlist
  - [x] ~~Fix the stupdly small hitbox for the progress thumb, make the view sliding impossible around it so accidents don't happen as often as they do now~~ (1.04)
  - [x] ~~Improve cover art support and add a local cache~~
  - [x] ~~Better Android 4.x integration (Jelly Bean notifications, lock screen controls)~~
- - Keep it the most up to date and best MPDroid client for android
+ - Keep it the most up to date and best Mupeace client for android
  - ???
  - Profit
 
 ## Donations
 
-Since MPDroid is a fork of dmix and that a lot of people helped me with some huge patches (see special thanks), I don't really belive it would be ethical to accept donations.
+Since Mupeace is a fork of dmix and that a lot of people helped me with some huge patches (see special thanks), I don't really belive it would be ethical to accept donations.
 
 If you still want to donate, I have a paypal address at dreamteam69@gmail.com , you can send how much you want to it :)
 
@@ -64,12 +62,12 @@ Please consider donating to some of the developpers down there :)
 
 Obviously, PMix for their work on the original application. There is not much of PMix left, but their core code is still here.
 
-Everybody who blogged about MPDroid, allowing it to gain a large userbase.
+Everybody who blogged about Mupeace, allowing it to gain a large userbase.
 Mopidy, for working with me on the search support.
 
 #### Developpers
 
-There are a lot of people here. Developpers who crossed my path now and then, working on mpdroid and fixing some things. This project wouldn't be the same without you !
+There are a lot of people here. Developpers who crossed my path now and then, working on Mupeace and fixing some things. This project wouldn't be the same without you !
 
 [Kent Gustavsson](https://github.com/orrche) - Cleaned up a lot of PMix's old bugged core and polished the interface. Huge refactoring work on the activities.
 
@@ -79,7 +77,7 @@ There are a lot of people here. Developpers who crossed my path now and then, wo
 
 Andrew Blackburn - Various stuff, suggestions and layout work
 
-[Stefan Richter](https://github.com/02strich) - Refactoring and … Widget ! I was really too lazy about this one, and it was a much requested feature. Also added a way to build MPDroid from the command line, which I didn't even try.
+[Stefan Richter](https://github.com/02strich) - Refactoring and … Widget ! I was really too lazy about this one, and it was a much requested feature. Also added a way to build Mupeace from the command line, which I didn't even try.
 
 [Matt Black](https://github.com/mafrosis) - Also worked on ant building. Reported a log of bugs/improvement suggestions. We may not agree on everything but it's been useful !
 
@@ -90,4 +88,4 @@ Other patch submitters : Jörg Thalheim, Florian Weile, Daniel Schoepe, John Bä
 And if I forgot you … I'm sorry, it's kinda hard to remember everybody who worked on a 2 year old project, feel free to mail me :)
 
 
-Thanks a lot guys!
+Thanks a lot guys!

MPDroid/.project → main/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>MPDroid</name>
+	<name>Mupeace</name>
 	<comment></comment>
 	<projects>
 		<project>JmDNS</project>

MPDroid/AndroidManifest.xml → main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.namelessdev.mpdroid" android:versionCode="31" android:versionName="1.06">
+	package="org.musicpd.android" android:versionCode="31" android:versionName="1.06">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -31,7 +31,7 @@
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 			<intent-filter>
-				<action android:name="com.namelessdev.mpdroid.PLAYBACK_VIEWER" />
+				<action android:name="org.musicpd.android.PLAYBACK_VIEWER" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 			<meta-data android:name="android.app.default_searchable"
@@ -74,7 +74,7 @@
 		</activity>
 
 		<service android:enabled="true" android:name="StreamingService" />
-		<receiver android:name="com.namelessdev.mpdroid.RemoteControlReceiver">
+		<receiver android:name="org.musicpd.android.RemoteControlReceiver">
 			<intent-filter android:priority="500">
 				<action android:name="android.intent.action.MEDIA_BUTTON" />
 			</intent-filter>
@@ -83,7 +83,7 @@
 			</intent-filter>
 		</receiver>
 
-		<receiver android:name="com.namelessdev.mpdroid.PhoneStateReceiver">
+		<receiver android:name="org.musicpd.android.PhoneStateReceiver">
     		<intent-filter>
       			<action android:name="android.intent.action.PHONE_STATE" />
     			</intent-filter>

MPDroid/build.xml → main/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="MainMenuActivity" default="help">
+<project name="Main" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into

MPDroid/MPDroid.eml → main/main.eml

@@ -3,6 +3,6 @@
 	<exclude-output/>
 	<contentEntry url="file://$MODULE_DIR$"/>
 	<lib name="$MODULE_DIR$/libs/android-support-v4.jar" scope="COMPILE">
-		<relative-module-cls project-related="jar://$USER_HOME$/dev/android/dmix/MPDroid/libs/android-support-v4.jar!/"/>
+		<relative-module-cls project-related="jar://$USER_HOME$/dev/android/dmix/Mupeace/libs/android-support-v4.jar!/"/>
 	</lib>
 </component>

MPDroid/res/layout-land/main_activity_tablet.xml → main/res/layout-land/main_activity_tablet.xml

@@ -5,15 +5,15 @@
     android:orientation="horizontal"
     tools:context=".MainMenuActivity" >
 
-    <com.namelessdev.mpdroid.views.MainMenuViewPager
+    <org.musicpd.android.views.MainMenuViewPager
         android:id="@+id/pager"
         android:layout_width="0dip"
         android:layout_height="match_parent"
         android:layout_weight="40" />
 
     <fragment
         android:id="@+id/playlist_fragment"
-        android:name="com.namelessdev.mpdroid.fragments.PlaylistFragment"
+        android:name="org.musicpd.android.fragments.PlaylistFragment"
         android:layout_width="0dip"
         android:layout_height="match_parent"
         android:layout_weight="60"

MPDroid/res/layout-land/songs.xml → main/res/layout-land/songs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:mpdroid="http://schemas.android.com/apk/res/com.namelessdev.mpdroid"
+    xmlns:mupeace="http://schemas.android.com/apk/res/org.musicpd.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
@@ -17,12 +17,12 @@
             android:layout_weight="3"
             android:orientation="vertical" >
 
-            <com.namelessdev.mpdroid.views.FixedRatioRelativeLayout
+            <org.musicpd.android.views.FixedRatioRelativeLayout
                 android:id="@+id/albumCoverFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dip"
-                mpdroid:fixedSide="width" >
+                mupeace:fixedSide="width" >
 
                 <ImageView
                     android:id="@+id/albumCover"
@@ -38,7 +38,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:visibility="invisible" />
-            </com.namelessdev.mpdroid.views.FixedRatioRelativeLayout>
+            </org.musicpd.android.views.FixedRatioRelativeLayout>
 
             <TextView
                 android:id="@+id/tracks_artist"

MPDroid/res/layout-v11/playlist_activity.xml → main/res/layout-v11/playlist_activity.xml

@@ -14,7 +14,7 @@
         android:queryHint="@string/searchQueue" >
     </SearchView>
 
-    <com.namelessdev.mpdroid.views.TouchInterceptor
+    <org.musicpd.android.views.TouchInterceptor
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="0dip"

MPDroid/res/layout-v11/playlist_editlist_activity.xml → main/res/layout-v11/playlist_editlist_activity.xml

@@ -6,7 +6,7 @@
     >
 
     <!-- <include android:id="@+id/header" layout="@layout/generic_header" /> -->
-    <com.namelessdev.mpdroid.views.TouchInterceptor android:id="@android:id/list"
+    <org.musicpd.android.views.TouchInterceptor android:id="@android:id/list"
         android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"

MPDroid/res/layout/album_grid_item.xml → main/res/layout/album_grid_item.xml

@@ -3,7 +3,7 @@
 			 android:layout_width="match_parent"
 			 android:layout_height="match_parent">
 
-	<com.namelessdev.mpdroid.ui.SquareImageView
+	<org.musicpd.android.ui.SquareImageView
 		android:id="@+id/albumCover"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"

MPDroid/res/layout/library_tabs.xml → main/res/layout/library_tabs.xml

@@ -20,7 +20,7 @@
 
     <fragment
         android:id="@+id/now_playing_small_fragment"
-        android:name="com.namelessdev.mpdroid.fragments.NowPlayingSmallFragment"
+        android:name="org.musicpd.android.fragments.NowPlayingSmallFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:layout="@layout/now_playing_small_fragment" />

MPDroid/res/layout/library_tabs_settings.xml → main/res/layout/library_tabs_settings.xml

@@ -4,7 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-  	<com.namelessdev.mpdroid.views.TouchInterceptor
+  	<org.musicpd.android.views.TouchInterceptor
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="0dip"

MPDroid/res/layout/main_activity.xml → main/res/layout/main_activity.xml

@@ -1,4 +1,4 @@
-<com.namelessdev.mpdroid.views.MainMenuViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+<org.musicpd.android.views.MainMenuViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/pager"
     android:layout_width="match_parent"

MPDroid/res/layout/main_activity_tablet.xml → main/res/layout/main_activity_tablet.xml

@@ -5,15 +5,15 @@
     android:orientation="vertical"
     tools:context=".MainMenuActivity" >
 
-    <com.namelessdev.mpdroid.views.MainMenuViewPager
+    <org.musicpd.android.views.MainMenuViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="30" />
 
     <fragment
         android:id="@+id/playlist_fragment"
-        android:name="com.namelessdev.mpdroid.fragments.PlaylistFragment"
+        android:name="org.musicpd.android.fragments.PlaylistFragment"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="70"

MPDroid/res/layout/main_fragment_land.xml → main/res/layout/main_fragment_land.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:mpdroid="http://schemas.android.com/apk/res/com.namelessdev.mpdroid"
+    xmlns:mupeace="http://schemas.android.com/apk/res/org.musicpd.android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -14,14 +14,14 @@
         android:baselineAligned="true"
         android:orientation="horizontal" >
 
-        <com.namelessdev.mpdroid.views.FixedRatioRelativeLayout
+        <org.musicpd.android.views.FixedRatioRelativeLayout
             android:id="@+id/coverLayout"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="10dip"
             android:layout_marginRight="10dip"
             android:layout_marginTop="4dip"
-            mpdroid:fixedSide="height" >
+            mupeace:fixedSide="height" >
 
             <ImageView
                 android:id="@+id/albumCover"
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:visible="false" />
-        </com.namelessdev.mpdroid.views.FixedRatioRelativeLayout>
+        </org.musicpd.android.views.FixedRatioRelativeLayout>
 
         <RelativeLayout
             android:id="@+id/songInfo"

MPDroid/res/layout/playlist_editlist_activity.xml → main/res/layout/playlist_editlist_activity.xml

@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     >
     <!-- <include android:id="@+id/header" layout="@layout/generic_header" /> -->
-    <com.namelessdev.mpdroid.views.TouchInterceptor android:id="@android:id/list"
+    <org.musicpd.android.views.TouchInterceptor android:id="@android:id/list"
         android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"

MPDroid/res/layout/settings.xml → main/res/layout/settings.xml

@@ -7,8 +7,8 @@
 			android:summary="@string/connectionSettingsDescription" android:key="connectionScreen">
 
 			<intent android:action="android.intent.action.MAIN"
-				android:targetPackage="com.namelessdev.mpdroid"
-				android:targetClass="com.namelessdev.mpdroid.WifiConnectionSettings" />
+				android:targetPackage="org.musicpd.android"
+				android:targetClass="org.musicpd.android.WifiConnectionSettings" />
 
 		</PreferenceScreen>
 		<!-- Outputs -->
@@ -65,8 +65,8 @@
  	    <PreferenceScreen android:key="libraryTabsSettings"
 			android:title="@string/libraryTabsSettings" android:summary="@string/libraryTabsSettingsDescription">
 			<intent android:action="android.intent.action.MAIN"
-				android:targetPackage="com.namelessdev.mpdroid"
-				android:targetClass="com.namelessdev.mpdroid.library.LibraryTabsSettings" />
+				android:targetPackage="org.musicpd.android"
+				android:targetClass="org.musicpd.android.library.LibraryTabsSettings" />
 		</PreferenceScreen>
 
 		<PreferenceScreen android:key="coverArtScreen"
@@ -138,7 +138,7 @@
 		<PreferenceScreen android:title="@string/donate" android:key="whatsNew">
 
 			<intent android:action="android.intent.action.MAIN"
-				android:targetPackage="com.namelessdev.mpdroid" android:targetClass="com.namelessdev.mpdroid.WebViewActivity" />
+				android:targetPackage="org.musicpd.android" android:targetClass="org.musicpd.android.WebViewActivity" />
 
 		</PreferenceScreen>
 
@@ -147,7 +147,7 @@
 			android:summary="@string/aboutDescription" android:key="aboutScreen">
 
 			<intent android:action="android.intent.action.MAIN"
-				android:targetPackage="com.namelessdev.mpdroid" android:targetClass="com.namelessdev.mpdroid.AboutActivity" />
+				android:targetPackage="org.musicpd.android" android:targetClass="org.musicpd.android.AboutActivity" />
 
 		</PreferenceScreen>
 	</PreferenceCategory>

MPDroid/res/layout/stored_playlist_activity.xml → main/res/layout/stored_playlist_activity.xml

@@ -4,7 +4,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-    <fragment android:name="com.namelessdev.mpdroid.fragments.StoredPlaylistFragment"
+    <fragment android:name="org.musicpd.android.fragments.StoredPlaylistFragment"
             android:id="@+id/storedPlaylistFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />