Renamed main layout to home, music to main

6 files changed, 57 insertions, 57 deletions

diff --git a/subsonic-android/res/layout/home.xml b/subsonic-android/res/layout/home.xml
new file mode 100644
index 00000000..56b013fe
--- /dev/null
+++ b/subsonic-android/res/layout/home.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+              android:orientation="vertical"

+              android:layout_width="fill_parent"

+              android:layout_height="fill_parent">

+

+    <View

+            android:layout_width="fill_parent"

+            android:layout_height="1px"

+            android:background="@color/dividerColor"/>

+

+    <ListView

+            android:id="@+id/main_list"

+            android:layout_width="fill_parent"

+            android:layout_height="0px"

+            android:layout_weight="1"/>

+

+    <View android:id="@+id/main_dummy"

+          android:layout_width="0px"

+          android:layout_height="0px"/>

+    

+    <include 

+            layout="@layout/button_bar"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"/>

+

+</LinearLayout>

+

diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml
index 56b013fe..f5c95b3f 100644
--- a/subsonic-android/res/layout/main.xml
+++ b/subsonic-android/res/layout/main.xml
@@ -1,28 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>

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

-              android:orientation="vertical"

-              android:layout_width="fill_parent"

-              android:layout_height="fill_parent">

-

-    <View

-            android:layout_width="fill_parent"

-            android:layout_height="1px"

-            android:background="@color/dividerColor"/>

-

-    <ListView

-            android:id="@+id/main_list"

-            android:layout_width="fill_parent"

-            android:layout_height="0px"

-            android:layout_weight="1"/>

-

-    <View android:id="@+id/main_dummy"

-          android:layout_width="0px"

-          android:layout_height="0px"/>

-    

-    <include 

-            layout="@layout/button_bar"

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"/>

-

-</LinearLayout>

-

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center_horizontal"
+	android:orientation="vertical" >
+
+	<android.support.v4.view.ViewPager
+		android:id="@+id/pager"
+		android:layout_width="match_parent"
+		android:layout_height="0px"
+		android:layout_weight="1" >
+
+		<!-- Optional page title view -->
+
+		<android.support.v4.view.PagerTitleStrip
+			android:id="@+id/pager_title_strip"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="top"
+			android:background="#33b5e5"
+			android:paddingBottom="4dp"
+			android:paddingTop="4dp"
+			android:textColor="#fff" />
+	</android.support.v4.view.ViewPager>
+</LinearLayout>
\ No newline at end of file
diff --git a/subsonic-android/res/layout/music.xml b/subsonic-android/res/layout/music.xml
deleted file mode 100644
index f5c95b3f..00000000
--- a/subsonic-android/res/layout/music.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:gravity="center_horizontal"
-	android:orientation="vertical" >
-
-	<android.support.v4.view.ViewPager
-		android:id="@+id/pager"
-		android:layout_width="match_parent"
-		android:layout_height="0px"
-		android:layout_weight="1" >
-
-		<!-- Optional page title view -->
-
-		<android.support.v4.view.PagerTitleStrip
-			android:id="@+id/pager_title_strip"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="top"
-			android:background="#33b5e5"
-			android:paddingBottom="4dp"
-			android:paddingTop="4dp"
-			android:textColor="#fff" />
-	</android.support.v4.view.ViewPager>
-</LinearLayout>
\ No newline at end of file
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
index 807767d9..c012e4c8 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
@@ -22,7 +22,7 @@ public class MainActivity extends SubsonicActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.music);
+		setContentView(R.layout.main);
 
 		pagerAdapter = new MainActivityPagerAdapter(getSupportFragmentManager());
 		viewPager = (ViewPager) findViewById(R.id.pager);
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index 938bf624..4df7fb96 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -124,9 +124,9 @@ public class SubsonicTabActivity extends SherlockActivity {
             }

         });

 

-        if (this instanceof MainActivity) {

+        /*if (this instanceof MainActivity) {

             homeButton.setEnabled(false);

-        } else if (this instanceof SelectAlbumActivity || this instanceof SelectArtistActivity) {

+        } else*/ if (this instanceof SelectAlbumActivity || this instanceof SelectArtistActivity) {

             musicButton.setEnabled(false);

         } else if (this instanceof SelectPlaylistActivity) {

             playlistButton.setEnabled(false);

diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java
index 38140f87..d179c150 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java
@@ -35,7 +35,7 @@ public class MainFragment extends SubsonicTabFragment {
 	@Override

 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {

 		this.inflater = inflater;

-		rootView = inflater.inflate(R.layout.main, container, false);

+		rootView = inflater.inflate(R.layout.home, container, false);

 

 		loadSettings();

 		createLayout();