Merge branch 'light-header-background' of https://github.com/connyduck/Tusky into connyduck-light-header-background

This commit is contained in:
Vavassor 2017-05-07 17:29:55 -04:00
commit e134e35a14

View file

@ -30,6 +30,7 @@ import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.graphics.drawable.VectorDrawableCompat; import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -491,6 +492,8 @@ public class MainActivity extends BaseActivity implements SFragment.OnUserRemove
backgroundHeight = background.getMeasuredHeight(); backgroundHeight = background.getMeasuredHeight();
} }
background.setBackgroundColor(ContextCompat.getColor(this, R.color.window_background_dark));
Picasso.with(MainActivity.this) Picasso.with(MainActivity.this)
.load(me.header) .load(me.header)
.placeholder(R.drawable.account_header_missing) .placeholder(R.drawable.account_header_missing)