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

focused status

This commit is contained in:
tom79 2019-08-18 17:53:56 +02:00
parent 72e0ea3594
commit d14843c131
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
View File

@ -2422,7 +2422,6 @@ public abstract class BaseMainActivity extends BaseActivity
public void updateNotifCounter(){
if( timelines == null)
return;
ManageTimelines notifTimeline;
int i = 0;
int position = -1;
for(ManageTimelines tl: timelines){
@ -2476,7 +2475,6 @@ public abstract class BaseMainActivity extends BaseActivity
public void manageFloatingButton(boolean display){
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
boolean displayFollowInstance = sharedpreferences.getBoolean(Helper.SET_DISPLAY_FOLLOW_INSTANCE, true);
if( social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE ||social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA|| social == UpdateAccountInfoAsyncTask.SOCIAL.GNU|| social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
if (display) {
tootShow();

2
app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
View File

@ -118,6 +118,8 @@ public class ShowConversationActivity extends BaseActivity implements OnRetriev
finish();
detailsStatus.setFocused(true);
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
if( receive_action != null)

5
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -849,7 +849,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
@Override
public int getItemViewType(int position) {
return statuses.get(position).getViewType();
if( statuses.get(position).isFocused() && type == RetrieveFeedsAsyncTask.Type.CONTEXT && statuses.get(position).getViewType() != CONSOLE_STATUS)
return FOCUSED_STATUS;
else
return statuses.get(position).getViewType();
}
@NonNull