mirror of
https://github.com/KokaKiwi/BarInsta
synced 2024-12-23 13:26:59 +00:00
support dm message type "clip" (which is glorified "media_share" for reels)
This commit is contained in:
parent
c3d92b8fc0
commit
40cb975384
@ -106,7 +106,8 @@ public final class DirectMessageItemsAdapter extends ListAdapter<DirectItemModel
|
|||||||
final LayoutDmRavenMediaBinding binding = LayoutDmRavenMediaBinding.inflate(layoutInflater, itemViewParent, false);
|
final LayoutDmRavenMediaBinding binding = LayoutDmRavenMediaBinding.inflate(layoutInflater, itemViewParent, false);
|
||||||
return new DirectMessageReelShareViewHolder(baseBinding, binding, onClickListener, mentionClickListener);
|
return new DirectMessageReelShareViewHolder(baseBinding, binding, onClickListener, mentionClickListener);
|
||||||
}
|
}
|
||||||
case MEDIA_SHARE: {
|
case MEDIA_SHARE:
|
||||||
|
case CLIP: {
|
||||||
final LayoutDmMediaShareBinding binding = LayoutDmMediaShareBinding.inflate(layoutInflater, itemViewParent, false);
|
final LayoutDmMediaShareBinding binding = LayoutDmMediaShareBinding.inflate(layoutInflater, itemViewParent, false);
|
||||||
return new DirectMessageMediaShareViewHolder(baseBinding, binding, onClickListener);
|
return new DirectMessageMediaShareViewHolder(baseBinding, binding, onClickListener);
|
||||||
}
|
}
|
||||||
|
@ -74,6 +74,7 @@ public final class DirectMessageInboxItemViewHolder extends RecyclerView.ViewHol
|
|||||||
case MEDIA:
|
case MEDIA:
|
||||||
case MEDIA_SHARE:
|
case MEDIA_SHARE:
|
||||||
case RAVEN_MEDIA:
|
case RAVEN_MEDIA:
|
||||||
|
case CLIP:
|
||||||
messageText = context.getString(R.string.direct_messages_sent_media);
|
messageText = context.getString(R.string.direct_messages_sent_media);
|
||||||
break;
|
break;
|
||||||
case ACTION_LOG:
|
case ACTION_LOG:
|
||||||
|
@ -205,6 +205,7 @@ public class DirectMessageThreadFragment extends Fragment {
|
|||||||
final DirectItemType itemType = directItemModel.getItemType();
|
final DirectItemType itemType = directItemModel.getItemType();
|
||||||
switch (itemType) {
|
switch (itemType) {
|
||||||
case MEDIA_SHARE:
|
case MEDIA_SHARE:
|
||||||
|
case CLIP:
|
||||||
startActivity(new Intent(requireContext(), PostViewer.class)
|
startActivity(new Intent(requireContext(), PostViewer.class)
|
||||||
.putExtra(Constants.EXTRAS_POST, new PostModel(directItemModel.getMediaModel().getCode(), false)));
|
.putExtra(Constants.EXTRAS_POST, new PostModel(directItemModel.getMediaModel().getCode(), false)));
|
||||||
break;
|
break;
|
||||||
@ -281,6 +282,7 @@ public class DirectMessageThreadFragment extends Fragment {
|
|||||||
|
|
||||||
switch (itemType) {
|
switch (itemType) {
|
||||||
case MEDIA_SHARE:
|
case MEDIA_SHARE:
|
||||||
|
case CLIP:
|
||||||
firstOption = R.string.view_post;
|
firstOption = R.string.view_post;
|
||||||
break;
|
break;
|
||||||
case LINK:
|
case LINK:
|
||||||
|
@ -18,7 +18,8 @@ public enum DirectItemType implements Serializable {
|
|||||||
REEL_SHARE(11),
|
REEL_SHARE(11),
|
||||||
ACTION_LOG(12),
|
ACTION_LOG(12),
|
||||||
PLACEHOLDER(13),
|
PLACEHOLDER(13),
|
||||||
STORY_SHARE(14);
|
STORY_SHARE(14),
|
||||||
|
CLIP(15); // clip is just media_share but reel
|
||||||
|
|
||||||
private final int id;
|
private final int id;
|
||||||
private static Map<Integer, DirectItemType> map = new HashMap<>();
|
private static Map<Integer, DirectItemType> map = new HashMap<>();
|
||||||
|
@ -426,7 +426,7 @@ public final class Utils {
|
|||||||
if (userObj != null) {
|
if (userObj != null) {
|
||||||
user = new ProfileModel(
|
user = new ProfileModel(
|
||||||
userObj.getBoolean("is_private"),
|
userObj.getBoolean("is_private"),
|
||||||
false, // temporary
|
false,
|
||||||
userObj.optBoolean("is_verified"),
|
userObj.optBoolean("is_verified"),
|
||||||
String.valueOf(userObj.get("pk")),
|
String.valueOf(userObj.get("pk")),
|
||||||
userObj.getString("username"),
|
userObj.getString("username"),
|
||||||
@ -467,6 +467,7 @@ public final class Utils {
|
|||||||
if ("animated_media".equals(itemType)) return DirectItemType.ANIMATED_MEDIA;
|
if ("animated_media".equals(itemType)) return DirectItemType.ANIMATED_MEDIA;
|
||||||
if ("voice_media".equals(itemType)) return DirectItemType.VOICE_MEDIA;
|
if ("voice_media".equals(itemType)) return DirectItemType.VOICE_MEDIA;
|
||||||
if ("story_share".equals(itemType)) return DirectItemType.STORY_SHARE;
|
if ("story_share".equals(itemType)) return DirectItemType.STORY_SHARE;
|
||||||
|
if ("clip".equals(itemType)) return DirectItemType.CLIP;
|
||||||
return DirectItemType.TEXT;
|
return DirectItemType.TEXT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -705,6 +706,11 @@ public final class Utils {
|
|||||||
directMedia = getDirectMediaModel(itemObject.getJSONObject("media_share"));
|
directMedia = getDirectMediaModel(itemObject.getJSONObject("media_share"));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case CLIP:
|
||||||
|
Log.d("austin_debug", "clip: "+itemObject.getJSONObject("clip").getJSONObject("clip"));
|
||||||
|
directMedia = getDirectMediaModel(itemObject.getJSONObject("clip").getJSONObject("clip"));
|
||||||
|
break;
|
||||||
|
|
||||||
case MEDIA:
|
case MEDIA:
|
||||||
directMedia = getDirectMediaModel(itemObject.optJSONObject("media"));
|
directMedia = getDirectMediaModel(itemObject.optJSONObject("media"));
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user