fix #27 #28 #29 (maybe)

zorgluf · zorgluf · commit 3a229c2c8fa3 · 2024-06-05T21:52:11.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
     }
 }
@@ -76,6 +76,6 @@ dependencies {
 
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.4.1'
     }
 }
diff --git a/app/src/main/java/fr/nuage/souvenirs/view/DataBindingAdapters.java b/app/src/main/java/fr/nuage/souvenirs/view/DataBindingAdapters.java
@@ -21,7 +21,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import fr.nuage.souvenirs.R;
+import fr.nuage.souvenirs.model.Element;
 import fr.nuage.souvenirs.model.ImageElement;
+import fr.nuage.souvenirs.viewmodel.AlbumViewModel;
 import fr.nuage.souvenirs.viewmodel.ElementViewModel;
 
 public class DataBindingAdapters {
@@ -129,8 +131,17 @@ public static void setLayoutMarginLeft(View v, int marginLeft, int marginTop, in
         }
     }
 
-    public static void onLayoutChange(View view, int left, int top, int right, int bottom) {
-        setLayoutMarginLeft(view, left, top, right, bottom);
+    public static void onLayoutChange(View view, ElementViewModel element, AlbumViewModel album) {
+        if ((element != null) && (album != null)) {
+            if ((element.getLeft().getValue() != null) && (element.getRight().getValue() != null) && (element.getTop().getValue() != null) && (element.getBottom().getValue() != null)) {
+                if (album.getLdElementMargin().getValue() != null) {
+                    setLayoutMarginLeft(view, element.getLeft().getValue() + album.getLdElementMargin().getValue(),
+                            element.getTop().getValue() + album.getLdElementMargin().getValue(),
+                            element.getRight().getValue() - album.getLdElementMargin().getValue(),
+                            element.getBottom().getValue() - album.getLdElementMargin().getValue());
+                }
+            }
+        }
     }
 
     @BindingAdapter("is_selected")
diff --git a/app/src/main/java/fr/nuage/souvenirs/view/EditPageFragment.java b/app/src/main/java/fr/nuage/souvenirs/view/EditPageFragment.java
@@ -13,6 +13,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.MediaStore;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -21,24 +22,16 @@
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContract;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.view.menu.MenuBuilder;
-import androidx.core.app.ActivityCompat;
 import androidx.core.content.FileProvider;
-import androidx.core.content.PermissionChecker;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.appbar.AppBarLayout;
 
@@ -49,7 +42,6 @@
 
 import fr.nuage.souvenirs.R;
 import fr.nuage.souvenirs.databinding.FragmentEditPageBinding;
-import fr.nuage.souvenirs.model.AudioElement;
 import fr.nuage.souvenirs.model.Page;
 import fr.nuage.souvenirs.model.TilePageBuilder;
 import fr.nuage.souvenirs.view.helpers.Div;
@@ -89,6 +81,10 @@ public void onCreate(Bundle savedInstanceState) {
             String pageId = EditPageFragmentArgs.fromBundle(getArguments()).getPageId();
             //load view model
             albumVM = new ViewModelProvider(requireActivity(),new AlbumListViewModelFactory(requireActivity().getApplication())).get(AlbumListViewModel.class).getAlbum(albumPath);
+            if (albumVM == null) {
+                Log.e(getClass().getName(),"Unable to load album at "+albumPath);
+                getActivity().getSupportFragmentManager().popBackStack();
+            }
             PageViewModel pageVM = albumVM.getPage(UUID.fromString(pageId));
             //set focus on that page
             albumVM.setFocusPage(pageVM);
diff --git a/app/src/main/java/fr/nuage/souvenirs/view/EditPageListAdapter.java b/app/src/main/java/fr/nuage/souvenirs/view/EditPageListAdapter.java
@@ -111,10 +111,10 @@ public void onBindViewHolder(@NonNull EditPageListAdapter.ViewHolder holder, int
                         ImageElementViewModel ei = (ImageElementViewModel)e;
                         //load xml layout and bind data
                         ImageElementViewBinding binding = DataBindingUtil.inflate(inflater, R.layout.image_element_view, layout,false);
-                        binding.setLifecycleOwner(lifecycleOwner);
                         binding.setElement(ei);
                         binding.setAlbum(albumViewModel);
                         layout.addView(binding.getRoot());
+                        binding.setLifecycleOwner(lifecycleOwner);
                         binding.executePendingBindings();
                     } else if (e.getClass() == AudioElementViewModel.class) {
                         continue;
diff --git a/app/src/main/res/layout/image_element_view.xml b/app/src/main/res/layout/image_element_view.xml
@@ -18,7 +18,7 @@
         android:layout_marginBottom="@{element.bottom - album.ldElementMargin}"
         android:layout_marginStart="@{element.left + album.ldElementMargin}"
         android:layout_marginEnd="@{element.right - album.ldElementMargin}"
-        android:onLayoutChange="@{(view, a, b, c, d, e, f, g, h) -> DataBindingAdapters.onLayoutChange(view, element.left + album.ldElementMargin, element.top + album.ldElementMargin, element.right - album.ldElementMargin, element.bottom - album.ldElementMargin)}"
+        android:onLayoutChange="@{(view, a, b, c, d, e, f, g, h) -> DataBindingAdapters.onLayoutChange(view, element, album)}"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/text_element_view.xml b/app/src/main/res/layout/text_element_view.xml
@@ -16,7 +16,7 @@
         android:layout_marginBottom="@{element.bottom - album.ldElementMargin}"
         android:layout_marginStart="@{element.left + album.ldElementMargin}"
         android:layout_marginEnd="@{element.right - album.ldElementMargin}"
-        android:onLayoutChange="@{(view, a, b, c, d, e, f, g, h) -> DataBindingAdapters.onLayoutChange(view, element.left + album.ldElementMargin, element.top + album.ldElementMargin, element.right - album.ldElementMargin, element.bottom - album.ldElementMargin)}"
+        android:onLayoutChange="@{(view, a, b, c, d, e, f, g, h) -> DataBindingAdapters.onLayoutChange(view, element, album)}"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/video_element_view.xml b/app/src/main/res/layout/video_element_view.xml
@@ -18,7 +18,7 @@
         android:layout_marginBottom="@{element.bottom - album.ldElementMargin}"
         android:layout_marginStart="@{element.left + album.ldElementMargin}"
         android:layout_marginEnd="@{element.right - album.ldElementMargin}"
-        android:onLayoutChange="@{(view, a, b, c, d, e, f, g, h) -> DataBindingAdapters.onLayoutChange(view, element.left + album.ldElementMargin, element.top + album.ldElementMargin, element.right - album.ldElementMargin, element.bottom - album.ldElementMargin)}"
+        android:onLayoutChange="@{(view, a, b, c, d, e, f, g, h) -> DataBindingAdapters.onLayoutChange(view, element, album)}"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
 
         // NOTE: Do not place your application dependencies here; they belong

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`mavenCentral()`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:8.4.0'`
	`11`	`+ classpath 'com.android.tools.build:gradle:8.4.1'`
`12`	`12`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"`
`13`	`13`	`}`
`14`	`14`	`}`
`@@ -76,6 +76,6 @@ dependencies {`
`76`	`76`
`77`	`77`	`buildscript {`
`78`	`78`	`dependencies {`
`79`		`- classpath 'com.android.tools.build:gradle:8.4.0'`
	`79`	`+ classpath 'com.android.tools.build:gradle:8.4.1'`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:8.4.0'`
	`10`	`+ classpath 'com.android.tools.build:gradle:8.4.1'`
`11`	`11`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`