diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-06-30 22:10:13 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-06-30 22:10:13 -0700 |
| commit | 07858677d17b21e37652979bd34642698bae4497 (patch) | |
| tree | 71ac1a269d5c3408673b8cfeba17393637283555 | |
| parent | 6b4a6a3ae038f2b46c9427427e892d72d83cd670 (diff) | |
| download | dsub-07858677d17b21e37652979bd34642698bae4497.tar.gz dsub-07858677d17b21e37652979bd34642698bae4497.tar.bz2 dsub-07858677d17b21e37652979bd34642698bae4497.zip | |
Remove extra abstraction, fix other cases needing new id method
4 files changed, 27 insertions, 39 deletions
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml index 4fddf330..01df495a 100644 --- a/subsonic-android/res/layout/select_album.xml +++ b/subsonic-android/res/layout/select_album.xml @@ -1,36 +1,31 @@ <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/select_album_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+ <View
android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_height="1px"
+ android:background="@color/dividerColor"/>
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
+ <include layout="@layout/tab_progress"/>
- <include layout="@layout/tab_progress"/>
-
- <TextView
- android:id="@+id/select_album_empty"
- android:text="@string/select_album.empty"
- android:visibility="gone"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="10dip"/>
+ <TextView
+ android:id="@+id/select_album_empty"
+ android:text="@string/select_album.empty"
+ android:visibility="gone"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dip"/>
- <com.mobeta.android.dslv.DragSortListView
- style="@style/DragDropListView"
- android:id="@+id/select_album_entries"
- android:textFilterEnabled="true"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
- </LinearLayout>
-</FrameLayout>
\ No newline at end of file + <com.mobeta.android.dslv.DragSortListView
+ style="@style/DragDropListView"
+ android:id="@+id/select_album_entries"
+ android:textFilterEnabled="true"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
+ android:fastScrollEnabled="true"/>
+</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 08e8e593..3b6a456d 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java @@ -209,7 +209,7 @@ public class MainActivity extends SubsonicActivity { fragment.setArguments(args); pagerAdapter.queueFragment(fragment, R.id.select_artist_layout); - fragmentID = R.id.select_album_layout; + fragmentID = fragment.getRootId(); } SubsonicFragment fragment = new SelectDirectoryFragment(); diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java index 446285d1..e7bbf2ef 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java @@ -291,7 +291,7 @@ public class SearchFragment extends SubsonicFragment { parentFragment.setArguments(args);
replaceFragment(parentFragment, R.id.search_layout);
- id = R.id.select_album_layout;
+ id = parentFragment.getRootId();
}
SubsonicFragment fragment = new SelectDirectoryFragment();
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index cd20c0e2..9bff7e17 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -63,7 +63,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter int albumListSize;
- SelectDirectoryFragment() {
+ public SelectDirectoryFragment() {
super();
rootId = getNewId();
}
@@ -287,13 +287,6 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter @Override
public void setPrimaryFragment(boolean primary) {
super.setPrimaryFragment(primary);
- if(rootView != null) {
- if(primary) {
- ((ViewGroup)rootView).getChildAt(0).setVisibility(View.VISIBLE);
- } else {
- ((ViewGroup)rootView).getChildAt(0).setVisibility(View.GONE);
- }
- }
}
@Override
|