diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/item_gallery_image_in_post_feed.xml | 106 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_post_detail_gallery.xml | 122 |
2 files changed, 103 insertions, 125 deletions
diff --git a/app/src/main/res/layout/item_gallery_image_in_post_feed.xml b/app/src/main/res/layout/item_gallery_image_in_post_feed.xml index 54e443fb..7b741342 100644 --- a/app/src/main/res/layout/item_gallery_image_in_post_feed.xml +++ b/app/src/main/res/layout/item_gallery_image_in_post_feed.xml @@ -1,30 +1,92 @@ <?xml version="1.0" encoding="utf-8"?> -<ml.docilealligator.infinityforreddit.customviews.SwipeLockFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ml.docilealligator.infinityforreddit.customviews.SwipeLockLinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:orientation="vertical" + xmlns:app="http://schemas.android.com/apk/res-auto"> - <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView - android:id="@+id/image_view_item_gallery_image_in_post_feed" + <FrameLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:adjustViewBounds="true" /> + android:layout_height="wrap_content"> - <ProgressBar - android:id="@+id/progress_bar_item_gallery_image_in_post_feed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> + <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView + android:id="@+id/image_view_item_gallery_image_in_post_feed" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" /> + + <ProgressBar + android:id="@+id/progress_bar_item_gallery_image_in_post_feed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + + <TextView + android:id="@+id/error_text_view_item_gallery_image_in_post_feed" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:layout_gravity="center" + android:gravity="center" + android:text="@string/error_loading_image_tap_to_retry" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:visibility="gone" /> + + </FrameLayout> - <TextView - android:id="@+id/error_text_view_item_gallery_image_in_post_feed" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/caption_constraint_layout_item_gallery_image_in_post_feed" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - -</ml.docilealligator.infinityforreddit.customviews.SwipeLockFrameLayout>
\ No newline at end of file + android:background="?attr/colorBackgroundFloating" + android:visibility="gone"> + + <TextView + android:id="@+id/caption_text_view_item_gallery_image_in_post_feed" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:focusable="true" + android:focusableInTouchMode="true" + android:fontFamily="?attr/content_font_family" + android:gravity="start" + android:marqueeRepeatLimit="marquee_forever" + android:paddingHorizontal="8dp" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/content_font_default" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/caption_url_text_view_item_gallery_image_in_post_feed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/caption_url_text_view_item_gallery_image_in_post_feed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:fontFamily="?attr/content_font_family" + android:gravity="end" + android:maxLines="1" + android:paddingHorizontal="8dp" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/content_font_default" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintHorizontal_bias="1" + app:layout_constraintLeft_toRightOf="@id/guideline4" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline4" + android:layout_width="1dp" + android:layout_height="wrap_content" + android:orientation="vertical" + app:layout_constraintGuide_percent="0.50" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + +</ml.docilealligator.infinityforreddit.customviews.SwipeLockLinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_post_detail_gallery.xml b/app/src/main/res/layout/item_post_detail_gallery.xml index dbdd849e..bb9f2903 100644 --- a/app/src/main/res/layout/item_post_detail_gallery.xml +++ b/app/src/main/res/layout/item_post_detail_gallery.xml @@ -202,61 +202,31 @@ </com.nex3z.flowlayout.FlowLayout> - <RelativeLayout - android:id="@+id/image_view_wrapper_item_post_detail_gallery" + <FrameLayout + android:id="@+id/gallery_frame_layout_item_post_detail_gallery" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView - android:id="@+id/image_view_item_post_detail_gallery" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:adjustViewBounds="true" /> - - <ImageView - android:id="@+id/video_or_gif_indicator_image_view_item_post_detail" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_margin="16dp" - android:layout_gravity="start" - android:scaleType="center" - android:background="@drawable/play_button_round_background" - android:src="@drawable/ic_gallery_24dp" /> - - </FrameLayout> - - <RelativeLayout - android:id="@+id/load_wrapper_item_post_detail_gallery" + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/gallery_recycler_view_item_post_detail_gallery" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerInParent="true"> - - <ProgressBar - android:id="@+id/progress_bar_item_post_detail_gallery" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" /> - - <TextView - android:id="@+id/load_image_error_text_view_item_post_detail_gallery" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" - android:layout_centerInParent="true" - android:gravity="center" - android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - - </RelativeLayout> - - </RelativeLayout> + android:orientation="horizontal" /> + + <com.libRG.CustomTextView + android:id="@+id/image_index_text_view_item_post_detail_gallery" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" + android:padding="4dp" + app:lib_setRadius="6dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + </FrameLayout> <ImageView android:id="@+id/image_view_no_preview_link_item_post_detail_gallery" @@ -266,60 +236,6 @@ android:src="@drawable/ic_link" android:visibility="gone" /> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/caption_constraint_layout_item_post_detail_gallery" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/colorBackgroundFloating" - android:visibility="gone"> - - <TextView - android:id="@+id/caption_text_view_item_post_detail_gallery" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:ellipsize="marquee" - android:focusable="true" - android:focusableInTouchMode="true" - android:fontFamily="?attr/content_font_family" - android:gravity="start" - android:marqueeRepeatLimit="marquee_forever" - android:paddingHorizontal="8dp" - android:scrollHorizontally="true" - android:singleLine="true" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/content_font_default" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/caption_url_text_view_item_post_detail_gallery" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/caption_url_text_view_item_post_detail_gallery" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:fontFamily="?attr/content_font_family" - android:gravity="end" - android:maxLines="1" - android:paddingHorizontal="8dp" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/content_font_default" - app:layout_constrainedWidth="true" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintHorizontal_bias="1" - app:layout_constraintLeft_toRightOf="@id/guideline4" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline4" - android:layout_width="1dp" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.50" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - <androidx.recyclerview.widget.RecyclerView android:id="@+id/content_markdown_view_item_post_detail_gallery" android:layout_width="match_parent" |