Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'account_activity_title' of https://github.com/raphaelm/Tusky into raphaelm-account_activity_title

This commit is contained in:
Vavassor 2017-04-17 00:31:10 -04:00
parent a33c259760 c7772d0f56
commit 8b4bf0ab33
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View File

@ -107,8 +107,18 @@ public class AccountActivity extends BaseActivity {
@AttrRes int attribute; @AttrRes int attribute;
if (collapsingToolbar.getHeight() + verticalOffset if (collapsingToolbar.getHeight() + verticalOffset
< 2 * ViewCompat.getMinimumHeight(collapsingToolbar)) { < 2 * ViewCompat.getMinimumHeight(collapsingToolbar)) {
if (getSupportActionBar() != null && loadedAccount != null) {
getSupportActionBar().setTitle(loadedAccount.getDisplayName());
getSupportActionBar().setSubtitle(
String.format(getString(R.string.status_username_format),
loadedAccount.username));
}
attribute = R.attr.account_toolbar_icon_tint_collapsed; attribute = R.attr.account_toolbar_icon_tint_collapsed;
} else { } else {
if (getSupportActionBar() != null) {
getSupportActionBar().setTitle("");
getSupportActionBar().setSubtitle("");
}
attribute = R.attr.account_toolbar_icon_tint_uncollapsed; attribute = R.attr.account_toolbar_icon_tint_uncollapsed;
} }
if (attribute != priorAttribute) { if (attribute != priorAttribute) {