mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add an option for video autoplay. Rewrite some viewholders in PostRecyclerViewAdapter.

Browse Source
This commit is contained in:
Alex Ning
2020-04-30 15:29:56 +08:00
parent 5c05350119
commit 4678caa92b
13 changed files with 280 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/exo_autoplay_playback_control_view.xml
View File

@@ -7,8 +7,6 @@
android:gravity="bottom"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingBottom="16dp"
android:background="@color/transparentActionBarAndExoPlayerControllerColor"
android:orientation="vertical">
<RelativeLayout

6
app/src/main/res/layout/fragment_post.xml
View File

@@ -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"

1
app/src/main/res/layout/item_post_image_type.xml → app/src/main/res/layout/item_post_image_and_gif_autoplay_type.xml
View File

@@ -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"

98
app/src/main/res/layout/item_post_gif_type.xml → app/src/main/res/layout/item_post_video_and_gif_preview_type.xml
View File

@@ -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"

12
app/src/main/res/values/arrays.xml
View File

@@ -47,6 +47,18 @@
<item>1</item>
</string-array>
<string-array name="settings_video_autoplay">
<item>Always On</item>
<item>Only on Wifi</item>
<item>Never</item>
</string-array>
<string-array name="settings_video_autoplay_values">
<item>2</item>
<item>1</item>
<item>0</item>
</string-array>
<string-array name="settings_lazy_mode_interval">
<item>1s</item>
<item>2s</item>

1
app/src/main/res/values/strings.xml
View File

@@ -311,6 +311,7 @@
<string name="settings_interface_title">Interface</string>
<string name="settings_gestures_and_buttons_title">Gestures &amp; Buttons</string>
<string name="settings_open_link_in_app_title">Open Link In App</string>
<string name="settings_video_autoplay_title">Video Autoplay</string>
<string name="settings_immersive_interface_title">Immersive Interface</string>
<string name="settings_immersive_interface_ignore_nav_bar_title">Ignore Navigation Bar in Immersive Interface</string>
<string name="settings_immersive_interface_ignore_nav_bar_summary">Prevent the Bottom Navigation Bar Having Extra Padding</string>

8
app/src/main/res/xml/main_preferences.xml
View File

@@ -28,6 +28,14 @@
app:key="open_link_in_app"
app:title="@string/settings_open_link_in_app_title" />
<ListPreference
app:defaultValue="0"
android:entries="@array/settings_video_autoplay"
app:entryValues="@array/settings_video_autoplay_values"
app:key="video_autoplay"
app:title="@string/settings_video_autoplay_title"
app:useSimpleSummaryProvider="true" />
<SwitchPreference
app:defaultValue="false"
app:key="mute_video"