Fix reactions

This commit is contained in:
Thomas 2021-03-03 16:16:52 +01:00
parent 4d16cae21d
commit 8adfd3ac65
6 changed files with 89 additions and 21 deletions

View File

@ -79,7 +79,7 @@ public class PushHelper {
if (distributors.size() == 0) {
alert.setTitle(R.string.no_distributors_found);
final TextView message = new TextView(context);
String link = "https://fedilab.app/wiki/features/push-notifications#fdroid";
String link = "https://fedilab.app/wiki/features/push-notifications/";
final SpannableString s =
new SpannableString(context.getString(R.string.no_distributors_explanation, link));
Linkify.addLinks(s, Linkify.WEB_URLS);

View File

@ -992,7 +992,13 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
holder.status_account_username.setVisibility(View.GONE);
holder.status_action_container.setVisibility(View.GONE);
}
holder.status_reactions.setVisibility(View.VISIBLE);
holder.status_show_reactions.setVisibility(View.VISIBLE);
if (status.getReactions() != null && status.getReactions().size() > 0) {
holder.status_reactions.setVisibility(View.VISIBLE);
} else {
holder.status_reactions.setVisibility(View.GONE);
}
ReactionAdapter reactionAdapter = new ReactionAdapter(status.getReactions(), type, status.getId());
holder.reactions_view.setAdapter(reactionAdapter);
LinearLayoutManager layoutManager
@ -1002,6 +1008,15 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
holder.status_add_reaction.setOnClickListener(v -> statusAddReactionClick(status, holder));
}
holder.status_show_reactions.setOnClickListener(v -> {
if (status.getReactions() != null && status.getReactions().size() == 0) {
if (holder.status_reactions.getVisibility() == View.VISIBLE) {
holder.status_reactions.setVisibility(View.GONE);
} else {
holder.status_reactions.setVisibility(View.VISIBLE);
}
}
});
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
@ -3960,6 +3975,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
ImageView status_pin;
ImageView status_remove;
ImageView status_privacy;
ImageView status_show_reactions;
LinearLayout status_container2;
LinearLayout status_container3;
ConstraintLayout main_container;
@ -4057,7 +4073,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
status_prev4_container = itemView.findViewById(R.id.status_prev4_container);
status_reply = itemView.findViewById(R.id.status_reply);
status_privacy = itemView.findViewById(R.id.status_privacy);
status_show_reactions = itemView.findViewById(R.id.status_show_reactions);
status_content_translated_container = itemView.findViewById(R.id.status_content_translated_container);
main_container = itemView.findViewById(R.id.main_container);
status_spoiler_container = itemView.findViewById(R.id.status_spoiler_container);

View File

@ -1022,6 +1022,20 @@
app:layout_constraintStart_toEndOf="@id/spark_button_fav"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/status_show_reactions"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginStart="15dp"
android:contentDescription="@string/add_reaction"
android:src="@drawable/ic_baseline_mood_24"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/iconColor" />
<ImageView
android:id="@+id/status_pin"
android:layout_width="25dp"
@ -1030,7 +1044,7 @@
android:contentDescription="@string/pin_add"
android:src="@drawable/ic_pin_drop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:layout_constraintStart_toEndOf="@id/status_show_reactions"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/iconColor" />

View File

@ -960,6 +960,19 @@
app:layout_constraintStart_toEndOf="@id/spark_button_fav"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/status_show_reactions"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginStart="15dp"
android:contentDescription="@string/add_reaction"
android:src="@drawable/ic_baseline_mood_24"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/iconColor" />
<ImageView
android:id="@+id/new_element"
android:layout_width="wrap_content"
@ -972,7 +985,7 @@
android:src="@drawable/ic_fiber_new"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:layout_constraintStart_toEndOf="@id/status_show_reactions"
app:layout_constraintTop_toTopOf="parent" />
<ImageView

View File

@ -191,7 +191,7 @@
android:layout_height="20dp"
android:contentDescription="@string/cached_status"
android:src="@drawable/ic_cached_black"
android:tint="?attr/textColor"
app:tint="?attr/iconColor"
android:visibility="gone" />
<LinearLayout
@ -566,7 +566,7 @@
android:contentDescription="@string/hide_media"
android:padding="5dp"
android:src="@drawable/ic_remove_red_eye_img"
android:tint="@color/white" />
app:tint="?attr/iconColor" />
</RelativeLayout>
<LinearLayout
@ -607,7 +607,7 @@
android:contentDescription="@string/hide_media"
android:padding="5dp"
android:src="@drawable/ic_remove_red_eye_img"
android:tint="@color/white" />
app:tint="?attr/iconColor" />
</RelativeLayout>
<LinearLayout
@ -832,7 +832,7 @@
android:layout_height="30dp"
android:layout_marginStart="15dp"
android:src="@drawable/ic_reply"
android:tint="?attr/iconColor"
app:tint="?attr/iconColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/new_element"
app:layout_constraintTop_toTopOf="parent"
@ -890,6 +890,19 @@
app:layout_constraintStart_toEndOf="@id/spark_button_fav"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/status_show_reactions"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginStart="15dp"
android:contentDescription="@string/add_reaction"
android:src="@drawable/ic_baseline_mood_24"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/iconColor" />
<ImageView
android:id="@+id/status_remove"
android:layout_width="20dp"
@ -898,10 +911,10 @@
android:layout_marginTop="5dp"
android:contentDescription="@string/delete"
android:src="@drawable/ic_clear_toot"
android:tint="?attr/iconColor"
app:layout_constraintStart_toEndOf="@id/status_show_reactions"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:tint="?attr/iconColor"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
@ -911,7 +924,7 @@
android:layout_marginStart="15dp"
android:contentDescription="@string/pin_add"
android:src="@drawable/ic_pin_drop"
android:tint="?attr/iconColor"
app:tint="?attr/iconColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_remove"
app:layout_constraintTop_toTopOf="parent" />
@ -931,7 +944,7 @@
android:layout_height="25dp"
android:contentDescription="@string/display_toot_truncate"
android:src="@drawable/ic_more_horiz"
android:tint="?attr/iconColor"
app:tint="?attr/iconColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@ -154,7 +154,7 @@
android:layout_height="20dp"
android:contentDescription="@string/cached_status"
android:src="@drawable/ic_cached_black"
android:tint="?attr/textColor"
app:tint="?attr/iconColor"
android:visibility="gone" />
<TextView
@ -508,7 +508,7 @@
android:contentDescription="@string/hide_media"
android:padding="5dp"
android:src="@drawable/ic_remove_red_eye_img"
android:tint="?attr/iconColor" />
app:tint="?attr/iconColor" />
</RelativeLayout>
<LinearLayout
@ -549,7 +549,7 @@
android:contentDescription="@string/hide_media"
android:padding="5dp"
android:src="@drawable/ic_remove_red_eye_img"
android:tint="?attr/iconColor" />
app:tint="?attr/iconColor" />
</RelativeLayout>
<LinearLayout
@ -796,7 +796,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_reply"
android:tint="?attr/iconColor"
app:tint="?attr/iconColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -856,19 +856,31 @@
app:layout_constraintStart_toEndOf="@id/spark_button_fav"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/status_show_reactions"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginStart="15dp"
android:contentDescription="@string/add_reaction"
android:src="@drawable/ic_baseline_mood_24"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/iconColor" />
<ImageView
android:id="@+id/status_remove"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="15dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="5dp"
android:contentDescription="@string/delete"
android:src="@drawable/ic_clear_toot"
android:tint="?attr/iconColor"
app:layout_constraintStart_toEndOf="@id/status_show_reactions"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/status_favorite_count"
app:tint="?attr/iconColor"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
@ -898,7 +910,7 @@
android:layout_height="25dp"
android:contentDescription="@string/display_toot_truncate"
android:src="@drawable/ic_more_horiz"
android:tint="?attr/iconColor"
app:tint="?attr/iconColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />