diff options
Diffstat (limited to 'app/src/main/res/layout/feedinfo.xml')
-rw-r--r-- | app/src/main/res/layout/feedinfo.xml | 162 |
1 files changed, 95 insertions, 67 deletions
diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index a52104afa..db897865c 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -11,7 +12,10 @@ android:focusableInTouchMode="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="8dp"> <ImageView android:id="@+id/imgvCover" @@ -20,26 +24,26 @@ android:layout_height="70dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="4dp" tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> <TextView android:id="@+id/txtvTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_margin="4dp" + android:layout_marginLeft="8dp" android:layout_toRightOf="@id/imgvCover" style="@style/AntennaPod.TextView.Heading" tools:text="Feed title" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> <View android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" android:layout_below="@id/imgvCover" + android:layout_marginTop="8dp" android:background="@color/bright_blue"/> </RelativeLayout> @@ -47,99 +51,120 @@ android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"> + android:layout_weight="1" + android:scrollbarStyle="outsideInset" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - <RelativeLayout + <android.support.v7.widget.GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp"> - - <View - android:id="@+id/center_divider" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_centerHorizontal="true"/> + android:layout_marginTop="8dp" + app:columnCount="2" + app:rowCount="3"> <TextView android:id="@+id/lblAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="0" + app:layout_column="0" + android:lines="1" android:text="@string/author_label" android:textColor="?android:attr/textColorPrimary" - tools:background="@android:color/holo_red_light" /> + tools:background="@android:color/holo_red_light"/> <TextView android:id="@+id/txtvAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_margin="8dp" - android:layout_toRightOf="@id/center_divider" + app:layout_row="0" + app:layout_column="1" tools:text="Daniel Oeh" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> <TextView android:id="@+id/lblLanguage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@id/txtvAuthor" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="1" + app:layout_column="0" + android:lines="1" android:text="@string/language_label" android:textColor="?android:attr/textColorPrimary" - tools:background="@android:color/holo_red_light" /> + tools:background="@android:color/holo_red_light"/> <TextView android:id="@+id/txtvLanguage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/txtvAuthor" - android:layout_margin="8dp" - android:layout_toRightOf="@id/center_divider" + app:layout_row="1" + app:layout_column="1" tools:text="English" - tools:background="@android:color/holo_green_dark" /> - </RelativeLayout> + tools:background="@android:color/holo_green_dark"/> + + <TextView + android:id="@+id/lblUrl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="2" + app:layout_column="0" + android:lines="1" + android:text="@string/url_label" + android:textColor="?android:attr/textColorPrimary" + tools:background="@android:color/holo_red_light"/> + + <TextView + android:id="@+id/txtvUrl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_row="2" + app:layout_column="1" + tools:text="http://www.example.com/feed" + tools:background="@android:color/holo_green_dark"/> + + </android.support.v7.widget.GridLayout> <TextView android:id="@+id/txtvSettings" style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" android:text="@string/podcast_settings_label" - android:layout_marginLeft="8dp" - android:layout_marginBottom="8dp" - android:layout_marginTop="24dp"/> + android:layout_marginTop="8dp"/> <CheckBox android:id="@+id/cbxAutoDownload" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginTop="8dp" android:text="@string/auto_download_label" android:enabled="false" android:textColor="?android:attr/textColorPrimary" - tools:background="@android:color/holo_red_light" /> + tools:background="@android:color/holo_red_light" + android:checked="false"/> <TextView android:id="@+id/txtvAuthentication" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginTop="8dp" android:text="@string/authentication_label" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorPrimary" - android:layout_marginLeft="8dp" - android:layout_marginBottom="8dp" - android:layout_marginTop="24dp"/> + android:textColor="?android:attr/textColorPrimary"/> <TextView android:id="@+id/txtvAuthenticationDescr" @@ -148,71 +173,74 @@ android:textColor="?android:attr/textColorPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp"/> + android:layout_marginTop="8dp"/> - <LinearLayout - android:layout_width="match_parent" + <android.support.v7.widget.GridLayout + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp"> + android:layout_marginTop="8dp" + app:columnCount="2" + app:rowCount="3" + android:layout_gravity="center_horizontal"> <TextView android:id="@+id/txtvUsername" - android:layout_width="0dp" - android:layout_weight="1" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="0" + app:layout_column="0" android:text="@string/username_label" android:textColor="?android:attr/textColorPrimary"/> <EditText android:id="@+id/etxtUsername" - android:layout_width="0dp" - android:layout_weight="2" + android:layout_width="140sp" android:layout_height="wrap_content" + app:layout_row="0" + app:layout_column="1" android:hint="@string/username_label"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp"> <TextView android:id="@+id/txtvPassword" - android:layout_width="0dp" - android:layout_weight="1" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="1" + app:layout_column="0" android:text="@string/password_label" android:textColor="?android:attr/textColorPrimary"/> <EditText android:id="@+id/etxtPassword" - android:layout_width="0dp" - android:layout_weight="2" + android:layout_width="140sp" android:layout_height="wrap_content" + app:layout_row="1" + app:layout_column="1" android:hint="@string/password_label" android:inputType="textPassword"/> - </LinearLayout> + + </android.support.v7.widget.GridLayout> <TextView style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginBottom="8dp" - android:layout_marginTop="24dp" + android:layout_marginTop="8dp" android:text="@string/description_label"/> <TextView android:id="@+id/txtvDescription" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginTop="8dp" android:text="@string/design_time_lorem_ipsum" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> </LinearLayout> + </ScrollView> </LinearLayout>
\ No newline at end of file |