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

Basic up/down vote separation

Browse Source 
This commit adds separation option of the up and downvote scres for post on the main page.
This commit is contained in:
Bazsalanszky
2023-08-09 20:39:12 +02:00
parent 167aecb696
commit b13dd58c70
25 changed files with 420 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/res/layout/item_post_card_2_gallery_type.xml
View File

@@ -256,6 +256,20 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_gallery_type" />
<TextView
android:id="@+id/downvote_text_view_item_post_card_2_gallery_type"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_gallery_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/comments_count_text_view_item_post_card_2_gallery_type"
android:layout_width="wrap_content"
@@ -269,7 +283,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_gallery_type" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_card_2_gallery_type" />
<ImageView
android:id="@+id/save_button_item_post_card_2_gallery_type"

16
app/src/main/res/layout/item_post_card_2_text.xml
View File

@@ -216,6 +216,20 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_text" />
<TextView
android:id="@+id/downvote_text_view_item_post_card_2_text"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
android:fontFamily="?attr/font_family"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_text" />
<TextView
android:id="@+id/comments_count_item_post_card_2_text"
android:layout_width="wrap_content"
@@ -229,7 +243,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_text" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_card_2_text" />
<ImageView
android:id="@+id/save_button_item_post_card_2_text"

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

@@ -257,6 +257,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_video_autoplay" />
<TextView
android:id="@+id/downvote_text_view_item_post_card_2_video_autoplay"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:fontFamily="?attr/font_family"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_video_autoplay" />
<TextView
android:id="@+id/comments_count_item_post_card_2_video_autoplay"
android:layout_width="wrap_content"
@@ -270,7 +283,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_video_autoplay" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_card_2_video_autoplay" />
<ImageView
android:id="@+id/save_button_item_post_card_2_video_autoplay"

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

@@ -257,6 +257,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_video_autoplay" />
<TextView
android:id="@+id/downvote_text_view_item_post_card_2_video_autoplay"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
android:fontFamily="?attr/font_family"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_video_autoplay" />
<TextView
android:id="@+id/comments_count_item_post_card_2_video_autoplay"
android:layout_width="wrap_content"
@@ -270,7 +283,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_video_autoplay" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_card_2_video_autoplay" />
<ImageView
android:id="@+id/save_button_item_post_card_2_video_autoplay"

15
app/src/main/res/layout/item_post_card_2_with_preview.xml
View File

@@ -268,6 +268,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_with_preview" />
<TextView
android:id="@+id/downvote_text_view_item_post_card_2_with_preview"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
android:fontFamily="?attr/font_family"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_with_preview" />
<TextView
android:id="@+id/comments_count_item_post_card_2_with_preview"
android:layout_width="wrap_content"
@@ -281,7 +294,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_with_preview" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_card_2_with_preview" />
<ImageView
android:id="@+id/save_button_item_post_card_2_with_preview"

16
app/src/main/res/layout/item_post_compact.xml
View File

@@ -328,6 +328,20 @@
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_compact"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/downvote_text_view_item_post_compact"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/comments_count_item_post_compact"
android:layout_width="wrap_content"
@@ -343,7 +357,7 @@
android:textSize="?attr/font_12"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact"
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_compact"
app:layout_constraintTop_toTopOf="parent" />
<ImageView

15
app/src/main/res/layout/item_post_compact_right_thumbnail.xml
View File

@@ -325,6 +325,19 @@
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_compact_right_thumbnail"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/downvote_text_view_item_post_compact_right_thumbnail"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact_right_thumbnail"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/comments_count_item_post_compact_right_thumbnail"
android:layout_width="wrap_content"
@@ -340,7 +353,7 @@
android:textSize="?attr/font_12"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact_right_thumbnail"
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_compact_right_thumbnail"
app:layout_constraintTop_toTopOf="parent" />
<ImageView

15
app/src/main/res/layout/item_post_gallery_type.xml
View File

@@ -273,6 +273,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_gallery_type" />
<TextView
android:id="@+id/downvote_text_view_item_post_gallery_type"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
android:fontFamily="?attr/font_family"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_gallery_type" />
<TextView
android:id="@+id/comments_count_text_view_item_post_gallery_type"
android:layout_width="wrap_content"
@@ -286,7 +299,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_gallery_type" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_gallery_type" />
<ImageView
android:id="@+id/save_button_item_post_gallery_type"

15
app/src/main/res/layout/item_post_text.xml
View File

@@ -252,6 +252,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_text_type" />
<TextView
android:id="@+id/downvote_text_view_item_post_text_type"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_text_type" />
<TextView
android:id="@+id/comments_count_item_post_text_type"
android:layout_width="wrap_content"
@@ -265,7 +278,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_text_type" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_text_type" />
<ImageView
android:id="@+id/save_button_item_post_text_type"

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

@@ -273,6 +273,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_video_type_autoplay" />
<TextView
android:id="@+id/downvote_text_view_item_post_video_type_autoplay"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:fontFamily="?attr/font_family"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_video_type_autoplay" />
<TextView
android:id="@+id/comments_count_item_post_video_type_autoplay"
android:layout_width="wrap_content"
@@ -286,7 +299,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_video_type_autoplay" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_video_type_autoplay" />
<ImageView
android:id="@+id/save_button_item_post_video_type_autoplay"

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

@@ -273,6 +273,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_video_type_autoplay" />
<TextView
android:id="@+id/downvote_text_view_item_post_video_type_autoplay"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:fontFamily="?attr/font_family"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_video_type_autoplay" />
<TextView
android:id="@+id/comments_count_item_post_video_type_autoplay"
android:layout_width="wrap_content"
@@ -286,7 +299,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_video_type_autoplay" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_video_type_autoplay" />
<ImageView
android:id="@+id/save_button_item_post_video_type_autoplay"

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

@@ -297,6 +297,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_with_preview" />
<TextView
android:id="@+id/downvote_text_view_item_post_with_preview"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="?attr/font_12"
android:textStyle="bold"
android:visibility="gone"
android:fontFamily="?attr/font_family"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_with_preview" />
<TextView
android:id="@+id/comments_count_item_post_with_preview"
android:layout_width="wrap_content"
@@ -310,7 +323,7 @@
android:drawablePadding="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/minus_button_item_post_with_preview" />
app:layout_constraintStart_toEndOf="@id/downvote_text_view_item_post_with_preview" />
<ImageView
android:id="@+id/save_button_item_post_with_preview"

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

@@ -1354,4 +1354,5 @@
<string name="password_cannot_be_empty">The password field cannot be left empty.</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="separate_down_and_up_votes">Separate Up and Down votes</string>
</resources>

5
app/src/main/res/xml/comment_preferences.xml
View File

@@ -56,6 +56,11 @@
app:key="hide_the_number_of_votes_in_comments"
app:title="@string/settings_hide_the_number_of_votes" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="true"
app:key="comment_separate_down_and_up_votes"
app:title="@string/separate_down_and_up_votes" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSeekBarPreference
app:defaultValue="5"
android:max="10"

10
app/src/main/res/xml/post_details_preferences.xml
View File

@@ -22,11 +22,6 @@
app:key="hide_upvote_ratio"
app:title="@string/settings_hide_upvote_ratio_title" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_the_number_of_awards"
app:title="@string/settings_hide_the_number_of_awards" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_subreddit_and_user_prefix"
@@ -37,6 +32,11 @@
app:key="hide_the_number_of_votes"
app:title="@string/settings_hide_the_number_of_votes" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="true"
app:key="post_detail_separate_down_and_up_votes"
app:title="@string/separate_down_and_up_votes" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_the_number_of_comments"

5
app/src/main/res/xml/post_preferences.xml
View File

@@ -38,6 +38,11 @@
app:key="hide_the_number_of_votes"
app:title="@string/settings_hide_the_number_of_votes" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="true"
app:key="post_separate_down_and_up_votes"
app:title="@string/separate_down_and_up_votes" />
<eu.toldi.infinityforlemmy.customviews.CustomFontSwitchPreference
app:defaultValue="false"
app:key="hide_the_number_of_comments"