diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/activity_gallery.xml | 19 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml | 12 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines_row.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml | 2 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml (renamed from org.fox.ttrss/src/main/res/menu/context_article_content_img.xml) | 0 |
5 files changed, 17 insertions, 18 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index de99eedb..8ae3d971 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -7,11 +7,23 @@ android:layout_height="fill_parent"> <com.bogdwellers.pinchtozoom.view.ImageViewPager - android:id="@+id/article_images_pager" + android:id="@+id/gallery_pager" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentTop="true" /> + <ImageView + android:id="@+id/gallery_overflow" + android:clickable="true" + android:layout_width="wrap_content" + android:layout_height="26dp" + android:layout_weight="0" + android:background="@drawable/ripple" + android:src="@drawable/ic_dots_vertical" + android:layout_alignParentRight="true" + android:layout_marginRight="8dp" + android:layout_marginTop="@dimen/activity_vertical_margin" /> + <ProgressBar style="?android:attr/progressBarStyleHorizontal" android:layout_width="wrap_content" @@ -20,7 +32,7 @@ android:progress="0" android:indeterminate="false" android:visibility="gone" - android:layout_above="@+id/article_images_indicator" + android:layout_above="@+id/gallery_pager_indicator" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentRight="true" @@ -29,7 +41,7 @@ android:layout_marginRight="@dimen/activity_horizontal_margin" /> <me.relex.circleindicator.CircleIndicator - android:id="@+id/article_images_indicator" + android:id="@+id/gallery_pager_indicator" android:layout_width="fill_parent" android:layout_height="40dp" android:layout_alignParentBottom="true" @@ -37,7 +49,6 @@ android:layout_alignParentStart="true" android:visibility="invisible" /> - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> </RelativeLayout> diff --git a/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml b/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml index e5fe47f4..5bde3166 100644 --- a/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml @@ -34,16 +34,4 @@ android:layout_gravity="center" android:id="@+id/flavor_image_progress" /> - <ImageView - android:id="@+id/flavor_image_overflow" - android:clickable="true" - android:layout_width="wrap_content" - android:layout_height="26dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:src="@drawable/ic_dots_vertical" - android:layout_gravity="top|right" - android:layout_marginRight="8dp" - android:layout_marginTop="@dimen/activity_vertical_margin" /> - </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 6ffec2dd..e434c497 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -151,7 +151,7 @@ android:layout_marginLeft="8dp" /> <ImageView - android:id="@+id/flavor_image_overflow" + android:id="@+id/gallery_overflow" android:clickable="true" android:layout_width="wrap_content" android:layout_height="24dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index c0ec3013..35fcc777 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -152,7 +152,7 @@ android:layout_marginBottom="8dp" /> <ImageView - android:id="@+id/flavor_image_overflow" + android:id="@+id/gallery_overflow" android:clickable="true" android:layout_width="wrap_content" android:layout_height="24dp" diff --git a/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml index 67dbd6d8..67dbd6d8 100644 --- a/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml +++ b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml |