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

Merge branch 'develop' into improves_conversations 

# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
#	app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java
This commit is contained in:
tom79 2017-10-21 16:36:05 +02:00
parent 7b92d0feff
commit e8997edae1
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
private ListView lv_status;
private boolean isRefreshed;
private ImageView pp_actionBar;
public static int position;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -237,7 +237,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);
int positionSpinnerTrans = sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX);
position = 0;
int position = 0;
boolean positionFound = false;
List<Status> statuses = new ArrayList<>();
if( statusFirst != null)
@ -266,7 +266,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
}
}
RelativeLayout loader = findViewById(R.id.loader);
StatusListAdapter statusListAdapter = new StatusListAdapter(ShowConversationActivity.this, RetrieveFeedsAsyncTask.Type.CONTEXT, null, isOnWifi, behaviorWithAttachments, positionSpinnerTrans, statuses);
StatusListAdapter statusListAdapter = new StatusListAdapter(ShowConversationActivity.this, position, null, isOnWifi, behaviorWithAttachments, positionSpinnerTrans, statuses);
lv_status.setAdapter(statusListAdapter);
statusListAdapter.notifyDataSetChanged();
loader.setVisibility(View.GONE);

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

@ -40,7 +40,6 @@ import android.text.SpannableString;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.util.Patterns;
import android.util.TypedValue;
import android.view.LayoutInflater;
@ -130,6 +129,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
private final int HIDDEN_STATUS = 0;
private final int DISPLAYED_STATUS = 1;
private List<Status> pins;
private int conversationPosition;
public StatusListAdapter(Context context, RetrieveFeedsAsyncTask.Type type, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List<Status> statuses){
this.context = context;
@ -144,7 +144,19 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
pins = new ArrayList<>();
}
public StatusListAdapter(Context context, int position, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List<Status> statuses){
this.context = context;
this.statuses = statuses;
this.isOnWifi = isOnWifi;
this.behaviorWithAttachments = behaviorWithAttachments;
layoutInflater = LayoutInflater.from(this.context);
statusListAdapter = this;
this.type = RetrieveFeedsAsyncTask.Type.CONTEXT;
this.conversationPosition = position;
this.targetedId = targetedId;
this.translator = translator;
pins = new ArrayList<>();
}
@Override
public int getCount() {
@ -736,13 +748,13 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
});
}else {
if( theme == Helper.THEME_LIGHT){
if( position == ShowConversationActivity.position){
if( position == conversationPosition){
holder.main_container.setBackgroundResource(R.color.mastodonC3_);
}else {
holder.main_container.setBackgroundResource(R.color.mastodonC3__);
}
}else {
if( position == ShowConversationActivity.position){
if( position == conversationPosition){
holder.main_container.setBackgroundResource(R.color.mastodonC1___);
}else {
holder.main_container.setBackgroundResource(R.color.mastodonC1_);