diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/gpodnet_podcast_list.xml | 19 | ||||
| -rw-r--r-- | res/layout/gpodnetauth_device.xml | 24 | ||||
| -rw-r--r-- | res/layout/onlinefeedview_header.xml | 1 | ||||
| -rw-r--r-- | res/layout/organize_queue.xml | 7 | ||||
| -rw-r--r-- | res/layout/simplechapter_item.xml | 12 |
5 files changed, 49 insertions, 14 deletions
diff --git a/res/layout/gpodnet_podcast_list.xml b/res/layout/gpodnet_podcast_list.xml index e69c2dbee..149b52033 100644 --- a/res/layout/gpodnet_podcast_list.xml +++ b/res/layout/gpodnet_podcast_list.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout 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"> @@ -21,14 +21,25 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/progressBar" - android:layout_gravity="center" + android:layout_centerInParent="true" android:indeterminateOnly="true"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txtvError" - android:layout_gravity="center" + android:layout_centerInParent="true" android:visibility="gone" + android:textAlignment="center" + android:layout_margin="16dp" android:textSize="@dimen/text_size_small"/> -</FrameLayout>
\ No newline at end of file + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/butRetry" + android:text="@string/retry_label" + android:layout_margin="16dp" + android:visibility="gone" + android:layout_centerHorizontal="true" + android:layout_below="@id/txtvError"/> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml index ac08cb5ad..e7bfdc425 100644 --- a/res/layout/gpodnetauth_device.xml +++ b/res/layout/gpodnetauth_device.xml @@ -33,12 +33,24 @@ android:layout_below="@id/txtvDescription" android:layout_margin="8dp"/> + <TextView + android:id="@+id/txtvDeviceID" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/gpodnetauth_device_deviceID" + android:textSize="@dimen/text_size_medium" + android:textColor="?android:attr/textColorSecondary" + android:layout_margin="8dp" + android:layout_alignTop="@+id/etxtDeviceID" + android:layout_alignLeft="@+id/etxtCaption"/> + <EditText android:id="@+id/etxtDeviceID" - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" - android:hint="@string/gpodnetauth_device_deviceID" android:layout_below="@id/etxtCaption" + android:layout_toRightOf="@id/txtvDeviceID" + android:layout_alignParentRight="true" android:layout_margin="8dp"/> <Button @@ -52,14 +64,14 @@ <TextView android:id="@+id/txtvError" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@id/etxtCaption" - android:layout_alignBottom="@id/butCreateNewDevice" + android:layout_below="@id/etxtDeviceID" + android:layout_toLeftOf="@id/butCreateNewDevice" android:textColor="@color/download_failed_red" android:layout_margin="16dp" - android:textSize="@dimen/text_size_medium" + android:textSize="@dimen/text_size_small" /> <ProgressBar diff --git a/res/layout/onlinefeedview_header.xml b/res/layout/onlinefeedview_header.xml index 6bbecde1e..85f0f32f8 100644 --- a/res/layout/onlinefeedview_header.xml +++ b/res/layout/onlinefeedview_header.xml @@ -46,6 +46,7 @@ android:text="@string/subscribe_label" android:layout_below="@id/txtvAuthor" android:layout_alignParentRight="true" + android:focusable="false" /> diff --git a/res/layout/organize_queue.xml b/res/layout/organize_queue.xml index 3982529a2..5c08417b9 100644 --- a/res/layout/organize_queue.xml +++ b/res/layout/organize_queue.xml @@ -30,6 +30,13 @@ 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" /> + <LinearLayout android:id="@+id/undobar" style="@style/UndoBar"> <TextView android:id="@+id/undobar_message" style="@style/UndoBarMessage" /> <Button android:id="@+id/undobar_button" style="@style/UndoBarButton" /> diff --git a/res/layout/simplechapter_item.xml b/res/layout/simplechapter_item.xml index 99ba0b0a9..422458d5d 100644 --- a/res/layout/simplechapter_item.xml +++ b/res/layout/simplechapter_item.xml @@ -2,7 +2,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="8dp" > + android:paddingBottom="12dp" + android:paddingTop="12dp"> <TextView android:id="@+id/txtvStart" @@ -11,7 +12,8 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_margin="8dp" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small"/> <TextView android:id="@+id/txtvTitle" @@ -19,9 +21,10 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="8dp" + android:padding="8dp" android:layout_toLeftOf="@id/txtvStart" - android:textStyle="bold" /> + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_small"/> <TextView android:id="@+id/txtvLink" @@ -34,6 +37,7 @@ android:layout_toLeftOf="@id/txtvStart" android:focusable="false" android:focusableInTouchMode="false" + android:visibility="gone" android:maxLines="2" /> </RelativeLayout>
\ No newline at end of file |