Changed package name to subdroid to avoid getting banned by Google for being to similar to subphonic

14 files changed, 34 insertions, 16 deletions

diff --git a/subsonic-android/res/drawable-hdpi-v4/launch2.png b/subsonic-android/res/drawable-hdpi-v4/launch2.png
new file mode 100644
index 00000000..a23d09d9
--- /dev/null
+++ b/subsonic-android/res/drawable-hdpi-v4/launch2.png
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_header_icon2.png b/subsonic-android/res/drawable-hdpi-v4/main_header_icon2.png
new file mode 100644
index 00000000..0889aee6
--- /dev/null
+++ b/subsonic-android/res/drawable-hdpi-v4/main_header_icon2.png
diff --git a/subsonic-android/res/drawable/ic_menu_overflow.png b/subsonic-android/res/drawable/ic_menu_overflow.png
new file mode 100644
index 00000000..2abc4580
--- /dev/null
+++ b/subsonic-android/res/drawable/ic_menu_overflow.png
diff --git a/subsonic-android/res/drawable/launch2.png b/subsonic-android/res/drawable/launch2.png
new file mode 100644
index 00000000..b023d189
--- /dev/null
+++ b/subsonic-android/res/drawable/launch2.png
diff --git a/subsonic-android/res/drawable/main_header_icon2.png b/subsonic-android/res/drawable/main_header_icon2.png
new file mode 100644
index 00000000..dc62e6b6
--- /dev/null
+++ b/subsonic-android/res/drawable/main_header_icon2.png
diff --git a/subsonic-android/res/drawable/menu_more.png b/subsonic-android/res/drawable/menu_more.png
new file mode 100644
index 00000000..c3733747
--- /dev/null
+++ b/subsonic-android/res/drawable/menu_more.png
diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index a63e7d9e..5f4f3915 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -165,7 +165,7 @@
 

         </RelativeLayout>

 

-        <github.daneren2005.subphonic.util.MyViewFlipper

+        <github.daneren2005.subdroid.util.MyViewFlipper

                 android:id="@+id/download_playlist_flipper"

                 android:layout_width="wrap_content"

                 android:layout_height="fill_parent"

@@ -196,7 +196,7 @@
 

             <include layout="@layout/download_playlist"/>

 

-        </github.daneren2005.subphonic.util.MyViewFlipper>

+        </github.daneren2005.subdroid.util.MyViewFlipper>

 

     </RelativeLayout>

 

diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index c2ca0a4a..d74fa553 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -4,7 +4,7 @@
               android:layout_width="fill_parent"

               android:layout_height="fill_parent">

 

-    <github.daneren2005.subphonic.util.MyViewFlipper

+    <github.daneren2005.subdroid.util.MyViewFlipper

                  android:id="@+id/download_playlist_flipper"

                  android:layout_width="fill_parent"

                  android:layout_height="0dip"

@@ -121,7 +121,7 @@
 

         <include layout="@layout/download_playlist"/>

 

-    </github.daneren2005.subphonic.util.MyViewFlipper>

+    </github.daneren2005.subdroid.util.MyViewFlipper>

 

     <LinearLayout android:orientation="horizontal"

                   android:layout_width="fill_parent"

diff --git a/subsonic-android/res/layout/action_bar.xml b/subsonic-android/res/layout/action_bar.xml
index 6c846ecc..2aaa4116 100644
--- a/subsonic-android/res/layout/action_bar.xml
+++ b/subsonic-android/res/layout/action_bar.xml
@@ -6,7 +6,7 @@
 

     <ImageView

             android:id="@+id/actionbar_home_icon"

-            android:src="@drawable/main_header_icon"

+            android:src="@drawable/main_header_icon2"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_gravity="center_vertical"

diff --git a/subsonic-android/res/layout/download_button_bar_flipper.xml b/subsonic-android/res/layout/download_button_bar_flipper.xml
index 8069f52b..160d4422 100644
--- a/subsonic-android/res/layout/download_button_bar_flipper.xml
+++ b/subsonic-android/res/layout/download_button_bar_flipper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<github.daneren2005.subphonic.util.MyViewFlipper

+<github.daneren2005.subdroid.util.MyViewFlipper

         xmlns:android="http://schemas.android.com/apk/res/android"

         android:id="@+id/download_button_bar_flipper"

         android:layout_width="fill_parent"

@@ -60,7 +60,7 @@
 

     <include layout="@layout/button_bar"/>

 

-</github.daneren2005.subphonic.util.MyViewFlipper>

+</github.daneren2005.subdroid.util.MyViewFlipper>

 

 

 

diff --git a/subsonic-android/res/layout/download_slider.xml b/subsonic-android/res/layout/download_slider.xml
index 98b54df3..eefe3dca 100644
--- a/subsonic-android/res/layout/download_slider.xml
+++ b/subsonic-android/res/layout/download_slider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<github.daneren2005.subphonic.util.HorizontalSlider

+<github.daneren2005.subdroid.util.HorizontalSlider

         xmlns:android="http://schemas.android.com/apk/res/android"

         style="?android:attr/progressBarStyleHorizontal"

         android:id="@+id/download_progress_bar"

diff --git a/subsonic-android/res/layout/overflow_menu.xml b/subsonic-android/res/layout/overflow_menu.xml
new file mode 100644
index 00000000..4881324f
--- /dev/null
+++ b/subsonic-android/res/layout/overflow_menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<linearlayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/overflow_menu"
+	android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+	android:background="@drawable/menubar_button_disabled">
+		
+	<ImageButton
+		android:id="@+id/overflow_button_1"
+		android:src="@drawable/action_shuffle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:scaleType="center"
+		android:background="@drawable/actionbar_button"
+		/>
+	
+</linearlayout>
\ No newline at end of file
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 7a257105..1566fa05 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <resources>

 

-    <string name="common.appname">Subphonic</string>

+    <string name="common.appname">Sub Droid</string>

     <string name="common.ok">OK</string>

     <string name="common.save">Save</string>

     <string name="common.cancel">Cancel</string>

@@ -13,14 +13,14 @@
     <string name="common.unpin">Unpin</string>

     <string name="common.delete">Delete</string>

 

-    <string name="button_bar.home">Subphonic home</string>

+    <string name="button_bar.home">Sub Droid home</string>

     <string name="button_bar.browse">Media library</string>

     <string name="button_bar.search">Search</string>

     <string name="button_bar.playlists">Playlists</string>

     <string name="button_bar.now_playing">Now playing</string>

 

     <string name="main.welcome_title">Welcome!</string>

-    <string name="main.welcome_text">Welcome to Subphonic! The app is currently configured to use the Subsonic demo server. After you\'ve

+    <string name="main.welcome_text">Welcome to Sub Droid! The app is currently configured to use the Subsonic demo server. After you\'ve

         set up your personal server (available from <b>subsonic.org</b>), please go to <b>Settings</b> and change the configuration to connect to it.</string>

     <string name="main.select_server">Select server</string>

     <string name="main.shuffle">Shuffle play</string>

@@ -40,7 +40,7 @@
     <string name="playlist.label">Playlists</string>

 

     <string name="help.label">Help</string>

-    <string name="help.title">Welcome to Subphonic!</string>

+    <string name="help.title">Welcome to Sub Droid!</string>

     <string name="help.back">Back</string>

     <string name="help.close">Close</string>

     <string name="help.url">file:///android_asset/html/en/index.html</string>

@@ -118,7 +118,7 @@
 

     <string name="error.label">Error</string>

 

-    <string name="settings.title">Subphonic settings</string>

+    <string name="settings.title">Sub Droid settings</string>

     <string name="settings.test_connection_title">Test connection</string>

     <string name="settings.servers_title">Servers</string>

     <string name="settings.server_unused1">Unused 1</string>

@@ -175,7 +175,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>

     <string name="settings.other_title">Other settings</string>

     <string name="settings.scrobble_title">Scrobble to Last.fm</string>

-    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subphonic server</string>

+    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Sub Droid server</string>

     <string name="settings.hide_media_title">Hide from other</string>

     <string name="settings.hide_media_summary">Hide music files from other apps.</string>

     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>

@@ -199,7 +199,7 @@
 

     <string name="parser.reading">Reading from server.</string>

     <string name="parser.reading_done">Reading from server. Done!</string>

-    <string name="parser.upgrade_client">Incompatible versions. Please upgrade Subphonic Android app.</string>

+    <string name="parser.upgrade_client">Incompatible versions. Please upgrade Sub Droid Android app.</string>

     <string name="parser.upgrade_server">Incompatible versions. Please upgrade Subsonic server.</string>

     <string name="parser.not_authenticated">Wrong username or password.</string>

     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>

diff --git a/subsonic-android/res/xml/searchable.xml b/subsonic-android/res/xml/searchable.xml
index b8040e24..b6ad1a49 100644
--- a/subsonic-android/res/xml/searchable.xml
+++ b/subsonic-android/res/xml/searchable.xml
@@ -4,6 +4,6 @@
             android:hint="@string/search.title"
             android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             android:voiceLanguageModel="web_search"
-            android:searchSuggestAuthority="github.daneren2005.subphonic.provider.SearchSuggestionProvider"
+            android:searchSuggestAuthority="github.daneren2005.subdroid.provider.SearchSuggestionProvider"
             android:searchSuggestSelection=" ?" >
 </searchable>
\ No newline at end of file