diff options
author | ByteHamster <info@bytehamster.com> | 2021-07-26 20:58:10 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-07-26 20:58:10 +0200 |
commit | bc59d50804328f3c5a293079a33576ff260022ea (patch) | |
tree | c369253e816e85337af1aa51f820452698e99ff7 /app/src/main/res | |
parent | dbac6cae4666f89e3ccb8ecbc2f1c5b06e381fa5 (diff) | |
parent | 8b183915bee1419a0577196b19414529fca75432 (diff) | |
download | AntennaPod-bc59d50804328f3c5a293079a33576ff260022ea.zip |
Merge branch 'master' into develop
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/layout/edit_tags_dialog.xml | 58 | ||||
-rw-r--r-- | app/src/main/res/layout/single_tag_text_view.xml | 8 |
3 files changed, 41 insertions, 30 deletions
diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 8333ded1e..548e55774 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -4,10 +4,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/cover_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:id="@+id/cover_fragment" android:padding="8dp" android:gravity="center"> @@ -57,7 +57,6 @@ android:id="@+id/txtvEpisodeTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" android:ellipsize="none" android:gravity="center_horizontal" android:maxLines="2" @@ -125,6 +124,7 @@ android:text="@string/shownotes_label" android:textColor="?android:attr/textColorSecondary" android:textSize="16sp" /> + </LinearLayout> <LinearLayout @@ -168,6 +168,7 @@ android:contentDescription="@string/next_chapter" android:scaleType="fitCenter" app:srcCompat="@drawable/ic_chapter_next" /> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/edit_tags_dialog.xml b/app/src/main/res/layout/edit_tags_dialog.xml index 2e7774cea..57e3c412f 100644 --- a/app/src/main/res/layout/edit_tags_dialog.xml +++ b/app/src/main/res/layout/edit_tags_dialog.xml @@ -1,41 +1,43 @@ <?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" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="16dp"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/tagsRecycler" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:id="@+id/tagsRecycler" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> <CheckBox - android:id="@+id/rootFolderCheckbox" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/feed_folders_include_root" /> + android:id="@+id/rootFolderCheckbox" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/feed_folders_include_root" /> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> - <EditText - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="text" - android:ems="10" - android:id="@+id/newTagEditText"/> + <AutoCompleteTextView + android:id="@+id/newTagEditText" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="text" + android:ems="10" /> <ImageButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:srcCompat="@drawable/ic_add" - android:contentDescription="@string/new_label" - android:id="@+id/newTagButton"/> + android:id="@+id/newTagButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/new_label" + app:srcCompat="@drawable/ic_add" /> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/single_tag_text_view.xml b/app/src/main/res/layout/single_tag_text_view.xml new file mode 100644 index 000000000..67410a20e --- /dev/null +++ b/app/src/main/res/layout/single_tag_text_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbars="vertical" + android:padding="10dp" + android:ems="10" /> |