diff options
Diffstat (limited to 'app/src/main/res/layout')
14 files changed, 106 insertions, 151 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 b66d0c34..66fd39ac 100644 --- a/app/src/main/res/layout/activity_post_gallery.xml +++ b/app/src/main/res/layout/activity_post_gallery.xml @@ -73,10 +73,10 @@ </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" @@ -127,17 +127,10 @@ </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 a73dfcf4..fc4c15cd 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -73,10 +73,10 @@ </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" @@ -127,17 +127,10 @@ </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" diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index f7a26366..29c33d4b 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -73,10 +73,10 @@ </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" @@ -127,17 +127,10 @@ </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,10 +157,10 @@ </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" @@ -201,11 +194,6 @@ </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 e6c1a366..78728545 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -79,10 +79,10 @@ </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" @@ -130,17 +130,10 @@ </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 31632565..f9b34698 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -73,10 +73,10 @@ </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" @@ -127,17 +127,10 @@ </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/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/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml index 62f68bb2..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 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 458630ef..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 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 ff03dacc..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 @@ -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 56784af0..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 @@ -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_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index 3ea2d41a..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 @@ -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 12369cd3..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 @@ -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" |