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

Merge branch 'master' into gallery-captions-feature

Browse Source
This commit is contained in:
scria1000
2021-11-27 17:10:50 +00:00
committed by GitHub
parent 90a9b1033f d8f6572262
commit a399200be2
59 changed files with 1137 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout-land/fragment_view_post_detail.xml
View File

@@ -23,6 +23,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingBottom="144dp"
android:clipToPadding="false"
app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />

1
app/src/main/res/layout-sw600dp/fragment_view_post_detail.xml
View File

@@ -23,6 +23,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingBottom="144dp"
android:clipToPadding="false"
app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />

120
app/src/main/res/layout/activity_edit_profile.xml
View File

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

22
app/src/main/res/layout/activity_post_gallery.xml
View File

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

22
app/src/main/res/layout/activity_post_image.xml
View File

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

22
app/src/main/res/layout/activity_post_link.xml
View File

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

22
app/src/main/res/layout/activity_post_text.xml
View File

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

32
app/src/main/res/layout/activity_post_video.xml
View File

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

8
app/src/main/res/layout/exo_playback_control_view.xml
View File

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

1
app/src/main/res/layout/item_post_card_2_video_autoplay.xml
View File

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

1
app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml
View File

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

1
app/src/main/res/layout/item_post_detail_video_autoplay.xml
View File

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

1
app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml
View File

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

1
app/src/main/res/layout/item_post_video_type_autoplay.xml
View File

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

1
app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml
View File

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

3
app/src/main/res/layout/item_post_with_preview.xml
View File

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

2
app/src/main/res/menu/edit_profile_activity.xml
View File

@@ -6,6 +6,6 @@
android:id="@+id/action_save_edit_profile_activity"
android:orderInCategory="1"
android:title="@string/action_save"
android:icon="@drawable/ic_save_to_database_24dp"
android:icon="@drawable/ic_check_circle_toolbar_24dp"
app:showAsAction="ifRoom" />
</menu>

8
app/src/main/res/menu/view_subreddit_detail_activity.xml
View File

@@ -54,8 +54,14 @@
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_wiki_activity"
android:id="@+id/action_go_to_wiki_view_subreddit_detail_activity"
android:orderInCategory="9"
android:title="@string/action_go_to_wiki"
app:showAsAction="never" />
<item
android:id="@+id/action_contact_mods_view_subreddit_detail_activity"
android:orderInCategory="10"
android:title="@string/action_contact_mods"
app:showAsAction="never" />
</menu>

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

@@ -43,6 +43,7 @@
<string name="post_gallery_activity_label">Gallery Post</string>
<string name="trending_activity_label">Trending</string>
<string name="wiki_activity_label">Wiki</string>
<string name="edit_profile_activity_label">Edit Profile</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
@@ -91,6 +92,7 @@
<string name="action_share_post_link">Share Post Link</string>
<string name="action_go_to_wiki">Go to Wiki</string>
<string name="action_playback_speed">Playback Speed</string>
<string name="action_contact_mods">Contact Mods</string>
<string name="parse_json_response_error">Error occurred when parsing the JSON response</string>
<string name="retrieve_token_error">Error Retrieving the token</string>
@@ -1226,18 +1228,18 @@
<string name="remove_banner">Remove Banner</string>
<string name="display_name_text">Display Name</string>
<string name="display_name_hint">Show on your profile page</string>
<string name="display_name_description">This will be displayed to viewer of your profile page and does not change your username</string>
<string name="display_name_description">This will be displayed to viewers of your profile page and does not change your username.</string>
<string name="about_you_text">About You</string>
<string name="about_you_hint">A little description of your self</string>
<string name="message_remove_avatar_success">Success remove Avatar</string>
<string name="message_remove_avatar_failed_fmt">Failed remove Avatar %s</string>
<string name="message_remove_banner_success">Success remove Banner</string>
<string name="message_remove_banner_failed_fmt">Failed remove Banner %s</string>
<string name="message_change_avatar_success">Success changing Avatar</string>
<string name="message_change_avatar_failed_fmt">Failed changing Avatar %s</string>
<string name="message_change_banner_success">Success changing Banner</string>
<string name="message_change_banner_failed_fmt">Failed changing Banner %s</string>
<string name="message_save_profile_success">Success save profile</string>
<string name="message_save_profile_failed_fmt">Failed save profile %s</string>
<string name="about_you_hint">A little description of yourself</string>
<string name="message_remove_avatar_success">Remove avatar successfully</string>
<string name="message_remove_avatar_failed_fmt">Failed to remove avatar %s</string>
<string name="message_remove_banner_success">Remove banner successfully</string>
<string name="message_remove_banner_failed_fmt">Failed to remove banner %s</string>
<string name="message_change_avatar_success">Change avatar successfully</string>
<string name="message_change_avatar_failed_fmt">Failed to change avatar %s</string>
<string name="message_change_banner_success">Changing banner successfully</string>
<string name="message_change_banner_failed_fmt">Failed to change banner %s</string>
<string name="message_save_profile_success">Save profile successfully</string>
<string name="message_save_profile_failed_fmt">Failed to save profile %s</string>
</resources>