Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Revert error/retry/loading changes

Browse source
This commit is contained in:
Coffeemakr 2017-07-02 22:22:37 +02:00
parent 43a1c4ce11
commit 4ad9fcdc6f
4 changed files with 71 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/res/layout/fragment_channel.xml
View file

@ -1,9 +1,8 @@
<?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"
tools:context=".fragments.channel.ChannelFragment">
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/channel_streams_view"
@ -13,9 +12,24 @@
android:scrollbars="vertical"
tools:listitem="@layout/stream_item" />
<include
layout="@layout/loading_error_retry"
android:layout_width="match_parent"
<ProgressBar
android:id="@+id/loading_progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout>
android:layout_centerInParent="true"
android:indeterminate="true"
android:visibility="gone"
tools:visibility="visible" />
<!--ERROR PANEL-->
<include
android:id="@+id/error_panel"
layout="@layout/error_retry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="50dp"
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout>