diff options
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/exo_autoplay_playback_control_view.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_post.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/item_post_image_and_gif_autoplay_type.xml (renamed from app/src/main/res/layout/item_post_image_type.xml) | 1 | ||||
-rw-r--r-- | app/src/main/res/layout/item_post_video_and_gif_preview_type.xml (renamed from app/src/main/res/layout/item_post_gif_type.xml) | 98 |
4 files changed, 56 insertions, 51 deletions
diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml index 99cab8e2..1adc685e 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml @@ -7,8 +7,6 @@ android:gravity="bottom" android:paddingStart="16dp" android:paddingEnd="16dp" - android:paddingBottom="16dp" - android:background="@color/transparentActionBarAndExoPlayerControllerColor" android:orientation="vertical"> <RelativeLayout diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml index 69652bbc..94d2f551 100644 --- a/app/src/main/res/layout/fragment_post.xml +++ b/app/src/main/res/layout/fragment_post.xml @@ -10,12 +10,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <!--<androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view_post_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" />--> - <ml.docilealligator.infinityforreddit.CustomView.CustomToroContainer android:id="@+id/recycler_view_post_fragment" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_image_type.xml b/app/src/main/res/layout/item_post_image_and_gif_autoplay_type.xml index 6ca140d3..b2fdf016 100644 --- a/app/src/main/res/layout/item_post_image_type.xml +++ b/app/src/main/res/layout/item_post_image_and_gif_autoplay_type.xml @@ -109,7 +109,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" - android:text="@string/image" android:textSize="?attr/font_12" app:lib_setRadius="3dp" app:lib_setRoundedView="true" diff --git a/app/src/main/res/layout/item_post_gif_type.xml b/app/src/main/res/layout/item_post_video_and_gif_preview_type.xml index 3c6b7389..c3549df4 100644 --- a/app/src/main/res/layout/item_post_gif_type.xml +++ b/app/src/main/res/layout/item_post_video_and_gif_preview_type.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:id="@+id/card_view_item_post_gif_type" + android:id="@+id/card_view_item_post_gif_type_autoplay" app:cardBackgroundColor="?attr/cardViewBackgroundColor" app:cardElevation="2dp" app:cardCornerRadius="16dp"> @@ -21,7 +21,7 @@ android:padding="16dp"> <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView - android:id="@+id/icon_gif_image_view_item_post_gif_type" + android:id="@+id/icon_gif_image_view_item_post_gif_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center" @@ -30,20 +30,20 @@ app:layout_constraintTop_toTopOf="parent"/> <TextView - android:id="@+id/subreddit_name_text_view_item_post_gif_type" + android:id="@+id/subreddit_name_text_view_item_post_gif_type_autoplay" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:textSize="?attr/font_default" - app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_gif_type" - app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_gif_type" - app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gif_type" + app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_gif_type_autoplay" + app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_gif_type_autoplay" + app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gif_type_autoplay" app:layout_constraintTop_toTopOf="parent"/> <TextView - android:id="@+id/user_text_view_item_post_gif_type" + android:id="@+id/user_text_view_item_post_gif_type_autoplay" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -52,24 +52,24 @@ android:maxLines="2" android:ellipsize="end" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_gif_type" - app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gif_type" - app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_gif_type" + app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_gif_type_autoplay" + app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gif_type_autoplay" + app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_gif_type_autoplay" app:layout_constraintHorizontal_bias="0" /> <ImageView - android:id="@+id/stickied_post_image_view_item_post_gif_type" + android:id="@+id/stickied_post_image_view_item_post_gif_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="8dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post_gif_type" + app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post_gif_type_autoplay" app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintTop_toTopOf="parent"/> <TextView - android:id="@+id/post_time_text_view_best_item_post_gif_type" + android:id="@+id/post_time_text_view_best_item_post_gif_type_autoplay" android:layout_width="0dp" android:layout_height="wrap_content" android:gravity="end" @@ -89,7 +89,7 @@ </androidx.constraintlayout.widget.ConstraintLayout> <TextView - android:id="@+id/title_text_view_best_item_post_gif_type" + android:id="@+id/title_text_view_best_item_post_gif_type_autoplay" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" @@ -105,7 +105,7 @@ app:flRowSpacing="8dp"> <com.libRG.CustomTextView - android:id="@+id/type_text_view_item_post_gif_type" + android:id="@+id/type_text_view_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" @@ -116,7 +116,7 @@ app:lib_setShape="rectangle" /> <com.libRG.CustomTextView - android:id="@+id/spoiler_custom_text_view_item_post_gif_type" + android:id="@+id/spoiler_custom_text_view_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -129,7 +129,7 @@ app:lib_setShape="rectangle" /> <com.libRG.CustomTextView - android:id="@+id/nsfw_text_view_item_post_gif_type" + android:id="@+id/nsfw_text_view_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" @@ -141,7 +141,7 @@ app:lib_setShape="rectangle" /> <com.libRG.CustomTextView - android:id="@+id/flair_custom_text_view_item_post_gif_type" + android:id="@+id/flair_custom_text_view_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -153,7 +153,7 @@ app:lib_setShape="rectangle" /> <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_gif_type" + android:id="@+id/awards_text_view_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" @@ -164,21 +164,21 @@ app:lib_setShape="rectangle" /> <ImageView - android:id="@+id/archived_image_view_item_post_gif_type" + android:id="@+id/archived_image_view_item_post_gif_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_archive_outline" android:visibility="gone" /> <ImageView - android:id="@+id/locked_image_view_item_post_gif_type" + android:id="@+id/locked_image_view_item_post_gif_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_outline_lock_24dp" android:visibility="gone" /> <ImageView - android:id="@+id/crosspost_image_view_item_post_gif_type" + android:id="@+id/crosspost_image_view_item_post_gif_type_autoplay" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/crosspost" @@ -187,25 +187,39 @@ </com.nex3z.flowlayout.FlowLayout> <RelativeLayout - android:id="@+id/image_view_wrapper_item_post_gif_type" + android:id="@+id/image_view_wrapper_item_post_gif_type_autoplay" android:layout_width="match_parent" android:layout_height="wrap_content"> - <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView - android:id="@+id/image_view_best_post_item" + <FrameLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:adjustViewBounds="true" - android:scaleType="fitStart" /> + android:layout_height="wrap_content"> + + <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView + android:id="@+id/image_view_item_post_gif_type_autoplay" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:scaleType="fitStart" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:layout_gravity="start" + android:background="@drawable/play_button_round_background" + android:src="@drawable/ic_play_circle_36dp" /> + + </FrameLayout> <ProgressBar - android:id="@+id/progress_bar_item_post_gif_type" + android:id="@+id/progress_bar_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" /> <RelativeLayout - android:id="@+id/load_image_error_relative_layout_item_post_gif_type" + android:id="@+id/load_image_error_relative_layout_item_post_gif_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerInParent="true" @@ -225,12 +239,12 @@ </RelativeLayout> <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/bottom_constraint_layout_item_post_gif_type" + android:id="@+id/bottom_constraint_layout_item_post_gif_type_autoplay" android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView - android:id="@+id/plus_button_item_post_gif_type" + android:id="@+id/plus_button_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" @@ -243,7 +257,7 @@ app:layout_constraintStart_toStartOf="parent" /> <TextView - android:id="@+id/score_text_view_item_post_gif_type" + android:id="@+id/score_text_view_item_post_gif_type_autoplay" android:layout_width="64dp" android:layout_height="wrap_content" android:gravity="center" @@ -251,10 +265,10 @@ android:textStyle="bold" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/plus_button_item_post_gif_type" /> + app:layout_constraintStart_toEndOf="@id/plus_button_item_post_gif_type_autoplay" /> <ImageView - android:id="@+id/minus_button_item_post_gif_type" + android:id="@+id/minus_button_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" @@ -264,10 +278,10 @@ android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_gif_type" /> + app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_gif_type_autoplay" /> <TextView - android:id="@+id/comments_count_item_post_gif_type" + android:id="@+id/comments_count_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" @@ -278,10 +292,10 @@ android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/minus_button_item_post_gif_type" /> + app:layout_constraintStart_toEndOf="@id/minus_button_item_post_gif_type_autoplay" /> <ImageView - android:id="@+id/save_button_item_post_gif_type" + android:id="@+id/save_button_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" @@ -291,11 +305,11 @@ app:layout_constraintHorizontal_bias="1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/comments_count_item_post_gif_type" - app:layout_constraintEnd_toStartOf="@id/share_button_item_post_gif_type" /> + app:layout_constraintStart_toEndOf="@id/comments_count_item_post_gif_type_autoplay" + app:layout_constraintEnd_toStartOf="@id/share_button_item_post_gif_type_autoplay" /> <ImageView - android:id="@+id/share_button_item_post_gif_type" + android:id="@+id/share_button_item_post_gif_type_autoplay" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" |