chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

Switches back a foolish last second change that ruined the light theme toolbar text fix.

Browse source
This commit is contained in:
Vavassor 2017-05-01 23:39:06 -04:00
parent ba0ad09f19
commit b6cf99602b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View file

@ -127,13 +127,13 @@ public class AccountActivity extends BaseActivity implements SFragment.OnUserRem
< 2 * ViewCompat.getMinimumHeight(collapsingToolbar)) { < 2 * ViewCompat.getMinimumHeight(collapsingToolbar)) {
if (getSupportActionBar() != null && loadedAccount != null) { if (getSupportActionBar() != null && loadedAccount != null) {
getSupportActionBar().setTitle(loadedAccount.getDisplayName()); getSupportActionBar().setTitle(loadedAccount.getDisplayName());
toolbar.setTitleTextColor(ThemeUtils.getColor(toolbar.getContext(), toolbar.setTitleTextColor(ThemeUtils.getColor(AccountActivity.this,
android.R.attr.textColorPrimary)); android.R.attr.textColorPrimary));
String subtitle = String.format(getString(R.string.status_username_format), String subtitle = String.format(getString(R.string.status_username_format),
loadedAccount.username); loadedAccount.username);
getSupportActionBar().setSubtitle(subtitle); getSupportActionBar().setSubtitle(subtitle);
toolbar.setSubtitleTextColor(ThemeUtils.getColor(toolbar.getContext(), toolbar.setSubtitleTextColor(ThemeUtils.getColor(AccountActivity.this,
android.R.attr.textColorSecondary)); android.R.attr.textColorSecondary));
} }
attribute = R.attr.account_toolbar_icon_tint_collapsed; attribute = R.attr.account_toolbar_icon_tint_collapsed;