diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-09-05 15:24:50 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-09-05 15:24:50 +0200 |
| commit | 02926a6e5ffa968d08efeae5012a0ecf41a6f33a (patch) | |
| tree | f9cfef6a7569b82301ea1d1aa7066cefc7cd1146 /res/layout/gpodnet_podcast_list.xml | |
| parent | 862b8db20b8003691b2a40693275c2390dd9a4e7 (diff) | |
| parent | eb7addaaf07e5ede3c1bc730b33aee6541c78290 (diff) | |
| download | AntennaPod-02926a6e5ffa968d08efeae5012a0ecf41a6f33a.zip | |
Merge branch 'gpoddernet' into develop
Conflicts:
AndroidManifest.xml
res/values/arrays.xml
res/values/strings.xml
res/xml/preferences.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
Diffstat (limited to 'res/layout/gpodnet_podcast_list.xml')
| -rw-r--r-- | res/layout/gpodnet_podcast_list.xml | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/res/layout/gpodnet_podcast_list.xml b/res/layout/gpodnet_podcast_list.xml new file mode 100644 index 000000000..e69c2dbee --- /dev/null +++ b/res/layout/gpodnet_podcast_list.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <GridView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/gridView" + android:stretchMode="columnWidth" + android:numColumns="auto_fit" + android:verticalSpacing="4dp" + android:horizontalSpacing="4dp" + android:gravity="center" + android:columnWidth="200dp" + tools:listitem="@layout/gpodnet_podcast_listitem"/> + + <ProgressBar + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/progressBar" + android:layout_gravity="center" + android:indeterminateOnly="true"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/txtvError" + android:layout_gravity="center" + android:visibility="gone" + android:textSize="@dimen/text_size_small"/> +</FrameLayout>
\ No newline at end of file |