diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout')
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/cats_fragment.xml | 10 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/feeds_fragment.xml | 26 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 39 |
3 files changed, 59 insertions, 16 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml index 1f0fc38b..87479565 100644 --- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="fill_parent" > - <android.support.v4.widget.SwipeRefreshLayout + <android.support.v4.widget.SwipeRefreshLayout android:id="@+id/feeds_swipe_container" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -29,4 +29,12 @@ android:visibility="invisible" > </TextView> + <ProgressBar + style="?android:attr/progressBarStyleLarge" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/feeds_loading_bar" + android:layout_gravity="center" /> + </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml index 4c5ad73a..ae82bdd2 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:orientation="vertical" + android:layout_width="fill_parent" android:layout_height="fill_parent" > <android.support.v4.widget.SwipeRefreshLayout android:id="@+id/feeds_swipe_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1"> + android:layout_height="match_parent"> <ListView android:id="@+id/feeds" @@ -21,15 +19,6 @@ </ListView> </android.support.v4.widget.SwipeRefreshLayout> - <Button - style="?android:attr/buttonStyleSmall" - android:background="?parentBtnBackground" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/open_parent" - android:layout_weight="0" - android:id="@+id/open_parent" /> - <TextView android:id="@+id/no_feeds" android:layout_width="wrap_content" @@ -40,4 +29,11 @@ android:visibility="gone" > </TextView> -</LinearLayout>
\ No newline at end of file + <ProgressBar + style="?android:attr/progressBarStyleLarge" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/feeds_loading_bar" + android:layout_gravity="center" /> +</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml new file mode 100644 index 00000000..bace3d5f --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/feeds_row" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:descendantFocusability="blocksDescendants" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:baselineAligned="true" + android:gravity="center_vertical" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/icon" + android:layout_gravity="center_vertical" + android:layout_width="16dp" + android:layout_height="16dp" + android:layout_weight="0" + android:scaleType="fitXY" + android:visibility="invisible" + android:src="@drawable/ic_unpublished" /> + + <TextView + android:fontFamily="sans-serif-light" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:layout_weight="1" + android:ellipsize="end" + android:paddingLeft="16dp" + android:singleLine="true" + android:text=".." + android:paddingBottom="2dp" + android:textColor="?feedlistTextColor" + android:textSize="18sp" /> + +</LinearLayout>
\ No newline at end of file |