diff --git a/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java b/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java index e9554a9df6b0..23a2ea7c2b36 100644 --- a/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java @@ -27,6 +27,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; @@ -49,6 +50,7 @@ public abstract class ToolbarActivity extends BaseActivity { private ProgressBar mProgressBar; private ImageView mPreviewImage; + private FrameLayout mPreviewImageContainer; private LinearLayout mInfoBox; private TextView mInfoBoxMessage; @@ -79,6 +81,7 @@ protected void setupToolbar(boolean useBackgroundImage) { mInfoBoxMessage = findViewById(R.id.info_box_message); mPreviewImage = findViewById(R.id.preview_image); + mPreviewImageContainer = findViewById(R.id.preview_image_frame); ThemeUtils.colorStatusBar(this, primaryColor); @@ -191,8 +194,8 @@ public void setProgressBarVisibility(int visibility) { * @param visibility visibility of the preview image */ public void setPreviewImageVisibility(int visibility) { - if (mPreviewImage != null) { - mPreviewImage.setVisibility(visibility); + if (mPreviewImage != null && mPreviewImageContainer != null) { + mPreviewImageContainer.setVisibility(visibility); } } diff --git a/src/main/res/drawable/preview_image_gradient_shape.xml b/src/main/res/drawable/preview_image_gradient_shape.xml new file mode 100644 index 000000000000..f15d034d7c60 --- /dev/null +++ b/src/main/res/drawable/preview_image_gradient_shape.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/src/main/res/layout/toolbar_standard.xml b/src/main/res/layout/toolbar_standard.xml index 88cccee9c787..ce95ce7a3944 100644 --- a/src/main/res/layout/toolbar_standard.xml +++ b/src/main/res/layout/toolbar_standard.xml @@ -32,13 +32,24 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + android:visibility="gone"> + + + + +