diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-04-16 21:08:41 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-04-16 21:08:41 -0400 |
commit | beabcf4302a9e703a3fefa114ff946acb593b7e2 (patch) | |
tree | 731325a1cbd0e1fddbe81033690f8e43593b6c92 /app/src/main/res | |
parent | ffc358ee671fc0bac5f1afa6bf2f672f474dfab3 (diff) | |
parent | 4e9597a95075e8384c6545b8d6c9a63be3c22e48 (diff) | |
download | AntennaPod-beabcf4302a9e703a3fefa114ff946acb593b7e2.zip |
Merge pull request #748 from TomHennen/new_and_all_episodes
New and all episodes fixes AntennaPod/AntennaPod#741 and fixes AntennaPod/AntennaPod#742
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/all_episodes_fragment.xml | 52 | ||||
-rw-r--r-- | app/src/main/res/menu/new_episodes.xml | 7 |
2 files changed, 52 insertions, 7 deletions
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml new file mode 100644 index 000000000..19db02f1d --- /dev/null +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:dslv="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.mobeta.android.dslv.DragSortListView + android:id="@android:id/list" + android:scrollbarStyle="outsideOverlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="@dimen/list_vertical_padding" + android:paddingBottom="@dimen/list_vertical_padding" + android:clipToPadding="false" + dslv:collapsed_height="2dp" + dslv:drag_enabled="false" + dslv:drag_scroll_start="0.33" + dslv:float_alpha="0.6" + dslv:max_drag_scroll_speed="0.5" + dslv:remove_enabled="true" + dslv:remove_mode="flingRemove" + dslv:slide_shuffle_speed="0.3" + dslv:sort_enabled="false" + dslv:track_drag_sort="false" + dslv:float_background_color="?attr/dragview_float_background" + dslv:use_default_controller="true" + tools:background="@android:color/holo_green_dark"/> + + <TextView + android:id="@id/android:empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:text="@string/no_items_label"/> + + <ProgressBar + android:id="@+id/progLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminateOnly="true" + android:visibility="gone" + tools:visibility="visible" + tools:layout_width="match_parent" + tools:layout_height="64dp" + tools:background="@android:color/holo_red_light"/> + +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml index 72661a17e..d7bcdf0f6 100644 --- a/app/src/main/res/menu/new_episodes.xml +++ b/app/src/main/res/menu/new_episodes.xml @@ -17,11 +17,4 @@ custom:showAsAction="collapseActionView" android:icon="?attr/navigation_accept"/> - <item - android:id="@+id/episode_filter_item" - android:title="@string/episode_filter_label" - android:menuCategory="container" - android:checkable="true" - custom:showAsAction="collapseActionView"/> - </menu>
\ No newline at end of file |