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

Merge branch 'raphaelm-account_activity_title'

Browse source
This commit is contained in:
Vavassor 2017-05-01 23:31:59 -04:00
commit ba0ad09f19
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,8 +125,23 @@ public class AccountActivity extends BaseActivity implements SFragment.OnUserRem
@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());
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; 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) {

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

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