diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java index 043d034d9..6abdca69e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java @@ -235,11 +235,43 @@ public class MainActivity extends AppCompatActivity } } }); + + if (Helper.THEME_MENU == sharedpreferences.getInt(Helper.SET_TABS, Helper.THEME_TABS)) { + + toolbarTitle.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + + int pos = tabLayout.getSelectedTabPosition(); + + Fragment fragment = (Fragment) viewPager.getAdapter().instantiateItem(viewPager, pos); + + switch (pos) { + case 0: + case 2: + case 3: + DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment); + if (displayStatusFragment != null) + displayStatusFragment.scrollToTop(); + break; + case 1: + DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment); + if (displayNotificationsFragment != null) + displayNotificationsFragment.scrollToTop(); + break; + } + } + }); + } + + else { + toolbarTitle.setOnClickListener(null); + toolbar.setClickable(false); + } + for(int i = 0 ; i < 4 ; i++) if( tabLayout.getTabAt(i) != null && tabLayout.getTabAt(i).getIcon() != null) tabLayout.getTabAt(i).getIcon().setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN); - toolbar_search.setOnQueryTextListener(new SearchView.OnQueryTextListener() { @Override public boolean onQueryTextSubmit(String query) {