waltercool/Husky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes the text colour in the light theme for the collapsed toolbar in the account page.

Browse Source
This commit is contained in:
Vavassor 2017-05-01 23:31:31 -04:00
parent 8b4bf0ab33
commit 07f22b2560
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,9 +109,14 @@ public class AccountActivity extends BaseActivity {
< 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));
toolbar.setTitleTextColor(ThemeUtils.getColor(toolbar.getContext(),
android.R.attr.textColorPrimary));
String subtitle = String.format(getString(R.string.status_username_format),
loadedAccount.username);
getSupportActionBar().setSubtitle(subtitle);
toolbar.setSubtitleTextColor(ThemeUtils.getColor(toolbar.getContext(),
android.R.attr.textColorSecondary));
}
attribute = R.attr.account_toolbar_icon_tint_collapsed;
} else {

4
app/src/main/res/layout/activity_account.xml
View File

@ -103,7 +103,7 @@
app:srcCompat="@drawable/reblog_disabled_light"
android:tint="?android:textColorSecondary"
android:layout_toRightOf="@id/account_username"
android:contentDescription="@string/description_account_locked"/>
android:contentDescription="@string/description_account_locked" />
</RelativeLayout>
</LinearLayout>
@ -115,7 +115,7 @@
android:id="@+id/account_note"
android:textColor="?android:textColorTertiary"
android:padding="16dp"
android:paddingTop="10dp"/>
android:paddingTop="10dp" />
</LinearLayout>