tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-18 17:15:05 +02:00
commit 986c2e7493
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -159,7 +159,7 @@ public class MainActivity extends AbsFabActivity
} }
private void setToolBarTransparent(boolean transparent) { private void setToolBarTransparent(boolean transparent) {
float alpha = transparent ? 0.97f : 1f; float alpha = transparent ? 0.9f : 1f;
final int colorPrimary = PreferenceUtils.getInstance(this).getThemeColorPrimary(); final int colorPrimary = PreferenceUtils.getInstance(this).getThemeColorPrimary();
ViewUtil.setBackgroundAlpha(toolbar, alpha, colorPrimary); ViewUtil.setBackgroundAlpha(toolbar, alpha, colorPrimary);
ViewUtil.setBackgroundAlpha(slidingTabLayout, alpha, colorPrimary); ViewUtil.setBackgroundAlpha(slidingTabLayout, alpha, colorPrimary);

1
app/src/main/res/values-v19/dimens.xml
View file

@ -2,4 +2,5 @@
<resources> <resources>
<dimen name="statusMargin">25dp</dimen> <dimen name="statusMargin">25dp</dimen>
<dimen name="navigation_drawer_image_height">165dp</dimen> <dimen name="navigation_drawer_image_height">165dp</dimen>
<dimen name="main_toolbar_padding_top">@dimen/statusMargin</dimen>
</resources> </resources>

2
app/src/main/res/values/dimens.xml
View file

@ -14,7 +14,7 @@
<dimen name="header_image_height">360dp</dimen> <dimen name="header_image_height">360dp</dimen>
<dimen name="statusMargin">0dp</dimen> <dimen name="statusMargin">0dp</dimen>
<dimen name="main_toolbar_padding_top">@dimen/statusMargin</dimen> <dimen name="main_toolbar_padding_top">0dp</dimen>
<!-- Notification template --> <!-- Notification template -->
<dimen name="notification_big_icon_height">64.0dip</dimen> <dimen name="notification_big_icon_height">64.0dip</dimen>