Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2558 from ByteHamster/layout-improvements

Browse Source 
Layout improvements
This commit is contained in:
Martin Fietz 2018-04-03 21:57:34 +02:00 committed by GitHub
commit edcc7ac9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 78 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
View File

@ -109,7 +109,6 @@ public class QueueFragment extends Fragment {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
recyclerView.setAdapter(recyclerAdapter);
loadItems(true); loadItems(true);
EventDistributor.getInstance().register(contentUpdate); EventDistributor.getInstance().register(contentUpdate);
EventBus.getDefault().registerSticky(this); EventBus.getDefault().registerSticky(this);

2
app/src/main/res/layout/cover_fragment.xml
View File

@ -38,6 +38,7 @@
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
android:text="Podcast" android:text="Podcast"
android:textIsSelectable="true"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
@ -61,6 +62,7 @@
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
android:text="Episode" android:text="Episode"
android:textIsSelectable="true"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
</LinearLayout> </LinearLayout>

152
app/src/main/res/layout/external_player_fragment.xml
View File

@ -1,90 +1,84 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragmentLayout" android:id="@+id/fragmentLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/external_player_height"
android:orientation="vertical" android:visibility="gone"
android:visibility="gone"> android:background="?attr/selectableItemBackground">
<RelativeLayout <ImageView
android:id="@+id/imgvCover"
android:contentDescription="@string/cover_label"
android:layout_width="@dimen/external_player_height"
android:layout_height="@dimen/external_player_height"
android:adjustViewBounds="true"
android:cropToPadding="true"
android:scaleType="centerCrop"
tools:src="@drawable/ic_drag_vertical_white_48dp"
tools:background="@android:color/holo_green_dark"
android:transitionName="coverTransition"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<ProgressBar
android:id="@+id/episodeProgress"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/external_player_height"> android:layout_height="4dp"
android:layout_toRightOf="@id/imgvCover"
android:layout_toEndOf="@id/imgvCover"
android:layout_alignParentTop="true"
style="?attr/progressBarTheme"
android:indeterminate="false"
tools:progress="100"/>
<ImageView <ImageButton
android:id="@+id/imgvCover" android:id="@+id/butPlay"
android:contentDescription="@string/cover_label" android:layout_width="52dp"
android:layout_width="@dimen/external_player_height" android:layout_height="52dp"
android:layout_height="@dimen/external_player_height" android:layout_alignParentRight="true"
android:adjustViewBounds="true" android:layout_alignParentEnd="true"
android:cropToPadding="true" android:layout_below="@id/episodeProgress"
android:scaleType="centerCrop" android:layout_centerVertical="true"
tools:src="@drawable/ic_drag_vertical_white_48dp" android:contentDescription="@string/pause_label"
tools:background="@android:color/holo_green_dark" android:background="?attr/selectableItemBackground"
android:transitionName="coverTransition" tools:src="@drawable/ic_play_arrow_white_36dp"/>
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<ProgressBar <TextView
android:id="@+id/episodeProgress" android:id="@+id/txtvTitle"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="4dp" android:layout_height="wrap_content"
android:layout_toRightOf="@id/imgvCover" android:layout_alignParentBottom="true"
android:layout_toEndOf="@id/imgvCover" android:layout_marginBottom="26dp"
android:layout_alignParentTop="true" android:layout_toRightOf="@id/imgvCover"
style="?attr/progressBarTheme" android:layout_toEndOf="@id/imgvCover"
android:indeterminate="false" android:layout_marginLeft="16dp"
tools:progress="100"/> android:layout_marginStart="16dp"
android:layout_toLeftOf="@id/butPlay"
android:layout_toStartOf="@id/butPlay"
style="@style/Base.TextAppearance.AppCompat.Body1"
android:ellipsize="end"
android:maxLines="1"
tools:text="Episode title that is too long and will cause the text to wrap"/>
<ImageButton <TextView
android:id="@+id/butPlay" android:id="@+id/txtvAuthor"
android:layout_width="52dp" android:layout_width="wrap_content"
android:layout_height="52dp" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_below="@id/episodeProgress"
android:layout_alignParentEnd="true" android:layout_marginTop="26dp"
android:layout_below="@id/episodeProgress" android:layout_toRightOf="@id/imgvCover"
android:layout_centerVertical="true" android:layout_toEndOf="@id/imgvCover"
android:contentDescription="@string/pause_label" android:layout_marginLeft="16dp"
android:background="?attr/selectableItemBackground" android:layout_marginStart="16dp"
tools:src="@drawable/ic_play_arrow_white_36dp"/> android:layout_toLeftOf="@id/butPlay"
android:layout_toStartOf="@id/butPlay"
style="@style/TextAppearance.AppCompat.Body1"
android:textColor="?android:attr/textColorSecondary"
android:ellipsize="end"
android:maxLines="1"
tools:text="Episode author that is too long and will cause the text to wrap"/>
<TextView </RelativeLayout>
android:id="@+id/txtvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="26dp"
android:layout_toRightOf="@id/imgvCover"
android:layout_toEndOf="@id/imgvCover"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_toLeftOf="@id/butPlay"
android:layout_toStartOf="@id/butPlay"
style="@style/Base.TextAppearance.AppCompat.Body1"
android:ellipsize="end"
android:maxLines="1"
tools:text="Episode title that is too long and will cause the text to wrap"/>
<TextView
android:id="@+id/txtvAuthor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/episodeProgress"
android:layout_marginTop="26dp"
android:layout_toRightOf="@id/imgvCover"
android:layout_toEndOf="@id/imgvCover"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_toLeftOf="@id/butPlay"
android:layout_toStartOf="@id/butPlay"
style="@style/TextAppearance.AppCompat.Body1"
android:textColor="?android:attr/textColorSecondary"
android:ellipsize="end"
android:maxLines="1"
tools:text="Episode author that is too long and will cause the text to wrap"/>
</RelativeLayout>
</LinearLayout>

1
app/src/main/res/layout/feeditemlist_header.xml
View File

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/feed_image_bg"
tools:context="de.danoeh.antennapod.activity.MainActivity" tools:context="de.danoeh.antennapod.activity.MainActivity"
tools:background="@android:color/darker_gray"> tools:background="@android:color/darker_gray">

2
app/src/main/res/layout/main.xml
View File

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
android:id="@+id/content" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">

1
core/src/main/res/values/colors.xml
View File

@ -20,6 +20,7 @@
<color name="swipe_refresh_secondary_color_dark">#060708</color> <color name="swipe_refresh_secondary_color_dark">#060708</color>
<color name="new_indicator_green">#669900</color> <color name="new_indicator_green">#669900</color>
<color name="image_readability_tint">#80000000</color> <color name="image_readability_tint">#80000000</color>
<color name="feed_image_bg">#50000000</color>
<color name="selection_background_color_dark">#286E8A</color> <color name="selection_background_color_dark">#286E8A</color>
<color name="selection_background_color_light">#81CFEA</color> <color name="selection_background_color_light">#81CFEA</color>