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

Improves conversation activity #354

This commit is contained in:
stom79 2018-03-15 18:28:12 +01:00
parent 644d213193
commit 1d95bb2f95
4 changed files with 86 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
View File

@ -23,6 +23,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.DividerItemDecoration;
@ -81,6 +82,8 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
private ImageView pp_actionBar;
private List<Status> statuses;
private StatusListAdapter statusListAdapter;
private boolean expanded;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -92,11 +95,19 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
}else {
setTheme(R.style.AppThemeDark_NoActionBar);
}
expanded = false;
setContentView(R.layout.activity_show_conversation);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
Bundle b = getIntent().getExtras();
if(b != null)
statusId = b.getString("statusId", null);
if( statusId == null)
finish();
if( getSupportActionBar() != null)
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if( getSupportActionBar() != null) {
@ -108,6 +119,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
TextView title = getSupportActionBar().getCustomView().findViewById(R.id.toolbar_title);
pp_actionBar = getSupportActionBar().getCustomView().findViewById(R.id.pp_actionBar);
ImageView action_refresh = getSupportActionBar().getCustomView().findViewById(R.id.action_refresh);
final ImageView action_expand = getSupportActionBar().getCustomView().findViewById(R.id.action_expand);
title.setText(R.string.conversation);
ImageView close_conversation = getSupportActionBar().getCustomView().findViewById(R.id.close_conversation);
@ -142,6 +154,19 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
}, 1000);
}
});
action_expand.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
expanded = !expanded;
if( expanded)
action_expand.setImageResource(R.drawable.ic_expand_less);
else
action_expand.setImageResource(R.drawable.ic_expand_more);
new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false,false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
});
}else{
setTitle(R.string.conversation);
}
@ -158,7 +183,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
.load(url)
.into(new SimpleTarget<Bitmap>() {
@Override
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
BitmapDrawable ppDrawable = new BitmapDrawable(getResources(), Bitmap.createScaledBitmap(resource, (int) Helper.convertDpToPixel(25, getApplicationContext()), (int) Helper.convertDpToPixel(25, getApplicationContext()), true));
if( pp_actionBar != null){
pp_actionBar.setImageDrawable(ppDrawable);
@ -170,11 +195,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
}
});
Bundle b = getIntent().getExtras();
if(b != null)
statusId = b.getString("statusId", null);
if( statusId == null)
finish();
isRefreshed = false;
swipeRefreshLayout = findViewById(R.id.swipeContainer);
@ -222,7 +243,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
List<Status> statuses = apiResponse.getStatuses();
if( statuses != null && statuses.size() > 0 ){
initialStatus = statuses.get(0);
new RetrieveContextAsyncTask(getApplicationContext(), initialStatus.getId(), ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveContextAsyncTask(getApplicationContext(), expanded, initialStatus.getId(), ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
@ -244,29 +265,41 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
int position = 0;
boolean positionFound = false;
statuses = new ArrayList<>();
if( statusFirst != null)
statuses.add(0, statusFirst);
if( context.getAncestors() != null && context.getAncestors().size() > 0){
for(Status status: context.getAncestors()){
statuses.add(status);
if( !positionFound)
position++;
if( status.getId().equals(initialStatus.getId()))
positionFound = true;
if( expanded) {
if (statusFirst != null)
statuses.add(0, statusFirst);
if (context.getAncestors() != null && context.getAncestors().size() > 0) {
for (Status status : context.getAncestors()) {
statuses.add(status);
if (!positionFound)
position++;
if (status.getId().equals(initialStatus.getId()))
positionFound = true;
}
} else if (statusFirst == null) {
statuses.add(0, initialStatus);
positionFound = true;
}
}else if( statusFirst == null){
statuses.add(0, initialStatus);
positionFound = true;
}
if( context.getDescendants() != null && context.getDescendants().size() > 0){
for(Status status: context.getDescendants()){
statuses.add(status);
if( !positionFound)
position++;
if( status.getId().equals(initialStatus.getId()))
positionFound = true;
if (context.getDescendants() != null && context.getDescendants().size() > 0) {
for (Status status : context.getDescendants()) {
statuses.add(status);
if (!positionFound)
position++;
if (status.getId().equals(initialStatus.getId()))
positionFound = true;
}
}
}else {
position = 0;
if (context.getAncestors() != null && context.getAncestors().size() > 0) {
statuses.addAll(context.getAncestors());
position = context.getAncestors().size();
}
statuses.add(initialStatus);
if (context.getDescendants() != null && context.getDescendants().size() > 0) {
statuses.addAll(context.getDescendants());
}
}

6
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
View File

@ -36,11 +36,13 @@ public class RetrieveContextAsyncTask extends AsyncTask<Void, Void, Void> {
private OnRetrieveContextInterface listener;
private API api;
private WeakReference<Context> contextReference;
private boolean expanded;
public RetrieveContextAsyncTask(Context context, String statusId, OnRetrieveContextInterface onRetrieveContextInterface){
public RetrieveContextAsyncTask(Context context, boolean expanded, String statusId, OnRetrieveContextInterface onRetrieveContextInterface){
this.contextReference = new WeakReference<>(context);
this.statusId = statusId;
this.listener = onRetrieveContextInterface;
this.expanded = expanded;
}
@Override
@ -48,7 +50,7 @@ public class RetrieveContextAsyncTask extends AsyncTask<Void, Void, Void> {
api = new API(this.contextReference.get());
statusContext = api.getStatusContext(statusId);
//Retrieves the first toot
if( statusContext != null && statusContext.getAncestors() != null && statusContext.getAncestors().size() > 0 ) {
if( expanded && statusContext != null && statusContext.getAncestors() != null && statusContext.getAncestors().size() > 0 ) {
statusFirst = statusContext.getAncestors().get(0);
statusContext = api.getStatusContext(statusContext.getAncestors().get(0).getId());
}

9
app/src/main/res/drawable-anydpi/ic_expand_less.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
</vector>

13
app/src/main/res/layout/conversation_action_bar.xml
View File

@ -57,6 +57,7 @@
android:textColor="?attr/actionBarTextColor"
android:textSize="14sp"
android:id="@+id/toolbar_title" />
<ImageView
android:id="@+id/action_refresh"
android:layout_width="30dp"
@ -69,5 +70,17 @@
android:layout_marginRight="10dp"
android:gravity="center_vertical"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/action_expand"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="end"
android:src="@drawable/ic_expand_more"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:gravity="center_vertical"
tools:ignore="ContentDescription" />
</android.support.v7.widget.Toolbar>