Skip to content

Commit e2e6533

Browse files
committedNov 7, 2024
blured background on video
1 parent 11a8e42 commit e2e6533

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed
 

‎app/src/main/java/fr/nuage/souvenirs/view/DataBindingAdapters.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
import com.bumptech.glide.Glide;
1616
import com.bumptech.glide.request.target.CustomTarget;
1717
import com.bumptech.glide.request.transition.Transition;
18-
import com.google.android.material.card.MaterialCardView;
1918

2019
import java.io.File;
2120
import androidx.annotation.NonNull;
2221
import androidx.annotation.Nullable;
2322
import fr.nuage.souvenirs.R;
24-
import fr.nuage.souvenirs.model.Element;
2523
import fr.nuage.souvenirs.model.ImageElement;
2624
import fr.nuage.souvenirs.viewmodel.AlbumViewModel;
2725
import fr.nuage.souvenirs.viewmodel.ElementViewModel;
@@ -54,8 +52,11 @@ public static void setSrcCompatZoomOffset(ImageElementView view, String imagePat
5452
}
5553
}
5654

57-
@BindingAdapter(value = { "srcCompat"}, requireAll=false)
58-
public static void setSrcCompatZoomOffset(ImageView view, String imagePath) {
55+
@BindingAdapter(value = { "srcCompat" }, requireAll=false)
56+
public static void setSrcCompat(ImageView view, String imagePath) {
57+
if (view instanceof ImageElementView) {
58+
return;
59+
}
5960
if (imagePath != null) {
6061
if (imagePath.equals("")) {
6162
view.setImageDrawable(ContextCompat.getDrawable(view.getContext(),R.drawable.ic_image_black_24dp));

‎app/src/main/res/layout/image_element_view.xml

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
android:layout_width="match_parent"
3232
android:layout_height="match_parent"
3333
android:alpha="0.2"
34+
android:scaleType="centerCrop"
3435
app:srcCompat="@{element.zoom >= 100 ? null : element.imagePath}"
3536
tools:visibility="visible" />
3637

‎app/src/main/res/layout/video_element_view.xml

+10-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<import type="fr.nuage.souvenirs.model.ImageElement" />
88
<import type="fr.nuage.souvenirs.viewmodel.VideoElementViewModel" />
99
<import type="android.view.View"/>
10+
<import type="android.widget.ImageView"/>
1011
<variable name="element" type="fr.nuage.souvenirs.viewmodel.VideoElementViewModel"/>
1112
<variable name="album" type="fr.nuage.souvenirs.viewmodel.AlbumViewModel" />
1213
<import type="fr.nuage.souvenirs.view.DataBindingAdapters" />
@@ -27,6 +28,15 @@
2728
app:layout_constraintTop_toBottomOf="parent"
2829
>
2930

31+
<ImageView
32+
android:id="@+id/image_background"
33+
android:layout_width="match_parent"
34+
android:layout_height="match_parent"
35+
android:alpha="0.2"
36+
android:scaleType="centerCrop"
37+
app:srcCompat="@{element.zoom >= 100 ? null : element.imagePath}"
38+
tools:visibility="visible" />
39+
3040
<RelativeLayout
3141
android:layout_width="match_parent"
3242
android:layout_height="match_parent"
@@ -51,14 +61,9 @@
5161
android:layout_marginStart="8dp"
5262
android:layout_marginTop="8dp"
5363
android:alpha="0.5"
54-
android:visibility="@{(element instanceof VideoElementViewModel) ? View.VISIBLE : View.GONE }"
5564
app:layout_constraintDimensionRatio="h,1:1"
5665
app:layout_constraintStart_toStartOf="parent"
5766
app:layout_constraintTop_toTopOf="parent"
58-
android:scaleType="@{element.transformType}"
59-
android:scaleX='@{element.transformType.equals(ImageElement.ZOOM_OFFSET) ? element.zoom : null }'
60-
android:scrollX='@{element.transformType.equals(ImageElement.ZOOM_OFFSET) ? element.offsetX : null }'
61-
android:scrollY='@{element.transformType.equals(ImageElement.ZOOM_OFFSET) ? element.offsetY : null }'
6267
app:srcCompat="@drawable/ic_baseline_videocam_24"
6368
app:tint="@color/secondaryColor"
6469
tools:visibility="visible" />

0 commit comments

Comments
 (0)
Failed to load comments.