Merge pull request #828 from Ampli-fier/master

Dark Theme improvements
This commit is contained in:
björn petersen
2019-04-14 00:59:43 +02:00
committed by GitHub
9 changed files with 23 additions and 15 deletions
@@ -753,7 +753,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Drawable image = Drawable.createFromPath(backgroundImagePath);
getWindow().setBackgroundDrawable(image);
}
else if(!dynamicTheme.isDarkTheme(this)) {
else if(dynamicTheme.isDarkTheme(this)) {
getWindow().setBackgroundDrawableResource(R.drawable.background_hd_dark);
}
else {
getWindow().setBackgroundDrawableResource(R.drawable.background_hd);
}
}
@@ -169,8 +169,8 @@ public class ChatBackgroundActivity extends PassphraseRequiredActionBarActivity
private void setDefaultLayoutBackgroundImage() {
if(dynamicTheme.isDarkTheme(this)) {
preview.setImageDrawable(null);
preview.setBackgroundColor(Color.BLACK);
Drawable image = getResources().getDrawable(R.drawable.background_hd_dark);
preview.setImageDrawable(image);
}
else {
Drawable image = getResources().getDrawable(R.drawable.background_hd);