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

discussion threads activity extended to every toots + prepares to v1.0.5

This commit is contained in:
tom79 2017-05-17 16:28:26 +02:00
parent 82d66cb9fb
commit 529cef7777
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 4 versionCode 5
versionName "1.0.4" versionName "1.0.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

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

@ -173,20 +173,16 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
} }
//Click on a conversation //Click on a conversation
if( type != RetrieveFeedsAsyncTask.Type.CONTEXT ){ if( type != RetrieveFeedsAsyncTask.Type.CONTEXT ){
if( !status.getIn_reply_to_account_id().equals("null") || !status.getIn_reply_to_id().equals("null") ) { holder.status_content.setOnClickListener(new View.OnClickListener() {
holder.status_content.setOnClickListener(new View.OnClickListener() { @Override
@Override public void onClick(View v) {
public void onClick(View v) { Intent intent = new Intent(context, ShowConversationActivity.class);
Intent intent = new Intent(context, ShowConversationActivity.class); Bundle b = new Bundle();
Bundle b = new Bundle(); b.putString("statusId", status.getId()); //Your id
b.putString("statusId", status.getId()); //Your id intent.putExtras(b); //Put your id to your next Intent
intent.putExtras(b); //Put your id to your next Intent context.startActivity(intent);
context.startActivity(intent); }
} });
});
}else{
holder.status_content.setOnClickListener(null);
}
}else { }else {
if( position == ShowConversationActivity.position){ if( position == ShowConversationActivity.position){
holder.main_container.setBackgroundResource(R.color.blue_light); holder.main_container.setBackgroundResource(R.color.blue_light);