mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix RTL corners in AlbumThumbnailView.

main
Alex Hart 2023-02-16 12:06:36 -04:00 zatwierdzone przez Greyson Parrelli
rodzic c61f45b88b
commit 76383fe1bc
1 zmienionych plików z 32 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

55
app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
Wyświetl plik

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
@ -34,9 +33,9 @@ public class AlbumThumbnailView extends FrameLayout {
private Stub<TransferControlView> transferControls; private Stub<TransferControlView> transferControls;
private final SlideClickListener defaultThumbnailClickListener = (v, slide) -> { private final SlideClickListener defaultThumbnailClickListener = (v, slide) -> {
if (thumbnailClickListener != null) { if (thumbnailClickListener != null) {
thumbnailClickListener.onClick(v, slide); thumbnailClickListener.onClick(v, slide);
} }
}; };
private final OnLongClickListener defaultLongClickListener = v -> this.performLongClick(); private final OnLongClickListener defaultLongClickListener = v -> this.performLongClick();
@ -161,43 +160,53 @@ public class AlbumThumbnailView extends FrameLayout {
} }
private ThumbnailView[] getCells() { private ThumbnailView[] getCells() {
ThumbnailView one = findViewById(R.id.album_cell_1); ThumbnailView one = findViewById(R.id.album_cell_1);
ThumbnailView two = findViewById(R.id.album_cell_2); ThumbnailView two = findViewById(R.id.album_cell_2);
ThumbnailView three = findViewById(R.id.album_cell_3); ThumbnailView three = findViewById(R.id.album_cell_3);
ThumbnailView four = findViewById(R.id.album_cell_4); ThumbnailView four = findViewById(R.id.album_cell_4);
ThumbnailView five = findViewById(R.id.album_cell_5); ThumbnailView five = findViewById(R.id.album_cell_5);
return new ThumbnailView[]{one, two, three, four, five}; return new ThumbnailView[] { one, two, three, four, five };
} }
private void applyCornersForSizeClass2() { private void applyCornersForSizeClass2() {
ThumbnailView[] cells = getCells(); ThumbnailView[] cells = getCells();
cells[0].setRadii(corners[0], 0, 0, corners[3]); setRelativeRadii(cells[0], corners[0], 0, 0, corners[3]);
cells[1].setRadii(0, corners[1], corners[2], 0); setRelativeRadii(cells[1], 0, corners[1], corners[2], 0);
} }
private void applyCornersForSizeClass3() { private void applyCornersForSizeClass3() {
ThumbnailView[] cells = getCells(); ThumbnailView[] cells = getCells();
cells[0].setRadii(corners[0], 0, 0, corners[3]); setRelativeRadii(cells[0], corners[0], 0, 0, corners[3]);
cells[1].setRadii(0, corners[1], 0, 0); setRelativeRadii(cells[1], 0, corners[1], 0, 0);
cells[2].setRadii(0, 0, corners[2], 0); setRelativeRadii(cells[2], 0, 0, corners[2], 0);
} }
private void applyCornersForSizeClass4() { private void applyCornersForSizeClass4() {
ThumbnailView[] cells = getCells(); ThumbnailView[] cells = getCells();
cells[0].setRadii(corners[0], 0, 0, 0); setRelativeRadii(cells[0], corners[0], 0, 0, 0);
cells[1].setRadii(0, corners[1], 0, 0); setRelativeRadii(cells[1], 0, corners[1], 0, 0);
cells[2].setRadii(0, 0, 0, corners[3]); setRelativeRadii(cells[2], 0, 0, 0, corners[3]);
cells[3].setRadii(0, 0, corners[2], 0); setRelativeRadii(cells[3], 0, 0, corners[2], 0);
} }
private void applyCornersForSizeClass5() { private void applyCornersForSizeClass5() {
ThumbnailView[] cells = getCells(); ThumbnailView[] cells = getCells();
cells[0].setRadii(corners[0], 0, 0, 0); setRelativeRadii(cells[0], corners[0], 0, 0, 0);
cells[1].setRadii(0, corners[1], 0, 0); setRelativeRadii(cells[1], 0, corners[1], 0, 0);
cells[2].setRadii(0, 0, 0, corners[3]); setRelativeRadii(cells[2], 0, 0, 0, corners[3]);
cells[3].setRadii(0, 0, 0, 0); setRelativeRadii(cells[3], 0, 0, 0, 0);
cells[4].setRadii(0, 0, corners[2], 0); setRelativeRadii(cells[4], 0, 0, corners[2], 0);
}
private void setRelativeRadii(@NonNull ThumbnailView cell, int topLeft, int topRight, int bottomRight, int bottomLeft) {
boolean isLTR = getRootView().getLayoutDirection() == LAYOUT_DIRECTION_LTR;
cell.setRadii(
isLTR ? topLeft : topRight,
isLTR ? topRight : topLeft,
isLTR ? bottomRight : bottomLeft,
isLTR ? bottomLeft : bottomRight
);
} }
private void applyCornersForManySizeClass() { private void applyCornersForManySizeClass() {