Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert StickerTable to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-01-07 16:59:45 -05:00
parent 1509e3ed79
commit 465c852e8b
23 changed files with 574 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
View File

@@ -197,7 +197,7 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
} else if (records.isEmpty()) {
return idGenerator.getId(tag + "_" + STABLE_ID_TEXT);
} else {
return idGenerator.getId(records.get(localPosition - 1).getPackId());
return idGenerator.getId(records.get(localPosition - 1).packId);
}
}
@@ -264,38 +264,38 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
boolean lastInList,
boolean allowApngAnimation)
{
SpannableStringBuilder titleBuilder = new SpannableStringBuilder(stickerPack.getTitle().orElse(itemView.getResources().getString(R.string.StickerManagementAdapter_untitled)));
if (BlessedPacks.contains(stickerPack.getPackId())) {
SpannableStringBuilder titleBuilder = new SpannableStringBuilder(stickerPack.titleOptional.orElse(itemView.getResources().getString(R.string.StickerManagementAdapter_untitled)));
if (BlessedPacks.contains(stickerPack.packId)) {
titleBuilder.append(blessedBadge);
}
title.setText(titleBuilder);
author.setText(stickerPack.getAuthor().orElse(itemView.getResources().getString(R.string.StickerManagementAdapter_unknown)));
author.setText(stickerPack.authorOptional.orElse(itemView.getResources().getString(R.string.StickerManagementAdapter_unknown)));
divider.setVisibility(lastInList ? View.GONE : View.VISIBLE);
requestManager.load(new DecryptableUri(stickerPack.getCover().getUri()))
requestManager.load(new DecryptableUri(stickerPack.cover.uri))
.transition(DrawableTransitionOptions.withCrossFade())
.fitCenter()
.set(ApngOptions.ANIMATE, allowApngAnimation)
.into(cover);
if (stickerPack.isInstalled()) {
if (stickerPack.isInstalled) {
actionButtonImage.setImageResource(R.drawable.ic_x);
actionButton.setOnClickListener(v -> eventListener.onStickerPackUninstallClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
actionButton.setOnClickListener(v -> eventListener.onStickerPackUninstallClicked(stickerPack.packId, stickerPack.packKey));
shareButton.setVisibility(View.VISIBLE);
shareButtonImage.setVisibility(View.VISIBLE);
shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.packId, stickerPack.packKey));
} else {
actionButtonImage.setImageResource(R.drawable.symbol_arrow_down_24);
actionButton.setOnClickListener(v -> eventListener.onStickerPackInstallClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
actionButton.setOnClickListener(v -> eventListener.onStickerPackInstallClicked(stickerPack.packId, stickerPack.packKey));
shareButton.setVisibility(View.GONE);
shareButtonImage.setVisibility(View.GONE);
shareButton.setOnClickListener(null);
}
itemView.setOnClickListener(v -> eventListener.onStickerPackClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
itemView.setOnClickListener(v -> eventListener.onStickerPackClicked(stickerPack.packId, stickerPack.packKey));
}
void recycle() {

4
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
View File

@@ -61,9 +61,9 @@ final class StickerManagementRepository {
try (StickerPackRecordReader reader = new StickerPackRecordReader(stickerDatabase.getAllStickerPacks())) {
StickerPackRecord record;
while ((record = reader.getNext()) != null) {
if (record.isInstalled()) {
if (record.isInstalled) {
installedPacks.add(record);
} else if (BlessedPacks.contains(record.getPackId())) {
} else if (BlessedPacks.contains(record.packId)) {
blessedPacks.add(record);
} else {
availablePacks.add(record);

16
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
View File

@@ -58,18 +58,18 @@ public final class StickerPackPreviewRepository {
private Optional<StickerManifestResult> getManifestFromDatabase(@NonNull String packId) {
StickerPackRecord record = stickerDatabase.getStickerPack(packId);
if (record != null && record.isInstalled()) {
StickerManifest.Sticker cover = toSticker(record.getCover());
if (record != null && record.isInstalled) {
StickerManifest.Sticker cover = toSticker(record.cover);
List<StickerManifest.Sticker> stickers = getStickersFromDatabase(packId);
StickerManifest manifest = new StickerManifest(record.getPackId(),
record.getPackKey(),
record.getTitle(),
record.getAuthor(),
StickerManifest manifest = new StickerManifest(record.packId,
record.packKey,
record.titleOptional,
record.authorOptional,
Optional.of(cover),
stickers);
return Optional.of(new StickerManifestResult(manifest, record.isInstalled()));
return Optional.of(new StickerManifestResult(manifest, record.isInstalled));
}
return Optional.empty();
@@ -131,7 +131,7 @@ public final class StickerPackPreviewRepository {
}
private StickerManifest.Sticker toSticker(@NonNull StickerRecord record) {
return new StickerManifest.Sticker(record.getPackId(), record.getPackKey(), record.getStickerId(), record.getEmoji(), record.getContentType(), record.getUri());
return new StickerManifest.Sticker(record.packId, record.packKey, record.stickerId, record.emoji, record.contentType, record.uri);
}
static class StickerManifestResult {

2
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRolloverTouchListener.java
View File

@@ -81,7 +81,7 @@ public class StickerRolloverTouchListener implements RecyclerView.OnItemTouchLis
public void enterHoverMode(@NonNull RecyclerView recyclerView, @NonNull KeyboardStickerListAdapter.Sticker sticker) {
this.hoverMode = true;
showSticker(recyclerView, sticker.getUri(), sticker.getStickerRecord().getEmoji());
showSticker(recyclerView, sticker.getUri(), sticker.getStickerRecord().emoji);
}
private void exitHoverMode() {