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

Fixes crash when opening the block list. Also, fixes an issue where the collapsed toolbar appears dark on profiles even when using the light theme.

Browse source
This commit is contained in:
Vavassor 2017-03-07 02:28:12 -05:00
commit 37bb799efc
9 changed files with 77 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,8 +10,9 @@
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:theme="@style/AppTheme"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:theme="@style/AppTheme.Account.AppBarLayout"
android:id="@+id/account_app_bar_layout">
<android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
@ -91,7 +92,9 @@
android:textColor="?android:textColorTertiary"
android:padding="16dp"
android:paddingTop="10dp"/>
</LinearLayout>
</FrameLayout>
<android.support.v7.widget.Toolbar
@ -101,7 +104,8 @@
android:background="@android:color/transparent"
android:layout_gravity="top"
android:layout_alignParentTop="true"
app:layout_collapseMode="pin" />
app:layout_collapseMode="pin"
app:popupTheme="?attr/account_toolbar_popup_theme" />
</android.support.design.widget.CollapsingToolbarLayout>

2
app/src/main/res/layout/item_blocked_user.xml
View file

@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/blocked_user_username"
android:textColor="?attr/status_text_color_secondary" />
android:textColor="?android:textColorSecondary" />
<Space
android:layout_width="wrap_content"

2
app/src/main/res/layout/item_follow.xml
View file

@ -83,7 +83,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/notification_username"
android:textColor="?attr/status_text_color_secondary" />
android:textColor="?android:textColorSecondary" />
<Space
android:layout_width="wrap_content"