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

Refactor MappingAdapter code into package.

Browse Source
This commit is contained in:
Cody Henthorne
2021-12-16 11:42:46 -05:00
committed by Greyson Parrelli
parent 4275877b47
commit dbce4be31d
125 changed files with 374 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareSelectionAdapter.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.sharing;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.MappingAdapter;
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter;
public class ShareSelectionAdapter extends MappingAdapter {
public ShareSelectionAdapter() {

2
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareSelectionMappingModel.java
View File

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MappingModel;
import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
public class ShareSelectionMappingModel implements MappingModel<ShareSelectionMappingModel> {

14
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareSelectionViewHolder.java
View File

@@ -5,15 +5,11 @@ import android.widget.TextView;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MappingAdapter;
import org.thoughtcrime.securesms.util.MappingViewHolder;
import org.thoughtcrime.securesms.util.ViewUtil;
import org.thoughtcrime.securesms.util.viewholders.RecipientMappingModel;
import org.thoughtcrime.securesms.util.adapter.mapping.Factory;
import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory;
import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder;
public class ShareSelectionViewHolder extends MappingViewHolder<ShareSelectionMappingModel> {
@@ -30,7 +26,7 @@ public class ShareSelectionViewHolder extends MappingViewHolder<ShareSelectionMa
name.setText(model.getName(context));
}
public static @NonNull MappingAdapter.Factory<ShareSelectionMappingModel> createFactory(@LayoutRes int layout) {
return new MappingAdapter.LayoutFactory<>(ShareSelectionViewHolder::new, layout);
public static @NonNull Factory<ShareSelectionMappingModel> createFactory(@LayoutRes int layout) {
return new LayoutFactory<>(ShareSelectionViewHolder::new, layout);
}
}

2
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.java
View File

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.DefaultValueLiveData;
import org.thoughtcrime.securesms.util.MappingModelList;
import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Collections;

2
app/src/main/java/org/thoughtcrime/securesms/sharing/interstitial/ShareInterstitialSelectionAdapter.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.sharing.interstitial;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.MappingAdapter;
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter;
import org.thoughtcrime.securesms.util.viewholders.RecipientViewHolder;
class ShareInterstitialSelectionAdapter extends MappingAdapter {

2
app/src/main/java/org/thoughtcrime/securesms/sharing/interstitial/ShareInterstitialViewModel.java
View File

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreview;
import org.thoughtcrime.securesms.sharing.MultiShareArgs;
import org.thoughtcrime.securesms.sharing.MultiShareSender;
import org.thoughtcrime.securesms.util.DefaultValueLiveData;
import org.thoughtcrime.securesms.util.MappingModelList;
import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
import org.thoughtcrime.securesms.util.Util;
class ShareInterstitialViewModel extends ViewModel {