diff options
Diffstat (limited to 'app/src/main/res/layout')
30 files changed, 236 insertions, 277 deletions
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 453ad5c4..4f3ad007 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -13,14 +13,23 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_view_edit_profile_activity" + <com.google.android.material.appbar.CollapsingToolbarLayout + android:id="@+id/collapsing_toolbar_layout_edit_profile_activity" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - app:navigationIcon="?attr/homeAsUpIndicator" - app:popupTheme="@style/AppTheme.PopupOverlay" - app:title="@string/action_edit_profile" /> + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_post_text_activity"> + + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar_view_edit_profile_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + app:navigationIcon="?attr/homeAsUpIndicator" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.AppBarLayout> @@ -42,130 +51,121 @@ <FrameLayout android:id="@+id/frame_layout_view_banner_edit_profile_activity" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp"> + android:layout_height="wrap_content"> - <ImageView + <pl.droidsonroids.gif.GifImageView android:id="@+id/image_view_banner_edit_profile_activity" android:layout_width="match_parent" android:layout_height="180dp" - android:contentDescription="@null" android:scaleType="centerCrop" tools:src="@tools:sample/backgrounds/scenic" /> <ImageView android:id="@+id/image_view_change_banner_edit_profile_activity" - android:layout_width="32dp" - android:layout_height="32dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end|bottom" - android:layout_margin="4dp" + android:layout_margin="8dp" + android:padding="8dp" android:background="@drawable/ic_dot_outline" - android:contentDescription="@null" - android:padding="4dp" app:srcCompat="@drawable/ic_outline_add_a_photo_day_night_24dp" /> </FrameLayout> <FrameLayout android:id="@+id/frame_layout_view_avatar_edit_profile_activity" - android:layout_width="74dp" - android:layout_height="74dp" - android:layout_marginStart="24dp" - android:layout_marginTop="143dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="144dp" android:elevation="4dp"> - <ImageView + <pl.droidsonroids.gif.GifImageView android:id="@+id/image_view_avatar_edit_profile_activity" - android:layout_width="74dp" - android:layout_height="74dp" - android:contentDescription="@null" + android:layout_width="72dp" + android:layout_height="72dp" tools:src="@tools:sample/avatars" /> <ImageView android:id="@+id/image_view_change_avatar_edit_profile_activity" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_gravity="end|bottom" - android:layout_margin="4dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="8dp" android:background="@drawable/ic_dot_outline" - android:contentDescription="@null" - android:padding="4dp" app:srcCompat="@drawable/ic_outline_add_a_photo_day_night_24dp" /> </FrameLayout> </FrameLayout> - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_margin="8dp" - android:background="?dividerVertical" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - android:orientation="vertical" - android:padding="8dp"> + android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="?attr/font_family" + android:paddingTop="48dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/display_name_text" - android:textSize="?attr/font_18" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> <EditText android:id="@+id/edit_text_display_name_edit_profile_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="top" + android:padding="16dp" + android:background="#00000000" + android:textSize="?attr/font_16" + android:fontFamily="?attr/font_family" android:hint="@string/display_name_hint" android:importantForAutofill="no" android:inputType="textCapSentences" - android:lines="1" - android:maxLength="30" - android:maxLines="1" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingBottom="16dp" /> + android:maxLength="30" /> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/display_name_description" /> + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:text="@string/display_name_description" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" /> </LinearLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - android:orientation="vertical" - android:padding="8dp"> + android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="?attr/font_family" + android:paddingTop="48dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/about_you_text" - android:textSize="?attr/font_18" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> <EditText android:id="@+id/edit_text_about_you_edit_profile_activity" android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="16dp" android:gravity="top" + android:background="#00000000" + android:textSize="?attr/font_16" + android:fontFamily="?attr/font_family" android:hint="@string/about_you_hint" android:importantForAutofill="no" android:inputType="textCapSentences|textMultiLine" - android:lines="4" - android:maxLength="200" - android:maxLines="4" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingBottom="16dp" /> + android:maxLength="200" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_gallery.xml b/app/src/main/res/layout/activity_post_gallery.xml index 150870e0..66fd39ac 100644 --- a/app/src/main/res/layout/activity_post_gallery.xml +++ b/app/src/main/res/layout/activity_post_gallery.xml @@ -36,9 +36,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="16dp" android:paddingTop="8dp" - android:paddingEnd="16dp" android:paddingBottom="8dp"> <pl.droidsonroids.gif.GifImageView @@ -46,7 +44,8 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_alignParentStart="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:layout_marginStart="16dp" /> <TextView android:id="@+id/subreddit_name_text_view_post_gallery_activity" @@ -54,7 +53,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="32dp" - android:layout_marginEnd="16dp" android:layout_toStartOf="@id/rules_button_post_gallery_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_gallery_activity" android:text="@string/choose_a_subreddit" @@ -67,16 +65,18 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/rules" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_gallery_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -93,7 +93,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -107,7 +107,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,23 +121,16 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> </LinearLayout> - <View - android:id="@+id/divider_2_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_gallery_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_gallery_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_gallery_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_gallery_activity" @@ -182,11 +175,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <androidx.recyclerview.widget.RecyclerView android:id="@+id/images_recycler_view_post_gallery_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 2e66a7ea..fc4c15cd 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -36,9 +36,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="16dp" android:paddingTop="8dp" - android:paddingEnd="16dp" android:paddingBottom="8dp"> <pl.droidsonroids.gif.GifImageView @@ -46,7 +44,8 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_alignParentStart="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:layout_marginStart="16dp" /> <TextView android:id="@+id/subreddit_name_text_view_post_image_activity" @@ -54,7 +53,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="32dp" - android:layout_marginEnd="16dp" android:layout_toStartOf="@id/rules_button_post_image_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity" android:text="@string/choose_a_subreddit" @@ -67,16 +65,18 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/rules" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -93,7 +93,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -107,7 +107,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,23 +121,16 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> </LinearLayout> - <View - android:id="@+id/divider_2_post_image_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_image_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_image_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_image_activity" @@ -182,11 +175,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_image_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_image_constraint_layout_post_image_activity" android:layout_width="match_parent" @@ -197,6 +185,7 @@ android:id="@+id/capture_fab_post_image_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_margin="16dp" android:src="@drawable/ic_outline_add_a_photo_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity" @@ -209,6 +198,7 @@ android:id="@+id/select_from_library_fab_post_image_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_margin="16dp" android:src="@drawable/ic_outline_select_photo_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 427b8306..29c33d4b 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -36,9 +36,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="16dp" android:paddingTop="8dp" - android:paddingEnd="16dp" android:paddingBottom="8dp"> <pl.droidsonroids.gif.GifImageView @@ -46,7 +44,8 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_alignParentStart="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:layout_marginStart="16dp" /> <TextView android:id="@+id/subreddit_name_text_view_post_link_activity" @@ -54,7 +53,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="32dp" - android:layout_marginEnd="16dp" android:layout_toStartOf="@id/rules_button_post_link_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity" android:text="@string/choose_a_subreddit" @@ -67,16 +65,18 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/rules" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -93,7 +93,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -107,7 +107,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,23 +121,16 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> </LinearLayout> - <View - android:id="@+id/divider_2_post_link_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_link_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,16 +157,14 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_link_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="0dp" - android:paddingEnd="16dp"> + android:layout_height="wrap_content"> <EditText android:id="@+id/post_title_edit_text_post_link_activity" @@ -195,17 +186,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/suggest_title" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> </LinearLayout> - <View - android:id="@+id/divider_4_post_link_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <EditText android:id="@+id/post_link_edit_text_post_link_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index f18bf667..78728545 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -42,9 +42,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="16dp" android:paddingTop="8dp" - android:paddingEnd="16dp" android:paddingBottom="8dp"> <pl.droidsonroids.gif.GifImageView @@ -52,7 +50,8 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_alignParentStart="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:layout_marginStart="16dp" /> <TextView android:id="@+id/subreddit_name_text_view_post_text_activity" @@ -60,7 +59,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="32dp" - android:layout_marginEnd="16dp" android:layout_toStartOf="@id/rules_button_post_text_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_text_activity" android:text="@string/choose_a_subreddit" @@ -73,16 +71,18 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/rules" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -98,7 +98,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -111,7 +111,7 @@ android:text="@string/spoiler" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -124,23 +124,16 @@ android:text="@string/nsfw" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> </LinearLayout> - <View - android:id="@+id/divider_2_post_text_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_text_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -167,10 +160,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_text_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_text_activity" @@ -184,11 +177,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_text_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <EditText android:id="@+id/post_text_content_edit_text_post_text_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index e1c297cb..f9b34698 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -36,9 +36,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="16dp" android:paddingTop="8dp" - android:paddingEnd="16dp" android:paddingBottom="8dp"> <pl.droidsonroids.gif.GifImageView @@ -46,7 +44,8 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_alignParentStart="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:layout_marginStart="16dp" /> <TextView android:id="@+id/subreddit_name_text_view_post_video_activity" @@ -54,7 +53,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="32dp" - android:layout_marginEnd="16dp" android:layout_toStartOf="@id/rules_button_post_video_activity" android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity" android:text="@string/choose_a_subreddit" @@ -67,16 +65,18 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/rules" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -93,7 +93,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -107,7 +107,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,23 +121,16 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> </LinearLayout> - <View - android:id="@+id/divider_2_post_video_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_video_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_video_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_video_activity" @@ -182,11 +175,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_video_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_video_constraint_layout_post_video_activity" android:layout_width="match_parent" @@ -197,25 +185,27 @@ android:id="@+id/capture_fab_post_video_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="16dp" android:src="@drawable/ic_outline_add_a_photo_24dp" + app:useCompatPadding="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="@android:color/white" /> + app:layout_constraintTop_toTopOf="parent" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/select_from_library_fab_post_video_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="16dp" android:src="@drawable/ic_outline_select_photo_24dp" + app:useCompatPadding="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity" - app:layout_constraintTop_toTopOf="parent" - app:tint="@android:color/white" /> + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_submit_crosspost.xml b/app/src/main/res/layout/activity_submit_crosspost.xml index 345de3ae..797f9608 100644 --- a/app/src/main/res/layout/activity_submit_crosspost.xml +++ b/app/src/main/res/layout/activity_submit_crosspost.xml @@ -93,7 +93,7 @@ android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -107,7 +107,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,7 +121,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index 6709af9f..a347b353 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -65,7 +65,8 @@ android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" + app:chipStrokeColor="#00000000" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index c312e808..203f53ff 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -67,7 +67,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:layout_gravity="center_horizontal" - android:visibility="gone"/> + android:visibility="gone" + app:chipStrokeColor="#00000000" /> <RelativeLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml index b81b5026..28ee2d9a 100644 --- a/app/src/main/res/layout/exo_playback_control_view.xml +++ b/app/src/main/res/layout/exo_playback_control_view.xml @@ -119,6 +119,14 @@ android:src="@drawable/ic_file_download_toolbar_white_24dp" android:background="?attr/selectableItemBackgroundBorderless" /> + <ImageView + android:id="@+id/playback_speed_image_view_exo_playback_control_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="16dp" + android:src="@drawable/ic_playback_speed_toolbar_24dp" + android:background="?attr/selectableItemBackgroundBorderless" /> + </LinearLayout> </com.google.android.material.bottomappbar.BottomAppBar> diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml index 8c0169cf..9ed975e3 100644 --- a/app/src/main/res/layout/fragment_theme_preview_posts.xml +++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml @@ -136,7 +136,7 @@ android:text="@string/post_type_preview" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -149,7 +149,7 @@ android:text="@string/spoiler" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -161,7 +161,7 @@ android:text="@string/nsfw" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -174,7 +174,7 @@ android:text="@string/flair_preview" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -186,7 +186,7 @@ android:text="@string/awards_preview" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index f72eadc0..e6d3f89d 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -99,7 +99,7 @@ android:fontFamily="?attr/font_family" tools:visibility="visible" /> - <TextView + <ml.docilealligator.infinityforreddit.customviews.SpoilerOnClickTextView android:id="@+id/comment_markdown_view_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/item_post_card_2_text.xml b/app/src/main/res/layout/item_post_card_2_text.xml index a133cd52..c70142c2 100644 --- a/app/src/main/res/layout/item_post_card_2_text.xml +++ b/app/src/main/res/layout/item_post_card_2_text.xml @@ -49,7 +49,7 @@ android:text="@string/text" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -63,7 +63,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -76,7 +76,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -89,7 +89,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -101,7 +101,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml index ef8794ce..3f3cf37c 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml @@ -31,6 +31,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:show_timeout="1500" + app:auto_show="false" app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> <pl.droidsonroids.gif.GifImageView @@ -81,7 +82,7 @@ android:text="@string/video" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -95,7 +96,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -108,7 +109,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,7 +122,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -133,7 +134,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml index 4f5dc4f2..002afb56 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml @@ -31,6 +31,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:show_timeout="1500" + app:auto_show="false" app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> <pl.droidsonroids.gif.GifImageView @@ -81,7 +82,7 @@ android:text="@string/video" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -95,7 +96,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -108,7 +109,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -121,7 +122,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -133,7 +134,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml index 298e77ce..7c752ab1 100644 --- a/app/src/main/res/layout/item_post_card_2_with_preview.xml +++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml @@ -92,7 +92,7 @@ android:text="@string/gallery" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -106,7 +106,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -119,7 +119,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -132,7 +132,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -144,7 +144,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index 0371a939..5bab3835 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -112,7 +112,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:textSize="?attr/font_10" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -126,7 +126,7 @@ android:text="@string/spoiler" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -139,7 +139,7 @@ android:text="@string/nsfw" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -152,7 +152,7 @@ android:padding="4dp" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -164,7 +164,7 @@ android:padding="4dp" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml index f151c98d..da3305d6 100644 --- a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml +++ b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml @@ -174,7 +174,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:textSize="?attr/font_10" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -188,7 +188,7 @@ android:text="@string/spoiler" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -201,7 +201,7 @@ android:text="@string/nsfw" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -214,7 +214,7 @@ android:padding="4dp" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -226,7 +226,7 @@ android:padding="4dp" android:textSize="?attr/font_10" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> 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 5a53410d..6a5d2a51 100644 --- a/app/src/main/res/layout/item_post_detail_gallery.xml +++ b/app/src/main/res/layout/item_post_detail_gallery.xml @@ -120,7 +120,7 @@ android:text="@string/gallery" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -134,7 +134,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -147,7 +147,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -160,7 +160,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml index 567269d5..fa135603 100644 --- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml @@ -120,7 +120,7 @@ android:text="@string/image" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -134,7 +134,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -147,7 +147,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -160,7 +160,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml index 105b34eb..076766d0 100644 --- a/app/src/main/res/layout/item_post_detail_link.xml +++ b/app/src/main/res/layout/item_post_detail_link.xml @@ -120,7 +120,7 @@ android:text="@string/link" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -134,7 +134,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -147,7 +147,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -160,7 +160,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail_no_preview.xml b/app/src/main/res/layout/item_post_detail_no_preview.xml index 63d6e17e..01aabe38 100644 --- a/app/src/main/res/layout/item_post_detail_no_preview.xml +++ b/app/src/main/res/layout/item_post_detail_no_preview.xml @@ -129,7 +129,7 @@ android:text="@string/link" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -143,7 +143,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -156,7 +156,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -169,7 +169,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml index d71c4670..2043ad98 100644 --- a/app/src/main/res/layout/item_post_detail_text.xml +++ b/app/src/main/res/layout/item_post_detail_text.xml @@ -129,7 +129,7 @@ android:text="@string/text" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -143,7 +143,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -156,7 +156,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -169,7 +169,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml index 9ebfe960..846a2c10 100644 --- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml +++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml @@ -119,7 +119,7 @@ android:padding="4dp" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -133,7 +133,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -146,7 +146,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -159,7 +159,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml index 6e6f77b2..aa3a3662 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml @@ -120,7 +120,7 @@ android:text="@string/video" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -134,7 +134,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -147,7 +147,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -160,7 +160,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -214,6 +214,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:show_timeout="1500" + app:auto_show="false" app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> <pl.droidsonroids.gif.GifImageView diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml index 2f77d082..8e1b67ac 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml @@ -120,7 +120,7 @@ android:text="@string/video" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -134,7 +134,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -147,7 +147,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -160,7 +160,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -214,6 +214,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:show_timeout="1500" + app:auto_show="false" app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> <pl.droidsonroids.gif.GifImageView diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml index b2b979b1..3b2ca0f3 100644 --- a/app/src/main/res/layout/item_post_text.xml +++ b/app/src/main/res/layout/item_post_text.xml @@ -130,7 +130,7 @@ android:text="@string/text" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -144,7 +144,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -157,7 +157,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -170,7 +170,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -182,7 +182,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index 5afde9c1..b63b608e 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml @@ -117,7 +117,7 @@ android:text="@string/video" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,7 +131,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -144,7 +144,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -157,7 +157,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -169,7 +169,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -208,6 +208,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:show_timeout="1500" + app:auto_show="false" app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> <pl.droidsonroids.gif.GifImageView diff --git a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml index b8f4a27c..6dc38374 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml @@ -117,7 +117,7 @@ android:text="@string/video" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,7 +131,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -144,7 +144,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -157,7 +157,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -169,7 +169,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -208,6 +208,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:show_timeout="1500" + app:auto_show="false" app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> <pl.droidsonroids.gif.GifImageView diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml index 91014578..e0162b1c 100644 --- a/app/src/main/res/layout/item_post_with_preview.xml +++ b/app/src/main/res/layout/item_post_with_preview.xml @@ -216,8 +216,7 @@ android:id="@+id/image_view_item_post_with_preview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:adjustViewBounds="true" - android:scaleType="fitStart" /> + android:adjustViewBounds="true" /> <ImageView android:id="@+id/video_or_gif_indicator_image_view_item_post_with_preview" |