diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java index 4cb40fb3..e13c6814 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java +++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java @@ -365,6 +365,10 @@ class ColumnViewHolder loadBackgroundImage( ivColumnBackgroundImage, column.column_bg_image ); + + if( status_adapter != null && status_adapter.header != null ){ + status_adapter.header.showColor(); + } } diff --git a/app/src/main/java/jp/juggler/subwaytooter/HeaderViewHolder.java b/app/src/main/java/jp/juggler/subwaytooter/HeaderViewHolder.java index 59b06b2e..aa32981c 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/HeaderViewHolder.java +++ b/app/src/main/java/jp/juggler/subwaytooter/HeaderViewHolder.java @@ -1,5 +1,6 @@ package jp.juggler.subwaytooter; +import android.support.v4.view.ViewCompat; import android.view.View; import android.widget.Button; import android.widget.ImageButton; @@ -34,6 +35,8 @@ class HeaderViewHolder implements View.OnClickListener, View.OnLongClickListener private final TextView tvNote; private final ImageButton btnFollow; private final ImageView ivFollowedBy; + private final View llProfile; + private TootAccount who; @@ -62,6 +65,7 @@ class HeaderViewHolder implements View.OnClickListener, View.OnLongClickListener ivBackground = (MyNetworkImageView) viewRoot.findViewById( R.id.ivBackground ); + llProfile = viewRoot.findViewById( R.id.llProfile ); tvCreated = (TextView) viewRoot.findViewById( R.id.tvCreated ); ivAvatar = (MyNetworkImageView) viewRoot.findViewById( R.id.ivAvatar ); tvDisplayName = (TextView) viewRoot.findViewById( R.id.tvDisplayName ); @@ -73,6 +77,8 @@ class HeaderViewHolder implements View.OnClickListener, View.OnLongClickListener View btnMore = viewRoot.findViewById( R.id.btnMore ); btnFollow = (ImageButton) viewRoot.findViewById( R.id.btnFollow ); ivFollowedBy = (ImageView) viewRoot.findViewById( R.id.ivFollowedBy ); + + ivBackground.setOnClickListener( this ); btnFollowing.setOnClickListener( this ); btnFollowers.setOnClickListener( this ); @@ -85,8 +91,20 @@ class HeaderViewHolder implements View.OnClickListener, View.OnLongClickListener tvNote.setMovementMethod( MyLinkMovementMethod.getInstance() ); } + void showColor(){ + int c = column.column_bg_color; + if( c == 0 ){ + c = Styler.getAttributeColor( activity, R.attr. colorProfileBackgroundMask); + }else{ + c = 0xc0000000 | (0x00ffffff & c); + } + llProfile.setBackgroundColor( c ); + } + void bind( TootAccount who ){ this.who = who; + + showColor(); if( who == null ){ tvCreated.setText( "" ); @@ -176,4 +194,5 @@ class HeaderViewHolder implements View.OnClickListener, View.OnLongClickListener return false; } + } \ No newline at end of file diff --git a/app/src/main/res/layout/lv_list_header.xml b/app/src/main/res/layout/lv_list_header.xml index 258d521d..b54231b3 100644 --- a/app/src/main/res/layout/lv_list_header.xml +++ b/app/src/main/res/layout/lv_list_header.xml @@ -33,10 +33,10 @@