Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Display cards in toots

This commit is contained in:
stom79 2018-11-07 11:03:32 +01:00
parent 729f2b1ec8
commit 8da120db59
5 changed files with 90 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
View File

@ -123,7 +123,7 @@ public class Status implements Parcelable{
this.status = this;
}
private List<String> conversationProfilePicture;
private String webviewURL = null;
protected Status(Parcel in) {
id = in.readString();
@ -1090,4 +1090,12 @@ public class Status implements Parcelable{
public void setConversationProfilePicture(List<String> conversationProfilePicture) {
this.conversationProfilePicture = conversationProfilePicture;
}
public String getWebviewURL() {
return webviewURL;
}
public void setWebviewURL(String webviewURL) {
this.webviewURL = webviewURL;
}
}

30
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -294,14 +294,18 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
WebView status_cardview_webview;
ImageView hide_preview, hide_preview_h;
TextView status_toot_app;
RelativeLayout webview_preview;
ImageView webview_preview_card;
public View getView(){
return itemView;
}
ViewHolder(View itemView) {
super(itemView);
fetch_more = itemView.findViewById(R.id.fetch_more);
fetch_more = itemView.findViewById(R.id.fetch_more);
webview_preview_card = itemView.findViewById(R.id.webview_preview_card);
webview_preview = itemView.findViewById(R.id.webview_preview);
status_horizontal_document_container = itemView.findViewById(R.id.status_horizontal_document_container);
status_document_container = itemView.findViewById(R.id.status_document_container);
status_horizontal_document_container = itemView.findViewById(R.id.status_horizontal_document_container);
status_content = itemView.findViewById(R.id.status_content);
@ -1120,9 +1124,20 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, true);
if( status.getWebviewURL() != null){
holder.status_cardview_webview.loadUrl(status.getWebviewURL());
holder.status_cardview_webview.setVisibility(View.VISIBLE);
holder.status_cardview_video.setVisibility(View.VISIBLE);
holder.webview_preview.setVisibility(View.GONE);
}else {
holder.status_cardview_webview.setVisibility(View.GONE);
holder.status_cardview_video.setVisibility(View.GONE);
holder.webview_preview.setVisibility(View.VISIBLE);
}
if( type == RetrieveFeedsAsyncTask.Type.CONTEXT || display_card){
if( position == conversationPosition || display_card){
Card card = status.getReblog()!= null?status.getReblog().getCard():status.getCard();
if( card != null){
@ -1147,6 +1162,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
});
}else {
Glide.with(holder.status_cardview_image.getContext())
.load(card.getImage())
.into(holder.webview_preview_card);
holder.status_cardview.setVisibility(View.GONE);
holder.status_cardview_video.setVisibility(View.VISIBLE);
holder.status_cardview_webview.getSettings().setJavaScriptEnabled(true);
@ -1164,7 +1182,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_cardview_video.setVisibility(View.GONE);
}
});
holder.status_cardview_webview.loadUrl(finalSrc);
holder.webview_preview.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
status.setWebviewURL(finalSrc);
notifyStatusChanged(status);
}
});
}
}else {
holder.status_cardview.setVisibility(View.GONE);

19
app/src/main/res/layout/drawer_status.xml
View File

@ -334,8 +334,27 @@
android:id="@+id/status_cardview_video"
android:layout_width="300dp"
android:layout_height="220dp"
android:layout_marginTop="5dp"
android:layout_margin="10dp"
>
<RelativeLayout
android:id="@+id/webview_preview"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/webview_preview_card"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:layout_centerInParent="true"
android:layout_width="30dp"
android:src="@drawable/ic_play_arrow"
android:layout_height="30dp"
tools:ignore="ContentDescription" />
</RelativeLayout>
<WebView
android:visibility="gone"
android:id="@+id/status_cardview_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

16
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -325,7 +325,23 @@
android:layout_marginTop="5dp"
android:layout_margin="10dp"
>
<RelativeLayout
android:id="@+id/webview_preview"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/webview_preview_card"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:layout_centerInParent="true"
android:layout_width="30dp"
android:src="@drawable/ic_play_arrow"
android:layout_height="30dp"
tools:ignore="ContentDescription" />
</RelativeLayout>
<WebView
android:visibility="gone"
android:id="@+id/status_cardview_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

20
app/src/main/res/layout/drawer_status_focused.xml
View File

@ -251,9 +251,27 @@
android:id="@+id/status_cardview_video"
android:layout_width="300dp"
android:layout_height="220dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="5dp"
android:layout_margin="10dp"
>
<RelativeLayout
android:id="@+id/webview_preview"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/webview_preview_card"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:layout_centerInParent="true"
android:layout_width="30dp"
android:src="@drawable/ic_play_arrow"
android:layout_height="30dp"
tools:ignore="ContentDescription" />
</RelativeLayout>
<WebView
android:visibility="gone"
android:id="@+id/status_cardview_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>