Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

layout fix, bug fix

This commit is contained in:
nuclearfog 2023-06-13 23:08:50 +02:00
parent d902704c09
commit 12ef18cc96
No known key found for this signature in database
GPG Key ID: 03488A185C476379
6 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonMedia.java
View File

@ -116,7 +116,10 @@ public class MastodonMedia implements Media {
@Override
public boolean equals(@Nullable Object obj) {
return obj instanceof Media && ((Media) obj).getKey().equals(getKey());
if (!(obj instanceof Media))
return false;
Media media = (Media) obj;
return media.getMediaType() == getMediaType() && media.getKey().equals(getKey()) && media.getPreviewUrl().equals(getPreviewUrl()) && media.getUrl().equals(getUrl());
}

5
app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/MediaV1.java
View File

@ -135,7 +135,10 @@ public class MediaV1 implements Media {
@Override
public boolean equals(@Nullable Object obj) {
return obj instanceof Media && ((Media) obj).getKey().equals(getKey());
if (!(obj instanceof Media))
return false;
Media media = (Media) obj;
return media.getMediaType() == getMediaType() && media.getKey().equals(getKey()) && media.getPreviewUrl().equals(getPreviewUrl()) && media.getUrl().equals(getUrl());
}

5
app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v2/impl/MediaV2.java
View File

@ -141,7 +141,10 @@ public class MediaV2 implements Media {
@Override
public boolean equals(@Nullable Object obj) {
return obj instanceof Media && ((Media) obj).getKey().equals(getKey());
if (!(obj instanceof Media))
return false;
Media media = (Media) obj;
return media.getMediaType() == getMediaType() && media.getKey().equals(getKey()) && media.getPreviewUrl().equals(getPreviewUrl()) && media.getUrl().equals(getUrl());
}

5
app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseMedia.java
View File

@ -81,7 +81,10 @@ public class DatabaseMedia implements Media, MediaTable {
@Override
public boolean equals(@Nullable Object obj) {
return obj instanceof Media && ((Media) obj).getKey().equals(getKey());
if (!(obj instanceof Media))
return false;
Media media = (Media) obj;
return media.getMediaType() == getMediaType() && media.getKey().equals(getKey()) && media.getPreviewUrl().equals(getPreviewUrl()) && media.getUrl().equals(getUrl());
}

9
app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
View File

@ -183,8 +183,8 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
private TextView status_source, created_at, status_text, screen_name, username, location_name, sensitive, spoiler, spoiler_hint, translate_text;
private Button reply_button, repost_button, like_button, reply_name, repost_name_button;
private ImageView profile_image;
private RecyclerView card_list;
private Toolbar toolbar;
private View card_container;
@Nullable
private Status status;
@ -224,7 +224,8 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
repost_name_button = findViewById(R.id.page_status_reposter_reference);
translate_text = findViewById(R.id.page_status_text_translate);
spoiler_hint = findViewById(R.id.page_status_text_sensitive_hint);
card_list = findViewById(R.id.page_status_cards);
card_container = findViewById(R.id.page_status_cards_container);
RecyclerView card_list = findViewById(R.id.page_status_cards);
statusLoader = new StatusAction(this);
pollLoader = new PollAction(this);
@ -925,11 +926,11 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
}
// set status attachment preview
if ((status.getCards().length > 0 || status.getMedia().length > 0) || status.getPoll() != null) {
card_list.setVisibility(View.VISIBLE);
card_container.setVisibility(View.VISIBLE);
adapter.replaceAll(status);
status_text.setMaxLines(5);
} else {
card_list.setVisibility(View.GONE);
card_container.setVisibility(View.GONE);
status_text.setMaxLines(10);
}
}

24
app/src/main/res/layout/page_status.xml
View File

@ -173,14 +173,23 @@
app:layout_constraintStart_toStartOf="@id/page_status_text"
app:layout_constraintTop_toBottomOf="@id/page_status_text" />
<LinearLayout
android:id="@+id/page_status_cards_container"
android:layout_width="0dp"
android:layout_height="@dimen/page_status_card_height"
android:layout_margin="@dimen/page_status_cards_list_margin"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/page_status_text_translate"
app:layout_constraintEnd_toEndOf="parent"
android:gravity="center">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/page_status_cards"
android:layout_width="wrap_content"
android:layout_height="@dimen/page_status_card_height"
android:layout_margin="@dimen/page_status_cards_list_margin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/page_status_text_translate"
app:layout_constraintEnd_toEndOf="parent" />
android:layout_height="match_parent" />
</LinearLayout>
<TextView
android:id="@+id/page_status_sensitive"
@ -195,7 +204,7 @@
android:text="@string/status_sensitive_media"
android:textSize="@dimen/page_status_textsize_small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/page_status_cards"
app:layout_constraintTop_toBottomOf="@id/page_status_cards_container"
app:layout_constraintEnd_toStartOf="@id/page_status_spoiler"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_chainStyle="packed" />
@ -213,7 +222,7 @@
android:text="@string/status_contains_spoiler"
android:textSize="@dimen/page_status_textsize_small"
app:layout_constraintStart_toEndOf="@id/page_status_sensitive"
app:layout_constraintTop_toBottomOf="@id/page_status_cards"
app:layout_constraintTop_toBottomOf="@id/page_status_cards_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" />
@ -225,6 +234,7 @@
android:drawablePadding="@dimen/page_status_padding_drawable"
android:layout_marginStart="@dimen/page_status_textview_margin"
android:layout_marginTop="@dimen/page_status_textview_margin"
android:layout_marginEnd="@dimen/page_status_textview_margin"
android:lines="1"
android:textSize="@dimen/page_status_textsize_locale"
app:layout_constraintStart_toStartOf="parent"